diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index 694835f8b..c12ef2530 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -281,7 +281,7 @@ VOID XTL::EmuD3DInit(Xbe::Header *XbeHeader, uint32 XbeHeaderSize) PresParam.SwapEffect = XTL::D3DSWAPEFFECT_DISCARD; - XTL::EmuIDirect3D8_CreateDevice(0, XTL::D3DDEVTYPE_HAL, 0, D3DCREATE_HARDWARE_VERTEXPROCESSING, &PresParam, &g_pD3DDevice8); + XTL::EMUPATCH(D3D_CreateDevice)(0, XTL::D3DDEVTYPE_HAL, 0, D3DCREATE_HARDWARE_VERTEXPROCESSING, &PresParam, &g_pD3DDevice8); } } @@ -1088,8 +1088,7 @@ static void EmuVerifyResourceIsRegistered(XTL::X_D3DResource *pResource) } } - ; - XTL::EmuIDirect3DResource8_Register(pResource, 0/*(PVOID)pResource->Data*/); + XTL::EMUPATCH(D3DResource_Register)(pResource, 0/*(PVOID)pResource->Data*/); if(pResource->Lock != X_D3DRESOURCE_LOCK_FLAG_NOSIZE) @@ -1229,9 +1228,9 @@ static void EmuUnswizzleTextureStages() } // ****************************************************************** -// * func: EmuIDirect3D8_CreateDevice +// * patch: D3D_CreateDevice // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_CreateDevice +HRESULT WINAPI XTL::EMUPATCH(D3D_CreateDevice) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -1294,15 +1293,15 @@ HRESULT WINAPI XTL::EmuIDirect3D8_CreateDevice } // ****************************************************************** -// * func: EmuIDirect3DResource8_IsBusy +// * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI XTL::EmuIDirect3DDevice8_IsBusy() +BOOL WINAPI XTL::EMUPATCH(D3DDevice_IsBusy)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_IsBusy();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_IsBusy();\n"); - EmuWarning("EmuIDirect3DDevice8_IsBusy ignored!"); + EmuWarning("EmuD3DDevice_IsBusy ignored!"); @@ -1310,13 +1309,13 @@ BOOL WINAPI XTL::EmuIDirect3DDevice8_IsBusy() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetCreationParameters +// * patch: D3DDevice_GetCreationParameters // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetCreationParameters(D3DDEVICE_CREATION_PARAMETERS *pParameters) +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetCreationParameters)(D3DDEVICE_CREATION_PARAMETERS *pParameters) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetCreationParameters\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetCreationParameters\n" "(\n" " pParameters : 0x%.08X\n" ");\n", @@ -1333,9 +1332,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetCreationParameters(D3DDEVICE_CREATION_PA } // ****************************************************************** -// * func: EmuIDirect3D8_CheckDeviceFormat +// * patch: D3D_CheckDeviceFormat // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_CheckDeviceFormat +HRESULT WINAPI XTL::EMUPATCH(D3D_CheckDeviceFormat) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -1376,13 +1375,13 @@ HRESULT WINAPI XTL::EmuIDirect3D8_CheckDeviceFormat } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDisplayFieldStatus +// * patch: D3DDevice_GetDisplayFieldStatus // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus(X_D3DFIELD_STATUS *pFieldStatus) +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pFieldStatus) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetDisplayFieldStatus\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetDisplayFieldStatus\n" "(\n" " pFieldStatus : 0x%.08X\n" ");\n", @@ -1402,13 +1401,13 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus(X_D3DFIELD_STATUS *pF } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginPush +// * patch: D3DDevice_BeginPush // ****************************************************************** -PDWORD WINAPI XTL::EmuIDirect3DDevice8_BeginPush(DWORD Count) +PDWORD WINAPI XTL::EMUPATCH(D3DDevice_BeginPush)(DWORD Count) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BeginPush(%d);\n", Count); + DbgPrintf("EmuD3D8: EmuD3DDevice_BeginPush(%d);\n", Count); DWORD *pRet = new DWORD[Count]; @@ -1421,13 +1420,13 @@ PDWORD WINAPI XTL::EmuIDirect3DDevice8_BeginPush(DWORD Count) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndPush +// * patch: D3DDevice_EndPush // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_EndPush(DWORD *pPush) +VOID WINAPI XTL::EMUPATCH(D3DDevice_EndPush)(DWORD *pPush) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_EndPush(0x%.08X);\n", pPush); + DbgPrintf("EmuD3D8: EmuD3DDevice_EndPush(0x%.08X);\n", pPush); #ifdef _DEBUG_TRACK_PB // DbgDumpPushBuffer(g_pPrimaryPB, g_dwPrimaryPBCount*sizeof(DWORD)); @@ -1445,13 +1444,13 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_EndPush(DWORD *pPush) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginVisibilityTest +// * patch: D3DDevice_BeginVisibilityTest // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginVisibilityTest() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginVisibilityTest)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BeginVisibilityTest();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_BeginVisibilityTest();\n"); @@ -1459,16 +1458,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginVisibilityTest() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndVisibilityTest +// * patch: D3DDevice_EndVisibilityTest // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndVisibilityTest +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_EndVisibilityTest) ( DWORD Index ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_EndVisibilityTest\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_EndVisibilityTest\n" "(\n" " Index : 0x%.08X\n" ");\n", @@ -1480,13 +1479,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndVisibilityTest } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetBackBufferScale +// * patch: D3DDevice_SetBackBufferScale // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetBackBufferScale(FLOAT x, FLOAT y) +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetBackBufferScale)(FLOAT x, FLOAT y) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetBackBufferScale\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetBackBufferScale\n" "(\n" " x : %f\n" " y : %f\n" @@ -1501,9 +1500,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetBackBufferScale(FLOAT x, FLOAT y) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVisibilityTestResult +// * patch: D3DDevice_GetVisibilityTestResult // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVisibilityTestResult +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVisibilityTestResult) ( DWORD Index, UINT *pResult, @@ -1512,7 +1511,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVisibilityTestResult { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetVisibilityTestResult\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetVisibilityTestResult\n" "(\n" " Index : 0x%.08X\n" " pResult : 0x%.08X\n" @@ -1534,16 +1533,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVisibilityTestResult } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDeviceCaps +// * patch: D3DDevice_GetDeviceCaps // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetDeviceCaps +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetDeviceCaps) ( D3DCAPS8 *pCaps ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetDeviceCaps\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetDeviceCaps\n" "(\n" " pCaps : 0x%.08X\n" ");\n", @@ -1551,7 +1550,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetDeviceCaps HRESULT hRet = g_pD3D8->GetDeviceCaps(g_XBVideo.GetDisplayAdapter(), (g_XBVideo.GetDirect3DDevice() == 0) ? XTL::D3DDEVTYPE_HAL : XTL::D3DDEVTYPE_REF, pCaps); if(FAILED(hRet)) - CxbxKrnlCleanup("EmuIDirect3DDevice8_GetDeviceCaps failed!"); + CxbxKrnlCleanup("EmuD3DDevice_GetDeviceCaps failed!"); @@ -1559,9 +1558,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetDeviceCaps } // ****************************************************************** -// * func: EmuIDirect3DDevice8_LoadVertexShader +// * patch: D3DDevice_LoadVertexShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_LoadVertexShader) ( DWORD Handle, DWORD Address @@ -1570,7 +1569,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShader // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_LoadVertexShader\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_LoadVertexShader\n" "(\n" " Handle : 0x%.08X\n" " Address : 0x%.08X\n" @@ -1593,9 +1592,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SelectVertexShader +// * patch: D3DDevice_SelectVertexShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SelectVertexShader) ( DWORD Handle, DWORD Address @@ -1603,7 +1602,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShader { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SelectVertexShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SelectVertexShader\n" "(\n" " Handle : 0x%.08X\n" " Address : 0x%.08X\n" @@ -1639,9 +1638,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShader } // ****************************************************************** -// * func: EmuIDirect3D8_KickOffAndWaitForIdle +// * patch: D3D_KickOffAndWaitForIdle // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3D8_KickOffAndWaitForIdle() +VOID WINAPI XTL::EMUPATCH(D3D_KickOffAndWaitForIdle)() { @@ -1655,9 +1654,9 @@ VOID WINAPI XTL::EmuIDirect3D8_KickOffAndWaitForIdle() } // ****************************************************************** -// * func: EmuIDirect3D8_KickOffAndWaitForIdle2 +// * patch: D3D_KickOffAndWaitForIdle2 // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3D8_KickOffAndWaitForIdle2(DWORD dwDummy1, DWORD dwDummy2) +VOID WINAPI XTL::EMUPATCH(D3D_KickOffAndWaitForIdle2)(DWORD dwDummy1, DWORD dwDummy2) { @@ -1676,9 +1675,9 @@ VOID WINAPI XTL::EmuIDirect3D8_KickOffAndWaitForIdle2(DWORD dwDummy1, DWORD dwDu } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetGammaRamp +// * patch: D3DDevice_SetGammaRamp // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetGammaRamp +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetGammaRamp) ( DWORD dwFlags, CONST X_D3DGAMMARAMP *pRamp @@ -1686,7 +1685,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetGammaRamp { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetGammaRamp\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetGammaRamp\n" "(\n" " dwFlags : 0x%.08X\n" " pRamp : 0x%.08X\n" @@ -1712,13 +1711,13 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetGammaRamp } // ****************************************************************** -// * func: EmuIDirect3DDevice8_AddRef +// * patch: D3DDevice_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuIDirect3DDevice8_AddRef() +ULONG WINAPI XTL::EMUPATCH(D3DDevice_AddRef)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_AddRef()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_AddRef()\n"); ULONG ret = g_pD3DDevice8->AddRef(); @@ -1728,13 +1727,13 @@ ULONG WINAPI XTL::EmuIDirect3DDevice8_AddRef() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginStateBlock +// * patch: D3DDevice_BeginStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginStateBlock() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginStateBlock)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BeginStateBlock()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_BeginStateBlock()\n"); ULONG ret = g_pD3DDevice8->BeginStateBlock(); @@ -1744,13 +1743,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginStateBlock() } /*// ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginStateBig +// * patch: D3DDevice_BeginStateBig // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginStateBig() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginStateBig)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BeginStateBig()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_BeginStateBig()\n"); //ULONG ret = g_pD3DDevice8->BeginStateBlock(); @@ -1762,13 +1761,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginStateBig() }*/ // ****************************************************************** -// * func: EmuIDirect3DDevice8_CaptureStateBlock +// * patch: D3DDevice_CaptureStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CaptureStateBlock(DWORD Token) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CaptureStateBlock)(DWORD Token) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CaptureStateBlock\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CaptureStateBlock\n" "(\n" " Token : 0x%.08X\n" ");\n", @@ -1782,13 +1781,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CaptureStateBlock(DWORD Token) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_ApplyStateBlock +// * patch: D3DDevice_ApplyStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_ApplyStateBlock(DWORD Token) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_ApplyStateBlock)(DWORD Token) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_ApplyStateBlock\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_ApplyStateBlock\n" "(\n" " Token : 0x%.08X\n" ");\n", @@ -1802,13 +1801,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_ApplyStateBlock(DWORD Token) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndStateBlock +// * patch: D3DDevice_EndStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndStateBlock(DWORD *pToken) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_EndStateBlock)(DWORD *pToken) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_EndStateBlock\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_EndStateBlock\n" "(\n" " pToken : 0x%.08X\n" ");\n", @@ -1822,9 +1821,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndStateBlock(DWORD *pToken) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CopyRects +// * patch: D3DDevice_CopyRects // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CopyRects +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CopyRects) ( X_D3DSurface *pSourceSurface, CONST RECT *pSourceRectsArray, @@ -1835,7 +1834,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CopyRects { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CopyRects\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CopyRects\n" "(\n" " pSourceSurface : 0x%.08X\n" " pSourceRectsArray : 0x%.08X\n" @@ -1872,9 +1871,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CopyRects } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateImageSurface +// * patch: D3DDevice_CreateImageSurface // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateImageSurface +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateImageSurface) ( UINT Width, UINT Height, @@ -1884,7 +1883,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateImageSurface { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateImageSurface\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateImageSurface\n" "(\n" " Width : 0x%.08X\n" " Height : 0x%.08X\n" @@ -1914,16 +1913,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateImageSurface } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetGammaRamp +// * patch: D3DDevice_GetGammaRamp // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetGammaRamp +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetGammaRamp) ( X_D3DGAMMARAMP *pRamp ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetGammaRamp\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetGammaRamp\n" "(\n" " pRamp : 0x%.08X\n" ");\n", @@ -1948,16 +1947,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetGammaRamp } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackBuffer2 +// * patch: D3DDevice_GetBackBuffer2 // ****************************************************************** -XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetBackBuffer2 +XTL::X_D3DSurface* WINAPI XTL::EMUPATCH(D3DDevice_GetBackBuffer2) ( INT BackBuffer ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetBackBuffer2\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetBackBuffer2\n" "(\n" " BackBuffer : 0x%.08X\n" ");\n", @@ -2019,16 +2018,16 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetBackBuffer2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackBuffer +// * patch: D3DDevice_GetBackBuffer // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetBackBuffer +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetBackBuffer) ( INT BackBuffer, D3DBACKBUFFER_TYPE Type, X_D3DSurface **ppBackBuffer ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetBackBuffer\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetBackBuffer\n" "(\n" " BackBuffer : 0x%.08X\n" " Type : 0x%.08X\n" @@ -2036,22 +2035,22 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetBackBuffer ");\n", BackBuffer, Type, ppBackBuffer); - *ppBackBuffer = EmuIDirect3DDevice8_GetBackBuffer2(BackBuffer); + *ppBackBuffer = EMUPATCH(D3DDevice_GetBackBuffer2)(BackBuffer); return; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetViewport +// * patch: D3DDevice_SetViewport // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetViewport +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetViewport) ( CONST D3DVIEWPORT8 *pViewport ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetViewport\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetViewport\n" "(\n" " pViewport : 0x%.08X (%d, %d, %d, %d, %f, %f)\n" ");\n", @@ -2099,16 +2098,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetViewport } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetViewport +// * patch: D3DDevice_GetViewport // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetViewport +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetViewport) ( D3DVIEWPORT8 *pViewport ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetViewport\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetViewport\n" "(\n" " pViewport : 0x%.08X\n" ");\n", @@ -2128,9 +2127,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetViewport } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetViewportOffsetAndScale +// * patch: D3DDevice_GetViewportOffsetAndScale // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetViewportOffsetAndScale) ( D3DXVECTOR4 *pOffset, D3DXVECTOR4 *pScale @@ -2138,7 +2137,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetViewportOffsetAndScale\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetViewportOffsetAndScale\n" "(\n" " pOffset : 0x%.08X\n" " pScale : 0x%.08X\n" @@ -2153,7 +2152,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale D3DVIEWPORT8 Viewport; - EmuIDirect3DDevice8_GetViewport(&Viewport); + EMUPATCH(D3DDevice_GetViewport)(&Viewport); @@ -2183,16 +2182,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetShaderConstantMode +// * patch: D3DDevice_SetShaderConstantMode // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetShaderConstantMode +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetShaderConstantMode) ( XTL::X_VERTEXSHADERCONSTANTMODE Mode ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetShaderConstantMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetShaderConstantMode\n" "(\n" " Mode : 0x%.08X\n" ");\n", @@ -2206,16 +2205,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetShaderConstantMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Reset +// * patch: D3DDevice_Reset // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_Reset +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Reset) ( X_D3DPRESENT_PARAMETERS *pPresentationParameters ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Reset\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_Reset\n" "(\n" " pPresentationParameters : 0x%.08X\n" ");\n", @@ -2229,16 +2228,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Reset } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetRenderTarget +// * patch: D3DDevice_GetRenderTarget // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetRenderTarget +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetRenderTarget) ( X_D3DSurface **ppRenderTarget ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetRenderTarget\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetRenderTarget\n" "(\n" " ppRenderTarget : 0x%.08X\n" ");\n", @@ -2258,13 +2257,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetRenderTarget } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetRenderTarget2 +// * patch: D3DDevice_GetRenderTarget2 // ****************************************************************** -XTL::X_D3DSurface * WINAPI XTL::EmuIDirect3DDevice8_GetRenderTarget2() +XTL::X_D3DSurface * WINAPI XTL::EMUPATCH(D3DDevice_GetRenderTarget2)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetRenderTarget2()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_GetRenderTarget2()\n"); IDirect3DSurface8 *pSurface8 = g_pCachedRenderTarget->EmuSurface8; @@ -2278,16 +2277,16 @@ XTL::X_D3DSurface * WINAPI XTL::EmuIDirect3DDevice8_GetRenderTarget2() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDepthStencilSurface +// * patch: D3DDevice_GetDepthStencilSurface // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetDepthStencilSurface +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetDepthStencilSurface) ( X_D3DSurface **ppZStencilSurface ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetDepthStencilSurface\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetDepthStencilSurface\n" "(\n" " ppZStencilSurface : 0x%.08X\n" ");\n", @@ -2308,13 +2307,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetDepthStencilSurface } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDepthStencilSurface2 +// * patch: D3DDevice_GetDepthStencilSurface2 // ****************************************************************** -XTL::X_D3DSurface * WINAPI XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2() +XTL::X_D3DSurface * WINAPI XTL::EMUPATCH(D3DDevice_GetDepthStencilSurface2)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetDepthStencilSurface2()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_GetDepthStencilSurface2()\n"); IDirect3DSurface8 *pSurface8 = g_pCachedZStencilSurface->EmuSurface8; @@ -2329,9 +2328,9 @@ XTL::X_D3DSurface * WINAPI XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTile +// * patch: D3DDevice_GetTile // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTile +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetTile) ( DWORD Index, X_D3DTILE *pTile @@ -2339,7 +2338,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTile { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetTile\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetTile\n" "(\n" " Index : 0x%.08X\n" " pTile : 0x%.08X\n" @@ -2355,9 +2354,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTile } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTileNoWait +// * patch: D3DDevice_SetTileNoWait // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTileNoWait +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTileNoWait) ( DWORD Index, CONST X_D3DTILE *pTile @@ -2365,7 +2364,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTileNoWait { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTileNoWait\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTileNoWait\n" "(\n" " Index : 0x%.08X\n" " pTile : 0x%.08X\n" @@ -2381,9 +2380,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTileNoWait } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexShader +// * patch: D3DDevice_CreateVertexShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateVertexShader) ( CONST DWORD *pDeclaration, CONST DWORD *pFunction, @@ -2393,7 +2392,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexShader { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateVertexShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateVertexShader\n" "(\n" " pDeclaration : 0x%.08X\n" " pFunction : 0x%.08X\n" @@ -2564,9 +2563,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShaderConstant +// * patch: D3DDevice_SetPixelShaderConstant // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderConstant +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShaderConstant) ( DWORD Register, CONST PVOID pConstantData, @@ -2575,7 +2574,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderConstant { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetPixelShaderConstant\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetPixelShaderConstant\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" @@ -2608,9 +2607,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderConstant } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant +// * patch: D3DDevice_SetVertexShaderConstant // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderConstant +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant) ( INT Register, CONST PVOID pConstantData, @@ -2619,7 +2618,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderConstant { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexShaderConstant\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexShaderConstant\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" @@ -2666,58 +2665,58 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderConstant } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant1 +// * patch: D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1 +VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant1) ( INT Register, CONST PVOID pConstantData ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexShaderConstant1\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexShaderConstant1\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" ");\n", Register, pConstantData); - XTL::EmuIDirect3DDevice8_SetVertexShaderConstant(Register, pConstantData, 1); + XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, 1); return; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant4 +// * patch: D3DDevice_SetVertexShaderConstant4 // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4 +VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant4) ( INT Register, CONST PVOID pConstantData ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexShaderConstant4\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexShaderConstant4\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" ");\n", Register, pConstantData); - XTL::EmuIDirect3DDevice8_SetVertexShaderConstant(Register, pConstantData, 4); + XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, 4); return; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstantNotInline +// * patch: D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline +VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) ( INT Register, CONST PVOID pConstantData, DWORD ConstantCount ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexShaderConstantNotInline\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexShaderConstantNotInline\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" @@ -2725,22 +2724,22 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline ");\n", Register, pConstantData, ConstantCount); - XTL::EmuIDirect3DDevice8_SetVertexShaderConstant(Register, pConstantData, ConstantCount / 4); + XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, ConstantCount / 4); return; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeletePixelShader +// * patch: D3DDevice_DeletePixelShader // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_DeletePixelShader +VOID WINAPI XTL::EMUPATCH(D3DDevice_DeletePixelShader) ( DWORD Handle ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DeletePixelShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DeletePixelShader\n" "(\n" " Handle : 0x%.08X\n" ");\n", @@ -2772,9 +2771,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DeletePixelShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePixelShader +// * patch: D3DDevice_CreatePixelShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreatePixelShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePixelShader) ( X_D3DPIXELSHADERDEF *pPSDef, DWORD *pHandle @@ -2782,7 +2781,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreatePixelShader { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreatePixelShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreatePixelShader\n" "(\n" " pPSDef : 0x%.08X\n" " pHandle : 0x%.08X (0x%.08X)\n" @@ -2865,16 +2864,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreatePixelShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShader +// * patch: D3DDevice_SetPixelShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShader) ( DWORD Handle ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetPixelShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetPixelShader\n" "(\n" " Handle : 0x%.08X\n" ");\n", @@ -2944,9 +2943,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateTexture2 +// * patch: D3DDevice_CreateTexture2 // ****************************************************************** -XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DDevice8_CreateTexture2 +XTL::X_D3DResource * WINAPI XTL::EMUPATCH(D3DDevice_CreateTexture2) ( UINT Width, UINT Height, @@ -2962,15 +2961,15 @@ XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DDevice8_CreateTexture2 switch(D3DResource) { case 3: /*D3DRTYPE_TEXTURE*/ - EmuIDirect3DDevice8_CreateTexture(Width, Height, Levels, Usage, Format, D3DPOOL_MANAGED, &pTexture); + EMUPATCH(D3DDevice_CreateTexture)(Width, Height, Levels, Usage, Format, D3DPOOL_MANAGED, &pTexture); break; case 4: /*D3DRTYPE_VOLUMETEXTURE*/ - EmuIDirect3DDevice8_CreateVolumeTexture(Width, Height, Depth, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DVolumeTexture**)&pTexture); + EMUPATCH(D3DDevice_CreateVolumeTexture)(Width, Height, Depth, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DVolumeTexture**)&pTexture); break; case 5: /*D3DRTYPE_CUBETEXTURE*/ //DbgPrintf( "D3DDevice_CreateTexture2: Width = 0x%X, Height = 0x%X\n", Width, Height ); //CxbxKrnlCleanup("Cube textures temporarily not supported!"); - EmuIDirect3DDevice8_CreateCubeTexture(Width, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DCubeTexture**) &pTexture); + EMUPATCH(D3DDevice_CreateCubeTexture)(Width, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DCubeTexture**) &pTexture); break; default: CxbxKrnlCleanup("D3DResource = %d is not supported!", D3DResource); @@ -2980,9 +2979,9 @@ XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DDevice8_CreateTexture2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateTexture +// * patch: D3DDevice_CreateTexture // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateTexture) ( UINT Width, UINT Height, @@ -2995,7 +2994,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateTexture\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateTexture\n" "(\n" " Width : 0x%.08X\n" " Height : 0x%.08X\n" @@ -3137,9 +3136,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVolumeTexture +// * patch: D3DDevice_CreateVolumeTexture // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVolumeTexture +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateVolumeTexture) ( UINT Width, UINT Height, @@ -3153,7 +3152,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVolumeTexture { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateVolumeTexture\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateVolumeTexture\n" "(\n" " Width : 0x%.08X\n" " Height : 0x%.08X\n" @@ -3241,9 +3240,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVolumeTexture } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateCubeTexture +// * patch: D3DDevice_CreateCubeTexture // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateCubeTexture +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateCubeTexture) ( UINT EdgeLength, UINT Levels, @@ -3255,7 +3254,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateCubeTexture { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateCubeTexture\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateCubeTexture\n" "(\n" " EdgeLength : 0x%.08X\n" " Levels : 0x%.08X\n" @@ -3310,9 +3309,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateCubeTexture } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateIndexBuffer +// * patch: D3DDevice_CreateIndexBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateIndexBuffer +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateIndexBuffer) ( UINT Length, DWORD Usage, @@ -3323,7 +3322,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateIndexBuffer { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateIndexBuffer\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateIndexBuffer\n" "(\n" " Length : 0x%.08X\n" " Usage : 0x%.08X\n" @@ -3363,13 +3362,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateIndexBuffer } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateIndexBuffer2 +// * patch: D3DDevice_CreateIndexBuffer2 // ****************************************************************** -XTL::X_D3DIndexBuffer * WINAPI XTL::EmuIDirect3DDevice8_CreateIndexBuffer2(UINT Length) +XTL::X_D3DIndexBuffer * WINAPI XTL::EMUPATCH(D3DDevice_CreateIndexBuffer2)(UINT Length) { X_D3DIndexBuffer *pIndexBuffer = NULL; - EmuIDirect3DDevice8_CreateIndexBuffer + EMUPATCH(D3DDevice_CreateIndexBuffer) ( Length, NULL, @@ -3384,9 +3383,9 @@ XTL::X_D3DIndexBuffer * WINAPI XTL::EmuIDirect3DDevice8_CreateIndexBuffer2(UINT BOOL g_bBadIndexData = FALSE; // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetIndices +// * patch: D3DDevice_SetIndices // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetIndices +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetIndices) ( X_D3DIndexBuffer *pIndexData, UINT BaseVertexIndex @@ -3394,7 +3393,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetIndices { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetIndices\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetIndices\n" "(\n" " pIndexData : 0x%.08X\n" " BaseVertexIndex : 0x%.08X\n" @@ -3418,8 +3417,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetIndices //#if 0 if(pIndexData != NULL) { - DbgPrintf("EmuIDirect3DDevice8_SetIndcies(): pIndexData->EmuIndexBuffer8:= 0x%.08X\n", pIndexData->EmuIndexBuffer8 ); - DbgPrintf("EmuIDirect3DDevice8_SetIndcies(): pIndexData->Lock:= 0x%.08X\n", pIndexData->Lock ); + DbgPrintf("EmuD3DDevice_SetIndcies(): pIndexData->EmuIndexBuffer8:= 0x%.08X\n", pIndexData->EmuIndexBuffer8 ); + DbgPrintf("EmuD3DDevice_SetIndcies(): pIndexData->Lock:= 0x%.08X\n", pIndexData->Lock ); } g_dwBaseVertexIndex = BaseVertexIndex; @@ -3461,9 +3460,9 @@ fail: } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTexture +// * patch: D3DDevice_SetTexture // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTexture +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTexture) ( DWORD Stage, X_D3DResource *pTexture @@ -3471,7 +3470,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTexture { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTexture\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTexture\n" "(\n" " Stage : 0x%.08X\n" " pTexture : 0x%.08X\n" @@ -3493,8 +3492,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTexture // - EmuIDirect3DDevice8_EnableOverlay(TRUE); - EmuIDirect3DDevice8_UpdateOverlay((X_D3DSurface*)pTexture, 0, 0, FALSE, 0); + EMUPATCH(D3DDevice_EnableOverlay)(TRUE); + EMUPATCH(D3DDevice_UpdateOverlay)((X_D3DSurface*)pTexture, 0, 0, FALSE, 0); } else @@ -3586,9 +3585,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTexture } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SwitchTexture +// * patch: D3DDevice_SwitchTexture // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SwitchTexture +VOID __fastcall XTL::EMUPATCH(D3DDevice_SwitchTexture) ( DWORD Method, DWORD Data, @@ -3597,7 +3596,7 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SwitchTexture { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SwitchTexture\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SwitchTexture\n" "(\n" " Method : 0x%.08X\n" " Data : 0x%.08X\n" @@ -3654,16 +3653,16 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SwitchTexture } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDisplayMode +// * patch: D3DDevice_GetDisplayMode // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetDisplayMode +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetDisplayMode) ( X_D3DDISPLAYMODE *pMode ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetDisplayMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetDisplayMode\n" "(\n" " pMode : 0x%.08X\n" ");\n", @@ -3694,16 +3693,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetDisplayMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Begin +// * patch: D3DDevice_Begin // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_Begin +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Begin) ( X_D3DPRIMITIVETYPE PrimitiveType ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Begin\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_Begin\n" "(\n" " PrimitiveType : 0x%.08X\n" ");\n", @@ -3733,16 +3732,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Begin } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData2f +// * patch: D3DDevice_SetVertexData2f // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData2f +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexData2f) ( int Register, FLOAT a, FLOAT b ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexData2f >>\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexData2f >>\n" "(\n" " Register : 0x%.08X\n" " a : %f\n" @@ -3750,23 +3749,23 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData2f ");\n", Register, a, b); - return EmuIDirect3DDevice8_SetVertexData4f(Register, a, b, 0.0f, 1.0f); + return EMUPATCH(D3DDevice_SetVertexData4f)(Register, a, b, 0.0f, 1.0f); } static inline DWORD FtoDW(FLOAT f) { return *((DWORD*)&f); } static inline FLOAT DWtoF(DWORD f) { return *((FLOAT*)&f); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData2s +// * patch: D3DDevice_SetVertexData2s // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData2s +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexData2s) ( int Register, SHORT a, SHORT b ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexData2s >>\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexData2s >>\n" "(\n" " Register : 0x%.08X\n" " a : %d\n" @@ -3776,13 +3775,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData2s DWORD dwA = a, dwB = b; - return EmuIDirect3DDevice8_SetVertexData4f(Register, DWtoF(dwA), DWtoF(dwB), 0.0f, 1.0f); + return EMUPATCH(D3DDevice_SetVertexData4f)(Register, DWtoF(dwA), DWtoF(dwB), 0.0f, 1.0f); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4f +// * patch: D3DDevice_SetVertexData4f // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4f +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexData4f) ( int Register, FLOAT a, @@ -3793,7 +3792,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4f { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexData4f\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexData4f\n" "(\n" " Register : 0x%.08X\n" " a : %f\n" @@ -3968,9 +3967,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4f } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4ub +// * patch: D3DDevice_SetVertexData4ub // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4ub +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexData4ub) ( INT Register, BYTE a, @@ -3981,7 +3980,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4ub { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexData4ub\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexData4ub\n" "(\n" " Register : 0x%.08X\n" " a : 0x%.02X\n" @@ -3995,13 +3994,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4ub DWORD dwA = a, dwB = b, dwC = c, dwD = d; - return EmuIDirect3DDevice8_SetVertexData4f(Register, DWtoF(dwA), DWtoF(dwB), DWtoF(dwC), DWtoF(dwD)); + return EMUPATCH(D3DDevice_SetVertexData4f)(Register, DWtoF(dwA), DWtoF(dwB), DWtoF(dwC), DWtoF(dwD)); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4s +// * patch: D3DDevice_SetVertexData4s // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4s +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexData4s) ( INT Register, SHORT a, @@ -4012,7 +4011,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4s { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexData4s\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexData4s\n" "(\n" " Register : 0x%.08X\n" " a : 0x%.04X\n" @@ -4026,19 +4025,19 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexData4s DWORD dwA = a, dwB = b, dwC = c, dwD = d; - return EmuIDirect3DDevice8_SetVertexData4f(Register, DWtoF(dwA), DWtoF(dwB), DWtoF(dwC), DWtoF(dwD)); + return EMUPATCH(D3DDevice_SetVertexData4f)(Register, DWtoF(dwA), DWtoF(dwB), DWtoF(dwC), DWtoF(dwD)); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexDataColor +// * patch: D3DDevice_SetVertexDataColor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexDataColor +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexDataColor) ( int Register, D3DCOLOR Color ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexDataColor >>\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexDataColor >>\n" "(\n" " Register : 0x%.08X\n" " Color : 0x%.08X\n" @@ -4050,17 +4049,17 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexDataColor FLOAT g = DWtoF((Color & 0x0000FF00) >> 8); FLOAT b = DWtoF((Color & 0x000000FF) >> 0); - return EmuIDirect3DDevice8_SetVertexData4f(Register, r, g, b, a); + return EMUPATCH(D3DDevice_SetVertexData4f)(Register, r, g, b, a); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_End +// * patch: D3DDevice_End // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_End() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_End)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_End();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_End();\n"); if(g_IVBTblOffs != 0) EmuFlushIVB(); @@ -4075,9 +4074,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_End() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_RunPushBuffer +// * patch: D3DDevice_RunPushBuffer // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_RunPushBuffer +VOID WINAPI XTL::EMUPATCH(D3DDevice_RunPushBuffer) ( X_D3DPushBuffer *pPushBuffer, X_D3DFixup *pFixup @@ -4085,7 +4084,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_RunPushBuffer { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_RunPushBuffer\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_RunPushBuffer\n" "(\n" " pPushBuffer : 0x%.08X\n" " pFixup : 0x%.08X\n" @@ -4100,9 +4099,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_RunPushBuffer } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Clear +// * patch: D3DDevice_Clear // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_Clear +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Clear) ( DWORD Count, CONST D3DRECT *pRects, @@ -4114,7 +4113,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Clear { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Clear\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_Clear\n" "(\n" " Count : 0x%.08X\n" " pRects : 0x%.08X\n" @@ -4141,7 +4140,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Clear newFlags |= D3DCLEAR_STENCIL; if(Flags & ~(0x000000f0 | 0x00000001 | 0x00000002)) - EmuWarning("Unsupported Flag(s) for IDirect3DDevice8_Clear : 0x%.08X", Flags & ~(0x000000f0 | 0x00000001 | 0x00000002)); + EmuWarning("Unsupported Flag(s) for D3DDevice_Clear : 0x%.08X", Flags & ~(0x000000f0 | 0x00000001 | 0x00000002)); // Regardless of above setting, do not needlessly clear Z Buffer if (!g_bHasZBuffer) { @@ -4171,9 +4170,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Clear } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Present +// * patch: D3DDevice_Present // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_Present +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Present) ( CONST RECT* pSourceRect, CONST RECT* pDestRect, @@ -4183,7 +4182,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Present { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Present\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_Present\n" "(\n" " pSourceRect : 0x%.08X\n" " pDestRect : 0x%.08X\n" @@ -4253,16 +4252,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Present } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Swap +// * patch: D3DDevice_Swap // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_Swap +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Swap) ( DWORD Flags ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Swap\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_Swap\n" "(\n" " Flags : 0x%.08X\n" ");\n", @@ -4270,7 +4269,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Swap // TODO: Ensure this flag is always the same across library versions if(Flags != 0) - EmuWarning("XTL::EmuIDirect3DDevice8_Swap: Flags != 0"); + EmuWarning("XTL::EmuD3DDevice_Swap: Flags != 0"); // release back buffer lock { @@ -4309,9 +4308,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_Swap } // ****************************************************************** -// * func: EmuIDirect3DResource8_Register +// * patch: IDirect3DResource8_Register // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DResource8_Register +HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register) ( X_D3DResource *pThis, PVOID pBase @@ -5003,9 +5002,9 @@ HRESULT WINAPI XTL::EmuIDirect3DResource8_Register } // ****************************************************************** -// * func: EmuIDirect3DResource8_AddRef +// * patch: IDirect3DResource8_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuIDirect3DResource8_AddRef +ULONG WINAPI XTL::EMUPATCH(D3DResource_AddRef) ( X_D3DResource *pThis ) @@ -5054,9 +5053,9 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_AddRef } // ****************************************************************** -// * func: EmuIDirect3DResource8_Release +// * patch: IDirect3DResource8_Release // ****************************************************************** -ULONG WINAPI XTL::EmuIDirect3DResource8_Release +ULONG WINAPI XTL::EMUPATCH(D3DResource_Release) ( X_D3DResource *pThis ) @@ -5103,7 +5102,7 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_Release } - EmuIDirect3DDevice8_EnableOverlay(FALSE); + EMUPATCH(D3DDevice_EnableOverlay)(FALSE); } else @@ -5158,9 +5157,9 @@ ULONG WINAPI XTL::EmuIDirect3DResource8_Release } // ****************************************************************** -// * func: EmuIDirect3DResource8_IsBusy +// * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI XTL::EmuIDirect3DResource8_IsBusy +BOOL WINAPI XTL::EMUPATCH(D3DResource_IsBusy) ( X_D3DResource *pThis ) @@ -5183,9 +5182,9 @@ BOOL WINAPI XTL::EmuIDirect3DResource8_IsBusy } // ****************************************************************** -// * func: EmuIDirect3DResource8_GetType +// * patch: IDirect3DResource8_GetType // ****************************************************************** -XTL::X_D3DRESOURCETYPE WINAPI XTL::EmuIDirect3DResource8_GetType +XTL::X_D3DRESOURCETYPE WINAPI XTL::EMUPATCH(D3DResource_GetType) ( X_D3DResource *pThis ) @@ -5221,9 +5220,9 @@ XTL::X_D3DRESOURCETYPE WINAPI XTL::EmuIDirect3DResource8_GetType } // ****************************************************************** -// * func: EmuLock2DSurface +// * patch: Lock2DSurface // ****************************************************************** -VOID WINAPI XTL::EmuLock2DSurface +VOID WINAPI XTL::EMUPATCH(Lock2DSurface) ( X_D3DPixelContainer *pPixelContainer, D3DCUBEMAP_FACES FaceType, @@ -5256,9 +5255,9 @@ VOID WINAPI XTL::EmuLock2DSurface } // ****************************************************************** -// * func: EmuLock3DSurface +// * patch: Lock3DSurface // ****************************************************************** -VOID WINAPI XTL::EmuLock3DSurface +VOID WINAPI XTL::EMUPATCH(Lock3DSurface) ( X_D3DPixelContainer *pPixelContainer, UINT Level, @@ -5291,9 +5290,9 @@ VOID WINAPI XTL::EmuLock3DSurface } // ****************************************************************** -// * func: EmuGet2DSurfaceDesc +// * patch: Get2DSurfaceDesc // ****************************************************************** -VOID WINAPI XTL::EmuGet2DSurfaceDesc +VOID WINAPI XTL::EMUPATCH(Get2DSurfaceDesc) ( X_D3DPixelContainer *pPixelContainer, DWORD dwLevel, @@ -5394,9 +5393,9 @@ VOID WINAPI XTL::EmuGet2DSurfaceDesc } // ****************************************************************** -// * func: EmuGet2DSurfaceDescD +// * patch: Get2DSurfaceDescD // ****************************************************************** -VOID WINAPI XTL::EmuGet2DSurfaceDescD +VOID WINAPI XTL::EMUPATCH(Get2DSurfaceDescD) ( X_D3DPixelContainer *pPixelContainer, X_D3DSURFACE_DESC *pDesc @@ -5409,15 +5408,15 @@ VOID WINAPI XTL::EmuGet2DSurfaceDescD ");\n", pPixelContainer, pDesc); - EmuGet2DSurfaceDesc(pPixelContainer, 0xFEFEFEFE, pDesc); + EMUPATCH(Get2DSurfaceDesc)(pPixelContainer, 0xFEFEFEFE, pDesc); return; } // ****************************************************************** -// * func: EmuIDirect3DSurface8_GetDesc +// * patch: IDirect3DSurface8_GetDesc // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DSurface8_GetDesc +HRESULT WINAPI XTL::EMUPATCH(D3DSurface_GetDesc) ( X_D3DResource *pThis, X_D3DSURFACE_DESC *pDesc @@ -5485,9 +5484,9 @@ HRESULT WINAPI XTL::EmuIDirect3DSurface8_GetDesc } // ****************************************************************** -// * func: EmuIDirect3DSurface8_LockRect +// * patch: IDirect3DSurface8_LockRect // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DSurface8_LockRect +HRESULT WINAPI XTL::EMUPATCH(D3DSurface_LockRect) ( X_D3DResource *pThis, D3DLOCKED_RECT *pLockedRect, @@ -5564,9 +5563,9 @@ HRESULT WINAPI XTL::EmuIDirect3DSurface8_LockRect } // ****************************************************************** -// * func: EmuIDirect3DBaseTexture8_GetLevelCount +// * patch: IDirect3DBaseTexture8_GetLevelCount // ****************************************************************** -DWORD WINAPI XTL::EmuIDirect3DBaseTexture8_GetLevelCount +DWORD WINAPI XTL::EMUPATCH(D3DBaseTexture_GetLevelCount) ( X_D3DBaseTexture *pThis ) @@ -5597,9 +5596,9 @@ DWORD WINAPI XTL::EmuIDirect3DBaseTexture8_GetLevelCount } // ****************************************************************** -// * func: EmuIDirect3DTexture8_GetSurfaceLevel2 +// * patch: IDirect3DTexture8_GetSurfaceLevel2 // ****************************************************************** -XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DTexture8_GetSurfaceLevel2 +XTL::X_D3DResource * WINAPI XTL::EMUPATCH(D3DTexture_GetSurfaceLevel2) ( X_D3DTexture *pThis, UINT Level @@ -5620,15 +5619,15 @@ XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DTexture8_GetSurfaceLevel2 return pThis; } - EmuIDirect3DTexture8_GetSurfaceLevel(pThis, Level, &pSurfaceLevel); + EMUPATCH(D3DTexture_GetSurfaceLevel)(pThis, Level, &pSurfaceLevel); return pSurfaceLevel; } // ****************************************************************** -// * func: EmuIDirect3DTexture8_LockRect +// * patch: IDirect3DTexture8_LockRect // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DTexture8_LockRect +HRESULT WINAPI XTL::EMUPATCH(D3DTexture_LockRect) ( X_D3DTexture *pThis, UINT Level, @@ -5696,9 +5695,9 @@ HRESULT WINAPI XTL::EmuIDirect3DTexture8_LockRect } // ****************************************************************** -// * func: EmuIDirect3DTexture8_GetSurfaceLevel +// * patch: IDirect3DTexture8_GetSurfaceLevel // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DTexture8_GetSurfaceLevel +HRESULT WINAPI XTL::EMUPATCH(D3DTexture_GetSurfaceLevel) ( X_D3DTexture *pThis, UINT Level, @@ -5765,9 +5764,9 @@ HRESULT WINAPI XTL::EmuIDirect3DTexture8_GetSurfaceLevel } // ****************************************************************** -// * func: EmuIDirect3DVolumeTexture8_LockBox +// * patch: IDirect3DVolumeTexture8_LockBox // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DVolumeTexture8_LockBox +HRESULT WINAPI XTL::EMUPATCH(D3DVolumeTexture_LockBox) ( X_D3DVolumeTexture *pThis, UINT Level, @@ -5803,9 +5802,9 @@ HRESULT WINAPI XTL::EmuIDirect3DVolumeTexture8_LockBox } // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_LockRect +// * patch: IDirect3DCubeTexture8_LockRect // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_LockRect +HRESULT WINAPI XTL::EMUPATCH(D3DCubeTexture_LockRect) ( X_D3DCubeTexture *pThis, D3DCUBEMAP_FACES FaceType, @@ -5840,13 +5839,13 @@ HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_LockRect } // ****************************************************************** -// * func: EmuIDirect3DDevice8_Release +// * patch: D3DDevice_Release // ****************************************************************** -ULONG WINAPI XTL::EmuIDirect3DDevice8_Release() +ULONG WINAPI XTL::EMUPATCH(D3DDevice_Release)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Release();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_Release();\n"); g_pD3DDevice8->AddRef(); DWORD RefCount = g_pD3DDevice8->Release(); @@ -5871,9 +5870,9 @@ ULONG WINAPI XTL::EmuIDirect3DDevice8_Release() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexBuffer +// * patch: D3DDevice_CreateVertexBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexBuffer +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateVertexBuffer) ( UINT Length, DWORD Usage, @@ -5882,22 +5881,22 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVertexBuffer X_D3DVertexBuffer **ppVertexBuffer ) { - *ppVertexBuffer = EmuIDirect3DDevice8_CreateVertexBuffer2(Length); + *ppVertexBuffer = EMUPATCH(D3DDevice_CreateVertexBuffer2)(Length); return D3D_OK; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexBuffer2 +// * patch: D3DDevice_CreateVertexBuffer2 // ****************************************************************** -XTL::X_D3DVertexBuffer* WINAPI XTL::EmuIDirect3DDevice8_CreateVertexBuffer2 +XTL::X_D3DVertexBuffer* WINAPI XTL::EMUPATCH(D3DDevice_CreateVertexBuffer2) ( UINT Length ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateVertexBuffer2\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateVertexBuffer2\n" "(\n" " Length : 0x%.08X\n" ");\n", @@ -5927,16 +5926,16 @@ XTL::X_D3DVertexBuffer* WINAPI XTL::EmuIDirect3DDevice8_CreateVertexBuffer2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_EnableOverlay +// * patch: D3DDevice_EnableOverlay // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_EnableOverlay +VOID WINAPI XTL::EMUPATCH(D3DDevice_EnableOverlay) ( BOOL Enable ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_EnableOverlay\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_EnableOverlay\n" "(\n" " Enable : 0x%.08X\n" ");\n", @@ -5998,9 +5997,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_EnableOverlay } // ****************************************************************** -// * func: EmuIDirect3DDevice8_UpdateOverlay +// * patch: D3DDevice_UpdateOverlay // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_UpdateOverlay +VOID WINAPI XTL::EMUPATCH(D3DDevice_UpdateOverlay) ( X_D3DSurface *pSurface, CONST RECT *SrcRect, @@ -6011,7 +6010,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_UpdateOverlay { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_UpdateOverlay\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_UpdateOverlay\n" "(\n" " pSurface : 0x%.08X\n" " SrcRect : 0x%.08X\n" @@ -6185,7 +6184,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_UpdateOverlay } // Update overlay if present was not called since the last call to - // EmuIDirect3DDevice8_UpdateOverlay. + // EmuD3DDevice_UpdateOverlay. if(g_bHackUpdateSoftwareOverlay) g_pD3DDevice8->Present(0, 0, 0, 0); @@ -6200,13 +6199,13 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_UpdateOverlay return; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetOverlayUpdateStatus +// * patch: D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -BOOL WINAPI XTL::EmuIDirect3DDevice8_GetOverlayUpdateStatus() +BOOL WINAPI XTL::EMUPATCH(D3DDevice_GetOverlayUpdateStatus)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetOverlayUpdateStatus();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_GetOverlayUpdateStatus();\n"); @@ -6215,13 +6214,13 @@ BOOL WINAPI XTL::EmuIDirect3DDevice8_GetOverlayUpdateStatus() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BlockUntilVerticalBlank +// * patch: D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank() +VOID WINAPI XTL::EMUPATCH(D3DDevice_BlockUntilVerticalBlank)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BlockUntilVerticalBlank();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_BlockUntilVerticalBlank();\n"); // segaGT tends to freeze with this on // if(g_XBVideo.GetVSync()) @@ -6242,16 +6241,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVerticalBlankCallback +// * patch: D3DDevice_SetVerticalBlankCallback // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetVerticalBlankCallback) ( D3DVBLANKCALLBACK pCallback ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVerticalBlankCallback\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVerticalBlankCallback\n" "(\n" " pCallback : 0x%.08X\n" ");\n", @@ -6265,9 +6264,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_TexCoordIndex +// * patch: D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex) ( DWORD Stage, DWORD Value @@ -6275,7 +6274,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTextureState_TexCoordIndex\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTextureState_TexCoordIndex\n" "(\n" " Stage : 0x%.08X\n" " Value : 0x%.08X\n" @@ -6288,7 +6287,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex // Check for 0x00040000 instead. if(Value >= 0x00040000) - CxbxKrnlCleanup("EmuIDirect3DDevice8_SetTextureState_TexCoordIndex: Unknown TexCoordIndex Value (0x%.08X)", Value); + CxbxKrnlCleanup("EmuD3DDevice_SetTextureState_TexCoordIndex: Unknown TexCoordIndex Value (0x%.08X)", Value); g_pD3DDevice8->SetTextureStageState(Stage, D3DTSS_TEXCOORDINDEX, Value); @@ -6298,16 +6297,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting +// * patch: D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_TwoSidedLighting) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTextureState_TwoSidedLighting\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6321,14 +6320,14 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_BackFillMode +// * patch: D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_BackFillMode) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_BackFillMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_BackFillMode\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6347,9 +6346,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_BorderColor +// * patch: D3DDevice_SetTextureState_BorderColor // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_BorderColor) ( DWORD Stage, DWORD Value @@ -6357,7 +6356,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTextureState_BorderColor\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTextureState_BorderColor\n" "(\n" " Stage : 0x%.08X\n" " Value : 0x%.08X\n" @@ -6372,9 +6371,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +// * patch: D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor) ( DWORD Stage, DWORD Value @@ -6382,7 +6381,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTextureState_ColorKeyColor\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTextureState_ColorKeyColor\n" "(\n" " Stage : 0x%.08X\n" " Value : 0x%.08X\n" @@ -6397,9 +6396,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_BumpEnv +// * patch: D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_BumpEnv) ( DWORD Stage, X_D3DTEXTURESTAGESTATETYPE Type, @@ -6408,7 +6407,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTextureState_BumpEnv\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTextureState_BumpEnv\n" "(\n" " Stage : 0x%.08X\n" " Type : 0x%.08X\n" @@ -6441,16 +6440,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FrontFace +// * patch: D3DDevice_SetRenderState_FrontFace // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_FrontFace) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_FrontFace\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_FrontFace\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6464,16 +6463,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_LogicOp +// * patch: D3DDevice_SetRenderState_LogicOp // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_LogicOp) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_LogicOp\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_LogicOp\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6487,16 +6486,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_NormalizeNormals +// * patch: D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_NormalizeNormals) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_NormalizeNormals\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_NormalizeNormals\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6510,16 +6509,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_TextureFactor +// * patch: D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_TextureFactor) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_TextureFactor\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_TextureFactor\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6533,16 +6532,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ZBias +// * patch: D3DDevice_SetRenderState_ZBias // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ZBias +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_ZBias) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_ZBias\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_ZBias\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6556,16 +6555,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ZBias } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * patch: D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_EdgeAntiAlias) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_EdgeAntiAlias\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6582,16 +6581,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FillMode +// * patch: D3DDevice_SetRenderState_FillMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FillMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_FillMode) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_FillMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_FillMode\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6614,16 +6613,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FillMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FogColor +// * patch: D3DDevice_SetRenderState_FogColor // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FogColor +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_FogColor) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_FogColor\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_FogColor\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6637,16 +6636,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_FogColor } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * patch: D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_Dxt1NoiseEnable\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6660,9 +6659,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Simple +// * patch: D3DDevice_SetRenderState_Simple // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Simple +VOID __fastcall XTL::EMUPATCH(D3DDevice_SetRenderState_Simple) ( DWORD Method, DWORD Value @@ -6670,7 +6669,7 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Simple { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_Simple\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_Simple\n" "(\n" " Method : 0x%.08X\n" " Value : 0x%.08X\n" @@ -6806,16 +6805,16 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Simple } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_VertexBlend +// * patch: D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_VertexBlend) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_VertexBlend\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_VertexBlend\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6839,16 +6838,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_PSTextureModes +// * patch: D3DDevice_SetRenderState_PSTextureModes // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_PSTextureModes) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_PSTextureModes\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_PSTextureModes\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6862,16 +6861,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_CullMode +// * patch: D3DDevice_SetRenderState_CullMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_CullMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_CullMode) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_CullMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_CullMode\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6891,7 +6890,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_CullMode Value = D3DCULL_CCW; break; default: - CxbxKrnlCleanup("EmuIDirect3DDevice8_SetRenderState_CullMode: Unknown Cullmode (%d)", Value); + CxbxKrnlCleanup("EmuD3DDevice_SetRenderState_CullMode: Unknown Cullmode (%d)", Value); } g_pD3DDevice8->SetRenderState(D3DRS_CULLMODE, Value); @@ -6902,16 +6901,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_CullMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_LineWidth +// * patch: D3DDevice_SetRenderState_LineWidth // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_LineWidth) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_LineWidth\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_LineWidth\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6927,16 +6926,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilFail +// * patch: D3DDevice_SetRenderState_StencilFail // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_StencilFail) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_StencilFail\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_StencilFail\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6950,16 +6949,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable +// * patch: D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_OcclusionCullEnable) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_OcclusionCullEnable\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6973,16 +6972,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilCullEnable +// * patch: D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilCullEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_StencilCullEnable) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_StencilCullEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_StencilCullEnable\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -6996,16 +6995,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilCullEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +// * patch: D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_RopZCmpAlwaysRead\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7019,16 +7018,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_RopZRead +// * patch: D3DDevice_SetRenderState_RopZRead // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_RopZRead +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_RopZRead) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_RopZRead\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_RopZRead\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7042,16 +7041,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_RopZRead } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed +// * patch: D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_DoNotCullUncompressed) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_DoNotCullUncompressed\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7065,16 +7064,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ZEnable +// * patch: D3DDevice_SetRenderState_ZEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_ZEnable) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_ZEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_ZEnable\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7088,16 +7087,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilEnable +// * patch: D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_StencilEnable) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_StencilEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_StencilEnable\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7111,16 +7110,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * patch: D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_MultiSampleAntiAlias\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7134,16 +7133,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleMask +// * patch: D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_MultiSampleMask) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_MultiSampleMask\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_MultiSampleMask\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7157,16 +7156,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleMode +// * patch: D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_MultiSampleMode) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_MultiSampleMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_MultiSampleMode\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7180,16 +7179,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +// * patch: D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_MultiSampleRenderTargetMode\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7203,16 +7202,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ShadowFunc +// * patch: D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_ShadowFunc) ( DWORD Value ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_ShadowFunc\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_ShadowFunc\n" "(\n" " Value : 0x%.08X\n" ");\n", @@ -7241,16 +7240,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_YuvEnable +// * patch: D3DDevice_SetRenderState_YuvEnable // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_YuvEnable) ( BOOL Enable ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_YuvEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_YuvEnable\n" "(\n" " Enable : 0x%.08X\n" ");\n", @@ -7261,17 +7260,17 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable { g_fYuvEnabled = Enable; - EmuWarning("EmuIDirect3DDevice8_SetRenderState_YuvEnable using overlay!"); + EmuWarning("EmuD3DDevice_SetRenderState_YuvEnable using overlay!"); - EmuIDirect3DDevice8_EnableOverlay(g_fYuvEnabled); + EMUPATCH(D3DDevice_EnableOverlay)(g_fYuvEnabled); } if(g_fYuvEnabled) { - EmuIDirect3DDevice8_UpdateOverlay(g_YuvSurface, 0, 0, FALSE, 0); + EMUPATCH(D3DDevice_UpdateOverlay)(g_YuvSurface, 0, 0, FALSE, 0); } @@ -7281,9 +7280,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTransform +// * patch: D3DDevice_SetTransform // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTransform +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix @@ -7291,7 +7290,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTransform { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetTransform\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetTransform\n" "(\n" " State : 0x%.08X\n" " pMatrix : 0x%.08X\n" @@ -7329,9 +7328,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetTransform } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTransform +// * patch: D3DDevice_GetTransform // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTransform +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetTransform) ( D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix @@ -7339,7 +7338,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTransform { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetTransform\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetTransform\n" "(\n" " State : 0x%.08X\n" " pMatrix : 0x%.08X\n" @@ -7356,9 +7355,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetTransform } // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_Lock +// * patch: IDirect3DVertexBuffer8_Lock // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DVertexBuffer8_Lock +VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock) ( X_D3DVertexBuffer *ppVertexBuffer, UINT OffsetToLock, @@ -7392,9 +7391,9 @@ VOID WINAPI XTL::EmuIDirect3DVertexBuffer8_Lock } // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_Lock2 +// * patch: IDirect3DVertexBuffer8_Lock2 // ****************************************************************** -BYTE* WINAPI XTL::EmuIDirect3DVertexBuffer8_Lock2 +BYTE* WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock2) ( X_D3DVertexBuffer *ppVertexBuffer, DWORD Flags @@ -7432,9 +7431,9 @@ BYTE* WINAPI XTL::EmuIDirect3DVertexBuffer8_Lock2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetStreamSource2 +// * patch: D3DDevice_GetStreamSource2 // ****************************************************************** -XTL::X_D3DVertexBuffer* WINAPI XTL::EmuIDirect3DDevice8_GetStreamSource2 +XTL::X_D3DVertexBuffer* WINAPI XTL::EMUPATCH(D3DDevice_GetStreamSource2) ( UINT StreamNumber, UINT *pStride @@ -7443,7 +7442,7 @@ XTL::X_D3DVertexBuffer* WINAPI XTL::EmuIDirect3DDevice8_GetStreamSource2 // debug trace - DbgPrintf( "EmuD3D8 : EmuIDirect3DDevice8_GetStreamSource2\n" + DbgPrintf( "EmuD3D8 : EmuD3DDevice_GetStreamSource2\n" "(\n" " StreamNumber : 0x%.08X\n" " pStride : 0x%.08X\n" @@ -7459,9 +7458,9 @@ XTL::X_D3DVertexBuffer* WINAPI XTL::EmuIDirect3DDevice8_GetStreamSource2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetStreamSource +// * patch: D3DDevice_SetStreamSource // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetStreamSource +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetStreamSource) ( UINT StreamNumber, X_D3DVertexBuffer *pStreamData, @@ -7470,7 +7469,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetStreamSource { - DbgPrintf("EmuD3D8 : EmuIDirect3DDevice8_SetStreamSource\n" + DbgPrintf("EmuD3D8 : EmuD3DDevice_SetStreamSource\n" "(\n" " StreamNumber : 0x%.08X\n" " pStreamData : 0x%.08X (0x%.08X)\n" @@ -7521,16 +7520,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetStreamSource } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShader +// * patch: D3DDevice_SetVertexShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShader) ( DWORD Handle ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetVertexShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetVertexShader\n" "(\n" " Handle : 0x%.08X\n" ");\n", @@ -7571,7 +7570,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShader RealHandle &= ~D3DFVF_SPECULAR; RealHandle &= 0x00FF; if( RealHandle != 0 ) - EmuWarning("EmuIDirect3DDevice8_SetVertexShader Handle = 0x%.08X", RealHandle ); + EmuWarning("EmuD3DDevice_SetVertexShader Handle = 0x%.08X", RealHandle ); RealHandle = Handle; } hRet = g_pD3DDevice8->SetVertexShader(RealHandle); @@ -7582,9 +7581,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawVertices +// * patch: D3DDevice_DrawVertices // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVertices +VOID WINAPI XTL::EMUPATCH(D3DDevice_DrawVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, @@ -7593,7 +7592,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVertices { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DrawVertices\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DrawVertices\n" "(\n" " PrimitiveType : 0x%.08X\n" " StartVertex : 0x%.08X\n" @@ -7659,9 +7658,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVertices } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawVerticesUP +// * patch: D3DDevice_DrawVerticesUP // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVerticesUP +VOID WINAPI XTL::EMUPATCH(D3DDevice_DrawVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -7671,7 +7670,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVerticesUP { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DrawVerticesUP\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DrawVerticesUP\n" "(\n" " PrimitiveType : 0x%.08X\n" " VertexCount : 0x%.08X\n" @@ -7753,9 +7752,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawVerticesUP } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawIndexedVertices +// * patch: D3DDevice_DrawIndexedVertices // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVertices +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_DrawIndexedVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -7764,7 +7763,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVertices { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DrawIndexedVertices\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DrawIndexedVertices\n" "(\n" " PrimitiveType : 0x%.08X\n" " VertexCount : 0x%.08X\n" @@ -7950,9 +7949,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVertices } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawIndexedVerticesUP +// * patch: D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP +VOID WINAPI XTL::EMUPATCH(D3DDevice_DrawIndexedVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -7963,7 +7962,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DrawIndexedVerticesUP\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DrawIndexedVerticesUP\n" "(\n" " PrimitiveType : 0x%.08X\n" " VertexCount : 0x%.08X\n" @@ -8036,9 +8035,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetLight +// * patch: D3DDevice_SetLight // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetLight +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetLight) ( DWORD Index, CONST D3DLIGHT8 *pLight @@ -8046,7 +8045,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetLight { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetLight\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetLight\n" "(\n" " Index : 0x%.08X\n" " pLight : 0x%.08X\n" @@ -8061,16 +8060,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetLight } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetMaterial +// * patch: D3DDevice_SetMaterial // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetMaterial +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetMaterial) ( CONST D3DMATERIAL8 *pMaterial ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetMaterial\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetMaterial\n" "(\n" " pMaterial : 0x%.08X\n" ");\n", @@ -8084,9 +8083,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetMaterial } // ****************************************************************** -// * func: EmuIDirect3DDevice8_LightEnable +// * patch: D3DDevice_LightEnable // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_LightEnable +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_LightEnable) ( DWORD Index, BOOL bEnable @@ -8094,7 +8093,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_LightEnable { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_LightEnable\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_LightEnable\n" "(\n" " Index : 0x%.08X\n" " bEnable : 0x%.08X\n" @@ -8109,9 +8108,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_LightEnable } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderTarget +// * patch: D3DDevice_SetRenderTarget // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTarget +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetRenderTarget) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil @@ -8119,7 +8118,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTarget { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderTarget\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderTarget\n" "(\n" " pRenderTarget : 0x%.08X (0x%.08X)\n" " pNewZStencil : 0x%.08X (0x%.08X)\n" @@ -8168,30 +8167,30 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTarget } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePalette +// * patch: D3DDevice_CreatePalette // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreatePalette +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePalette) ( X_D3DPALETTESIZE Size, X_D3DPalette **ppPalette ) { - *ppPalette = EmuIDirect3DDevice8_CreatePalette2(Size); + *ppPalette = EMUPATCH(D3DDevice_CreatePalette2)(Size); return D3D_OK; } // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePalette2 +// * patch: D3DDevice_CreatePalette2 // ****************************************************************** -XTL::X_D3DPalette * WINAPI XTL::EmuIDirect3DDevice8_CreatePalette2 +XTL::X_D3DPalette * WINAPI XTL::EMUPATCH(D3DDevice_CreatePalette2) ( X_D3DPALETTESIZE Size ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreatePalette2\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreatePalette2\n" "(\n" " Size : 0x%.08X\n" ");\n", @@ -8216,7 +8215,7 @@ XTL::X_D3DPalette * WINAPI XTL::EmuIDirect3DDevice8_CreatePalette2 // EmuIDirect3DResource8_Register? So far, it doesn't look // like the palette registration code gets used. If not, then we // need to cache the palette manually during any calls to - // EmuIDirect3DDevice8_SetPalette for 8-bit textures to work properly. + // EmuD3DDevice_SetPalette for 8-bit textures to work properly. DbgPrintf("pPalette: = 0x%.08X\n", pPalette); @@ -8226,9 +8225,9 @@ XTL::X_D3DPalette * WINAPI XTL::EmuIDirect3DDevice8_CreatePalette2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPalette +// * patch: D3DDevice_SetPalette // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPalette +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetPalette) ( DWORD Stage, X_D3DPalette *pPalette @@ -8236,7 +8235,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPalette { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetPalette\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetPalette\n" "(\n" " Stage : 0x%.08X\n" " pPalette : 0x%.08X\n" @@ -8263,16 +8262,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPalette } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetFlickerFilter +// * patch: D3DDevice_SetFlickerFilter // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_SetFlickerFilter +void WINAPI XTL::EMUPATCH(D3DDevice_SetFlickerFilter) ( DWORD Filter ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetFlickerFilter\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetFlickerFilter\n" "(\n" " Filter : 0x%.08X\n" ");\n", @@ -8286,16 +8285,16 @@ void WINAPI XTL::EmuIDirect3DDevice8_SetFlickerFilter } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetSoftDisplayFilter +// * patch: D3DDevice_SetSoftDisplayFilter // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter +void WINAPI XTL::EMUPATCH(D3DDevice_SetSoftDisplayFilter) ( BOOL Enable ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetSoftDisplayFilter\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetSoftDisplayFilter\n" "(\n" " Enable : 0x%.08X\n" ");\n", @@ -8309,9 +8308,9 @@ void WINAPI XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter } // ****************************************************************** -// * func: EmuIDirect3DPalette8_Lock +// * patch: IDirect3DPalette8_Lock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DPalette8_Lock +HRESULT WINAPI XTL::EMUPATCH(D3DPalette_Lock) ( X_D3DPalette *pThis, D3DCOLOR **ppColors, @@ -8321,7 +8320,7 @@ HRESULT WINAPI XTL::EmuIDirect3DPalette8_Lock HRESULT hRet = D3D_OK; if( pThis ) - *ppColors = EmuIDirect3DPalette8_Lock2(pThis, Flags); + *ppColors = EMUPATCH(D3DPalette_Lock2)(pThis, Flags); else { EmuWarning( "EmuIDirect3DPalette8_Lock: pThis == NULL!" ); @@ -8332,9 +8331,9 @@ HRESULT WINAPI XTL::EmuIDirect3DPalette8_Lock } // ****************************************************************** -// * func: EmuIDirect3DPalette8_Lock2 +// * patch: IDirect3DPalette8_Lock2 // ****************************************************************** -XTL::D3DCOLOR * WINAPI XTL::EmuIDirect3DPalette8_Lock2 +XTL::D3DCOLOR * WINAPI XTL::EMUPATCH(D3DPalette_Lock2) ( X_D3DPalette *pThis, DWORD Flags @@ -8352,7 +8351,7 @@ XTL::D3DCOLOR * WINAPI XTL::EmuIDirect3DPalette8_Lock2 // If X_D3DLOCK_READONLY and X_D3DLOCK_NOOVERWRITE bitflags not set if( !(Flags & (X_D3DLOCK_READONLY | X_D3DLOCK_NOOVERWRITE)) ) { - EmuIDirect3DResource8_BlockUntilNotBusy(pThis); + EMUPATCH(D3DResource_BlockUntilNotBusy)(pThis); } D3DCOLOR *pColors = (D3DCOLOR*)pThis->Data; @@ -8363,9 +8362,9 @@ XTL::D3DCOLOR * WINAPI XTL::EmuIDirect3DPalette8_Lock2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderSize +// * patch: D3DDevice_GetVertexShaderSize // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderSize +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderSize) ( DWORD Handle, UINT* pSize @@ -8373,7 +8372,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderSize { - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderSize\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderSize\n" "(\n" " Handle : 0x%.08X\n" " pSize : 0x%.08X\n" @@ -8395,16 +8394,16 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderSize } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeleteVertexShader +// * patch: D3DDevice_DeleteVertexShader // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_DeleteVertexShader +VOID WINAPI XTL::EMUPATCH(D3DDevice_DeleteVertexShader) ( DWORD Handle ) { - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_DeleteVertexShader\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_DeleteVertexShader\n" "(\n" " Handle : 0x%.08X\n" ");\n", @@ -8437,9 +8436,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_DeleteVertexShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SelectVertexShaderDirect +// * patch: D3DDevice_SelectVertexShaderDirect // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShaderDirect +VOID WINAPI XTL::EMUPATCH(D3DDevice_SelectVertexShaderDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, DWORD Address @@ -8448,7 +8447,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShaderDirect // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_SelectVertexShaderDirect\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_SelectVertexShaderDirect\n" "(\n" " pVAF : 0x%.08X\n" " Address : 0x%.08X\n" @@ -8461,15 +8460,15 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShaderDirect } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetShaderConstantMode +// * patch: D3DDevice_GetShaderConstantMode // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetShaderConstantMode +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetShaderConstantMode) ( DWORD *pMode ) { - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetShaderConstantMode\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetShaderConstantMode\n" "(\n" " pMode : 0x%.08X\n" ");\n", @@ -8482,9 +8481,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetShaderConstantMode } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShader +// * patch: D3DDevice_GetVertexShader // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShader +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShader) ( DWORD *pHandle ) @@ -8492,7 +8491,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShader // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShader\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShader\n" "(\n" " pHandle : 0x%.08X\n" ");\n", @@ -8507,9 +8506,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderConstant +// * patch: D3DDevice_GetVertexShaderConstant // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderConstant +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderConstant) ( INT Register, void *pConstantData, @@ -8519,7 +8518,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderConstant // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderConstant\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderConstant\n" "(\n" " Register : 0x%.08X\n" " pConstantData : 0x%.08X\n" @@ -8538,9 +8537,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderConstant } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderInputDirect +// * patch: D3DDevice_SetVertexShaderInputDirect // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInputDirect +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderInputDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, UINT StreamCount, @@ -8550,7 +8549,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInputDirect // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_SelectVertexShaderDirect\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_SelectVertexShaderDirect\n" "(\n" " pVAF : 0x%.08X\n" " StreamCount : 0x%.08X\n" @@ -8566,9 +8565,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInputDirect } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderInput +// * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderInput +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderInput) ( DWORD *pHandle, UINT *pStreamCount, @@ -8578,7 +8577,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderInput // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderInput\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderInput\n" "(\n" " pHandle : 0x%.08X\n" " pStreamCount : 0x%.08X\n" @@ -8594,9 +8593,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderInput } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderInput +// * patch: D3DDevice_SetVertexShaderInput // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInput +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderInput) ( DWORD Handle, UINT StreamCount, @@ -8606,7 +8605,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInput // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_SetVertexShaderInput\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_SetVertexShaderInput\n" "(\n" " Handle : 0x%.08X\n" " StreamCount : 0x%.08X\n" @@ -8623,9 +8622,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetVertexShaderInput // ****************************************************************** -// * func: EmuIDirect3DDevice8_RunVertexStateShader +// * patch: D3DDevice_RunVertexStateShader // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_RunVertexStateShader +VOID WINAPI XTL::EMUPATCH(D3DDevice_RunVertexStateShader) ( DWORD Address, CONST FLOAT *pData @@ -8634,7 +8633,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_RunVertexStateShader // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_RunVertexStateShader\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_RunVertexStateShader\n" "(\n" " Address : 0x%.08X\n" " pData : 0x%.08X\n" @@ -8647,9 +8646,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_RunVertexStateShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_LoadVertexShaderProgram +// * patch: D3DDevice_LoadVertexShaderProgram // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram +VOID WINAPI XTL::EMUPATCH(D3DDevice_LoadVertexShaderProgram) ( CONST DWORD *pFunction, DWORD Address @@ -8658,7 +8657,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_LoadVertexShaderProgram\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_LoadVertexShaderProgram\n" "(\n" " pFunction : 0x%.08X\n" " Address : 0x%.08X\n" @@ -8671,9 +8670,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderType +// * patch: D3DDevice_GetVertexShaderType // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderType +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderType) ( DWORD Handle, DWORD *pType @@ -8682,7 +8681,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderType // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderType\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderType\n" "(\n" " Handle : 0x%.08X\n" " pType : 0x%.08X\n" @@ -8698,9 +8697,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderType } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderDeclaration +// * patch: D3DDevice_GetVertexShaderDeclaration // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderDeclaration +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderDeclaration) ( DWORD Handle, PVOID pData, @@ -8710,7 +8709,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderDeclaration // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderDeclaration\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderDeclaration\n" "(\n" " Handle : 0x%.08X\n" " pData : 0x%.08X\n" @@ -8741,9 +8740,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderDeclaration } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderFunction +// * patch: D3DDevice_GetVertexShaderFunction // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderFunction +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderFunction) ( DWORD Handle, PVOID *pData, @@ -8753,7 +8752,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderFunction // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_GetVertexShaderFunction\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_GetVertexShaderFunction\n" "(\n" " Handle : 0x%.08X\n" " pData : 0x%.08X\n" @@ -8784,9 +8783,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetVertexShaderFunction } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetDepthClipPlanes +// * patch: D3DDevice_SetDepthClipPlanes // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetDepthClipPlanes +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetDepthClipPlanes) ( FLOAT Near, FLOAT Far, @@ -8796,7 +8795,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetDepthClipPlanes // debug trace - DbgPrintf( "EmuD3D8: EmuIDirect3DDevice8_SetDepthClipPlanes\n" + DbgPrintf( "EmuD3D8: EmuD3DDevice_SetDepthClipPlanes\n" "(\n" " Near : 0x%.08X\n" " Far : 0x%.08X\n" @@ -8856,9 +8855,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetDepthClipPlanes } // ****************************************************************** -// * func: EmuIDirect3D8_AllocContiguousMemory +// * patch: D3D_AllocContiguousMemory // ****************************************************************** -PVOID WINAPI XTL::EmuIDirect3D8_AllocContiguousMemory +PVOID WINAPI XTL::EMUPATCH(D3D_AllocContiguousMemory) ( SIZE_T dwSize, DWORD dwAllocAttributes @@ -8902,9 +8901,9 @@ PVOID WINAPI XTL::EmuIDirect3D8_AllocContiguousMemory } // ****************************************************************** -// * func: EmuIDirect3DTexture8_GetLevelDesc +// * patch: IDirect3DTexture8_GetLevelDesc // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DTexture8_GetLevelDesc +HRESULT WINAPI XTL::EMUPATCH(D3DTexture_GetLevelDesc) ( UINT Level, X_D3DSURFACE_DESC* pDesc @@ -8926,9 +8925,9 @@ HRESULT WINAPI XTL::EmuIDirect3DTexture8_GetLevelDesc } // ****************************************************************** -// * func: EmuIDirect3D8_CheckDeviceMultiSampleType +// * patch: D3D_CheckDeviceMultiSampleType // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_CheckDeviceMultiSampleType +HRESULT WINAPI XTL::EMUPATCH(D3D_CheckDeviceMultiSampleType) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -9000,9 +8999,9 @@ HRESULT WINAPI XTL::EmuIDirect3D8_CheckDeviceMultiSampleType } // ****************************************************************** -// * func: EmuIDirect3D8_GetDeviceCaps +// * patch: D3D_GetDeviceCaps // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_GetDeviceCaps +HRESULT WINAPI XTL::EMUPATCH(D3D_GetDeviceCaps) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -9029,9 +9028,9 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetDeviceCaps } // ****************************************************************** -// * func: EmuIDirect3D8_SetPushBufferSize +// * patch: D3D_SetPushBufferSize // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_SetPushBufferSize +HRESULT WINAPI XTL::EMUPATCH(D3D_SetPushBufferSize) ( DWORD PushBufferSize, DWORD KickOffSize @@ -9056,13 +9055,13 @@ HRESULT WINAPI XTL::EmuIDirect3D8_SetPushBufferSize } // ****************************************************************** -// * func: EmuIDirect3DDevice8_InsertFence +// * patch: D3DDevice_InsertFence // ****************************************************************** -DWORD WINAPI XTL::EmuIDirect3DDevice8_InsertFence() +DWORD WINAPI XTL::EMUPATCH(D3DDevice_InsertFence)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_InsertFence()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_InsertFence()\n"); // TODO: Actually implement this DWORD dwRet = 0x8000BEEF; @@ -9073,16 +9072,16 @@ DWORD WINAPI XTL::EmuIDirect3DDevice8_InsertFence() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_IsFencePending +// * patch: D3DDevice_IsFencePending // ****************************************************************** -BOOL WINAPI XTL::EmuIDirect3DDevice8_IsFencePending +BOOL WINAPI XTL::EMUPATCH(D3DDevice_IsFencePending) ( DWORD Fence ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_IsFencePending\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_IsFencePending\n" "(\n" " Fence : 0x%.08X\n" ");\n", @@ -9096,16 +9095,16 @@ BOOL WINAPI XTL::EmuIDirect3DDevice8_IsFencePending } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BlockOnFence +// * patch: D3DDevice_BlockOnFence // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_BlockOnFence +VOID WINAPI XTL::EMUPATCH(D3DDevice_BlockOnFence) ( DWORD Fence ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BlockOnFence\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_BlockOnFence\n" "(\n" " Fence : 0x%.08X\n" ");\n", @@ -9117,9 +9116,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_BlockOnFence } // ****************************************************************** -// * func: EmuIDirect3DResource8_BlockUntilNotBusy +// * patch: IDirect3DResource8_BlockUntilNotBusy // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DResource8_BlockUntilNotBusy +VOID WINAPI XTL::EMUPATCH(D3DResource_BlockUntilNotBusy) ( X_D3DResource *pThis ) @@ -9140,9 +9139,9 @@ VOID WINAPI XTL::EmuIDirect3DResource8_BlockUntilNotBusy } // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_GetDesc +// * patch: IDirect3DVertexBuffer8_GetDesc // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DVertexBuffer8_GetDesc +VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_GetDesc) ( X_D3DVertexBuffer *pThis, D3DVERTEXBUFFER_DESC *pDesc @@ -9163,9 +9162,9 @@ VOID WINAPI XTL::EmuIDirect3DVertexBuffer8_GetDesc } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetScissors +// * patch: D3DDevice_SetScissors // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScissors +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetScissors) ( DWORD Count, BOOL Exclusive, @@ -9174,7 +9173,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScissors { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetScissors\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetScissors\n" "(\n" " Count : 0x%.08X\n" " Exclusive : 0x%.08X\n" @@ -9190,9 +9189,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScissors } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetScreenSpaceOffset +// * patch: D3DDevice_SetScreenSpaceOffset // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetScreenSpaceOffset) ( FLOAT x, FLOAT y @@ -9200,14 +9199,14 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetScreenSpaceOffset\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetScreenSpaceOffset\n" "(\n" " x : %f\n" " y : %f\n" ");\n", x, y); - EmuWarning("EmuIDirect3DDevice8_SetScreenSpaceOffset ignored"); + EmuWarning("EmuD3DDevice_SetScreenSpaceOffset ignored"); @@ -9215,16 +9214,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShaderProgram +// * patch: D3DDevice_SetPixelShaderProgram // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderProgram +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShaderProgram) ( X_D3DPIXELSHADERDEF* pPSDef ) { // Win2kXP FS - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetPixelShaderProgram\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetPixelShaderProgram\n" "(\n" " pPSDef : 0x%.08X\n" ");\n", @@ -9249,8 +9248,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderProgram // Now, redirect this to Xbox Direct3D // - //EmuIDirect3DDevice8_CreatePixelShader(pPSDef, &dwHandle); - //hRet = XTL::EmuIDirect3DDevice8_SetPixelShader( dwHandle ); + //XTL::EMUPATCH(D3DDevice_CreatePixelShader)(pPSDef, &dwHandle); + //hRet = XTL::EMUPATCH(D3DDevice_SetPixelShader)( dwHandle ); // @@ -9259,9 +9258,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetPixelShaderProgram } // ****************************************************************** -// * func: EmuIDirect3DDevice_CreateStateBlock +// * patch: IDirect3DDevice_CreateStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateStateBlock +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateStateBlock) ( D3DSTATEBLOCKTYPE Type, DWORD *pToken @@ -9269,7 +9268,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateStateBlock { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_CreateStateBlock\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_CreateStateBlock\n" "(\n" " Type : 0x%.08X\n" " pToken : 0x%.08X\n" @@ -9290,9 +9289,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateStateBlock } // ****************************************************************** -// * func: EmuIDirect3DDevice8_InsertCallback +// * patch: D3DDevice_InsertCallback // ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_InsertCallback +VOID WINAPI XTL::EMUPATCH(D3DDevice_InsertCallback) ( X_D3DCALLBACKTYPE Type, X_D3DCALLBACK pCallback, @@ -9301,7 +9300,7 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_InsertCallback { - /*DbgP*/printf("EmuD3D8: EmuIDirect3DDevice8_InsertCallback\n" + /*DbgP*/printf("EmuD3D8: EmuD3DDevice_InsertCallback\n" "(\n" " Type : 0x%.08X\n" " pCallback : 0x%.08X\n" @@ -9320,9 +9319,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_InsertCallback } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawRectPatch +// * patch: D3DDevice_DrawRectPatch // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawRectPatch +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_DrawRectPatch) ( UINT Handle, CONST FLOAT *pNumSegs, @@ -9331,7 +9330,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawRectPatch { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DrawRectPatch\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DrawRectPatch\n" "(\n" " Handle : 0x%.08X\n" " pNumSegs : %f\n" @@ -9351,16 +9350,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DrawRectPatch #pragma warning(disable:4244) // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetProjectionViewportMatrix +// * patch: D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetProjectionViewportMatrix) ( D3DXMATRIX *pProjectionViewport ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetProjectionViewportMatrix\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetProjectionViewportMatrix\n" "(\n" " pProjectionViewport : 0x%.08X\n" ");\n", @@ -9420,9 +9419,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix #pragma warning(default:4244) // ****************************************************************** -// * func: EmuD3DDevice_KickOff (D3D::CDevice::KickOff) +// * patch: D3DDevice_KickOff (D3D::CDevice::KickOff) // ****************************************************************** -VOID WINAPI XTL::EmuD3DDevice_KickOff() +VOID WINAPI XTL::EMUPATCH(D3DDevice_KickOff)() { @@ -9430,10 +9429,10 @@ VOID WINAPI XTL::EmuD3DDevice_KickOff() DbgPrintf("EmuD3D8: EmuD3DDevice_KickOff()\n"); // TODO: Anything (kick off and NOT wait for idle)? - // NOTE: We should actually emulate IDirect3DDevice8_KickPushBuffer() + // NOTE: We should actually emulate D3DDevice_KickPushBuffer() // instead of this function. When needed, use the breakpoint (int 3) // to determine what is calling this function if it's something other - // than IDirect3DDevice8_KickPushBuffer() itself. + // than D3DDevice_KickPushBuffer() itself. // __asm int 3; @@ -9441,13 +9440,13 @@ VOID WINAPI XTL::EmuD3DDevice_KickOff() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTexture2 +// * patch: D3DDevice_GetTexture2 // ****************************************************************** -XTL::X_D3DResource* WINAPI XTL::EmuIDirect3DDevice8_GetTexture2(DWORD Stage) +XTL::X_D3DResource* WINAPI XTL::EMUPATCH(D3DDevice_GetTexture2)(DWORD Stage) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetTexture2\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetTexture2\n" "(\n" " Stage : 0x%.08X\n" ");\n", @@ -9462,9 +9461,9 @@ XTL::X_D3DResource* WINAPI XTL::EmuIDirect3DDevice8_GetTexture2(DWORD Stage) } // ****************************************************************** -// * func: EmuD3DDevice_SetStateVB (D3D::CDevice::SetStateVB) +// * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB) // ****************************************************************** -VOID WINAPI XTL::EmuD3DDevice_SetStateVB( ULONG Unknown1 ) +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetStateVB)( ULONG Unknown1 ) { @@ -9481,9 +9480,9 @@ VOID WINAPI XTL::EmuD3DDevice_SetStateVB( ULONG Unknown1 ) } // ****************************************************************** -// * func: EmuD3DDevice_SetStateUP (D3D::CDevice::SetStateUP) +// * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP) // ****************************************************************** -VOID WINAPI XTL::EmuD3DDevice_SetStateUP() +VOID WINAPI XTL::EMUPATCH(D3DDevice_SetStateUP)() { @@ -9496,13 +9495,13 @@ VOID WINAPI XTL::EmuD3DDevice_SetStateUP() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetStipple +// * patch: D3DDevice_SetStipple // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_SetStipple( DWORD* pPattern ) +void WINAPI XTL::EMUPATCH(D3DDevice_SetStipple)( DWORD* pPattern ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetStipple\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetStipple\n" "(\n" " pPattern : 0x%.08X\n" ")\n", @@ -9514,16 +9513,16 @@ void WINAPI XTL::EmuIDirect3DDevice8_SetStipple( DWORD* pPattern ) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetSwapCallback +// * patch: D3DDevice_SetSwapCallback // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_SetSwapCallback +void WINAPI XTL::EMUPATCH(D3DDevice_SetSwapCallback) ( D3DSWAPCALLBACK pCallback ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetSwapCallback\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetSwapCallback\n" "(\n" " pCallback : 0x%.08X\n" ");\n", @@ -9539,13 +9538,13 @@ void WINAPI XTL::EmuIDirect3DDevice8_SetSwapCallback } // ****************************************************************** -// * func: EmuIDirect3DDevice8_PersistDisplay +// * patch: D3DDevice_PersistDisplay // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_PersistDisplay() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_PersistDisplay)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_PersistDisplay()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_PersistDisplay()\n"); HRESULT hRet = S_OK; @@ -9612,13 +9611,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PersistDisplay() // ****************************************************************** -// * func: EmuIDirect3DDevice8_Unknown1 +// * patch: D3DDevice_Unknown1 // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_Unknown1() +void WINAPI XTL::EMUPATCH(D3DDevice_Unknown1)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_Unknown1()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_Unknown1()\n"); // TODO: Find out what this actually is. // This function was only found in Run Like Hell (5233) @ 0x11FCD0. @@ -9630,9 +9629,9 @@ void WINAPI XTL::EmuIDirect3DDevice8_Unknown1() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_PrimeVertexCache +// * patch: D3DDevice_PrimeVertexCache // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_PrimeVertexCache +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_PrimeVertexCache) ( UINT VertexCount, WORD *pIndexData @@ -9640,7 +9639,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PrimeVertexCache { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_PrimeVertexCache\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_PrimeVertexCache\n" "(\n" " VertexCount : 0x%.08X\n" " pIndexData : 0x%.08X\n" @@ -9656,16 +9655,16 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_PrimeVertexCache } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_SampleAlpha +// * patch: D3DDevice_SetRenderState_SampleAlpha // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_SampleAlpha) ( DWORD dwSampleAlpha ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_SampleAlpha\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_SampleAlpha\n" "(\n" " dwSampleAlpha : 0x%.08X\n" ");\n", @@ -9681,9 +9680,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Deferred +// * patch: D3DDevice_SetRenderState_Deferred // ****************************************************************** -VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Deferred +VOID __fastcall XTL::EMUPATCH(D3DDevice_SetRenderState_Deferred) ( DWORD State, DWORD Value @@ -9691,7 +9690,7 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Deferred { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderState_Deferred\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderState_Deferred\n" "(\n" " State : 0x%.08X\n" " Value : 0x%.08X\n" @@ -9752,16 +9751,16 @@ VOID __fastcall XTL::EmuIDirect3DDevice8_SetRenderState_Deferred } // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeleteStateBlock +// * patch: D3DDevice_DeleteStateBlock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_DeleteStateBlock +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_DeleteStateBlock) ( DWORD Token ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_DeleteStateBlock\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_DeleteStateBlock\n" "(\n" " Token : 0x%.08X\n" ");\n", @@ -9776,9 +9775,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_DeleteStateBlock // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetModelView +// * patch: D3DDevice_SetModelView // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetModelView) ( CONST D3DMATRIX *pModelView, CONST D3DMATRIX *pInverseModelView, @@ -9787,7 +9786,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetModelView\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetModelView\n" "(\n" " pModelView : 0x%.08X\n" " pInverseModelView : 0x%.08X\n" @@ -9804,28 +9803,28 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetModelView } // ****************************************************************** -// * func: EmuIDirect3DDevice8_FlushVertexCache +// * patch: D3DDevice_FlushVertexCache // ****************************************************************** -void WINAPI XTL::EmuIDirect3DDevice8_FlushVertexCache() +void WINAPI XTL::EMUPATCH(D3DDevice_FlushVertexCache)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_FlushVertexCache();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_FlushVertexCache();\n"); } // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginPushBuffer +// * patch: D3DDevice_BeginPushBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginPushBuffer +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_BeginPushBuffer) ( X_D3DPushBuffer *pPushBuffer ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_BeginPushBuffer\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_BeginPushBuffer\n" "(\n" " pPushBuffer : 0x%.08X\n" ");\n", pPushBuffer); @@ -9842,13 +9841,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_BeginPushBuffer } // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndPushBuffer +// * patch: D3DDevice_EndPushBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndPushBuffer() +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_EndPushBuffer)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_EndPushBuffer();\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_EndPushBuffer();\n"); @@ -9856,9 +9855,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_EndPushBuffer() } // ****************************************************************** -// * func: EmuXMETAL_StartPush +// * patch: XMETAL_StartPush // ****************************************************************** -void WINAPI XTL::EmuXMETAL_StartPush(void* Unknown) +void WINAPI XTL::EMUPATCH(XMETAL_StartPush)(void* Unknown) { @@ -9875,13 +9874,13 @@ void WINAPI XTL::EmuXMETAL_StartPush(void* Unknown) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetModelView +// * patch: D3DDevice_GetModelView // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetModelView\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetModelView\n" "(\n" " pModelView : 0x%.08X\n" ");\n", pModelView); @@ -9900,13 +9899,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetBackMaterial +// * patch: D3DDevice_SetBackMaterial // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetBackMaterial(D3DMATERIAL8* pMaterial) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetBackMaterial)(D3DMATERIAL8* pMaterial) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetBackMaterial\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetBackMaterial\n" "(\n" " pMaterial : 0x%.08X\n" ");\n", pMaterial); @@ -9919,9 +9918,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetBackMaterial(D3DMATERIAL8* pMaterial) } // ****************************************************************** -// * func: EmuIDirect3D8_GetAdapterIdentifier +// * patch: D3D_GetAdapterIdentifier // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterIdentifier +HRESULT WINAPI XTL::EMUPATCH(D3D_GetAdapterIdentifier) ( UINT Adapter, DWORD Flags, @@ -9954,9 +9953,9 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterIdentifier } // ****************************************************************** -// * func: D3D::MakeRequestedSpace +// * patch: D3D_MakeRequestedSpace // ****************************************************************** -HRESULT WINAPI XTL::EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 ) +HRESULT WINAPI XTL::EMUPATCH(D3D_MakeRequestedSpace)( DWORD Unknown1, DWORD Unknown2 ) { @@ -9979,9 +9978,9 @@ HRESULT WINAPI XTL::EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 ) } // ****************************************************************** -// * func: D3DDevice_MakeSpace +// * patch: D3DDevice_MakeSpace // ****************************************************************** -void WINAPI XTL::EmuD3DDevice_MakeSpace() +void WINAPI XTL::EMUPATCH(D3DDevice_MakeSpace)() { @@ -9997,9 +9996,9 @@ void WINAPI XTL::EmuD3DDevice_MakeSpace() } // ****************************************************************** -// * func: D3D::SetCommonDebugRegisters +// * patch: D3D_SetCommonDebugRegisters // ****************************************************************** -void WINAPI XTL::EmuD3D_SetCommonDebugRegisters() +void WINAPI XTL::EMUPATCH(D3D_SetCommonDebugRegisters)() { @@ -10012,9 +10011,9 @@ void WINAPI XTL::EmuD3D_SetCommonDebugRegisters() } // ****************************************************************** -// * func: D3D::BlockOnTime +// * patch: D3D_BlockOnTime // ****************************************************************** -void WINAPI XTL::EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 ) +void WINAPI XTL::EMUPATCH(D3D_BlockOnTime)( DWORD Unknown1, int Unknown2 ) { @@ -10035,9 +10034,9 @@ void WINAPI XTL::EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 ) } // ****************************************************************** -// * func: D3D::BlockOnResource +// * patch: D3D_BlockOnResource // ****************************************************************** -void WINAPI XTL::EmuD3D_BlockOnResource( X_D3DResource* pResource ) +void WINAPI XTL::EMUPATCH(D3D_BlockOnResource)( X_D3DResource* pResource ) { @@ -10053,16 +10052,16 @@ void WINAPI XTL::EmuD3D_BlockOnResource( X_D3DResource* pResource ) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPushBufferOffset +// * patch: D3DDevice_GetPushBufferOffset // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPushBufferOffset +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetPushBufferOffset) ( DWORD *pOffset ) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetPushBufferOffset\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetPushBufferOffset\n" "(\n" " pOffset : 0x%.08X\n" ");\n", pOffset); @@ -10076,9 +10075,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPushBufferOffset } // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_GetCubeMapSurface +// * patch: IDirect3DCubeTexture8_GetCubeMapSurface // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface +HRESULT WINAPI XTL::EMUPATCH(D3DCubeTexture_GetCubeMapSurface) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, @@ -10109,9 +10108,9 @@ HRESULT WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface } // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_GetCubeMapSurface2 +// * patch: IDirect3DCubeTexture8_GetCubeMapSurface2 // ****************************************************************** -XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2 +XTL::X_D3DSurface* WINAPI XTL::EMUPATCH(D3DCubeTexture_GetCubeMapSurface2) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, @@ -10140,9 +10139,9 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2 } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPixelShader +// * patch: D3DDevice_GetPixelShader // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetPixelShader) ( DWORD Name, DWORD* pHandle @@ -10150,7 +10149,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetPixelShader\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetPixelShader\n" "(\n" " Name : 0x%.08X\n" " pHandle : 0x%.08X\n" @@ -10165,13 +10164,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPixelShader } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPersistedSurface +// * patch: D3DDevice_GetPersistedSurface // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSurface) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetPersistedSurface)(X_D3DSurface **ppSurface) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetPersistedSurface\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetPersistedSurface\n" "(\n" " ppSurface : 0x%.08X\n" ");\n", ppSurface); @@ -10205,13 +10204,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSur } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPersistedSurface +// * patch: D3DDevice_GetPersistedSurface // ****************************************************************** -XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface2() +XTL::X_D3DSurface* WINAPI XTL::EMUPATCH(D3DDevice_GetPersistedSurface2)() { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetPersistedSurface()\n"); + DbgPrintf("EmuD3D8: EmuD3DDevice_GetPersistedSurface()\n"); // Attempt to load the persisted surface from persisted_surface.bmp @@ -10242,9 +10241,9 @@ XTL::X_D3DSurface* WINAPI XTL::EmuIDirect3DDevice8_GetPersistedSurface2() } // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderTargetFast +// * patch: D3DDevice_SetRenderTargetFast // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTargetFast +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetRenderTargetFast) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil, @@ -10253,7 +10252,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTargetFast { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_SetRenderTarget\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_SetRenderTarget\n" "(\n" " pRenderTarget : 0x%.08X (0x%.08X)\n" " pNewZStencil : 0x%.08X (0x%.08X)\n" @@ -10264,7 +10263,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTargetFast // Redirect to the standard version. - HRESULT hr = EmuIDirect3DDevice8_SetRenderTarget(pRenderTarget, pNewZStencil); + HRESULT hr = EMUPATCH(D3DDevice_SetRenderTarget)(pRenderTarget, pNewZStencil); @@ -10273,9 +10272,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SetRenderTargetFast } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetScissors +// * patch: D3DDevice_GetScissors // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetScissors +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetScissors) ( DWORD *pCount, BOOL *pExclusive, @@ -10284,7 +10283,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetScissors { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetScissors\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetScissors\n" "(\n" " pCount : 0x%.08X\n" " pExclusive : 0x%.08X\n" @@ -10313,13 +10312,13 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetScissors } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackMaterial +// * patch: D3DDevice_GetBackMaterial // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetBackMaterial(D3DMATERIAL8* pMaterial) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetBackMaterial)(D3DMATERIAL8* pMaterial) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetBackMaterial\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetBackMaterial\n" "(\n" " pMaterial : 0x%.08X\n" ");\n", pMaterial); @@ -10337,9 +10336,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetBackMaterial(D3DMATERIAL8* pMaterial) } // ****************************************************************** -// * func: EmuD3D::LazySetPointParams +// * patch: D3D::LazySetPointParams // ****************************************************************** -void WINAPI XTL::EmuD3D_LazySetPointParams( void* Device ) +void WINAPI XTL::EMUPATCH(D3D_LazySetPointParams)( void* Device ) { @@ -10356,13 +10355,13 @@ void WINAPI XTL::EmuD3D_LazySetPointParams( void* Device ) } // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetMaterial +// * patch: D3DDevice_GetMaterial // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetMaterial(D3DMATERIAL8* pMaterial) +HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetMaterial)(D3DMATERIAL8* pMaterial) { - DbgPrintf("EmuD3D8: EmuIDirect3DDevice8_GetMaterial\n" + DbgPrintf("EmuD3D8: EmuD3DDevice_GetMaterial\n" "(\n" " pMaterial : 0x%.08X\n" ");\n", pMaterial); diff --git a/src/CxbxKrnl/EmuD3D8.h b/src/CxbxKrnl/EmuD3D8.h index 0ac65b9b4..55f5bd8f6 100644 --- a/src/CxbxKrnl/EmuD3D8.h +++ b/src/CxbxKrnl/EmuD3D8.h @@ -35,7 +35,7 @@ #define EMUD3D8_H #include "EmuD3D8Types.h" - +#include "CxbxKrnl.h" #include "Common/Xbe.h" #include "Emu.h" @@ -58,9 +58,9 @@ extern X_D3DTILE EmuD3DTileCache[0x08]; extern X_D3DResource *EmuD3DActiveTexture[4]; // ****************************************************************** -// * func: EmuIDirect3D8_CreateDevice +// * patch: D3D_CreateDevice // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_CreateDevice +HRESULT WINAPI EMUPATCH(D3D_CreateDevice) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -71,19 +71,19 @@ HRESULT WINAPI EmuIDirect3D8_CreateDevice ); // ****************************************************************** -// * func: EmuIDirect3DResource8_IsBusy +// * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI EmuIDirect3DDevice8_IsBusy(); +BOOL WINAPI EMUPATCH(D3DDevice_IsBusy)(); // ****************************************************************** -// * func: EmuIDirect3D8_CheckDeviceFormat +// * patch: D3D_CheckDeviceFormat // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetCreationParameters(D3DDEVICE_CREATION_PARAMETERS *pParameters); +VOID WINAPI EMUPATCH(D3DDevice_GetCreationParameters)(D3DDEVICE_CREATION_PARAMETERS *pParameters); // ****************************************************************** -// * func: EmuIDirect3D8_CheckDeviceFormat +// * patch: D3D_CheckDeviceFormat // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_CheckDeviceFormat +HRESULT WINAPI EMUPATCH(D3D_CheckDeviceFormat) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -94,45 +94,45 @@ HRESULT WINAPI EmuIDirect3D8_CheckDeviceFormat ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDeviceCaps +// * patch: D3DDevice_GetDeviceCaps // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetDeviceCaps +VOID WINAPI EMUPATCH(D3DDevice_GetDeviceCaps) ( D3DCAPS8 *pCaps ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDisplayFieldStatus +// * patch: D3DDevice_GetDisplayFieldStatus // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetDisplayFieldStatus(X_D3DFIELD_STATUS *pFieldStatus); +VOID WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pFieldStatus); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginPush +// * patch: D3DDevice_BeginPush // ****************************************************************** -PDWORD WINAPI EmuIDirect3DDevice8_BeginPush(DWORD Count); +PDWORD WINAPI EMUPATCH(D3DDevice_BeginPush)(DWORD Count); // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndPush +// * patch: D3DDevice_EndPush // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_EndPush(DWORD *pPush); +VOID WINAPI EMUPATCH(D3DDevice_EndPush)(DWORD *pPush); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginVisibilityTest +// * patch: D3DDevice_BeginVisibilityTest // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_BeginVisibilityTest(); +HRESULT WINAPI EMUPATCH(D3DDevice_BeginVisibilityTest)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndVisibilityTest +// * patch: D3DDevice_EndVisibilityTest // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_EndVisibilityTest +HRESULT WINAPI EMUPATCH(D3DDevice_EndVisibilityTest) ( DWORD Index ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVisibilityTestResult +// * patch: D3DDevice_GetVisibilityTestResult // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetVisibilityTestResult +HRESULT WINAPI EMUPATCH(D3DDevice_GetVisibilityTestResult) ( DWORD Index, UINT *pResult, @@ -140,76 +140,76 @@ HRESULT WINAPI EmuIDirect3DDevice8_GetVisibilityTestResult ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetBackBufferScale +// * patch: D3DDevice_SetBackBufferScale // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetBackBufferScale(FLOAT x, FLOAT y); +VOID WINAPI EMUPATCH(D3DDevice_SetBackBufferScale)(FLOAT x, FLOAT y); // ****************************************************************** -// * func: EmuIDirect3DDevice8_LoadVertexShader +// * patch: D3DDevice_LoadVertexShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_LoadVertexShader +HRESULT WINAPI EMUPATCH(D3DDevice_LoadVertexShader) ( DWORD Handle, DWORD Address ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SelectVertexShader +// * patch: D3DDevice_SelectVertexShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SelectVertexShader +HRESULT WINAPI EMUPATCH(D3DDevice_SelectVertexShader) ( DWORD Handle, DWORD Address ); // ****************************************************************** -// * func: EmuIDirect3D8_KickOffAndWaitForIdle +// * patch: D3D_KickOffAndWaitForIdle // ****************************************************************** -VOID WINAPI EmuIDirect3D8_KickOffAndWaitForIdle(); +VOID WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle)(); // ****************************************************************** -// * func: EmuIDirect3D8_KickOffAndWaitForIdle +// * patch: D3D_KickOffAndWaitForIdle // ****************************************************************** -VOID WINAPI EmuIDirect3D8_KickOffAndWaitForIdle2(DWORD dwDummy1, DWORD dwDummy2); +VOID WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle2)(DWORD dwDummy1, DWORD dwDummy2); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetGammaRamp +// * patch: D3DDevice_SetGammaRamp // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetGammaRamp +VOID WINAPI EMUPATCH(D3DDevice_SetGammaRamp) ( DWORD dwFlags, CONST X_D3DGAMMARAMP *pRamp ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_AddRef +// * patch: D3DDevice_AddRef // ****************************************************************** -ULONG WINAPI EmuIDirect3DDevice8_AddRef(); +ULONG WINAPI EMUPATCH(D3DDevice_AddRef)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginStateBlock +// * patch: D3DDevice_BeginStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_BeginStateBlock(); +HRESULT WINAPI EMUPATCH(D3DDevice_BeginStateBlock)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CaptureStateBlock +// * patch: D3DDevice_CaptureStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CaptureStateBlock(DWORD Token); +HRESULT WINAPI EMUPATCH(D3DDevice_CaptureStateBlock)(DWORD Token); // ****************************************************************** -// * func: EmuIDirect3DDevice8_ApplyStateBlock +// * patch: D3DDevice_ApplyStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_ApplyStateBlock(DWORD Token); +HRESULT WINAPI EMUPATCH(D3DDevice_ApplyStateBlock)(DWORD Token); // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndStateBlock +// * patch: D3DDevice_EndStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_EndStateBlock(DWORD *pToken); +HRESULT WINAPI EMUPATCH(D3DDevice_EndStateBlock)(DWORD *pToken); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CopyRects +// * patch: D3DDevice_CopyRects // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CopyRects +HRESULT WINAPI EMUPATCH(D3DDevice_CopyRects) ( X_D3DSurface *pSourceSurface, CONST RECT *pSourceRectsArray, @@ -219,9 +219,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_CopyRects ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateImageSurface +// * patch: D3DDevice_CreateImageSurface // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateImageSurface +HRESULT WINAPI EMUPATCH(D3DDevice_CreateImageSurface) ( UINT Width, UINT Height, @@ -230,25 +230,25 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateImageSurface ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetGammaRamp +// * patch: D3DDevice_GetGammaRamp // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetGammaRamp +VOID WINAPI EMUPATCH(D3DDevice_GetGammaRamp) ( X_D3DGAMMARAMP *pRamp ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackBuffer2 +// * patch: D3DDevice_GetBackBuffer2 // ****************************************************************** -X_D3DSurface* WINAPI EmuIDirect3DDevice8_GetBackBuffer2 +X_D3DSurface* WINAPI EMUPATCH(D3DDevice_GetBackBuffer2) ( INT BackBuffer ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackBuffer +// * patch: D3DDevice_GetBackBuffer // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetBackBuffer +VOID WINAPI EMUPATCH(D3DDevice_GetBackBuffer) ( INT BackBuffer, D3DBACKBUFFER_TYPE Type, @@ -256,94 +256,94 @@ VOID WINAPI EmuIDirect3DDevice8_GetBackBuffer ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetViewport +// * patch: D3DDevice_SetViewport // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetViewport +HRESULT WINAPI EMUPATCH(D3DDevice_SetViewport) ( CONST D3DVIEWPORT8 *pViewport ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetViewport +// * patch: D3DDevice_GetViewport // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetViewport +HRESULT WINAPI EMUPATCH(D3DDevice_GetViewport) ( D3DVIEWPORT8 *pViewport ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetViewportOffsetAndScale +// * patch: D3DDevice_GetViewportOffsetAndScale // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetViewportOffsetAndScale +VOID WINAPI EMUPATCH(D3DDevice_GetViewportOffsetAndScale) ( D3DXVECTOR4 *pOffset, D3DXVECTOR4 *pScale ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetShaderConstantMode +// * patch: D3DDevice_SetShaderConstantMode // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetShaderConstantMode +HRESULT WINAPI EMUPATCH(D3DDevice_SetShaderConstantMode) ( XTL::X_VERTEXSHADERCONSTANTMODE Mode ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Reset +// * patch: D3DDevice_Reset // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_Reset +HRESULT WINAPI EMUPATCH(D3DDevice_Reset) ( X_D3DPRESENT_PARAMETERS *pPresentationParameters ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetRenderTarget +// * patch: D3DDevice_GetRenderTarget // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetRenderTarget +HRESULT WINAPI EMUPATCH(D3DDevice_GetRenderTarget) ( X_D3DSurface **ppRenderTarget ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetRenderTarget +// * patch: D3DDevice_GetRenderTarget // ****************************************************************** -X_D3DSurface * WINAPI EmuIDirect3DDevice8_GetRenderTarget2(); +X_D3DSurface * WINAPI EMUPATCH(D3DDevice_GetRenderTarget2)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDepthStencilSurface +// * patch: D3DDevice_GetDepthStencilSurface // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetDepthStencilSurface +HRESULT WINAPI EMUPATCH(D3DDevice_GetDepthStencilSurface) ( X_D3DSurface **ppZStencilSurface ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDepthStencilSurface +// * patch: D3DDevice_GetDepthStencilSurface // ****************************************************************** -X_D3DSurface * WINAPI EmuIDirect3DDevice8_GetDepthStencilSurface2(); +X_D3DSurface * WINAPI EMUPATCH(D3DDevice_GetDepthStencilSurface2)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTile +// * patch: D3DDevice_GetTile // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetTile +HRESULT WINAPI EMUPATCH(D3DDevice_GetTile) ( DWORD Index, X_D3DTILE *pTile ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTileNoWait +// * patch: D3DDevice_SetTileNoWait // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetTileNoWait +HRESULT WINAPI EMUPATCH(D3DDevice_SetTileNoWait) ( DWORD Index, CONST X_D3DTILE *pTile ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexShader +// * patch: D3DDevice_CreateVertexShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateVertexShader +HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexShader) ( CONST DWORD *pDeclaration, CONST DWORD *pFunction, @@ -352,9 +352,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateVertexShader ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShaderConstant +// * patch: D3DDevice_SetPixelShaderConstant // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetPixelShaderConstant +VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant) ( DWORD Register, CONST PVOID pConstantData, @@ -362,9 +362,9 @@ VOID WINAPI EmuIDirect3DDevice8_SetPixelShaderConstant ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant +// * patch: D3DDevice_SetVertexShaderConstant // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderConstant +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexShaderConstant) ( INT Register, CONST PVOID pConstantData, @@ -372,27 +372,27 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderConstant ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant1 +// * patch: D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SetVertexShaderConstant1 +VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant1) ( INT Register, CONST PVOID pConstantData ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstant4 +// * patch: D3DDevice_SetVertexShaderConstant4 // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SetVertexShaderConstant4 +VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant4) ( INT Register, CONST PVOID pConstantData ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderConstantNotInline +// * patch: D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SetVertexShaderConstantNotInline +VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) ( INT Register, CONST PVOID pConstantData, @@ -400,34 +400,34 @@ VOID __fastcall EmuIDirect3DDevice8_SetVertexShaderConstantNotInline ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeletePixelShader +// * patch: D3DDevice_DeletePixelShader // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_DeletePixelShader +VOID WINAPI EMUPATCH(D3DDevice_DeletePixelShader) ( DWORD Handle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePixelShader +// * patch: D3DDevice_CreatePixelShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreatePixelShader +HRESULT WINAPI EMUPATCH(D3DDevice_CreatePixelShader) ( X_D3DPIXELSHADERDEF *pPSDef, DWORD *pHandle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShader +// * patch: D3DDevice_SetPixelShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetPixelShader +HRESULT WINAPI EMUPATCH(D3DDevice_SetPixelShader) ( DWORD Handle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateTexture2 +// * patch: D3DDevice_CreateTexture2 // ****************************************************************** -X_D3DResource * WINAPI EmuIDirect3DDevice8_CreateTexture2 +X_D3DResource * WINAPI EMUPATCH(D3DDevice_CreateTexture2) ( UINT Width, UINT Height, @@ -439,9 +439,9 @@ X_D3DResource * WINAPI EmuIDirect3DDevice8_CreateTexture2 ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateTexture +// * patch: D3DDevice_CreateTexture // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateTexture +HRESULT WINAPI EMUPATCH(D3DDevice_CreateTexture) ( UINT Width, UINT Height, @@ -453,9 +453,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateTexture ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVolumeTexture +// * patch: D3DDevice_CreateVolumeTexture // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateVolumeTexture +HRESULT WINAPI EMUPATCH(D3DDevice_CreateVolumeTexture) ( UINT Width, UINT Height, @@ -468,9 +468,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateVolumeTexture ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateCubeTexture +// * patch: D3DDevice_CreateCubeTexture // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateCubeTexture +HRESULT WINAPI EMUPATCH(D3DDevice_CreateCubeTexture) ( UINT EdgeLength, UINT Levels, @@ -481,9 +481,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateCubeTexture ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateIndexBuffer +// * patch: D3DDevice_CreateIndexBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateIndexBuffer +HRESULT WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer) ( UINT Length, DWORD Usage, @@ -493,32 +493,32 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateIndexBuffer ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateIndexBuffer2 +// * patch: D3DDevice_CreateIndexBuffer2 // ****************************************************************** -X_D3DIndexBuffer * WINAPI EmuIDirect3DDevice8_CreateIndexBuffer2(UINT Length); +X_D3DIndexBuffer * WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer2)(UINT Length); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetIndices +// * patch: D3DDevice_SetIndices // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetIndices +HRESULT WINAPI EMUPATCH(D3DDevice_SetIndices) ( X_D3DIndexBuffer *pIndexData, UINT BaseVertexIndex ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTexture +// * patch: D3DDevice_SetTexture // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetTexture +HRESULT WINAPI EMUPATCH(D3DDevice_SetTexture) ( DWORD Stage, X_D3DResource *pTexture ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SwitchTexture +// * patch: D3DDevice_SwitchTexture // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SwitchTexture +VOID __fastcall EMUPATCH(D3DDevice_SwitchTexture) ( DWORD Method, DWORD Data, @@ -526,25 +526,25 @@ VOID __fastcall EmuIDirect3DDevice8_SwitchTexture ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetDisplayMode +// * patch: D3DDevice_GetDisplayMode // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetDisplayMode +HRESULT WINAPI EMUPATCH(D3DDevice_GetDisplayMode) ( X_D3DDISPLAYMODE *pMode ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Begin +// * patch: D3DDevice_Begin // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_Begin +HRESULT WINAPI EMUPATCH(D3DDevice_Begin) ( X_D3DPRIMITIVETYPE PrimitiveType ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData2f +// * patch: D3DDevice_SetVertexData2f // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData2f +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexData2f) ( int Register, FLOAT a, @@ -552,9 +552,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData2f ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData2s +// * patch: D3DDevice_SetVertexData2s // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData2s +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexData2s) ( int Register, SHORT a, @@ -562,9 +562,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData2s ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4f +// * patch: D3DDevice_SetVertexData4f // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4f +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexData4f) ( int Register, FLOAT a, @@ -574,9 +574,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4f ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4ub +// * patch: D3DDevice_SetVertexData4ub // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4ub +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexData4ub) ( INT Register, BYTE a, @@ -586,9 +586,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4ub ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexData4s +// * patch: D3DDevice_SetVertexData4s // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4s +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexData4s) ( INT Register, SHORT a, @@ -598,32 +598,32 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexData4s ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexDataColor +// * patch: D3DDevice_SetVertexDataColor // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexDataColor +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexDataColor) ( int Register, D3DCOLOR Color ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_End +// * patch: D3DDevice_End // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_End(); +HRESULT WINAPI EMUPATCH(D3DDevice_End)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_RunPushBuffer +// * patch: D3DDevice_RunPushBuffer // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_RunPushBuffer +VOID WINAPI EMUPATCH(D3DDevice_RunPushBuffer) ( X_D3DPushBuffer *pPushBuffer, X_D3DFixup *pFixup ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Clear +// * patch: D3DDevice_Clear // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_Clear +HRESULT WINAPI EMUPATCH(D3DDevice_Clear) ( DWORD Count, CONST D3DRECT *pRects, @@ -634,9 +634,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_Clear ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Present +// * patch: D3DDevice_Present // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_Present +HRESULT WINAPI EMUPATCH(D3DDevice_Present) ( CONST RECT* pSourceRect, CONST RECT* pDestRect, @@ -645,58 +645,58 @@ HRESULT WINAPI EmuIDirect3DDevice8_Present ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Swap +// * patch: D3DDevice_Swap // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_Swap +HRESULT WINAPI EMUPATCH(D3DDevice_Swap) ( DWORD Flags ); // ****************************************************************** -// * func: EmuIDirect3DResource8_Register +// * patch: IDirect3DResource8_Register // ****************************************************************** -HRESULT WINAPI EmuIDirect3DResource8_Register +HRESULT WINAPI EMUPATCH(D3DResource_Register) ( X_D3DResource *pThis, PVOID pBase ); // ****************************************************************** -// * func: EmuIDirect3DResource8_Release +// * patch: IDirect3DResource8_Release // ****************************************************************** -ULONG WINAPI EmuIDirect3DResource8_Release +ULONG WINAPI EMUPATCH(D3DResource_Release) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuIDirect3DResource8_GetType +// * patch: IDirect3DResource8_GetType // ****************************************************************** -X_D3DRESOURCETYPE WINAPI EmuIDirect3DResource8_GetType +X_D3DRESOURCETYPE WINAPI EMUPATCH(D3DResource_GetType) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuIDirect3DResource8_AddRef +// * patch: IDirect3DResource8_AddRef // ****************************************************************** -ULONG WINAPI EmuIDirect3DResource8_AddRef +ULONG WINAPI EMUPATCH(D3DResource_AddRef) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuIDirect3DResource8_IsBusy +// * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI EmuIDirect3DResource8_IsBusy +BOOL WINAPI EMUPATCH(D3DResource_IsBusy) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuLock2DSurface +// * patch: Lock2DSurface // ****************************************************************** -VOID WINAPI EmuLock2DSurface +VOID WINAPI EMUPATCH(Lock2DSurface) ( X_D3DPixelContainer *pPixelContainer, D3DCUBEMAP_FACES FaceType, @@ -707,9 +707,9 @@ VOID WINAPI EmuLock2DSurface ); // ****************************************************************** -// * func: EmuLock3DSurface +// * patch: Lock3DSurface // ****************************************************************** -VOID WINAPI EmuLock3DSurface +VOID WINAPI EMUPATCH(Lock3DSurface) ( X_D3DPixelContainer *pPixelContainer, UINT Level, @@ -719,9 +719,9 @@ VOID WINAPI EmuLock3DSurface ); // ****************************************************************** -// * func: EmuGet2DSurfaceDesc +// * patch: Get2DSurfaceDesc // ****************************************************************** -VOID WINAPI EmuGet2DSurfaceDesc +VOID WINAPI EMUPATCH(Get2DSurfaceDesc) ( X_D3DPixelContainer *pPixelContainer, DWORD dwLevel, @@ -729,27 +729,27 @@ VOID WINAPI EmuGet2DSurfaceDesc ); // ****************************************************************** -// * func: EmuGet2DSurfaceDescD +// * patch: Get2DSurfaceDescD // ****************************************************************** -VOID WINAPI EmuGet2DSurfaceDescD +VOID WINAPI EMUPATCH(Get2DSurfaceDescD) ( X_D3DPixelContainer *pPixelContainer, X_D3DSURFACE_DESC *pDesc ); // ****************************************************************** -// * func: EmuIDirect3DSurface8_GetDesc +// * patch: IDirect3DSurface8_GetDesc // ****************************************************************** -HRESULT WINAPI EmuIDirect3DSurface8_GetDesc +HRESULT WINAPI EMUPATCH(D3DSurface_GetDesc) ( X_D3DResource *pThis, X_D3DSURFACE_DESC *pDesc ); // ****************************************************************** -// * func: EmuIDirect3DSurface8_LockRect +// * patch: IDirect3DSurface8_LockRect // ****************************************************************** -HRESULT WINAPI EmuIDirect3DSurface8_LockRect +HRESULT WINAPI EMUPATCH(D3DSurface_LockRect) ( X_D3DResource *pThis, D3DLOCKED_RECT *pLockedRect, @@ -758,26 +758,26 @@ HRESULT WINAPI EmuIDirect3DSurface8_LockRect ); // ****************************************************************** -// * func: EmuIDirect3DBaseTexture8_GetLevelCount +// * patch: IDirect3DBaseTexture8_GetLevelCount // ****************************************************************** -DWORD WINAPI EmuIDirect3DBaseTexture8_GetLevelCount +DWORD WINAPI EMUPATCH(D3DBaseTexture_GetLevelCount) ( X_D3DBaseTexture *pThis ); // ****************************************************************** -// * func: EmuIDirect3DTexture8_GetSurfaceLevel +// * patch: IDirect3DTexture8_GetSurfaceLevel // ****************************************************************** -X_D3DResource * WINAPI EmuIDirect3DTexture8_GetSurfaceLevel2 +X_D3DResource * WINAPI EMUPATCH(D3DTexture_GetSurfaceLevel2) ( X_D3DTexture *pThis, UINT Level ); // ****************************************************************** -// * func: EmuIDirect3DTexture8_LockRect +// * patch: IDirect3DTexture8_LockRect // ****************************************************************** -HRESULT WINAPI EmuIDirect3DTexture8_LockRect +HRESULT WINAPI EMUPATCH(D3DTexture_LockRect) ( X_D3DTexture *pThis, UINT Level, @@ -787,9 +787,9 @@ HRESULT WINAPI EmuIDirect3DTexture8_LockRect ); // ****************************************************************** -// * func: EmuIDirect3DTexture8_GetSurfaceLevel +// * patch: IDirect3DTexture8_GetSurfaceLevel // ****************************************************************** -HRESULT WINAPI EmuIDirect3DTexture8_GetSurfaceLevel +HRESULT WINAPI EMUPATCH(D3DTexture_GetSurfaceLevel) ( X_D3DTexture *pThis, UINT Level, @@ -797,9 +797,9 @@ HRESULT WINAPI EmuIDirect3DTexture8_GetSurfaceLevel ); // ****************************************************************** -// * func: EmuIDirect3DVolumeTexture8_LockBox +// * patch: IDirect3DVolumeTexture8_LockBox // ****************************************************************** -HRESULT WINAPI EmuIDirect3DVolumeTexture8_LockBox +HRESULT WINAPI EMUPATCH(D3DVolumeTexture_LockBox) ( X_D3DVolumeTexture *pThis, UINT Level, @@ -809,9 +809,9 @@ HRESULT WINAPI EmuIDirect3DVolumeTexture8_LockBox ); // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_LockRect +// * patch: IDirect3DCubeTexture8_LockRect // ****************************************************************** -HRESULT WINAPI EmuIDirect3DCubeTexture8_LockRect +HRESULT WINAPI EMUPATCH(D3DCubeTexture_LockRect) ( X_D3DCubeTexture *pThis, D3DCUBEMAP_FACES FaceType, @@ -822,9 +822,9 @@ HRESULT WINAPI EmuIDirect3DCubeTexture8_LockRect ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexBuffer +// * patch: D3DDevice_CreateVertexBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateVertexBuffer +HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer) ( UINT Length, DWORD Usage, @@ -834,25 +834,25 @@ HRESULT WINAPI EmuIDirect3DDevice8_CreateVertexBuffer ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateVertexBuffer2 +// * patch: D3DDevice_CreateVertexBuffer2 // ****************************************************************** -X_D3DVertexBuffer* WINAPI EmuIDirect3DDevice8_CreateVertexBuffer2 +X_D3DVertexBuffer* WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer2) ( UINT Length ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_EnableOverlay +// * patch: D3DDevice_EnableOverlay // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_EnableOverlay +VOID WINAPI EMUPATCH(D3DDevice_EnableOverlay) ( BOOL Enable ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_UpdateOverlay +// * patch: D3DDevice_UpdateOverlay // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_UpdateOverlay +VOID WINAPI EMUPATCH(D3DDevice_UpdateOverlay) ( X_D3DSurface *pSurface, CONST RECT *SrcRect, @@ -862,70 +862,70 @@ VOID WINAPI EmuIDirect3DDevice8_UpdateOverlay ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetOverlayUpdateStatus +// * patch: D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -BOOL WINAPI EmuIDirect3DDevice8_GetOverlayUpdateStatus(); +BOOL WINAPI EMUPATCH(D3DDevice_GetOverlayUpdateStatus)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BlockUntilVerticalBlank +// * patch: D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_BlockUntilVerticalBlank(); +VOID WINAPI EMUPATCH(D3DDevice_BlockUntilVerticalBlank)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVerticalBlankCallback +// * patch: D3DDevice_SetVerticalBlankCallback // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetVerticalBlankCallback +VOID WINAPI EMUPATCH(D3DDevice_SetVerticalBlankCallback) ( D3DVBLANKCALLBACK pCallback ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_TexCoordIndex +// * patch: D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetTextureState_TexCoordIndex +VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex) ( DWORD Stage, DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting +// * patch: D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting +VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_TwoSidedLighting) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_BackFillMode +// * patch: D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_BackFillMode +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_BackFillMode) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_BorderColor +// * patch: D3DDevice_SetTextureState_BorderColor // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetTextureState_BorderColor +VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BorderColor) ( DWORD Stage, DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +// * patch: D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor) ( DWORD Stage, DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTextureState_BumpEnv +// * patch: D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetTextureState_BumpEnv +VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BumpEnv) ( DWORD Stage, X_D3DTEXTURESTAGESTATETYPE Type, @@ -933,252 +933,252 @@ VOID WINAPI EmuIDirect3DDevice8_SetTextureState_BumpEnv ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FrontFace +// * patch: D3DDevice_SetRenderState_FrontFace // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_FrontFace +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FrontFace) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_LogicOp +// * patch: D3DDevice_SetRenderState_LogicOp // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_LogicOp +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_LogicOp) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_NormalizeNormals +// * patch: D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_NormalizeNormals +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_NormalizeNormals) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_TextureFactor +// * patch: D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_TextureFactor +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_TextureFactor) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ZBias +// * patch: D3DDevice_SetRenderState_ZBias // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_ZBias +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ZBias) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * patch: D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_EdgeAntiAlias) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FillMode +// * patch: D3DDevice_SetRenderState_FillMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_FillMode +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FillMode) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_FogColor +// * patch: D3DDevice_SetRenderState_FogColor // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_FogColor +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FogColor) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * patch: D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Simple +// * patch: D3DDevice_SetRenderState_Simple // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SetRenderState_Simple +VOID __fastcall EMUPATCH(D3DDevice_SetRenderState_Simple) ( DWORD Method, DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_VertexBlend +// * patch: D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_VertexBlend +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_VertexBlend) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_PSTextureModes +// * patch: D3DDevice_SetRenderState_PSTextureModes // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_PSTextureModes +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_PSTextureModes) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_CullMode +// * patch: D3DDevice_SetRenderState_CullMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_CullMode +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_CullMode) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_LineWidth +// * patch: D3DDevice_SetRenderState_LineWidth // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_LineWidth +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_LineWidth) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilFail +// * patch: D3DDevice_SetRenderState_StencilFail // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_StencilFail +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilFail) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable +// * patch: D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_OcclusionCullEnable) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilCullEnable +// * patch: D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_StencilCullEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilCullEnable) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +// * patch: D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_RopZRead +// * patch: D3DDevice_SetRenderState_RopZRead // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_RopZRead +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZRead) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed +// * patch: D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_DoNotCullUncompressed) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ZEnable +// * patch: D3DDevice_SetRenderState_ZEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_ZEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ZEnable) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilEnable +// * patch: D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_StencilEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilEnable) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleMask +// * patch: D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_MultiSampleMask +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMask) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleMode +// * patch: D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_MultiSampleMode +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMode) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +// * patch: D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * patch: D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_ShadowFunc +// * patch: D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_ShadowFunc +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ShadowFunc) ( DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_YuvEnable +// * patch: D3DDevice_SetRenderState_YuvEnable // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_YuvEnable +VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_YuvEnable) ( BOOL Enable ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetTransform +// * patch: D3DDevice_SetTransform // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetTransform +HRESULT WINAPI EMUPATCH(D3DDevice_SetTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTransform +// * patch: D3DDevice_GetTransform // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetTransform +HRESULT WINAPI EMUPATCH(D3DDevice_GetTransform) ( D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix ); // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_Lock +// * patch: IDirect3DVertexBuffer8_Lock // ****************************************************************** -VOID WINAPI EmuIDirect3DVertexBuffer8_Lock +VOID WINAPI EMUPATCH(D3DVertexBuffer_Lock) ( X_D3DVertexBuffer *ppVertexBuffer, UINT OffsetToLock, @@ -1188,27 +1188,27 @@ VOID WINAPI EmuIDirect3DVertexBuffer8_Lock ); // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_Lock2 +// * patch: IDirect3DVertexBuffer8_Lock2 // ****************************************************************** -BYTE* WINAPI EmuIDirect3DVertexBuffer8_Lock2 +BYTE* WINAPI EMUPATCH(D3DVertexBuffer_Lock2) ( X_D3DVertexBuffer *ppVertexBuffer, DWORD Flags ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetStreamSource2 +// * patch: D3DDevice_GetStreamSource2 // ****************************************************************** -XTL::X_D3DVertexBuffer* WINAPI EmuIDirect3DDevice8_GetStreamSource2 +XTL::X_D3DVertexBuffer* WINAPI EMUPATCH(D3DDevice_GetStreamSource2) ( UINT StreamNumber, UINT *pStride ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetStreamSource +// * patch: D3DDevice_SetStreamSource // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetStreamSource +HRESULT WINAPI EMUPATCH(D3DDevice_SetStreamSource) ( UINT StreamNumber, X_D3DVertexBuffer *pStreamData, @@ -1216,17 +1216,17 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetStreamSource ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShader +// * patch: D3DDevice_SetVertexShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShader +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexShader) ( DWORD Handle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawVertices +// * patch: D3DDevice_DrawVertices // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_DrawVertices +VOID WINAPI EMUPATCH(D3DDevice_DrawVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, @@ -1234,9 +1234,9 @@ VOID WINAPI EmuIDirect3DDevice8_DrawVertices ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawVerticesUP +// * patch: D3DDevice_DrawVerticesUP // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_DrawVerticesUP +VOID WINAPI EMUPATCH(D3DDevice_DrawVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -1245,9 +1245,9 @@ VOID WINAPI EmuIDirect3DDevice8_DrawVerticesUP ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawIndexedVertices +// * patch: D3DDevice_DrawIndexedVertices // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_DrawIndexedVertices +HRESULT WINAPI EMUPATCH(D3DDevice_DrawIndexedVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -1255,9 +1255,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_DrawIndexedVertices ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawIndexedVerticesUP +// * patch: D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_DrawIndexedVerticesUP +VOID WINAPI EMUPATCH(D3DDevice_DrawIndexedVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, UINT VertexCount, @@ -1267,91 +1267,91 @@ VOID WINAPI EmuIDirect3DDevice8_DrawIndexedVerticesUP ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetLight +// * patch: D3DDevice_SetLight // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetLight +HRESULT WINAPI EMUPATCH(D3DDevice_SetLight) ( DWORD Index, CONST D3DLIGHT8 *pLight ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetMaterial +// * patch: D3DDevice_SetMaterial // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetMaterial +HRESULT WINAPI EMUPATCH(D3DDevice_SetMaterial) ( CONST D3DMATERIAL8 *pMaterial ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_LightEnable +// * patch: D3DDevice_LightEnable // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_LightEnable +HRESULT WINAPI EMUPATCH(D3DDevice_LightEnable) ( DWORD Index, BOOL bEnable ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Release +// * patch: D3DDevice_Release // ****************************************************************** -ULONG WINAPI EmuIDirect3DDevice8_Release(); +ULONG WINAPI EMUPATCH(D3DDevice_Release)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePalette +// * patch: D3DDevice_CreatePalette // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreatePalette +HRESULT WINAPI EMUPATCH(D3DDevice_CreatePalette) ( X_D3DPALETTESIZE Size, X_D3DPalette **ppPalette ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreatePalette2 +// * patch: D3DDevice_CreatePalette2 // ****************************************************************** -X_D3DPalette * WINAPI EmuIDirect3DDevice8_CreatePalette2 +X_D3DPalette * WINAPI EMUPATCH(D3DDevice_CreatePalette2) ( X_D3DPALETTESIZE Size ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderTarget +// * patch: D3DDevice_SetRenderTarget // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetRenderTarget +HRESULT WINAPI EMUPATCH(D3DDevice_SetRenderTarget) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPalette +// * patch: D3DDevice_SetPalette // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetPalette +HRESULT WINAPI EMUPATCH(D3DDevice_SetPalette) ( DWORD Stage, X_D3DPalette *pPalette ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetFlickerFilter +// * patch: D3DDevice_SetFlickerFilter // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_SetFlickerFilter +void WINAPI EMUPATCH(D3DDevice_SetFlickerFilter) ( DWORD Filter ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetSoftDisplayFilter +// * patch: D3DDevice_SetSoftDisplayFilter // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_SetSoftDisplayFilter +void WINAPI EMUPATCH(D3DDevice_SetSoftDisplayFilter) ( BOOL Enable ); // ****************************************************************** -// * func: EmuIDirect3DPalette8_Lock +// * patch: IDirect3DPalette8_Lock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DPalette8_Lock +HRESULT WINAPI EMUPATCH(D3DPalette_Lock) ( X_D3DPalette *pThis, D3DCOLOR **ppColors, @@ -1359,60 +1359,60 @@ HRESULT WINAPI EmuIDirect3DPalette8_Lock ); // ****************************************************************** -// * func: EmuIDirect3DPalette8_Lock2 +// * patch: IDirect3DPalette8_Lock2 // ****************************************************************** -D3DCOLOR * WINAPI EmuIDirect3DPalette8_Lock2 +D3DCOLOR * WINAPI EMUPATCH(D3DPalette_Lock2) ( X_D3DPalette *pThis, DWORD Flags ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderSize +// * patch: D3DDevice_GetVertexShaderSize // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetVertexShaderSize +VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderSize) ( DWORD Handle, UINT* pSize ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeleteVertexShader +// * patch: D3DDevice_DeleteVertexShader // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_DeleteVertexShader +VOID WINAPI EMUPATCH(D3DDevice_DeleteVertexShader) ( DWORD Handle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SelectVertexShaderDirect +// * patch: D3DDevice_SelectVertexShaderDirect // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SelectVertexShaderDirect +VOID WINAPI EMUPATCH(D3DDevice_SelectVertexShaderDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, DWORD Address ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetShaderConstantMode +// * patch: D3DDevice_GetShaderConstantMode // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetShaderConstantMode +VOID WINAPI EMUPATCH(D3DDevice_GetShaderConstantMode) ( DWORD *pMode ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShader +// * patch: D3DDevice_GetVertexShader // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetVertexShader +VOID WINAPI EMUPATCH(D3DDevice_GetVertexShader) ( DWORD *pHandle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderConstant +// * patch: D3DDevice_GetVertexShaderConstant // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetVertexShaderConstant +VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderConstant) ( INT Register, void *pConstantData, @@ -1420,9 +1420,9 @@ VOID WINAPI EmuIDirect3DDevice8_GetVertexShaderConstant ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetVertexShaderInputDirect +// * patch: D3DDevice_SetVertexShaderInputDirect // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderInputDirect +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexShaderInputDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, UINT StreamCount, @@ -1430,9 +1430,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderInputDirect ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderInput +// * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderInput +HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderInput) ( DWORD *pHandle, UINT *pStreamCount, @@ -1440,9 +1440,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderInput ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderInput +// * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderInput +HRESULT WINAPI EMUPATCH(D3DDevice_SetVertexShaderInput) ( DWORD Handle, UINT StreamCount, @@ -1450,36 +1450,36 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetVertexShaderInput ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_RunVertexStateShader +// * patch: D3DDevice_RunVertexStateShader // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_RunVertexStateShader +VOID WINAPI EMUPATCH(D3DDevice_RunVertexStateShader) ( DWORD Address, CONST FLOAT *pData ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_LoadVertexShaderProgram +// * patch: D3DDevice_LoadVertexShaderProgram // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_LoadVertexShaderProgram +VOID WINAPI EMUPATCH(D3DDevice_LoadVertexShaderProgram) ( CONST DWORD *pFunction, DWORD Address ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderType +// * patch: D3DDevice_GetVertexShaderType // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_GetVertexShaderType +VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderType) ( DWORD Handle, DWORD *pType ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderDeclaration +// * patch: D3DDevice_GetVertexShaderDeclaration // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderDeclaration +HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderDeclaration) ( DWORD Handle, PVOID pData, @@ -1487,9 +1487,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderDeclaration ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetVertexShaderFunction +// * patch: D3DDevice_GetVertexShaderFunction // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderFunction +HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderFunction) ( DWORD Handle, PVOID *pData, @@ -1497,9 +1497,9 @@ HRESULT WINAPI EmuIDirect3DDevice8_GetVertexShaderFunction ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetDepthClipPlanes +// * patch: D3DDevice_SetDepthClipPlanes // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetDepthClipPlanes +HRESULT WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes) ( FLOAT Near, FLOAT Far, @@ -1507,27 +1507,27 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetDepthClipPlanes ); // ****************************************************************** -// * func: EmuIDirect3D8_AllocContiguousMemory +// * patch: D3D_AllocContiguousMemory // ****************************************************************** -PVOID WINAPI EmuIDirect3D8_AllocContiguousMemory +PVOID WINAPI EMUPATCH(D3D_AllocContiguousMemory) ( SIZE_T dwSize, DWORD dwAllocAttributes ); // ****************************************************************** -// * func: IDirect3DTexture8_GetLevelDesc +// * patch: D3DTexture_GetLevelDesc // ****************************************************************** -HRESULT WINAPI EmuIDirect3DTexture8_GetLevelDesc +HRESULT WINAPI EMUPATCH(D3DTexture_GetLevelDesc) ( UINT Level, X_D3DSURFACE_DESC* pDesc ); // ****************************************************************** -// * func: EmuIDirect3D8_CheckDeviceMultiSampleType +// * patch: D3D_CheckDeviceMultiSampleType // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_CheckDeviceMultiSampleType +HRESULT WINAPI EMUPATCH(D3D_CheckDeviceMultiSampleType) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -1537,9 +1537,9 @@ HRESULT WINAPI EmuIDirect3D8_CheckDeviceMultiSampleType ); // ****************************************************************** -// * func: EmuIDirect3D8_GetDeviceCaps +// * patch: D3D_GetDeviceCaps // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_GetDeviceCaps +HRESULT WINAPI EMUPATCH(D3D_GetDeviceCaps) ( UINT Adapter, D3DDEVTYPE DeviceType, @@ -1547,56 +1547,56 @@ HRESULT WINAPI EmuIDirect3D8_GetDeviceCaps ); // ****************************************************************** -// * func: EmuIDirect3D8_SetPushBufferSize +// * patch: D3D_SetPushBufferSize // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_SetPushBufferSize +HRESULT WINAPI EMUPATCH(D3D_SetPushBufferSize) ( DWORD PushBufferSize, DWORD KickOffSize ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_InsertFence +// * patch: D3DDevice_InsertFence // ****************************************************************** -DWORD WINAPI EmuIDirect3DDevice8_InsertFence(); +DWORD WINAPI EMUPATCH(D3DDevice_InsertFence)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_IsFencePending +// * patch: D3DDevice_IsFencePending // ****************************************************************** -BOOL WINAPI EmuIDirect3DDevice8_IsFencePending +BOOL WINAPI EMUPATCH(D3DDevice_IsFencePending) ( DWORD Fence ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BlockOnFence +// * patch: D3DDevice_BlockOnFence // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_BlockOnFence +VOID WINAPI EMUPATCH(D3DDevice_BlockOnFence) ( DWORD Fence ); // ****************************************************************** -// * func: EmuIDirect3DResource8_BlockUntilNotBusy +// * patch: D3DResource_BlockUntilNotBusy // ****************************************************************** -VOID WINAPI EmuIDirect3DResource8_BlockUntilNotBusy +VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_GetDesc +// * patch: D3DVertexBuffer_GetDesc // ****************************************************************** -VOID WINAPI EmuIDirect3DVertexBuffer8_GetDesc +VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc) ( X_D3DVertexBuffer *pThis, D3DVERTEXBUFFER_DESC *pDesc ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetScissors +// * patch: D3DDevice_SetScissors // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetScissors +HRESULT WINAPI EMUPATCH(D3DDevice_SetScissors) ( DWORD Count, BOOL Exclusive, @@ -1604,48 +1604,48 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetScissors ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetScreenSpaceOffset +// * patch: D3DDevice_SetScreenSpaceOffset // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetScreenSpaceOffset +HRESULT WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset) ( FLOAT x, FLOAT y ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_InsertFence +// * patch: D3DDevice_InsertFence // ****************************************************************** -DWORD WINAPI EmuIDirect3DDevice8_InsertFence(); +DWORD WINAPI EMUPATCH(D3DDevice_InsertFence)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BlockOnFence +// * patch: D3DDevice_BlockOnFence // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_BlockOnFence +VOID WINAPI EMUPATCH(D3DDevice_BlockOnFence) ( DWORD Fence ); // ****************************************************************** -// * func: EmuIDirect3DResource8_BlockUntilNotBusy +// * patch: D3DResource_BlockUntilNotBusy // ****************************************************************** -VOID WINAPI EmuIDirect3DResource8_BlockUntilNotBusy +VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy) ( X_D3DResource *pThis ); // ****************************************************************** -// * func: EmuIDirect3DVertexBuffer8_GetDesc +// * patch: D3DVertexBuffer_GetDesc // ****************************************************************** -VOID WINAPI EmuIDirect3DVertexBuffer8_GetDesc +VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc) ( X_D3DVertexBuffer *pThis, D3DVERTEXBUFFER_DESC *pDesc ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetScissors +// * patch: D3DDevice_SetScissors // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetScissors +HRESULT WINAPI EMUPATCH(D3DDevice_SetScissors) ( DWORD Count, BOOL Exclusive, @@ -1653,35 +1653,35 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetScissors ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetPixelShaderProgram +// * patch: D3DDevice_SetPixelShaderProgram // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetPixelShaderProgram +HRESULT WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram) ( X_D3DPIXELSHADERDEF *pPSDef ); // ****************************************************************** -// * func: EmuIDirect3DDevice_SetScreenSpaceOffset +// * patch: D3DDevice_SetScreenSpaceOffset // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetScreenSpaceOffset +HRESULT WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset) ( FLOAT x, FLOAT y ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_CreateStateBlock +// * patch: D3DDevice_CreateStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_CreateStateBlock +HRESULT WINAPI EMUPATCH(D3DDevice_CreateStateBlock) ( D3DSTATEBLOCKTYPE Type, DWORD *pToken ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_InsertCallback +// * patch: D3DDevice_InsertCallback // ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_InsertCallback +VOID WINAPI EMUPATCH(D3DDevice_InsertCallback) ( X_D3DCALLBACKTYPE Type, X_D3DCALLBACK pCallback, @@ -1689,9 +1689,9 @@ VOID WINAPI EmuIDirect3DDevice8_InsertCallback ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DrawRectPatch +// * patch: D3DDevice_DrawRectPatch // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_DrawRectPatch +HRESULT WINAPI EMUPATCH(D3DDevice_DrawRectPatch) ( UINT Handle, CONST FLOAT *pNumSegs, @@ -1699,100 +1699,100 @@ HRESULT WINAPI EmuIDirect3DDevice8_DrawRectPatch ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetProjectionViewportMatrix +// * patch: D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetProjectionViewportMatrix +HRESULT WINAPI EMUPATCH(D3DDevice_GetProjectionViewportMatrix) ( D3DXMATRIX *pProjectionViewport ); // ****************************************************************** -// * func: EmuD3DDevice_KickOff (D3D::CDevice::KickOff) +// * patch: D3DDevice_KickOff (D3D::CDevice::KickOff) // ****************************************************************** -VOID WINAPI EmuD3DDevice_KickOff(); +VOID WINAPI EMUPATCH(D3DDevice_KickOff)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetTexture2 +// * patch: D3DDevice_GetTexture2 // ****************************************************************** -X_D3DResource* WINAPI EmuIDirect3DDevice8_GetTexture2(DWORD Stage); +X_D3DResource* WINAPI EMUPATCH(D3DDevice_GetTexture2)(DWORD Stage); // ****************************************************************** -// * func: EmuD3DDevice_SetStateVB (D3D::CDevice::SetStateVB) +// * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB) // ****************************************************************** -VOID WINAPI EmuD3DDevice_SetStateVB( ULONG Unknown1 ); +VOID WINAPI EMUPATCH(D3DDevice_SetStateVB)( ULONG Unknown1 ); // ****************************************************************** -// * func: EmuD3DDevice_SetStateUP (D3D::CDevice::SetStateUP) +// * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP) // ****************************************************************** -VOID WINAPI EmuD3DDevice_SetStateUP(); +VOID WINAPI EMUPATCH(D3DDevice_SetStateUP)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetStipple +// * patch: D3DDevice_SetStipple // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_SetStipple( DWORD* pPattern ); +void WINAPI EMUPATCH(D3DDevice_SetStipple)( DWORD* pPattern ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetSwapCallback +// * patch: D3DDevice_SetSwapCallback // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_SetSwapCallback +void WINAPI EMUPATCH(D3DDevice_SetSwapCallback) ( D3DSWAPCALLBACK pCallback ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_PersistDisplay +// * patch: D3DDevice_PersistDisplay // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_PersistDisplay(); +HRESULT WINAPI EMUPATCH(D3DDevice_PersistDisplay)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPersistedSurface +// * patch: D3DDevice_GetPersistedSurface // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetPersistedSurface(X_D3DSurface **ppSurface); -X_D3DSurface* WINAPI EmuIDirect3DDevice8_GetPersistedSurface2(); +HRESULT WINAPI EMUPATCH(D3DDevice_GetPersistedSurface)(X_D3DSurface **ppSurface); +X_D3DSurface* WINAPI EMUPATCH(D3DDevice_GetPersistedSurface2)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_Unknown1 +// * patch: D3DDevice_Unknown1 // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_Unknown1(); +void WINAPI EMUPATCH(D3DDevice_Unknown1)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_PrimeVertexCache +// * patch: D3DDevice_PrimeVertexCache // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_PrimeVertexCache +HRESULT WINAPI EMUPATCH(D3DDevice_PrimeVertexCache) ( UINT VertexCount, WORD *pIndexData ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_SampleAlpha +// * patch: D3DDevice_SetRenderState_SampleAlpha // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetRenderState_SampleAlpha +HRESULT WINAPI EMUPATCH(D3DDevice_SetRenderState_SampleAlpha) ( DWORD dwSampleAlpha ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_Deferred +// * patch: D3DDevice_SetRenderState_Deferred // ****************************************************************** -VOID __fastcall EmuIDirect3DDevice8_SetRenderState_Deferred +VOID __fastcall EMUPATCH(D3DDevice_SetRenderState_Deferred) ( DWORD State, DWORD Value ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_DeleteStateBlock +// * patch: D3DDevice_DeleteStateBlock // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_DeleteStateBlock +HRESULT WINAPI EMUPATCH(D3DDevice_DeleteStateBlock) ( DWORD Token ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetModelView +// * patch: D3DDevice_SetModelView // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetModelView +HRESULT WINAPI EMUPATCH(D3DDevice_SetModelView) ( CONST D3DMATRIX *pModelView, CONST D3DMATRIX *pInverseModelView, @@ -1800,42 +1800,42 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetModelView ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_FlushVertexCache +// * patch: D3DDevice_FlushVertexCache // ****************************************************************** -void WINAPI EmuIDirect3DDevice8_FlushVertexCache(); +void WINAPI EMUPATCH(D3DDevice_FlushVertexCache)(); // ****************************************************************** -// * func: EmuIDirect3DDevice8_BeginPushBuffer +// * patch: D3DDevice_BeginPushBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_BeginPushBuffer +HRESULT WINAPI EMUPATCH(D3DDevice_BeginPushBuffer) ( X_D3DPushBuffer *pPushBuffer ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_EndPushBuffer +// * patch: D3DDevice_EndPushBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_EndPushBuffer(); +HRESULT WINAPI EMUPATCH(D3DDevice_EndPushBuffer)(); // ****************************************************************** -// * func: EmuXMETAL_StartPush +// * patch: XMETAL_StartPush // ****************************************************************** -void WINAPI EmuXMETAL_StartPush(void* Unknown); +void WINAPI EMUPATCH(XMETAL_StartPush)(void* Unknown); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetModelView +// * patch: D3DDevice_GetModelView // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetModelView(D3DXMATRIX* pModelView); +HRESULT WINAPI EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetBackMaterial +// * patch: D3DDevice_SetBackMaterial // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetBackMaterial(D3DMATERIAL8* pMaterial); +HRESULT WINAPI EMUPATCH(D3DDevice_SetBackMaterial)(D3DMATERIAL8* pMaterial); // ****************************************************************** -// * func: EmuIDirect3D8_GetAdapterIdentifier +// * patch: D3D_GetAdapterIdentifier // ****************************************************************** -HRESULT WINAPI EmuIDirect3D8_GetAdapterIdentifier +HRESULT WINAPI EMUPATCH(D3D_GetAdapterIdentifier) ( UINT Adapter, DWORD Flags, @@ -1843,42 +1843,42 @@ HRESULT WINAPI EmuIDirect3D8_GetAdapterIdentifier ); // ****************************************************************** -// * func: D3D::MakeRequestedSpace +// * patch: D3D::MakeRequestedSpace // ****************************************************************** -HRESULT WINAPI EmuD3D_MakeRequestedSpace( DWORD Unknown1, DWORD Unknown2 ); +HRESULT WINAPI EMUPATCH(D3D_MakeRequestedSpace)( DWORD Unknown1, DWORD Unknown2 ); // ****************************************************************** -// * func: D3DDevice_MakeSpace +// * patch: D3DDevice_MakeSpace // ****************************************************************** -void WINAPI EmuD3DDevice_MakeSpace(); +void WINAPI EMUPATCH(D3DDevice_MakeSpace)(); // ****************************************************************** -// * func: D3D::SetCommonDebugRegisters +// * patch: D3D_SetCommonDebugRegisters // ****************************************************************** -void WINAPI EmuD3D_SetCommonDebugRegisters(); +void WINAPI EMUPATCH(D3D_SetCommonDebugRegisters)(); // ****************************************************************** -// * func: D3D::BlockOnTime +// * patch: D3D_BlockOnTime // ****************************************************************** -void WINAPI EmuD3D_BlockOnTime( DWORD Unknown1, int Unknown2 ); +void WINAPI EMUPATCH(D3D_BlockOnTime)( DWORD Unknown1, int Unknown2 ); // ****************************************************************** -// * func: D3D::BlockOnResource +// * patch: D3D_BlockOnResource // ****************************************************************** -void WINAPI EmuD3D_BlockOnResource( X_D3DResource* pResource ); +void WINAPI EMUPATCH(D3D_BlockOnResource)( X_D3DResource* pResource ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPushBufferOffset +// * patch: D3DDevice_GetPushBufferOffset // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetPushBufferOffset +HRESULT WINAPI EMUPATCH(D3DDevice_GetPushBufferOffset) ( DWORD *pOffset ); // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_GetCubeMapSurface +// * patch: IDirect3DCubeTexture8_GetCubeMapSurface // ****************************************************************** -HRESULT WINAPI EmuIDirect3DCubeTexture8_GetCubeMapSurface +HRESULT WINAPI EMUPATCH(D3DCubeTexture_GetCubeMapSurface) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, @@ -1887,9 +1887,9 @@ HRESULT WINAPI EmuIDirect3DCubeTexture8_GetCubeMapSurface ); // ****************************************************************** -// * func: EmuIDirect3DCubeTexture8_GetCubeMapSurface2 +// * patch: IDirect3DCubeTexture8_GetCubeMapSurface2 // ****************************************************************** -X_D3DSurface* WINAPI EmuIDirect3DCubeTexture8_GetCubeMapSurface2 +X_D3DSurface* WINAPI EMUPATCH(D3DCubeTexture_GetCubeMapSurface2) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, @@ -1897,18 +1897,18 @@ X_D3DSurface* WINAPI EmuIDirect3DCubeTexture8_GetCubeMapSurface2 ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetPixelShader +// * patch: D3DDevice_GetPixelShader // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetPixelShader +HRESULT WINAPI EMUPATCH(D3DDevice_GetPixelShader) ( DWORD Name, DWORD* pHandle ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderTargetFast +// * patch: D3DDevice_SetRenderTargetFast // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_SetRenderTargetFast +HRESULT WINAPI EMUPATCH(D3DDevice_SetRenderTargetFast) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil, @@ -1916,27 +1916,27 @@ HRESULT WINAPI EmuIDirect3DDevice8_SetRenderTargetFast ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetScissors +// * patch: D3DDevice_GetScissors // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetScissors +HRESULT WINAPI EMUPATCH(D3DDevice_GetScissors) ( DWORD *pCount, BOOL *pExclusive, D3DRECT *pRects ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetBackMaterial +// * patch: D3DDevice_GetBackMaterial // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetBackMaterial(D3DMATERIAL8* pMaterial); +HRESULT WINAPI EMUPATCH(D3DDevice_GetBackMaterial)(D3DMATERIAL8* pMaterial); // ****************************************************************** -// * func: EmuD3D::LazySetPointParams +// * patch: D3D::LazySetPointParams // ****************************************************************** -void WINAPI EmuD3D_LazySetPointParams( void* Device ); +void WINAPI EMUPATCH(D3D_LazySetPointParams)( void* Device ); // ****************************************************************** -// * func: EmuIDirect3DDevice8_GetMaterial +// * patch: D3DDevice_GetMaterial // ****************************************************************** -HRESULT WINAPI EmuIDirect3DDevice8_GetMaterial(D3DMATERIAL8* pMaterial); +HRESULT WINAPI EMUPATCH(D3DDevice_GetMaterial)(D3DMATERIAL8* pMaterial); #endif diff --git a/src/CxbxKrnl/EmuD3D8/Convert.cpp b/src/CxbxKrnl/EmuD3D8/Convert.cpp index 1fb372fe1..80b001057 100644 --- a/src/CxbxKrnl/EmuD3D8/Convert.cpp +++ b/src/CxbxKrnl/EmuD3D8/Convert.cpp @@ -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 } diff --git a/src/CxbxKrnl/EmuD3D8/State.cpp b/src/CxbxKrnl/EmuD3D8/State.cpp index 3fa60dbfd..45ae85783 100644 --- a/src/CxbxKrnl/EmuD3D8/State.cpp +++ b/src/CxbxKrnl/EmuD3D8/State.cpp @@ -47,7 +47,7 @@ extern uint32 g_BuildVersion; extern uint32 g_OrigBuildVersion; // ****************************************************************** -// * func: EmuUpdateDeferredStates +// * patch: UpdateDeferredStates // ****************************************************************** void XTL::EmuUpdateDeferredStates() { diff --git a/src/CxbxKrnl/EmuD3D8/VertexShader.cpp b/src/CxbxKrnl/EmuD3D8/VertexShader.cpp index c7e692308..144eada06 100644 --- a/src/CxbxKrnl/EmuD3D8/VertexShader.cpp +++ b/src/CxbxKrnl/EmuD3D8/VertexShader.cpp @@ -2134,7 +2134,7 @@ extern boolean XTL::IsValidCurrentShader(void) DWORD Handle; - EmuIDirect3DDevice8_GetVertexShader(&Handle); + EMUPATCH(D3DDevice_GetVertexShader)(&Handle); //printf( "VS = 0x%.08X\n", Handle ); diff --git a/src/CxbxKrnl/EmuDInput.cpp b/src/CxbxKrnl/EmuDInput.cpp index efd621f25..f681719ad 100644 --- a/src/CxbxKrnl/EmuDInput.cpp +++ b/src/CxbxKrnl/EmuDInput.cpp @@ -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) { diff --git a/src/CxbxKrnl/EmuDInput.h b/src/CxbxKrnl/EmuDInput.h index 1763aedd8..ea24eb568 100644 --- a/src/CxbxKrnl/EmuDInput.h +++ b/src/CxbxKrnl/EmuDInput.h @@ -38,17 +38,17 @@ #include // ****************************************************************** -// * func: EmuDInputInit +// * patch: DInputInit // ****************************************************************** extern bool EmuDInputInit(); // ****************************************************************** -// * func: EmuDInputCleanup +// * patch: DInputCleanup // ****************************************************************** extern void EmuDInputCleanup(); // ****************************************************************** -// * func: EmuDInputPoll +// * patch: DInputPoll // ****************************************************************** extern void EmuDInputPoll(PXINPUT_STATE Controller); diff --git a/src/CxbxKrnl/EmuDSound.cpp b/src/CxbxKrnl/EmuDSound.cpp index 5f8e73a82..016829f1b 100644 --- a/src/CxbxKrnl/EmuDSound.cpp +++ b/src/CxbxKrnl/EmuDSound.cpp @@ -60,21 +60,21 @@ XTL::X_CMcpxStream::_vtbl XTL::X_CMcpxStream::vtbl = 0xBEEFC002, // 0x04 0xBEEFC003, // 0x08 0xBEEFC004, // 0x0C - &XTL::EmuCMcpxStream_Dummy_0x10,// 0x10 + &XTL::EMUPATCH(CMcpxStream_Dummy_0x10),// 0x10 }; XTL::X_CDirectSoundStream::_vtbl XTL::X_CDirectSoundStream::vtbl = { - &XTL::EmuCDirectSoundStream_AddRef, // 0x00 - &XTL::EmuCDirectSoundStream_Release, // 0x04 + &XTL::EMUPATCH(CDirectSoundStream_AddRef), // 0x00 + &XTL::EMUPATCH(CDirectSoundStream_Release), // 0x04 /* STDMETHOD(GetInfo)(THIS_ LPXMEDIAINFO pInfo) PURE; */ - &XTL::EmuCDirectSoundStream_GetInfo, // 0x08 - &XTL::EmuCDirectSoundStream_GetStatus, // 0x0C - &XTL::EmuCDirectSoundStream_Process, // 0x10 - &XTL::EmuCDirectSoundStream_Discontinuity, // 0x14 - &XTL::EmuCDirectSoundStream_Flush, // 0x18 + &XTL::EMUPATCH(CDirectSoundStream_GetInfo), // 0x08 + &XTL::EMUPATCH(CDirectSoundStream_GetStatus), // 0x0C + &XTL::EMUPATCH(CDirectSoundStream_Process), // 0x10 + &XTL::EMUPATCH(CDirectSoundStream_Discontinuity), // 0x14 + &XTL::EMUPATCH(CDirectSoundStream_Flush), // 0x18 0xBEEFB003, // 0x1C 0xBEEFB004, // 0x20 0xBEEFB005, // 0x24 @@ -87,16 +87,16 @@ XTL::X_CDirectSoundStream::_vtbl XTL::X_CDirectSoundStream::vtbl = XTL::X_XFileMediaObject::_vtbl XTL::X_XFileMediaObject::vtbl = { - &XTL::EmuXFileMediaObject_AddRef, // 0x00 - &XTL::EmuXFileMediaObject_Release, // 0x04 - &XTL::EmuXFileMediaObject_GetInfo, // 0x08 - &XTL::EmuXFileMediaObject_GetStatus, // 0x0C - &XTL::EmuXFileMediaObject_Process, // 0x10 - &XTL::EmuXFileMediaObject_Discontinuity,// 0x14 + &XTL::EMUPATCH(XFileMediaObject_AddRef), // 0x00 + &XTL::EMUPATCH(XFileMediaObject_Release), // 0x04 + &XTL::EMUPATCH(XFileMediaObject_GetInfo), // 0x08 + &XTL::EMUPATCH(XFileMediaObject_GetStatus), // 0x0C + &XTL::EMUPATCH(XFileMediaObject_Process), // 0x10 + &XTL::EMUPATCH(XFileMediaObject_Discontinuity),// 0x14 0xBEEFD007, // 0x18 - &XTL::EmuXFileMediaObject_Seek, // 0x1C + &XTL::EMUPATCH(XFileMediaObject_Seek), // 0x1C 0xBEEFD009, // 0x20 - &XTL::EmuXFileMediaObject_DoWork, // 0x24 + &XTL::EMUPATCH(XFileMediaObject_DoWork), // 0x24 }; @@ -247,9 +247,9 @@ static void EmuResizeIDirectSoundStream8(XTL::X_CDirectSoundStream *pThis, DWORD } // ****************************************************************** -// * func: EmuDirectSoundCreate +// * patch: DirectSoundCreate // ****************************************************************** -HRESULT WINAPI XTL::EmuDirectSoundCreate +HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreate) ( LPVOID pguidDeviceId, LPDIRECTSOUND8 *ppDirectSound, @@ -312,9 +312,9 @@ HRESULT WINAPI XTL::EmuDirectSoundCreate } // ****************************************************************** -// * func: EmuIDirectSound8_AddRef +// * patch: IDirectSound8_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuIDirectSound8_AddRef +ULONG WINAPI XTL::EMUPATCH(IDirectSound8_AddRef) ( LPDIRECTSOUND8 pThis ) @@ -335,9 +335,9 @@ ULONG WINAPI XTL::EmuIDirectSound8_AddRef } // ****************************************************************** -// * func: EmuIDirectSound8_Release +// * patch: IDirectSound8_Release // ****************************************************************** -ULONG WINAPI XTL::EmuIDirectSound8_Release +ULONG WINAPI XTL::EMUPATCH(IDirectSound8_Release) ( LPDIRECTSOUND8 pThis ) @@ -363,9 +363,9 @@ ULONG WINAPI XTL::EmuIDirectSound8_Release } // ****************************************************************** -// * func: EmuCDirectSound_GetSpeakerConfig +// * patch: CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSound_GetSpeakerConfig +HRESULT WINAPI XTL::EMUPATCH(CDirectSound_GetSpeakerConfig) ( X_CDirectSound *pThis, PDWORD pdwSpeakerConfig @@ -388,9 +388,9 @@ HRESULT WINAPI XTL::EmuCDirectSound_GetSpeakerConfig } // ****************************************************************** -// * func: EmuIDirectSound8_EnableHeadphones +// * patch: IDirectSound8_EnableHeadphones // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_EnableHeadphones +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_EnableHeadphones) ( LPDIRECTSOUND8 pThis, BOOL fEnabled @@ -413,9 +413,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_EnableHeadphones } // ****************************************************************** -// * func: EmuIDirectSound8_SynchPlayback +// * patch: IDirectSound8_SynchPlayback // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SynchPlayback +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SynchPlayback) ( LPDIRECTSOUND8 pThis ) @@ -436,9 +436,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SynchPlayback } // ****************************************************************** -// * func: EmuIDirectSound8_DownloadEffectsImage +// * patch: IDirectSound8_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_DownloadEffectsImage +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, @@ -467,9 +467,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_DownloadEffectsImage } // ****************************************************************** -// * func: EmuDirectSoundDoWork +// * patch: DirectSoundDoWork // ****************************************************************** -VOID WINAPI XTL::EmuDirectSoundDoWork() +VOID WINAPI XTL::EMUPATCH(DirectSoundDoWork)() { @@ -484,9 +484,9 @@ VOID WINAPI XTL::EmuDirectSoundDoWork() } // ****************************************************************** -// * func: EmuIDirectSound8_SetOrientation +// * patch: IDirectSound8_SetOrientation // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetOrientation +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetOrientation) ( LPDIRECTSOUND8 pThis, FLOAT xFront, @@ -521,9 +521,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetOrientation } // ****************************************************************** -// * func: EmuIDirectSound8_SetDistanceFactor +// * patch: IDirectSound8_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetDistanceFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDistanceFactor, @@ -548,9 +548,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetDistanceFactor } // ****************************************************************** -// * func: EmuIDirectSound8_SetRolloffFactor +// * patch: IDirectSound8_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetRolloffFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, FLOAT fRolloffFactor, @@ -575,9 +575,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetRolloffFactor } // ****************************************************************** -// * func: EmuIDirectSound8_SetDopplerFactor +// * patch: IDirectSound8_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetDopplerFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDopplerFactor, @@ -602,9 +602,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetDopplerFactor } // ****************************************************************** -// * func: EmuIDirectSound8_SetI3DL2Listener +// * patch: IDirectSound8_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetI3DL2Listener +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, PVOID pDummy, // TODO: fill this out @@ -625,9 +625,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetI3DL2Listener } // ****************************************************************** -// * func: EmuIDirectSound8_SetMixBinHeadroom +// * patch: IDirectSound8_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetMixBinHeadroom +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, DWORD dwMixBinMask, @@ -648,9 +648,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetMixBinHeadroom } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMixBins +// * patch: IDirectSoundBuffer8_SetMixBins // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMixBins +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetMixBins) ( LPDIRECTSOUND8 pThis, PVOID pMixBins @@ -669,9 +669,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMixBins } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMixBinVolumes +// * patch: IDirectSoundBuffer8_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetMixBinVolumes) ( LPDIRECTSOUND8 pThis, PVOID pMixBins @@ -690,9 +690,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMixBinVolumes } // ****************************************************************** -// * func: EmuIDirectSound8_SetPosition +// * patch: IDirectSound8_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetPosition +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetPosition) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -717,9 +717,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetPosition } // ****************************************************************** -// * func: EmuIDirectSound8_SetPosition +// * patch: IDirectSound8_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetVelocity +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetVelocity) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -744,9 +744,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetVelocity } // ****************************************************************** -// * func: EmuIDirectSound8_SetAllParameters +// * patch: IDirectSound8_SetAllParameters // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetAllParameters +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPVOID pTodo, // TODO: LPCDS3DLISTENER @@ -767,9 +767,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetAllParameters } // ****************************************************************** -// * func: EmuCDirectSound_CommitDeferredSettings +// * patch: CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSound_CommitDeferredSettings +HRESULT WINAPI XTL::EMUPATCH(CDirectSound_CommitDeferredSettings) ( X_CDirectSound *pThis ) @@ -786,9 +786,9 @@ HRESULT WINAPI XTL::EmuCDirectSound_CommitDeferredSettings } // ****************************************************************** -// * func: EmuDirectSoundCreateBuffer +// * patch: DirectSoundCreateBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuDirectSoundCreateBuffer +HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateBuffer) ( X_DSBUFFERDESC *pdsbd, X_CDirectSoundBuffer **ppBuffer @@ -958,9 +958,9 @@ HRESULT WINAPI XTL::EmuDirectSoundCreateBuffer } // ****************************************************************** -// * func: EmuIDirectSound8_CreateBuffer +// * patch: IDirectSound8_CreateBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_CreateBuffer +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdssd, @@ -977,15 +977,15 @@ HRESULT WINAPI XTL::EmuIDirectSound8_CreateBuffer ");\n", pThis, pdssd, ppBuffer, pUnknown); - EmuDirectSoundCreateBuffer(pdssd, ppBuffer); + EMUPATCH(DirectSoundCreateBuffer)(pdssd, ppBuffer); return DS_OK; } // ****************************************************************** -// * func: EmuIDirectSound8_CreateSoundBuffer +// * patch: IDirectSound8_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_CreateSoundBuffer +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdsbd, @@ -1001,13 +1001,13 @@ HRESULT WINAPI XTL::EmuIDirectSound8_CreateSoundBuffer ");\n", pdsbd, ppBuffer, pUnkOuter); - return EmuDirectSoundCreateBuffer(pdsbd, ppBuffer); + return EMUPATCH(DirectSoundCreateBuffer)(pdsbd, ppBuffer); } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetBufferData +// * patch: IDirectSoundBuffer8_SetBufferData // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetBufferData +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetBufferData) ( X_CDirectSoundBuffer *pThis, LPVOID pvBufferData, @@ -1027,7 +1027,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetBufferData // update buffer data cache pThis->EmuBuffer = pvBufferData; - EmuResizeIDirectSoundBuffer8(pThis, dwBufferBytes); + EmuResizeIDirectSoundBuffer8(pThis, dwBufferBytes); @@ -1035,9 +1035,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetBufferData } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPlayRegion +// * patch: IDirectSoundBuffer8_SetPlayRegion // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPlayRegion +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetPlayRegion) ( X_CDirectSoundBuffer *pThis, DWORD dwPlayStart, @@ -1065,9 +1065,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPlayRegion } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Lock +// * patch: IDirectSoundBuffer8_Lock // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Lock +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_Lock) ( X_CDirectSoundBuffer *pThis, DWORD dwOffset, @@ -1105,7 +1105,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Lock else { if(dwBytes > pThis->EmuBufferDesc->dwBufferBytes) - EmuResizeIDirectSoundBuffer8(pThis, dwBytes); + EmuResizeIDirectSoundBuffer8(pThis, dwBytes); if(pThis->EmuLockPtr1 != 0) pThis->EmuDirectSoundBuffer8->Unlock(pThis->EmuLockPtr1, pThis->EmuLockBytes1, pThis->EmuLockPtr2, pThis->EmuLockBytes2); @@ -1128,9 +1128,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Lock } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetHeadroom +// * patch: IDirectSoundBuffer8_SetHeadroom // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetHeadroom +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetHeadroom) ( X_CDirectSoundBuffer *pThis, DWORD dwHeadroom @@ -1153,9 +1153,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetHeadroom } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetLoopRegion +// * patch: IDirectSoundBuffer8_SetLoopRegion // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetLoopRegion +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetLoopRegion) ( X_CDirectSoundBuffer *pThis, DWORD dwLoopStart, @@ -1183,9 +1183,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetLoopRegion } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Release +// * patch: IDirectSoundBuffer8_Release // ****************************************************************** -ULONG WINAPI XTL::EmuIDirectSoundBuffer8_Release +ULONG WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_Release) ( X_CDirectSoundBuffer *pThis ) @@ -1231,9 +1231,9 @@ ULONG WINAPI XTL::EmuIDirectSoundBuffer8_Release } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPitch +// * patch: IDirectSoundBuffer8_SetPitch // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPitch +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetPitch) ( X_CDirectSoundBuffer *pThis, LONG lPitch @@ -1256,9 +1256,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPitch } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_GetStatus +// * patch: IDirectSoundBuffer8_GetStatus // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_GetStatus +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_GetStatus) ( X_CDirectSoundBuffer *pThis, LPDWORD pdwStatus @@ -1290,9 +1290,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_GetStatus } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetCurrentPosition +// * patch: IDirectSoundBuffer8_SetCurrentPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetCurrentPosition +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetCurrentPosition) ( X_CDirectSoundBuffer *pThis, DWORD dwNewPosition @@ -1319,9 +1319,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetCurrentPosition } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_GetCurrentPosition +// * patch: IDirectSoundBuffer8_GetCurrentPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_GetCurrentPosition +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_GetCurrentPosition) ( X_CDirectSoundBuffer *pThis, PDWORD pdwCurrentPlayCursor, @@ -1363,9 +1363,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_GetCurrentPosition } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Play +// * patch: IDirectSoundBuffer8_Play // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Play +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_Play) ( X_CDirectSoundBuffer *pThis, DWORD dwReserved1, @@ -1431,9 +1431,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Play } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Stop +// * patch: IDirectSoundBuffer8_Stop // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Stop +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_Stop) ( X_CDirectSoundBuffer *pThis ) @@ -1456,9 +1456,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Stop } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_StopEx +// * patch: IDirectSoundBuffer8_StopEx // ****************************************************************** -extern "C" HRESULT __stdcall XTL::EmuIDirectSoundBuffer8_StopEx +extern "C" HRESULT __stdcall XTL::EMUPATCH(IDirectSoundBuffer8_StopEx) ( X_CDirectSoundBuffer *pBuffer, REFERENCE_TIME rtTimeStamp, @@ -1486,9 +1486,9 @@ extern "C" HRESULT __stdcall XTL::EmuIDirectSoundBuffer8_StopEx } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVolume +// * patch: IDirectSoundBuffer8_SetVolume // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetVolume +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetVolume) ( X_CDirectSoundBuffer *pThis, LONG lVolume @@ -1515,9 +1515,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetVolume } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFrequency +// * patch: IDirectSoundBuffer8_SetFrequency // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFrequency +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetFrequency) ( X_CDirectSoundBuffer *pThis, DWORD dwFrequency @@ -1541,9 +1541,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFrequency } // ****************************************************************** -// * func: EmuDirectSoundCreateStream +// * patch: DirectSoundCreateStream // ****************************************************************** -HRESULT WINAPI XTL::EmuDirectSoundCreateStream +HRESULT WINAPI XTL::EMUPATCH(DirectSoundCreateStream) ( X_DSSTREAMDESC *pdssd, X_CDirectSoundStream **ppStream @@ -1681,9 +1681,9 @@ HRESULT WINAPI XTL::EmuDirectSoundCreateStream } // ****************************************************************** -// * func: EmuIDirectSound8_CreateStream +// * patch: IDirectSound8_CreateStream // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_CreateStream +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_CreateStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC *pdssd, @@ -1700,15 +1700,15 @@ HRESULT WINAPI XTL::EmuIDirectSound8_CreateStream ");\n", pThis, pdssd, ppStream, pUnknown); - EmuDirectSoundCreateStream(pdssd, ppStream); + EMUPATCH(DirectSoundCreateStream)(pdssd, ppStream); return DS_OK; } // ****************************************************************** -// * func: EmuCMcpxStream_Dummy_0x10 +// * patch: CMcpxStream_Dummy_0x10 // ****************************************************************** -VOID WINAPI XTL::EmuCMcpxStream_Dummy_0x10(DWORD dwDummy1, DWORD dwDummy2) +VOID WINAPI XTL::EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2) { // Causes deadlock in Halo... // TODO: Verify that this is a Vista related problem (I HATE Vista!) @@ -1717,9 +1717,9 @@ VOID WINAPI XTL::EmuCMcpxStream_Dummy_0x10(DWORD dwDummy1, DWORD dwDummy2) } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetVolume +// * patch: CDirectSoundStream_SetVolume // ****************************************************************** -ULONG WINAPI XTL::EmuCDirectSoundStream_SetVolume(X_CDirectSoundStream *pThis, LONG lVolume) +ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume) { @@ -1738,9 +1738,9 @@ ULONG WINAPI XTL::EmuCDirectSoundStream_SetVolume(X_CDirectSoundStream *pThis, L } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetRolloffFactor +// * patch: CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetRolloffFactor +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream *pThis, FLOAT fRolloffFactor, @@ -1765,9 +1765,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetRolloffFactor } // ****************************************************************** -// * func: EmuCDirectSoundStream_AddRef +// * patch: CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuCDirectSoundStream_AddRef(X_CDirectSoundStream *pThis) +ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis) { @@ -1787,9 +1787,9 @@ ULONG WINAPI XTL::EmuCDirectSoundStream_AddRef(X_CDirectSoundStream *pThis) } // ****************************************************************** -// * func: EmuCDirectSoundStream_Release +// * patch: CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI XTL::EmuCDirectSoundStream_Release(X_CDirectSoundStream *pThis) +ULONG WINAPI XTL::EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis) { @@ -1829,9 +1829,9 @@ ULONG WINAPI XTL::EmuCDirectSoundStream_Release(X_CDirectSoundStream *pThis) } // ****************************************************************** -// * func: EmuCDirectSoundStream_GetInfo +// * patch: CDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_GetInfo +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, LPXMEDIAINFO pInfo @@ -1863,9 +1863,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_GetInfo } // ****************************************************************** -// * func: EmuCDirectSoundStream_GetStatus +// * patch: CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_GetStatus +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_GetStatus) ( X_CDirectSoundStream *pThis, DWORD *pdwStatus @@ -1890,9 +1890,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_GetStatus } // ****************************************************************** -// * func: EmuCDirectSoundStream_Process +// * patch: CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_Process +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Process) ( X_CDirectSoundStream *pThis, PXMEDIAPACKET pInputBuffer, @@ -1933,9 +1933,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_Process } // ****************************************************************** -// * func: EmuCDirectSoundStream_Discontinuity +// * patch: CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_Discontinuity(X_CDirectSoundStream *pThis) +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis) { @@ -1953,9 +1953,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_Discontinuity(X_CDirectSoundStream *pT } // ****************************************************************** -// * func: EmuCDirectSoundStream_Flush +// * patch: CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_Flush(X_CDirectSoundStream *pThis) +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis) { @@ -1973,9 +1973,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_Flush(X_CDirectSoundStream *pThis) } // ****************************************************************** -// * func: EmuCDirectSound_SynchPlayback +// * patch: CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSound_SynchPlayback(PVOID pUnknown) +HRESULT WINAPI XTL::EMUPATCH(CDirectSound_SynchPlayback)(PVOID pUnknown) { @@ -1991,9 +1991,9 @@ HRESULT WINAPI XTL::EmuCDirectSound_SynchPlayback(PVOID pUnknown) } // ****************************************************************** -// * func: EmuCDirectSoundStream_Pause +// * patch: CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_Pause +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_Pause) ( PVOID pStream, DWORD dwPause @@ -2014,9 +2014,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_Pause } // ****************************************************************** -// * func: EmuIDirectSoundStream_SetHeadroom +// * patch: IDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundStream_SetHeadroom +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetHeadroom) ( PVOID pThis, DWORD dwHeadroom @@ -2039,9 +2039,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundStream_SetHeadroom } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeAngles +// * patch: CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeAngles +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeAngles) ( PVOID pThis, DWORD dwInsideConeAngle, @@ -2068,9 +2068,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeAngles } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeOutsideVolume +// * patch: CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeOutsideVolume +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) ( PVOID pThis, LONG lConeOutsideVolume, @@ -2095,9 +2095,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeOutsideVolume } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetAllParameters +// * patch: CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetAllParameters +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetAllParameters) ( PVOID pThis, PVOID pUnknown, @@ -2122,9 +2122,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetAllParameters } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMaxDistance +// * patch: CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMaxDistance +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMaxDistance) ( PVOID pThis, D3DVALUE fMaxDistance, @@ -2149,9 +2149,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMaxDistance } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMinDistance +// * patch: CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMinDistance +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMinDistance) ( PVOID pThis, D3DVALUE fMinDistance, @@ -2176,9 +2176,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMinDistance } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetVelocity +// * patch: CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetVelocity +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetVelocity) ( PVOID pThis, D3DVALUE x, @@ -2207,9 +2207,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetVelocity } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeOrientation +// * patch: CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeOrientation +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetConeOrientation) ( PVOID pThis, D3DVALUE x, @@ -2238,9 +2238,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetConeOrientation } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetPosition +// * patch: CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPosition +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPosition) ( PVOID pThis, D3DVALUE x, @@ -2269,9 +2269,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPosition } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetFrequency +// * patch: CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFrequency +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFrequency) ( PVOID pThis, DWORD dwFrequency @@ -2294,9 +2294,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFrequency } // ****************************************************************** -// * func: EmuIDirectSoundStream_SetI3DL2Source +// * patch: IDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundStream_SetI3DL2Source +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetI3DL2Source) ( PVOID pThis, PVOID pds3db, @@ -2321,9 +2321,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundStream_SetI3DL2Source } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBins +// * patch: CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBins +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBins) ( PVOID pThis, PVOID pMixBins @@ -2346,9 +2346,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBins } // ****************************************************************** -// * func: EmuIDirectSoundStream_Unknown1 +// * patch: IDirectSoundStream_Unknown1 // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundStream_Unknown1 +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_Unknown1) ( PVOID pThis, DWORD dwUnknown1 @@ -2372,9 +2372,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundStream_Unknown1 // s+ // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMaxDistance +// * patch: IDirectSoundBuffer8_SetMaxDistance // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMaxDistance +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetMaxDistance) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flMaxDistance, @@ -2395,9 +2395,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMaxDistance } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMinDistance +// * patch: IDirectSoundBuffer8_SetMinDistance // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMinDistance +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetMinDistance) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flMinDistance, @@ -2418,9 +2418,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMinDistance } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetRolloffFactor +// * patch: IDirectSoundBuffer8_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetRolloffFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetRolloffFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flRolloffFactor, @@ -2441,9 +2441,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetRolloffFactor } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetDistanceFactor +// * patch: IDirectSoundBuffer8_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetDistanceFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetDistanceFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flDistanceFactor, @@ -2464,9 +2464,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetDistanceFactor } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeAngles +// * patch: IDirectSoundBuffer8_SetConeAngles // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeAngles +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetConeAngles) ( LPDIRECTSOUNDBUFFER8 pThis, DWORD dwInsideConeAngle, @@ -2490,9 +2490,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeAngles } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeOrientation +// * patch: IDirectSoundBuffer8_SetConeOrientation // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeOrientation +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetConeOrientation) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -2517,9 +2517,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeOrientation } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeOutsideVolume +// * patch: IDirectSoundBuffer8_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeOutsideVolume +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetConeOutsideVolume) ( LPDIRECTSOUNDBUFFER8 pThis, LONG lConeOutsideVolume, @@ -2540,9 +2540,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetConeOutsideVolume } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPosition +// * patch: IDirectSoundBuffer8_SetPosition // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPosition +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetPosition) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -2567,9 +2567,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetPosition } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVelocity +// * patch: IDirectSoundBuffer8_SetVelocity // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetVelocity +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetVelocity) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -2594,9 +2594,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetVelocity } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetDopplerFactor +// * patch: IDirectSoundBuffer8_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetDopplerFactor +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetDopplerFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flDopplerFactor, @@ -2619,9 +2619,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetDopplerFactor } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetI3DL2Source +// * patch: IDirectSoundBuffer8_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetI3DL2Source +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetI3DL2Source) ( LPDIRECTSOUNDBUFFER8 pThis, LPCDSI3DL2BUFFER pds3db, @@ -2644,9 +2644,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetI3DL2Source } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMode +// * patch: IDirectSoundBuffer8_SetMode // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMode +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetMode) ( X_CDirectSoundBuffer *pBuffer, DWORD dwMode, @@ -2674,9 +2674,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetMode // +s // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFormat +// * patch: IDirectSoundBuffer8_SetFormat // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFormat +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetFormat) ( X_CDirectSoundBuffer *pBuffer, LPCWAVEFORMATEX pwfxFormat @@ -2699,9 +2699,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFormat } // ****************************************************************** -// * func: EmuDirectSoundUseFullHRTF +// * patch: DirectSoundUseFullHRTF // ****************************************************************** -STDAPI_(void) EmuDirectSoundUseFullHRTF +STDAPI_(void) EMUPATCH(DirectSoundUseFullHRTF) ( void ) @@ -2716,9 +2716,9 @@ STDAPI_(void) EmuDirectSoundUseFullHRTF } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetLFO +// * patch: IDirectSoundBuffer8_SetLFO // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetLFO +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetLFO) ( LPDIRECTSOUNDBUFFER pThis, LPCDSLFODESC pLFODesc @@ -2741,9 +2741,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetLFO } // ****************************************************************** -// * func: EmuXAudioCreateAdpcmFormat +// * patch: XAudioCreateAdpcmFormat // ****************************************************************** -VOID WINAPI XTL::EmuXAudioCreateAdpcmFormat +VOID WINAPI XTL::EMUPATCH(XAudioCreateAdpcmFormat) ( WORD nChannels, DWORD nSamplesPerSec, @@ -2774,9 +2774,9 @@ VOID WINAPI XTL::EmuXAudioCreateAdpcmFormat } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetRolloffCurve +// * patch: IDirectSoundBuffer8_SetRolloffCurve // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetRolloffCurve +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetRolloffCurve) ( LPDIRECTSOUNDBUFFER pThis, const FLOAT *pflPoints, @@ -2803,9 +2803,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetRolloffCurve } // ****************************************************************** -// * func: EmuIDirectSoundStream_SetVolume +// * patch: IDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundStream_SetVolume +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_SetVolume) ( LPDIRECTSOUNDSTREAM pStream, LONG lVolume @@ -2829,9 +2829,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundStream_SetVolume // ****************************************************************** -// * func: EmuIDirectSound_EnableHeadphones +// * patch: IDirectSound_EnableHeadphones // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound_EnableHeadphones +HRESULT WINAPI XTL::EMUPATCH(IDirectSound_EnableHeadphones) ( LPDIRECTSOUND pThis, BOOL fEnabled @@ -2852,9 +2852,9 @@ HRESULT WINAPI XTL::EmuIDirectSound_EnableHeadphones } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_AddRef +// * patch: IDirectSoundBuffer8_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuIDirectSoundBuffer8_AddRef +ULONG WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_AddRef) ( X_CDirectSoundBuffer *pThis ) @@ -2889,9 +2889,9 @@ ULONG WINAPI XTL::EmuIDirectSoundBuffer8_AddRef } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Pause +// * patch: IDirectSoundBuffer8_Pause // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_Pause) ( X_CDirectSoundBuffer *pThis, DWORD dwPause @@ -2932,7 +2932,7 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause } //// ****************************************************************** -//// * func: EmuIDirectSoundBuffer_Pause +//// * patch: IDirectSoundBuffer_Pause //// ****************************************************************** //extern "C" HRESULT __stdcall XTL::EmuIDirectSoundBuffer_PauseEx //( @@ -2979,9 +2979,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Pause //} // ****************************************************************** -// * func: EmuIDirectSound8_GetOutputLevels +// * patch: IDirectSound8_GetOutputLevels // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_GetOutputLevels +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetOutputLevels) ( LPDIRECTSOUND8 *pThis, X_DSOUTPUTLEVELS *pOutputLevels, @@ -3006,9 +3006,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetOutputLevels } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetEG +// * patch: CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetEG +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetEG) ( LPVOID pThis, LPVOID pEnvelopeDesc @@ -3031,9 +3031,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetEG } // ****************************************************************** -// * func: EmuIDirectSoundStream_Flush +// * patch: IDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundStream_Flush() +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_Flush)() { @@ -3047,9 +3047,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundStream_Flush() } // ****************************************************************** -// * func: EmuIDirectSoundStream_FlushEx +// * patch: IDirectSoundStream_FlushEx // ****************************************************************** -extern "C" HRESULT WINAPI XTL::EmuIDirectSoundStream_FlushEx +extern "C" HRESULT WINAPI XTL::EMUPATCH(IDirectSoundStream_FlushEx) ( X_CDirectSoundStream* pThis, REFERENCE_TIME rtTimeStamp, @@ -3074,9 +3074,9 @@ extern "C" HRESULT WINAPI XTL::EmuIDirectSoundStream_FlushEx } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMode +// * patch: CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMode +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMode) ( X_CDirectSoundStream *pStream, DWORD dwMode, @@ -3103,9 +3103,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMode } // ****************************************************************** -// * func: EmuXAudioDownloadEffectsImage +// * patch: XAudioDownloadEffectsImage // ****************************************************************** -HRESULT WINAPI XTL::EmuXAudioDownloadEffectsImage +HRESULT WINAPI XTL::EMUPATCH(XAudioDownloadEffectsImage) ( LPCSTR pszImageName, LPVOID pImageLoc, @@ -3130,9 +3130,9 @@ HRESULT WINAPI XTL::EmuXAudioDownloadEffectsImage } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFilter +// * patch: IDirectSoundBuffer8_SetFilter // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFilter +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetFilter) ( LPVOID pThis, X_DSFILTERDESC* pFilterDesc @@ -3157,9 +3157,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetFilter } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetFilter +// * patch: CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFilter +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc @@ -3185,9 +3185,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFilter // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_PlayEx +// * patch: IDirectSoundBuffer8_PlayEx // ****************************************************************** -extern "C" HRESULT __stdcall XTL::EmuIDirectSoundBuffer8_PlayEx +extern "C" HRESULT __stdcall XTL::EMUPATCH(IDirectSoundBuffer8_PlayEx) ( X_CDirectSoundBuffer *pBuffer, REFERENCE_TIME rtTimeStamp, @@ -3219,9 +3219,9 @@ extern "C" HRESULT __stdcall XTL::EmuIDirectSoundBuffer8_PlayEx } // ****************************************************************** -// * func: EmuIDirectSound8_GetCaps +// * patch: IDirectSound8_GetCaps // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_GetCaps +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetCaps) ( X_CDirectSound* pThis, X_DSCAPS* pDSCaps @@ -3260,9 +3260,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetCaps } // ****************************************************************** -// * func: EmuIDirectSoundStream_SetPitch +// * patch: IDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPitch +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, LONG lPitch @@ -3287,9 +3287,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetPitch } // ****************************************************************** -// * func: EmuDirectSoundGetSampleTime +// * patch: DirectSoundGetSampleTime // ****************************************************************** -DWORD WINAPI XTL::EmuDirectSoundGetSampleTime() +DWORD WINAPI XTL::EMUPATCH(DirectSoundGetSampleTime)() { @@ -3311,9 +3311,9 @@ DWORD WINAPI XTL::EmuDirectSoundGetSampleTime() } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBinVolumes +// * patch: CDirectSoundStream_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes) ( X_CDirectSoundStream* pThis, DWORD dwMixBinMask, @@ -3339,9 +3339,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBinVolumes2 +// * patch: CDirectSoundStream_SetMixBinVolumes2 // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes2 +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) ( X_CDirectSoundStream* pThis, LPVOID pMixBins @@ -3364,9 +3364,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetMixBinVolumes2 } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetI3DL2Source +// * patch: CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetI3DL2Source +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, PVOID pds3db, @@ -3391,9 +3391,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetI3DL2Source } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetI3DL2Source +// * patch: IDirectSoundBuffer8_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetAllParameters +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetAllParameters) ( X_CDirectSoundBuffer* pThis, VOID* pcDs3dBuffer, @@ -3418,9 +3418,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetAllParameters } // ****************************************************************** -// * func: EmuCDirectSoundStream::SetFormat +// * patch: CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFormat +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat @@ -3450,9 +3450,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetFormat } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetOutputBuffer +// * patch: IDirectSoundBuffer8_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetOutputBuffer +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetOutputBuffer) ( X_CDirectSoundBuffer* pThis, X_CDirectSoundBuffer* pOutputBuffer @@ -3475,9 +3475,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetOutputBuffer } // ****************************************************************** -// * func: EmuCDirectSoundStream_SetOutputBuffer +// * patch: CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetOutputBuffer +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, X_CDirectSoundBuffer* pOutputBuffer @@ -3500,9 +3500,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetOutputBuffer } // ****************************************************************** -// * func: EmuXFileCreaeMediaObjectEx +// * patch: XFileCreaeMediaObjectEx // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileCreateMediaObjectEx +HRESULT WINAPI XTL::EMUPATCH(XFileCreateMediaObjectEx) ( HANDLE hFile, void** ppMediaObject @@ -3525,9 +3525,9 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectEx } // ****************************************************************** -// * func: EmuXWaveFileCreateMediaObject +// * patch: XWaveFileCreateMediaObject // ****************************************************************** -HRESULT WINAPI XTL::EmuXWaveFileCreateMediaObject +HRESULT WINAPI XTL::EMUPATCH(XWaveFileCreateMediaObject) ( LPCSTR pszFileName, LPCWAVEFORMATEX *ppwfxFormat, @@ -3552,9 +3552,9 @@ HRESULT WINAPI XTL::EmuXWaveFileCreateMediaObject } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetEG +// * patch: IDirectSoundBuffer8_SetEG // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetEG +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetEG) ( X_CDirectSoundBuffer* pThis, LPVOID pEnvelopeDesc @@ -3577,9 +3577,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetEG } // ****************************************************************** -// * func: EmuIDirectSound8_GetEffectData +// * patch: IDirectSound8_GetEffectData // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_GetEffectData +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_GetEffectData) ( X_CDirectSound* pThis, DWORD dwEffectIndex, @@ -3610,9 +3610,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_GetEffectData } // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetNotificationPositions +// * patch: IDirectSoundBuffer8_SetNotificationPositions // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetNotificationPositions +HRESULT WINAPI XTL::EMUPATCH(IDirectSoundBuffer8_SetNotificationPositions) ( X_CDirectSoundBuffer* pThis, DWORD dwNotifyCount, @@ -3662,9 +3662,9 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetNotificationPositions } // ****************************************************************** -// * func EmuCDirectSoundStream::SetRolloffCurve +// * patch: CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI XTL::EmuCDirectSoundStream_SetRolloffCurve +HRESULT WINAPI XTL::EMUPATCH(CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundBuffer *pThis, const FLOAT *pflPoints, @@ -3691,9 +3691,9 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_SetRolloffCurve } // ****************************************************************** -// * func: EmuIDirectSound8_SetEffectData +// * patch: IDirectSound8_SetEffectData // ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSound8_SetEffectData +HRESULT WINAPI XTL::EMUPATCH(IDirectSound8_SetEffectData) ( LPVOID pThis, DWORD dwEffectIndex, @@ -3724,9 +3724,9 @@ HRESULT WINAPI XTL::EmuIDirectSound8_SetEffectData } // ****************************************************************** -// * func: EmuXFileCreateMediaObjectAsync +// * patch: XFileCreateMediaObjectAsync // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileCreateMediaObjectAsync +HRESULT WINAPI XTL::EMUPATCH(XFileCreateMediaObjectAsync) ( HANDLE hFile, DWORD dwMaxPackets, @@ -3755,9 +3755,9 @@ HRESULT WINAPI XTL::EmuXFileCreateMediaObjectAsync } // ****************************************************************** -// * func: EmuXFileMediaObject_Seek +// * patch: XFileMediaObject_Seek // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileMediaObject_Seek +HRESULT WINAPI XTL::EMUPATCH(XFileMediaObject_Seek) ( X_XFileMediaObject* pThis, LONG lOffset, @@ -3784,9 +3784,9 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Seek } // ****************************************************************** -// * func: EmuXFileMediaObject_DoWork +// * patch: XFileMediaObject_DoWork // ****************************************************************** -VOID WINAPI XTL::EmuXFileMediaObject_DoWork(X_XFileMediaObject* pThis) +VOID WINAPI XTL::EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis) { @@ -3802,9 +3802,9 @@ VOID WINAPI XTL::EmuXFileMediaObject_DoWork(X_XFileMediaObject* pThis) } // ****************************************************************** -// * func: EmuXFileMediaObject_GetStatus +// * patch: XFileMediaObject_GetStatus // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileMediaObject_GetStatus +HRESULT WINAPI XTL::EMUPATCH(XFileMediaObject_GetStatus) ( X_XFileMediaObject* pThis, LPDWORD pdwStatus @@ -3827,9 +3827,9 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetStatus } // ****************************************************************** -// * func: EmuXFileMediaObject_GetInfo +// * patch: XFileMediaObject_GetInfo // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileMediaObject_GetInfo +HRESULT WINAPI XTL::EMUPATCH(XFileMediaObject_GetInfo) ( X_XFileMediaObject *pThis, XMEDIAINFO *pInfo @@ -3852,9 +3852,9 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_GetInfo } // ****************************************************************** -// * func: EmuXFileMediaObject_Process +// * patch: XFileMediaObject_Process // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileMediaObject_Process +HRESULT WINAPI XTL::EMUPATCH(XFileMediaObject_Process) ( X_XFileMediaObject *pThis, LPXMEDIAPACKET pInputBuffer, @@ -3879,9 +3879,9 @@ HRESULT WINAPI XTL::EmuXFileMediaObject_Process } // ****************************************************************** -// * func: EmuXFileMediaObject_AddRef +// * patch: XFileMediaObject_AddRef // ****************************************************************** -ULONG WINAPI XTL::EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis) +ULONG WINAPI XTL::EMUPATCH(XFileMediaObject_AddRef)(X_XFileMediaObject *pThis) { @@ -3905,9 +3905,9 @@ ULONG WINAPI XTL::EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis) } // ****************************************************************** -// * func: EmuXFileMediaObject_Release +// * patch: XFileMediaObject_Release // ****************************************************************** -ULONG WINAPI XTL::EmuXFileMediaObject_Release(X_XFileMediaObject *pThis) +ULONG WINAPI XTL::EMUPATCH(XFileMediaObject_Release)(X_XFileMediaObject *pThis) { @@ -3935,9 +3935,9 @@ ULONG WINAPI XTL::EmuXFileMediaObject_Release(X_XFileMediaObject *pThis) } // ****************************************************************** -// * func: EmuXFileMediaObject_Discontinuity +// * patch: XFileMediaObject_Discontinuity // ****************************************************************** -HRESULT WINAPI XTL::EmuXFileMediaObject_Discontinuity(X_XFileMediaObject *pThis) +HRESULT WINAPI XTL::EMUPATCH(XFileMediaObject_Discontinuity)(X_XFileMediaObject *pThis) { diff --git a/src/CxbxKrnl/EmuDSound.h b/src/CxbxKrnl/EmuDSound.h index 9cd6298b6..cec0042be 100644 --- a/src/CxbxKrnl/EmuDSound.h +++ b/src/CxbxKrnl/EmuDSound.h @@ -425,9 +425,9 @@ class X_XFileMediaObject }; // ****************************************************************** -// * func: EmuDirectSoundCreate +// * patch: DirectSoundCreate // ****************************************************************** -HRESULT WINAPI EmuDirectSoundCreate +HRESULT WINAPI EMUPATCH(DirectSoundCreate) ( LPVOID pguidDeviceId, LPDIRECTSOUND8 *ppDirectSound, @@ -435,56 +435,56 @@ HRESULT WINAPI EmuDirectSoundCreate ); // ****************************************************************** -// * func: EmuDirectSoundDoWork +// * patch: DirectSoundDoWork // ****************************************************************** -VOID WINAPI EmuDirectSoundDoWork(); +VOID WINAPI EMUPATCH(DirectSoundDoWork)(); // ****************************************************************** -// * func: EmuIDirectSound8_AddRef +// * patch: IDirectSound8_AddRef // ****************************************************************** -ULONG WINAPI EmuIDirectSound8_AddRef +ULONG WINAPI EMUPATCH(IDirectSound8_AddRef) ( LPDIRECTSOUND8 pThis ); // ****************************************************************** -// * func: EmuIDirectSound8_Release +// * patch: IDirectSound8_Release // ****************************************************************** -ULONG WINAPI EmuIDirectSound8_Release +ULONG WINAPI EMUPATCH(IDirectSound8_Release) ( LPDIRECTSOUND8 pThis ); // ****************************************************************** -// * func: EmuCDirectSound_GetSpeakerConfig +// * patch: CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI EmuCDirectSound_GetSpeakerConfig +HRESULT WINAPI EMUPATCH(CDirectSound_GetSpeakerConfig) ( X_CDirectSound *pThis, PDWORD pdwSpeakerConfig ); // ****************************************************************** -// * func: EmuIDirectSound8_EnableHeadphones +// * patch: IDirectSound8_EnableHeadphones // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_EnableHeadphones +HRESULT WINAPI EMUPATCH(IDirectSound8_EnableHeadphones) ( LPDIRECTSOUND8 pThis, BOOL fEnabled ); // ****************************************************************** -// * func: EmuIDirectSound8_SynchPlayback +// * patch: IDirectSound8_SynchPlayback // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SynchPlayback +HRESULT WINAPI EMUPATCH(IDirectSound8_SynchPlayback) ( LPDIRECTSOUND8 pThis ); // ****************************************************************** -// * func: EmuIDirectSound8_DownloadEffectsImage +// * patch: IDirectSound8_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_DownloadEffectsImage +HRESULT WINAPI EMUPATCH(IDirectSound8_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, @@ -494,9 +494,9 @@ HRESULT WINAPI EmuIDirectSound8_DownloadEffectsImage ); // ****************************************************************** -// * func: EmuIDirectSound8_SetOrientation +// * patch: IDirectSound8_SetOrientation // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetOrientation +HRESULT WINAPI EMUPATCH(IDirectSound8_SetOrientation) ( LPDIRECTSOUND8 pThis, FLOAT xFront, @@ -509,9 +509,9 @@ HRESULT WINAPI EmuIDirectSound8_SetOrientation ); // ****************************************************************** -// * func: EmuIDirectSound8_SetDistanceFactor +// * patch: IDirectSound8_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetDistanceFactor +HRESULT WINAPI EMUPATCH(IDirectSound8_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDistanceFactor, @@ -519,9 +519,9 @@ HRESULT WINAPI EmuIDirectSound8_SetDistanceFactor ); // ****************************************************************** -// * func: EmuIDirectSound8_SetRolloffFactor +// * patch: IDirectSound8_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetRolloffFactor +HRESULT WINAPI EMUPATCH(IDirectSound8_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, FLOAT fRolloffFactor, @@ -529,9 +529,9 @@ HRESULT WINAPI EmuIDirectSound8_SetRolloffFactor ); // ****************************************************************** -// * func: EmuIDirectSound8_SetDopplerFactor +// * patch: IDirectSound8_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetDopplerFactor +HRESULT WINAPI EMUPATCH(IDirectSound8_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, FLOAT fDopplerFactor, @@ -539,9 +539,9 @@ HRESULT WINAPI EmuIDirectSound8_SetDopplerFactor ); // ****************************************************************** -// * func: EmuIDirectSound8_SetI3DL2Listener +// * patch: IDirectSound8_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetI3DL2Listener +HRESULT WINAPI EMUPATCH(IDirectSound8_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, PVOID pDummy, // TODO: fill this out @@ -549,9 +549,9 @@ HRESULT WINAPI EmuIDirectSound8_SetI3DL2Listener ); // ****************************************************************** -// * func: EmuIDirectSound8_SetMixBinHeadroom +// * patch: IDirectSound8_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetMixBinHeadroom +HRESULT WINAPI EMUPATCH(IDirectSound8_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, DWORD dwMixBinMask, @@ -559,27 +559,27 @@ HRESULT WINAPI EmuIDirectSound8_SetMixBinHeadroom ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMixBins +// * patch: IDirectSoundBuffer8_SetMixBins // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetMixBins +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetMixBins) ( LPDIRECTSOUND8 pThis, PVOID pMixBins // TODO: fill this out ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMixBinVolumes +// * patch: IDirectSoundBuffer8_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetMixBinVolumes +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetMixBinVolumes) ( LPDIRECTSOUND8 pThis, PVOID pMixBins // TODO: fill this out ); // ****************************************************************** -// * func: EmuIDirectSound8_SetPosition +// * patch: IDirectSound8_SetPosition // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetPosition +HRESULT WINAPI EMUPATCH(IDirectSound8_SetPosition) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -589,9 +589,9 @@ HRESULT WINAPI EmuIDirectSound8_SetPosition ); // ****************************************************************** -// * func: EmuIDirectSound8_SetVelocity +// * patch: IDirectSound8_SetVelocity // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetVelocity +HRESULT WINAPI EMUPATCH(IDirectSound8_SetVelocity) ( LPDIRECTSOUND8 pThis, FLOAT x, @@ -601,9 +601,9 @@ HRESULT WINAPI EmuIDirectSound8_SetVelocity ); // ****************************************************************** -// * func: EmuIDirectSound8_SetAllParameters +// * patch: IDirectSound8_SetAllParameters // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetAllParameters +HRESULT WINAPI EMUPATCH(IDirectSound8_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPVOID pTodo, // TODO: LPCDS3DLISTENER @@ -611,17 +611,17 @@ HRESULT WINAPI EmuIDirectSound8_SetAllParameters ); // ****************************************************************** -// * func: EmuCDirectSound_CommitDeferredSettings +// * patch: CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI EmuCDirectSound_CommitDeferredSettings +HRESULT WINAPI EMUPATCH(CDirectSound_CommitDeferredSettings) ( X_CDirectSound *pThis ); // ****************************************************************** -// * func: EmuIDirectSound8_CreateSoundBuffer +// * patch: IDirectSound8_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_CreateSoundBuffer +HRESULT WINAPI EMUPATCH(IDirectSound8_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdsbd, @@ -630,18 +630,18 @@ HRESULT WINAPI EmuIDirectSound8_CreateSoundBuffer ); // ****************************************************************** -// * func: EmuDirectSoundCreateBuffer +// * patch: DirectSoundCreateBuffer // ****************************************************************** -HRESULT WINAPI EmuDirectSoundCreateBuffer +HRESULT WINAPI EMUPATCH(DirectSoundCreateBuffer) ( X_DSBUFFERDESC *pdsbd, X_CDirectSoundBuffer **ppBuffer ); // ****************************************************************** -// * func: EmuIDirectSound8_CreateBuffer +// * patch: IDirectSound8_CreateBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_CreateBuffer +HRESULT WINAPI EMUPATCH(IDirectSound8_CreateBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC *pdssd, @@ -650,9 +650,9 @@ HRESULT WINAPI EmuIDirectSound8_CreateBuffer ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetBufferData +// * patch: IDirectSoundBuffer8_SetBufferData // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetBufferData +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetBufferData) ( X_CDirectSoundBuffer *pThis, LPVOID pvBufferData, @@ -660,9 +660,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetBufferData ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPlayRegion +// * patch: IDirectSoundBuffer8_SetPlayRegion // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetPlayRegion +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetPlayRegion) ( X_CDirectSoundBuffer *pThis, DWORD dwPlayStart, @@ -670,9 +670,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetPlayRegion ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Lock +// * patch: IDirectSoundBuffer8_Lock // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_Lock +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_Lock) ( X_CDirectSoundBuffer *pThis, DWORD dwOffset, @@ -685,18 +685,18 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_Lock ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetHeadroom +// * patch: IDirectSoundBuffer8_SetHeadroom // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetHeadroom +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetHeadroom) ( X_CDirectSoundBuffer *pThis, DWORD dwHeadroom ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetLoopRegion +// * patch: IDirectSoundBuffer8_SetLoopRegion // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetLoopRegion +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetLoopRegion) ( X_CDirectSoundBuffer *pThis, DWORD dwLoopStart, @@ -704,53 +704,53 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetLoopRegion ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Release +// * patch: IDirectSoundBuffer8_Release // ****************************************************************** -ULONG WINAPI EmuIDirectSoundBuffer8_Release +ULONG WINAPI EMUPATCH(IDirectSoundBuffer8_Release) ( X_CDirectSoundBuffer *pThis ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPitch +// * patch: IDirectSoundBuffer8_SetPitch // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetPitch +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetPitch) ( X_CDirectSoundBuffer *pThis, LONG lPitch ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_GetStatus +// * patch: IDirectSoundBuffer8_GetStatus // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_GetStatus +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_GetStatus) ( X_CDirectSoundBuffer *pThis, LPDWORD pdwStatus ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVolume +// * patch: IDirectSoundBuffer8_SetVolume // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetVolume +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetVolume) ( X_CDirectSoundBuffer *pThis, LONG lVolume ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetCurrentPosition +// * patch: IDirectSoundBuffer8_SetCurrentPosition // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetCurrentPosition +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetCurrentPosition) ( X_CDirectSoundBuffer *pThis, DWORD dwNewPosition ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_GetCurrentPosition +// * patch: IDirectSoundBuffer8_GetCurrentPosition // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_GetCurrentPosition +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_GetCurrentPosition) ( X_CDirectSoundBuffer *pThis, PDWORD pdwCurrentPlayCursor, @@ -758,17 +758,17 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_GetCurrentPosition ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Stop +// * patch: IDirectSoundBuffer8_Stop // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_Stop +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_Stop) ( X_CDirectSoundBuffer *pThis ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_StopEx +// * patch: IDirectSoundBuffer8_StopEx // ****************************************************************** -extern "C" HRESULT __stdcall EmuIDirectSoundBuffer8_StopEx +extern "C" HRESULT __stdcall EMUPATCH(IDirectSoundBuffer8_StopEx) ( X_CDirectSoundBuffer *pBuffer, REFERENCE_TIME rtTimeStamp, @@ -776,9 +776,9 @@ extern "C" HRESULT __stdcall EmuIDirectSoundBuffer8_StopEx ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Play +// * patch: IDirectSoundBuffer8_Play // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_Play +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_Play) ( X_CDirectSoundBuffer *pThis, DWORD dwReserved1, @@ -787,9 +787,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_Play ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_PlayEx +// * patch: IDirectSoundBuffer8_PlayEx // ****************************************************************** -extern "C" HRESULT __stdcall EmuIDirectSoundBuffer8_PlayEx +extern "C" HRESULT __stdcall EMUPATCH(IDirectSoundBuffer8_PlayEx) ( X_CDirectSoundBuffer *pBuffer, REFERENCE_TIME rtTimeStamp, @@ -797,36 +797,36 @@ extern "C" HRESULT __stdcall EmuIDirectSoundBuffer8_PlayEx ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVolume +// * patch: IDirectSoundBuffer8_SetVolume // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetVolume +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetVolume) ( X_CDirectSoundBuffer *pThis, LONG lVolume ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFrequency +// * patch: IDirectSoundBuffer8_SetFrequency // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetFrequency +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetFrequency) ( X_CDirectSoundBuffer *pThis, DWORD dwFrequency ); // ****************************************************************** -// * func: EmuDirectSoundCreateStream +// * patch: DirectSoundCreateStream // ****************************************************************** -HRESULT WINAPI EmuDirectSoundCreateStream +HRESULT WINAPI EMUPATCH(DirectSoundCreateStream) ( X_DSSTREAMDESC *pdssd, X_CDirectSoundStream **ppStream ); // ****************************************************************** -// * func: EmuIDirectSound8_CreateStream +// * patch: IDirectSound8_CreateStream // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_CreateStream +HRESULT WINAPI EMUPATCH(IDirectSound8_CreateStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC *pdssd, @@ -835,19 +835,19 @@ HRESULT WINAPI EmuIDirectSound8_CreateStream ); // ****************************************************************** -// * func: EmuCMcpxStream_Dummy_0x10 +// * patch: CMcpxStream_Dummy_0x10 // ****************************************************************** -VOID WINAPI EmuCMcpxStream_Dummy_0x10(DWORD dwDummy1, DWORD dwDummy2); +VOID WINAPI EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetVolume +// * patch: CDirectSoundStream_SetVolume // ****************************************************************** -ULONG WINAPI EmuCDirectSoundStream_SetVolume(X_CDirectSoundStream *pThis, LONG lVolume); +ULONG WINAPI EMUPATCH(CDirectSoundStream_SetVolume)(X_CDirectSoundStream *pThis, LONG lVolume); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetRolloffFactor +// * patch: CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetRolloffFactor +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream *pThis, FLOAT fRolloffFactor, @@ -855,37 +855,37 @@ HRESULT WINAPI EmuCDirectSoundStream_SetRolloffFactor ); // ****************************************************************** -// * func: EmuCDirectSoundStream_AddRef +// * patch: CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI EmuCDirectSoundStream_AddRef(X_CDirectSoundStream *pThis); +ULONG WINAPI EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * func: EmuCDirectSoundStream_Release +// * patch: CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI EmuCDirectSoundStream_Release(X_CDirectSoundStream *pThis); +ULONG WINAPI EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis); // ****************************************************************** // * EmuCDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_GetInfo +HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, LPXMEDIAINFO pInfo ); // ****************************************************************** -// * func: EmuCDirectSoundStream_GetStatus +// * patch: CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_GetStatus +HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetStatus) ( X_CDirectSoundStream *pThis, DWORD *pdwStatus ); // ****************************************************************** -// * func: EmuCDirectSoundStream_Process +// * patch: CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_Process +HRESULT WINAPI EMUPATCH(CDirectSoundStream_Process) ( X_CDirectSoundStream *pThis, PXMEDIAPACKET pInputBuffer, @@ -893,42 +893,42 @@ HRESULT WINAPI EmuCDirectSoundStream_Process ); // ****************************************************************** -// * func: EmuCDirectSoundStream_Discontinuity +// * patch: CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_Discontinuity(X_CDirectSoundStream *pThis); +HRESULT WINAPI EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * func: EmuCDirectSoundStream_Flush +// * patch: CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_Flush(X_CDirectSoundStream *pThis); +HRESULT WINAPI EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis); // ****************************************************************** -// * func: EmuCDirectSound_SynchPlayback +// * patch: CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI EmuCDirectSound_SynchPlayback(PVOID pUnknown); +HRESULT WINAPI EMUPATCH(CDirectSound_SynchPlayback)(PVOID pUnknown); // ****************************************************************** -// * func: EmuCDirectSoundStream_Pause +// * patch: CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_Pause +HRESULT WINAPI EMUPATCH(CDirectSoundStream_Pause) ( PVOID pStream, DWORD dwPause ); // ****************************************************************** -// * func: EmuIDirectSoundStream_SetHeadroom +// * patch: IDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundStream_SetHeadroom +HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetHeadroom) ( PVOID pThis, DWORD dwHeadroom ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetAllParameters +// * patch: CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetAllParameters +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetAllParameters) ( PVOID pThis, PVOID pUnknown, @@ -936,9 +936,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetAllParameters ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeAngles +// * patch: CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetConeAngles +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeAngles) ( PVOID pThis, DWORD dwInsideConeAngle, @@ -947,9 +947,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetConeAngles ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeOutsideVolume +// * patch: CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetConeOutsideVolume +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) ( PVOID pThis, LONG lConeOutsideVolume, @@ -957,9 +957,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetConeOutsideVolume ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMaxDistance +// * patch: CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMaxDistance +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMaxDistance) ( PVOID pThis, D3DVALUE fMaxDistance, @@ -967,9 +967,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetMaxDistance ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMinDistance +// * patch: CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMinDistance +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMinDistance) ( PVOID pThis, D3DVALUE fMinDistance, @@ -977,9 +977,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetMinDistance ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetVelocity +// * patch: CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetVelocity +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetVelocity) ( PVOID pThis, D3DVALUE x, @@ -989,9 +989,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetVelocity ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetConeOrientation +// * patch: CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetConeOrientation +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOrientation) ( PVOID pThis, D3DVALUE x, @@ -1001,9 +1001,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetConeOrientation ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetPosition +// * patch: CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetPosition +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPosition) ( PVOID pThis, D3DVALUE x, @@ -1013,18 +1013,18 @@ HRESULT WINAPI EmuCDirectSoundStream_SetPosition ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetFrequency +// * patch: CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetFrequency +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFrequency) ( PVOID pThis, DWORD dwFrequency ); // ****************************************************************** -// * func: EmuIDirectSoundStream_SetI3DL2Source +// * patch: IDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundStream_SetI3DL2Source +HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetI3DL2Source) ( PVOID pThis, PVOID pds3db, @@ -1032,18 +1032,18 @@ HRESULT WINAPI EmuIDirectSoundStream_SetI3DL2Source ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBins +// * patch: CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMixBins +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBins) ( PVOID pThis, PVOID pMixBins ); // ****************************************************************** -// * func: EmuIDirectSoundStream_Unknown1 +// * patch: IDirectSoundStream_Unknown1 // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundStream_Unknown1 +HRESULT WINAPI EMUPATCH(IDirectSoundStream_Unknown1) ( PVOID pThis, DWORD dwUnknown1 @@ -1051,9 +1051,9 @@ HRESULT WINAPI EmuIDirectSoundStream_Unknown1 // s+ // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMaxDistance +// * patch: IDirectSoundBuffer8_SetMaxDistance // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetMaxDistance +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetMaxDistance) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flMaxDistance, @@ -1061,9 +1061,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetMaxDistance ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMinDistance +// * patch: IDirectSoundBuffer8_SetMinDistance // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetMinDistance +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetMinDistance) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flMaxDistance, @@ -1071,9 +1071,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetMinDistance ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetRolloffFactor +// * patch: IDirectSoundBuffer8_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetRolloffFactor +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetRolloffFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flRolloffFactor, @@ -1081,9 +1081,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetRolloffFactor ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetDistanceFactor +// * patch: IDirectSoundBuffer8_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetDistanceFactor +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetDistanceFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flDistanceFactor, @@ -1091,9 +1091,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetDistanceFactor ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeAngles +// * patch: IDirectSoundBuffer8_SetConeAngles // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeAngles +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetConeAngles) ( LPDIRECTSOUNDBUFFER8 pThis, DWORD dwInsideConeAngle, @@ -1102,9 +1102,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeAngles ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeOrientation +// * patch: IDirectSoundBuffer8_SetConeOrientation // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeOrientation +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetConeOrientation) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -1114,9 +1114,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeOrientation ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetConeOutsideVolume +// * patch: IDirectSoundBuffer8_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeOutsideVolume +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetConeOutsideVolume) ( LPDIRECTSOUNDBUFFER8 pThis, LONG lConeOutsideVolume, @@ -1124,9 +1124,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetConeOutsideVolume ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetPosition +// * patch: IDirectSoundBuffer8_SetPosition // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetPosition +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetPosition) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -1136,9 +1136,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetPosition ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVelocity +// * patch: IDirectSoundBuffer8_SetVelocity // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetVelocity +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetVelocity) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT x, @@ -1148,9 +1148,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetVelocity ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetDopplerFactor +// * patch: IDirectSoundBuffer8_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetDopplerFactor +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetDopplerFactor) ( LPDIRECTSOUNDBUFFER8 pThis, FLOAT flDopplerFactor, @@ -1160,9 +1160,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetDopplerFactor typedef void* LPCDSI3DL2BUFFER; // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetI3DL2Source +// * patch: IDirectSoundBuffer8_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetI3DL2Source +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetI3DL2Source) ( LPDIRECTSOUNDBUFFER8 pThis, LPCDSI3DL2BUFFER pds3db, @@ -1171,9 +1171,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetI3DL2Source // +s // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetMode +// * patch: IDirectSoundBuffer8_SetMode // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetMode +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetMode) ( X_CDirectSoundBuffer *pBuffer, DWORD dwMode, @@ -1181,35 +1181,35 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetMode ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFormat +// * patch: IDirectSoundBuffer8_SetFormat // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetFormat +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetFormat) ( X_CDirectSoundBuffer *pBuffer, LPCWAVEFORMATEX pwfxFormat ); // ****************************************************************** -// * func: EmuDirectSoundUseFullHRTF +// * patch: DirectSoundUseFullHRTF // ****************************************************************** -STDAPI_(void) EmuDirectSoundUseFullHRTF +STDAPI_(void) EMUPATCH(DirectSoundUseFullHRTF) ( void ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetLFO +// * patch: IDirectSoundBuffer8_SetLFO // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetLFO +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetLFO) ( LPDIRECTSOUNDBUFFER pThis, LPCDSLFODESC pLFODesc ); // ****************************************************************** -// * func: EmuXAudioCreateAdpcmFormat +// * patch: XAudioCreateAdpcmFormat // ****************************************************************** -VOID WINAPI EmuXAudioCreateAdpcmFormat +VOID WINAPI EMUPATCH(XAudioCreateAdpcmFormat) ( WORD nChannels, DWORD nSamplesPerSec, @@ -1217,9 +1217,9 @@ VOID WINAPI EmuXAudioCreateAdpcmFormat ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetRolloffCurve +// * patch: IDirectSoundBuffer8_SetRolloffCurve // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetRolloffCurve +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetRolloffCurve) ( LPDIRECTSOUNDBUFFER pThis, const FLOAT *pflPoints, @@ -1228,42 +1228,42 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetRolloffCurve ); // ****************************************************************** -// * func: EmuIDirectSoundStream_SetVolume +// * patch: IDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundStream_SetVolume +HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetVolume) ( LPDIRECTSOUNDSTREAM pStream, LONG lVolume ); // ****************************************************************** -// * func: EmuIDirectSound_EnableHeadphones +// * patch: IDirectSound_EnableHeadphones // ****************************************************************** -HRESULT WINAPI EmuIDirectSound_EnableHeadphones +HRESULT WINAPI EMUPATCH(IDirectSound_EnableHeadphones) ( LPDIRECTSOUND pThis, BOOL fEnabled ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_AddRef +// * patch: IDirectSoundBuffer8_AddRef // ****************************************************************** -ULONG WINAPI EmuIDirectSoundBuffer8_AddRef +ULONG WINAPI EMUPATCH(IDirectSoundBuffer8_AddRef) ( X_CDirectSoundBuffer *pThis ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_Pause +// * patch: IDirectSoundBuffer8_Pause // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_Pause +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_Pause) ( X_CDirectSoundBuffer *pThis, DWORD dwPause ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_PauseEx +// * patch: IDirectSoundBuffer8_PauseEx // ****************************************************************** extern "C" HRESULT __stdcall EmuIDirectSoundBuffer_PauseEx ( @@ -1273,9 +1273,9 @@ extern "C" HRESULT __stdcall EmuIDirectSoundBuffer_PauseEx ); // ****************************************************************** -// * func: EmuIDirectSound8_GetOutputLevels +// * patch: IDirectSound8_GetOutputLevels // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_GetOutputLevels +HRESULT WINAPI EMUPATCH(IDirectSound8_GetOutputLevels) ( LPDIRECTSOUND8 *pThis, X_DSOUTPUTLEVELS *pOutputLevels, @@ -1283,23 +1283,23 @@ HRESULT WINAPI EmuIDirectSound8_GetOutputLevels ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetEG +// * patch: CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetEG +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetEG) ( LPVOID pThis, LPVOID pEnvelopeDesc ); // ****************************************************************** -// * func: EmuIDirectSoundStream_Flush +// * patch: IDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundStream_Flush(); +HRESULT WINAPI EMUPATCH(IDirectSoundStream_Flush)(); // ****************************************************************** -// * func: EmuIDirectSoundStream_FlushEx +// * patch: IDirectSoundStream_FlushEx // ****************************************************************** -extern "C" HRESULT WINAPI EmuIDirectSoundStream_FlushEx +extern "C" HRESULT WINAPI EMUPATCH(IDirectSoundStream_FlushEx) ( X_CDirectSoundStream* pThis, REFERENCE_TIME rtTimeStamp, @@ -1307,9 +1307,9 @@ extern "C" HRESULT WINAPI EmuIDirectSoundStream_FlushEx ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMode +// * patch: CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMode +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMode) ( X_CDirectSoundStream *pStream, DWORD dwMode, @@ -1317,9 +1317,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetMode ); // ****************************************************************** -// * func: EmuXAudioDownloadEffectsImage +// * patch: XAudioDownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EmuXAudioDownloadEffectsImage +HRESULT WINAPI EMUPATCH(XAudioDownloadEffectsImage) ( LPCSTR pszImageName, LPVOID pImageLoc, @@ -1328,50 +1328,50 @@ HRESULT WINAPI EmuXAudioDownloadEffectsImage ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetFilter +// * patch: IDirectSoundBuffer8_SetFilter // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetFilter +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetFilter) ( LPVOID pThis, X_DSFILTERDESC* pFilterDesc ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetFilter +// * patch: CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetFilter +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc ); // ****************************************************************** -// * func: EmuIDirectSound8_GetCaps +// * patch: IDirectSound8_GetCaps // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_GetCaps +HRESULT WINAPI EMUPATCH(IDirectSound8_GetCaps) ( X_CDirectSound* pThis, X_DSCAPS* pDSCaps ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetPitch +// * patch: CDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetPitch +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, LONG lPitch ); // ****************************************************************** -// * func: EmuDirectSoundGetSampleTime +// * patch: DirectSoundGetSampleTime // ****************************************************************** -DWORD WINAPI EmuDirectSoundGetSampleTime(); +DWORD WINAPI EMUPATCH(DirectSoundGetSampleTime)(); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBinVolumes +// * patch: CDirectSoundStream_SetMixBinVolumes // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMixBinVolumes +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes) ( X_CDirectSoundStream* pThis, DWORD dwMixBinMask, @@ -1379,18 +1379,18 @@ HRESULT WINAPI EmuCDirectSoundStream_SetMixBinVolumes ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetMixBinVolumes2 +// * patch: CDirectSoundStream_SetMixBinVolumes2 // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetMixBinVolumes2 +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes2) ( X_CDirectSoundStream* pThis, LPVOID pMixBins ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetI3DL2Source +// * patch: CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetI3DL2Source +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, PVOID pds3db, @@ -1398,9 +1398,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetI3DL2Source ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetI3DL2Source +// * patch: IDirectSoundBuffer8_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetAllParameters +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetAllParameters) ( X_CDirectSoundBuffer* pThis, VOID* pcDs3dBuffer, @@ -1408,45 +1408,45 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetAllParameters ); // ****************************************************************** -// * func: EmuCDirectSoundStream::SetFormat +// * patch: CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetFormat +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetOutputBuffer +// * patch: IDirectSoundBuffer8_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetOutputBuffer +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetOutputBuffer) ( X_CDirectSoundBuffer* pThis, X_CDirectSoundBuffer* pOutputBuffer ); // ****************************************************************** -// * func: EmuCDirectSoundStream_SetOutputBuffer +// * patch: CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetOutputBuffer +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, X_CDirectSoundBuffer* pOutputBuffer ); // ****************************************************************** -// * func: EmuXFileCreaeMediaObjectEx +// * patch: XFileCreaeMediaObjectEx // ****************************************************************** -HRESULT WINAPI EmuXFileCreateMediaObjectEx +HRESULT WINAPI EMUPATCH(XFileCreateMediaObjectEx) ( HANDLE hFile, void** ppMediaObject ); // ****************************************************************** -// * func: EmuXWaveFileCreateMediaObject +// * patch: XWaveFileCreateMediaObject // ****************************************************************** -HRESULT WINAPI EmuXWaveFileCreateMediaObject +HRESULT WINAPI EMUPATCH(XWaveFileCreateMediaObject) ( LPCSTR pszFileName, LPCWAVEFORMATEX *ppwfxFormat, @@ -1454,18 +1454,18 @@ HRESULT WINAPI EmuXWaveFileCreateMediaObject ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetEG +// * patch: IDirectSoundBuffer8_SetEG // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetEG +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetEG) ( X_CDirectSoundBuffer* pThis, LPVOID pEnvelopeDesc ); // ****************************************************************** -// * func: EmuIDirectSound8_GetEffectData +// * patch: IDirectSound8_GetEffectData // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_GetEffectData +HRESULT WINAPI EMUPATCH(IDirectSound8_GetEffectData) ( X_CDirectSound* pThis, DWORD dwEffectIndex, @@ -1475,9 +1475,9 @@ HRESULT WINAPI EmuIDirectSound8_GetEffectData ); // ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetNotificationPositions +// * patch: IDirectSoundBuffer8_SetNotificationPositions // ****************************************************************** -HRESULT WINAPI EmuIDirectSoundBuffer8_SetNotificationPositions +HRESULT WINAPI EMUPATCH(IDirectSoundBuffer8_SetNotificationPositions) ( X_CDirectSoundBuffer* pThis, DWORD dwNotifyCount, @@ -1485,9 +1485,9 @@ HRESULT WINAPI EmuIDirectSoundBuffer8_SetNotificationPositions ); // ****************************************************************** -// * func EmuCDirectSoundStream::SetRolloffCurve +// * patch: CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI EmuCDirectSoundStream_SetRolloffCurve +HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundBuffer *pThis, const FLOAT *pflPoints, @@ -1496,9 +1496,9 @@ HRESULT WINAPI EmuCDirectSoundStream_SetRolloffCurve ); // ****************************************************************** -// * func: EmuIDirectSound8_SetEffectData +// * patch: IDirectSound8_SetEffectData // ****************************************************************** -HRESULT WINAPI EmuIDirectSound8_SetEffectData +HRESULT WINAPI EMUPATCH(IDirectSound8_SetEffectData) ( LPVOID pThis, DWORD dwEffectIndex, @@ -1509,9 +1509,9 @@ HRESULT WINAPI EmuIDirectSound8_SetEffectData ); // ****************************************************************** -// * func: EmuXFileCreateMediaObjectAsync +// * patch: XFileCreateMediaObjectAsync // ****************************************************************** -HRESULT WINAPI EmuXFileCreateMediaObjectAsync +HRESULT WINAPI EMUPATCH(XFileCreateMediaObjectAsync) ( HANDLE hFile, DWORD dwMaxPackets, @@ -1519,9 +1519,9 @@ HRESULT WINAPI EmuXFileCreateMediaObjectAsync ); // ****************************************************************** -// * func: EmuXFileMediaObject_Seek +// * patch: XFileMediaObject_Seek // ****************************************************************** -HRESULT WINAPI EmuXFileMediaObject_Seek +HRESULT WINAPI EMUPATCH(XFileMediaObject_Seek) ( X_XFileMediaObject* pThis, LONG lOffset, @@ -1530,32 +1530,32 @@ HRESULT WINAPI EmuXFileMediaObject_Seek ); // ****************************************************************** -// * func: EmuXFileMediaObject_DoWork +// * patch: XFileMediaObject_DoWork // ****************************************************************** -VOID WINAPI EmuXFileMediaObject_DoWork(X_XFileMediaObject* pThis); +VOID WINAPI EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis); // ****************************************************************** -// * func: EmuXFileMediaObject_GetStatus +// * patch: XFileMediaObject_GetStatus // ****************************************************************** -HRESULT WINAPI EmuXFileMediaObject_GetStatus +HRESULT WINAPI EMUPATCH(XFileMediaObject_GetStatus) ( X_XFileMediaObject* pThis, LPDWORD pdwStatus ); // ****************************************************************** -// * func: EmuXFileMediaObject_GetInfo +// * patch: XFileMediaObject_GetInfo // ****************************************************************** -HRESULT WINAPI EmuXFileMediaObject_GetInfo +HRESULT WINAPI EMUPATCH(XFileMediaObject_GetInfo) ( X_XFileMediaObject *pThis, XMEDIAINFO *pInfo ); // ****************************************************************** -// * func: EmuXFileMediaObject_Process +// * patch: XFileMediaObject_Process // ****************************************************************** -HRESULT WINAPI EmuXFileMediaObject_Process +HRESULT WINAPI EMUPATCH(XFileMediaObject_Process) ( X_XFileMediaObject *pThis, LPXMEDIAPACKET pInputBuffer, @@ -1563,18 +1563,18 @@ HRESULT WINAPI EmuXFileMediaObject_Process ); // ****************************************************************** -// * func: EmuXFileMediaObject_AddRef +// * patch: XFileMediaObject_AddRef // ****************************************************************** -ULONG WINAPI EmuXFileMediaObject_AddRef(X_XFileMediaObject *pThis); +ULONG WINAPI EMUPATCH(XFileMediaObject_AddRef)(X_XFileMediaObject *pThis); // ****************************************************************** -// * func: EmuXFileMediaObject_Release +// * patch: XFileMediaObject_Release // ****************************************************************** -ULONG WINAPI EmuXFileMediaObject_Release(X_XFileMediaObject *pThis); +ULONG WINAPI EMUPATCH(XFileMediaObject_Release)(X_XFileMediaObject *pThis); // ****************************************************************** -// * func: EmuXFileMediaObject_Discontinuity +// * patch: XFileMediaObject_Discontinuity // ****************************************************************** -HRESULT WINAPI EmuXFileMediaObject_Discontinuity(X_XFileMediaObject *pThis); +HRESULT WINAPI EMUPATCH(XFileMediaObject_Discontinuity)(X_XFileMediaObject *pThis); #endif diff --git a/src/CxbxKrnl/EmuXG.cpp b/src/CxbxKrnl/EmuXG.cpp index a310b7947..d95d31be2 100644 --- a/src/CxbxKrnl/EmuXG.cpp +++ b/src/CxbxKrnl/EmuXG.cpp @@ -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, diff --git a/src/CxbxKrnl/EmuXG.h b/src/CxbxKrnl/EmuXG.h index 14e53657c..e823d1598 100644 --- a/src/CxbxKrnl/EmuXG.h +++ b/src/CxbxKrnl/EmuXG.h @@ -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, diff --git a/src/CxbxKrnl/EmuXInput.cpp b/src/CxbxKrnl/EmuXInput.cpp index 3ba84b244..98ad6b740 100644 --- a/src/CxbxKrnl/EmuXInput.cpp +++ b/src/CxbxKrnl/EmuXInput.cpp @@ -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 diff --git a/src/CxbxKrnl/EmuXInput.h b/src/CxbxKrnl/EmuXInput.h index 699938504..19ea97087 100644 --- a/src/CxbxKrnl/EmuXInput.h +++ b/src/CxbxKrnl/EmuXInput.h @@ -35,7 +35,7 @@ #define EMUXINPUT_H // ****************************************************************** -// * func: EmuXInputPCPoll +// * patch: XInputPCPoll // ****************************************************************** // void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller ); diff --git a/src/CxbxKrnl/EmuXOnline.cpp b/src/CxbxKrnl/EmuXOnline.cpp index d6bd1abd5..fbffde1c5 100644 --- a/src/CxbxKrnl/EmuXOnline.cpp +++ b/src/CxbxKrnl/EmuXOnline.cpp @@ -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, diff --git a/src/CxbxKrnl/EmuXOnline.h b/src/CxbxKrnl/EmuXOnline.h index af6055e7d..b58cc8a7a 100644 --- a/src/CxbxKrnl/EmuXOnline.h +++ b/src/CxbxKrnl/EmuXOnline.h @@ -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, diff --git a/src/CxbxKrnl/EmuXactEng.cpp b/src/CxbxKrnl/EmuXactEng.cpp index 4c81987b9..7ab9a9c62 100644 --- a/src/CxbxKrnl/EmuXactEng.cpp +++ b/src/CxbxKrnl/EmuXactEng.cpp @@ -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 diff --git a/src/CxbxKrnl/EmuXactEng.h b/src/CxbxKrnl/EmuXactEng.h index 5be84e027..63ac302e4 100644 --- a/src/CxbxKrnl/EmuXactEng.h +++ b/src/CxbxKrnl/EmuXactEng.h @@ -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 diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/CxbxKrnl/EmuXapi.cpp index 8829b30ef..40db6211e 100644 --- a/src/CxbxKrnl/EmuXapi.cpp +++ b/src/CxbxKrnl/EmuXapi.cpp @@ -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, diff --git a/src/CxbxKrnl/EmuXapi.h b/src/CxbxKrnl/EmuXapi.h index 0b448f894..d5197867a 100644 --- a/src/CxbxKrnl/EmuXapi.h +++ b/src/CxbxKrnl/EmuXapi.h @@ -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 diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h index 1729bc28d..4b8788aa6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index da20694f8..0b3738497 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -33,30 +33,30 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_3925, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A +OOVPA_NO_XREF(D3D_CreateDevice_1_0_3925, 8) + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x79 : mov eax, esi + // D3D_CreateDevice+0x79 : mov eax, esi { 0x79, 0x8B }, // (Offset,Value)-Pair #3 { 0x7A, 0xC6 }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x7C : retn 0x18 + // D3D_CreateDevice+0x7C : retn 0x18 { 0x7C, 0xC2 }, // (Offset,Value)-Pair #5 { 0x7D, 0x18 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0x90 : retn 0x18 + // D3D_CreateDevice+0x90 : retn 0x18 { 0x90, 0xC2 }, // (Offset,Value)-Pair #7 { 0x91, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_IsBusy +// * D3DDevice_IsBusy // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_IsBusy_1_0_3925, 8) +OOVPA_NO_XREF(D3DDevice_IsBusy_1_0_3925, 8) { 0x0B, 0x8B }, // (Offset,Value)-Pair #1 { 0x0C, 0x90 }, // (Offset,Value)-Pair #2 { 0x0D, 0x04 }, // (Offset,Value)-Pair #3 @@ -71,47 +71,47 @@ OOVPA_NO_XREF(IDirect3DDevice8_IsBusy_1_0_3925, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDeviceCaps +// * D3DDevice_GetDeviceCaps // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDeviceCaps_1_0_3925, 11) - // IDirect3DDevice8_GetDeviceCaps+0x00 : push esi; push edi +OOVPA_NO_XREF(D3DDevice_GetDeviceCaps_1_0_3925, 11) + // D3DDevice_GetDeviceCaps+0x00 : push esi; push edi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 { 0x01, 0x57 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDeviceCaps+0x06 : mov ecx, 0x35 + // D3DDevice_GetDeviceCaps+0x06 : mov ecx, 0x35 { 0x06, 0xB9 }, // (Offset,Value)-Pair #3 { 0x07, 0x35 }, // (Offset,Value)-Pair #4 { 0x08, 0x00 }, // (Offset,Value)-Pair #5 { 0x09, 0x00 }, // (Offset,Value)-Pair #6 { 0x0A, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetDeviceCaps+0x10 : rep movsd + // D3DDevice_GetDeviceCaps+0x10 : rep movsd { 0x10, 0xF3 }, // (Offset,Value)-Pair #8 { 0x11, 0xA5 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetDeviceCaps+0x14 : retn 0x04 + // D3DDevice_GetDeviceCaps+0x14 : retn 0x04 { 0x14, 0xC2 }, // (Offset,Value)-Pair #10 { 0x15, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginVisibilityTest +// * D3DDevice_BeginVisibilityTest // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BeginVisibilityTest_1_0_3925, 11) - // IDirect3DDevice8_BeginVisibilityTest+0x0D : mov ecx, 1 +OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest_1_0_3925, 11) + // D3DDevice_BeginVisibilityTest+0x0D : mov ecx, 1 { 0x0D, 0xB9 }, // (Offset,Value)-Pair #1 { 0x0E, 0x01 }, // (Offset,Value)-Pair #2 { 0x0F, 0x00 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_BeginVisibilityTest+0x12 : mov dword ptr [eax], 0x000817C8 + // D3DDevice_BeginVisibilityTest+0x12 : mov dword ptr [eax], 0x000817C8 { 0x12, 0xC7 }, // (Offset,Value)-Pair #4 { 0x13, 0x00 }, // (Offset,Value)-Pair #5 { 0x14, 0xC8 }, // (Offset,Value)-Pair #6 { 0x15, 0x17 }, // (Offset,Value)-Pair #7 { 0x16, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_BeginVisibilityTest+0x1E : add eax, 0x0C + // D3DDevice_BeginVisibilityTest+0x1E : add eax, 0x0C { 0x1E, 0x83 }, // (Offset,Value)-Pair #9 { 0x1F, 0xC0 }, // (Offset,Value)-Pair #10 { 0x20, 0x0C }, // (Offset,Value)-Pair #11 @@ -134,44 +134,44 @@ OOVPA_NO_XREF(D3DDevice_GetMaterial_1_0_3925, 9) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EndVisibilityTest +// * D3DDevice_EndVisibilityTest // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_3925, 13) - // IDirect3DDevice8_EndVisibilityTest+0x11 : mov eax, 0x8007000E +OOVPA_NO_XREF(D3DDevice_EndVisibilityTest_1_0_3925, 13) + // D3DDevice_EndVisibilityTest+0x11 : mov eax, 0x8007000E { 0x11, 0xB8 }, // (Offset,Value)-Pair #1 { 0x12, 0x0E }, // (Offset,Value)-Pair #2 { 0x13, 0x00 }, // (Offset,Value)-Pair #3 { 0x14, 0x07 }, // (Offset,Value)-Pair #4 { 0x15, 0x80 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_EndVisibilityTest+0x2D : mov dword ptr [eax], 0x000817CC + // D3DDevice_EndVisibilityTest+0x2D : mov dword ptr [eax], 0x000817CC { 0x2D, 0xC7 }, // (Offset,Value)-Pair #6 { 0x2E, 0x00 }, // (Offset,Value)-Pair #7 { 0x2F, 0xCC }, // (Offset,Value)-Pair #8 { 0x30, 0x17 }, // (Offset,Value)-Pair #9 { 0x31, 0x08 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_EndVisibilityTest+0x43 : add eax, 0x0C + // D3DDevice_EndVisibilityTest+0x43 : add eax, 0x0C { 0x43, 0x83 }, // (Offset,Value)-Pair #11 { 0x44, 0xC0 }, // (Offset,Value)-Pair #12 { 0x45, 0x0C }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetVisibilityTestResult +// * D3DDevice_GetVisibilityTestResult // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, 11) - // IDirect3DDevice8_GetVisibilityTestResult+0x0C : shr ecx, 8 +OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult_1_0_3925, 11) + // D3DDevice_GetVisibilityTestResult+0x0C : shr ecx, 8 { 0x0C, 0xC1 }, // (Offset,Value)-Pair #1 { 0x0D, 0xE9 }, // (Offset,Value)-Pair #2 { 0x0E, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetVisibilityTestResult+0x0F : and eax, 0xFF + // D3DDevice_GetVisibilityTestResult+0x0F : and eax, 0xFF { 0x0F, 0x25 }, // (Offset,Value)-Pair #4 { 0x10, 0xFF }, // (Offset,Value)-Pair #5 { 0x11, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetVisibilityTestResult+0x2B : mov eax, 0x88760828 + // D3DDevice_GetVisibilityTestResult+0x2B : mov eax, 0x88760828 { 0x2B, 0xB8 }, // (Offset,Value)-Pair #7 { 0x2C, 0x28 }, // (Offset,Value)-Pair #8 { 0x2D, 0x08 }, // (Offset,Value)-Pair #9 @@ -180,11 +180,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, 11) OOVPA_END; // ****************************************************************** -// * IDirect3D8_KickOffAndWaitForIdle +// * D3D::CDevice::KickOff // ****************************************************************** -// * Actually, this is D3D::CDevice::KickOff -// ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_KickOff_1_0_3925, 10) { 0x01, 0xA1 }, // (Offset,Value)-Pair #1 { 0x32, 0x81 }, // (Offset,Value)-Pair #2 @@ -201,53 +199,53 @@ OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle_1_0_3925, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LoadVertexShader +// * D3DDevice_LoadVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LoadVertexShader_1_0_3925, 10) - // IDirect3DDevice8_LoadVertexShader+0x07 : mov al, [ebx+0x0C] +OOVPA_NO_XREF(D3DDevice_LoadVertexShader_1_0_3925, 10) + // D3DDevice_LoadVertexShader+0x07 : mov al, [ebx+0x0C] { 0x07, 0x8A }, // (Offset,Value)-Pair #1 { 0x08, 0x43 }, // (Offset,Value)-Pair #2 { 0x09, 0x0C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_LoadVertexShader+0x3D : mov dword ptr [eax], 0x00041E9C + // D3DDevice_LoadVertexShader+0x3D : mov dword ptr [eax], 0x00041E9C { 0x3D, 0xC7 }, // (Offset,Value)-Pair #4 { 0x3E, 0x00 }, // (Offset,Value)-Pair #5 { 0x3F, 0x9C }, // (Offset,Value)-Pair #6 { 0x40, 0x1E }, // (Offset,Value)-Pair #7 { 0x41, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_LoadVertexShader+0x4E : mov [ebx], ebx + // D3DDevice_LoadVertexShader+0x4E : mov [ebx], ebx { 0x4E, 0x89 }, // (Offset,Value)-Pair #9 { 0x4F, 0x13 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SelectVertexShader +// * D3DDevice_SelectVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SelectVertexShader_1_0_3925, 11) - // IDirect3DDevice8_SelectVertexShader+0x16 : or ecx, 0x3A0 +OOVPA_NO_XREF(D3DDevice_SelectVertexShader_1_0_3925, 11) + // D3DDevice_SelectVertexShader+0x16 : or ecx, 0x3A0 { 0x16, 0x81 }, // (Offset,Value)-Pair #1 { 0x17, 0xC9 }, // (Offset,Value)-Pair #2 { 0x18, 0xA0 }, // (Offset,Value)-Pair #3 { 0x19, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SelectVertexShader+0x3F : mov dword ptr [eax], 0x00081E94 + // D3DDevice_SelectVertexShader+0x3F : mov dword ptr [eax], 0x00081E94 { 0x3F, 0xC7 }, // (Offset,Value)-Pair #5 { 0x40, 0x00 }, // (Offset,Value)-Pair #6 { 0x41, 0x94 }, // (Offset,Value)-Pair #7 { 0x42, 0x1E }, // (Offset,Value)-Pair #8 { 0x43, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SelectVertexShader+0x51 : mov [esi], eax + // D3DDevice_SelectVertexShader+0x51 : mov [esi], eax { 0x51, 0x89 }, // (Offset,Value)-Pair #10 { 0x52, 0x06 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_3925, 14) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0;push 0;push 1 +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_3925, 14) + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0;push 0;push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -255,84 +253,84 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_3925, 14) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x0B : mov dword ptr [eax+0x24F4], + // D3DDevice_BlockUntilVerticalBlank+0x0B : mov dword ptr [eax+0x24F4], { 0x0B, 0xC7 }, // (Offset,Value)-Pair #7 { 0x0C, 0x80 }, // (Offset,Value)-Pair #8 { 0x0D, 0xF4 }, // (Offset,Value)-Pair #9 { 0x0E, 0x24 }, // (Offset,Value)-Pair #10 { 0x0F, 0x00 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : and eax, 0x24F0 + // D3DDevice_BlockUntilVerticalBlank+0x17 : and eax, 0x24F0 { 0x17, 0x05 }, // (Offset,Value)-Pair #12 { 0x18, 0xF0 }, // (Offset,Value)-Pair #13 { 0x19, 0x24 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_3925, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_3925, 12) + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x24EC], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x24EC], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #5 { 0x0B, 0x81 }, // (Offset,Value)-Pair #6 { 0x0C, 0xEC }, // (Offset,Value)-Pair #7 { 0x0D, 0x24 }, // (Offset,Value)-Pair #8 { 0x0E, 0x00 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #10 { 0x11, 0x04 }, // (Offset,Value)-Pair #11 { 0x12, 0x00 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderTarget +// * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_3925, 11) - // IDirect3DDevice8_SetRenderTarget+0x00 : sub esp, 0x20 +OOVPA_NO_XREF(D3DDevice_SetRenderTarget_1_0_3925, 11) + // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x20 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x20 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderTarget+0x32 : mov [esp+0x34], ebx + // D3DDevice_SetRenderTarget+0x32 : mov [esp+0x34], ebx { 0x32, 0x89 }, // (Offset,Value)-Pair #4 { 0x33, 0x5C }, // (Offset,Value)-Pair #5 { 0x34, 0x24 }, // (Offset,Value)-Pair #6 { 0x35, 0x34 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderTarget+0x55 : and ecx, 0x0F + // D3DDevice_SetRenderTarget+0x55 : and ecx, 0x0F { 0x55, 0x83 }, // (Offset,Value)-Pair #8 { 0x56, 0xE1 }, // (Offset,Value)-Pair #9 { 0x57, 0x0F }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderTarget+0xDC : push edx + // D3DDevice_SetRenderTarget+0xDC : push edx { 0xDC, 0x52 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderTarget +// * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_3948, 8) - // IDirect3DDevice8_SetRenderTarget+0x00 : sub esp, 0x30 +OOVPA_NO_XREF(D3DDevice_SetRenderTarget_1_0_3948, 8) + // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x30 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x30 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderTarget+0x32 : and ecx, 0x0F + // D3DDevice_SetRenderTarget+0x32 : and ecx, 0x0F { 0x32, 0x83 }, // (Offset,Value)-Pair #4 { 0x33, 0xE1 }, // (Offset,Value)-Pair #5 { 0x34, 0x0F }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderTarget+0x69 : push ebx + // D3DDevice_SetRenderTarget+0x69 : push ebx { 0x69, 0x53 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderTarget+0xDA : push edx + // D3DDevice_SetRenderTarget+0xDA : push edx { 0xDA, 0x52 }, // (Offset,Value)-Pair #8 OOVPA_END; @@ -350,35 +348,35 @@ OOVPA_NO_XREF(D3DSurface_GetDesc_1_0_3925, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetTransform +// * D3DDevice_GetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetTransform_1_0_3925, 12) - // IDirect3DDevice8_GetTransform+0x0A : add esi, 0x22 +OOVPA_NO_XREF(D3DDevice_GetTransform_1_0_3925, 12) + // D3DDevice_GetTransform+0x0A : add esi, 0x22 { 0x0A, 0x83 }, // (Offset,Value)-Pair #1 { 0x0B, 0xC6 }, // (Offset,Value)-Pair #2 { 0x0C, 0x22 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetTransform+0x12 : shl esi, 6; add esi, eax + // D3DDevice_GetTransform+0x12 : shl esi, 6; add esi, eax { 0x12, 0xC1 }, // (Offset,Value)-Pair #4 { 0x13, 0xE6 }, // (Offset,Value)-Pair #5 { 0x14, 0x06 }, // (Offset,Value)-Pair #6 { 0x15, 0x03 }, // (Offset,Value)-Pair #7 { 0x16, 0xF0 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetTransform+0x17 : mov ecx, 0x10 + // D3DDevice_GetTransform+0x17 : mov ecx, 0x10 { 0x17, 0xB9 }, // (Offset,Value)-Pair #7 { 0x18, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetTransform+0x20 : retn 0x08 + // D3DDevice_GetTransform+0x20 : retn 0x08 { 0x20, 0xC2 }, // (Offset,Value)-Pair #11 { 0x21, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetStreamSource +// * D3DDevice_SetStreamSource // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_3925, 12) - // IDirect3DDevice8_SetStreamSource+0x39 : add edx, 0xFFF80000 +OOVPA_NO_XREF(D3DDevice_SetStreamSource_1_0_3925, 12) + // D3DDevice_SetStreamSource+0x39 : add edx, 0xFFF80000 { 0x39, 0x81 }, // (Offset,Value)-Pair #1 { 0x3A, 0xC2 }, // (Offset,Value)-Pair #2 { 0x3B, 0x00 }, // (Offset,Value)-Pair #3 @@ -386,11 +384,11 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_3925, 12) { 0x3D, 0xF8 }, // (Offset,Value)-Pair #5 { 0x3E, 0xFF }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetStreamSource+0x49 : jnz +0x06 + // D3DDevice_SetStreamSource+0x49 : jnz +0x06 { 0x49, 0x75 }, // (Offset,Value)-Pair #7 { 0x4A, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetStreamSource+0x6A : or ecx, 0x280 + // D3DDevice_SetStreamSource+0x6A : or ecx, 0x280 { 0x6A, 0x81 }, // (Offset,Value)-Pair #9 { 0x6B, 0xC9 }, // (Offset,Value)-Pair #10 { 0x6C, 0x80 }, // (Offset,Value)-Pair #11 @@ -398,25 +396,25 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_3925, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_3925, 14) - // IDirect3DDevice8_SetVertexShader+0x05 : test bl, 1 +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_3925, 14) + // D3DDevice_SetVertexShader+0x05 : test bl, 1 { 0x05, 0xF6 }, // (Offset,Value)-Pair #1 { 0x06, 0xC3 }, // (Offset,Value)-Pair #2 { 0x07, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShader+0x10 : mov eax, [esi+0x0470] + // D3DDevice_SetVertexShader+0x10 : mov eax, [esi+0x0470] { 0x10, 0x8B }, // (Offset,Value)-Pair #4 { 0x11, 0x86 }, // (Offset,Value)-Pair #5 { 0x12, 0x70 }, // (Offset,Value)-Pair #6 { 0x13, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShader+0x6D : retn 0x04 + // D3DDevice_SetVertexShader+0x6D : retn 0x04 { 0x6D, 0xC2 }, // (Offset,Value)-Pair #8 { 0x6E, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShader+0x8C : mov dword ptr [eax], 0x81E94 + // D3DDevice_SetVertexShader+0x8C : mov dword ptr [eax], 0x81E94 { 0x8C, 0xC7 }, // (Offset,Value)-Pair #10 { 0x8D, 0x40 }, // (Offset,Value)-Pair #11 { 0x8E, 0x08 }, // (Offset,Value)-Pair #12 @@ -425,69 +423,69 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_3925, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreatePixelShader +// * D3DDevice_CreatePixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_3925, 11) - // IDirect3DDevice8_CreatePixelShader+0x00 : push 0xFC +OOVPA_NO_XREF(D3DDevice_CreatePixelShader_1_0_3925, 11) + // D3DDevice_CreatePixelShader+0x00 : push 0xFC { 0x00, 0x68 }, // (Offset,Value)-Pair #1 { 0x01, 0xFC }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreatePixelShader+0x10 : mov eax, 0x8007000E + // D3DDevice_CreatePixelShader+0x10 : mov eax, 0x8007000E { 0x10, 0xB8 }, // (Offset,Value)-Pair #3 { 0x11, 0x0E }, // (Offset,Value)-Pair #4 { 0x12, 0x00 }, // (Offset,Value)-Pair #5 { 0x13, 0x07 }, // (Offset,Value)-Pair #6 { 0x14, 0x80 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreatePixelShader+0x31 : mov ecx, 0x3C + // D3DDevice_CreatePixelShader+0x31 : mov ecx, 0x3C { 0x31, 0xB9 }, // (Offset,Value)-Pair #8 { 0x32, 0x3C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreatePixelShader+0x42 : retn 0x08 + // D3DDevice_CreatePixelShader+0x42 : retn 0x08 { 0x42, 0xC2 }, // (Offset,Value)-Pair #10 { 0x43, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_3925, 10) - // IDirect3DDevice8_SetPixelShader+0x0E : mov esi, [ebx+0x0414] +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_3925, 10) + // D3DDevice_SetPixelShader+0x0E : mov esi, [ebx+0x0414] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0xB3 }, // (Offset,Value)-Pair #2 { 0x10, 0x14 }, // (Offset,Value)-Pair #3 { 0x11, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x34 : or eax, 0x40 + // D3DDevice_SetPixelShader+0x34 : or eax, 0x40 { 0x35, 0xC8 }, // (Offset,Value)-Pair #5 { 0x36, 0x40 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x68 : retn 0x04 + // D3DDevice_SetPixelShader+0x68 : retn 0x04 { 0x68, 0xC2 }, // (Offset,Value)-Pair #7 { 0x69, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd + // D3DDevice_SetPixelShader+0xE3 : rep movsd { 0xE3, 0xF3 }, // (Offset,Value)-Pair #9 { 0xE4, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_3925, 11) - // IDirect3DDevice8_SetIndices+0x0E : jz +0x10 +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_3925, 11) + // D3DDevice_SetIndices+0x0E : jz +0x10 { 0x0E, 0x74 }, // (Offset,Value)-Pair #1 { 0x0F, 0x10 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetIndices+0x3E : test ecx, 0x78FFFF + // D3DDevice_SetIndices+0x3E : test ecx, 0x78FFFF { 0x3E, 0xF7 }, // (Offset,Value)-Pair #3 { 0x3F, 0xC1 }, // (Offset,Value)-Pair #4 { 0x40, 0xFF }, // (Offset,Value)-Pair #5 { 0x41, 0xFF }, // (Offset,Value)-Pair #6 { 0x42, 0x78 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetIndices+0x67 : mov [esi+0x047C], edi + // D3DDevice_SetIndices+0x67 : mov [esi+0x047C], edi { 0x67, 0x89 }, // (Offset,Value)-Pair #8 { 0x68, 0xBE }, // (Offset,Value)-Pair #9 { 0x69, 0x7C }, // (Offset,Value)-Pair #10 @@ -495,33 +493,33 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_3925, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_3925, 10) - // IDirect3DDevice8_SetViewport+0x00 : sub esp, 0x08 +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_3925, 10) + // D3DDevice_SetViewport+0x00 : sub esp, 0x08 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetViewport+0x2F : mov ebx, [esp+0x1C] + // D3DDevice_SetViewport+0x2F : mov ebx, [esp+0x1C] { 0x2F, 0x8B }, // (Offset,Value)-Pair #4 { 0x30, 0x5C }, // (Offset,Value)-Pair #5 { 0x31, 0x24 }, // (Offset,Value)-Pair #6 { 0x32, 0x1C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetViewport+0x55 : jnz +0x12 + // D3DDevice_SetViewport+0x55 : jnz +0x12 { 0x55, 0x75 }, // (Offset,Value)-Pair #8 { 0x56, 0x12 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetViewport+0x9D : inc edx + // D3DDevice_SetViewport+0x9D : inc edx { 0x9D, 0x42 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTexture +// * D3DDevice_SetTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_3925, 12) - // IDirect3DDevice8_SetTexture+0x0E : sub esp, 0x08 +OOVPA_NO_XREF(D3DDevice_SetTexture_1_0_3925, 12) + // D3DDevice_SetTexture+0x0E : sub esp, 0x08 { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0x84 }, // (Offset,Value)-Pair #2 { 0x10, 0x9F }, // (Offset,Value)-Pair #3 @@ -530,27 +528,27 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_3925, 12) { 0x13, 0x00 }, // (Offset,Value)-Pair #6 { 0x14, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTexture+0x57 : shl edx, 6 + // D3DDevice_SetTexture+0x57 : shl edx, 6 { 0x57, 0xC1 }, // (Offset,Value)-Pair #8 { 0x58, 0xE2 }, // (Offset,Value)-Pair #9 { 0x59, 0x06 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetTexture+0x7D : retn 0x08 + // D3DDevice_SetTexture+0x7D : retn 0x08 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x7E, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_3925, 12) - // IDirect3DDevice8_DrawIndexedVertices+0x0E : mov eax, [esi+0x0478] +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_3925, 12) + // D3DDevice_DrawIndexedVertices+0x0E : mov eax, [esi+0x0478] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0x86 }, // (Offset,Value)-Pair #2 { 0x10, 0x78 }, // (Offset,Value)-Pair #3 { 0x11, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawIndexedVertices+0x44 : mov dword ptr [ebx-8], 0x000417FC + // D3DDevice_DrawIndexedVertices+0x44 : mov dword ptr [ebx-8], 0x000417FC { 0x44, 0xC7 }, // (Offset,Value)-Pair #5 { 0x45, 0x43 }, // (Offset,Value)-Pair #6 { 0x46, 0xF8 }, // (Offset,Value)-Pair #7 @@ -558,16 +556,16 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_3925, 12) { 0x48, 0x17 }, // (Offset,Value)-Pair #9 { 0x49, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_DrawIndexedVertices+0xDA : lea ebx, [ebx+0] + // D3DDevice_DrawIndexedVertices+0xDA : lea ebx, [ebx+0] { 0xDA, 0x8D }, // (Offset,Value)-Pair #11 { 0xDB, 0x9B }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Begin +// * D3DDevice_Begin // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_3925, 11) - // IDirect3DDevice8_Begin+0x20 : mov dword ptr [eax], 0x417FC +OOVPA_NO_XREF(D3DDevice_Begin_1_0_3925, 11) + // D3DDevice_Begin+0x20 : mov dword ptr [eax], 0x417FC { 0x20, 0xC7 }, // (Offset,Value)-Pair #1 { 0x21, 0x00 }, // (Offset,Value)-Pair #2 { 0x22, 0xFC }, // (Offset,Value)-Pair #3 @@ -575,26 +573,26 @@ OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_3925, 11) { 0x24, 0x04 }, // (Offset,Value)-Pair #5 { 0x25, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_Begin+0x2E : shl edx, 6 + // D3DDevice_Begin+0x2E : shl edx, 6 { 0x2E, 0x0D }, // (Offset,Value)-Pair #7 { 0x2F, 0x00 }, // (Offset,Value)-Pair #8 { 0x30, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Begin+0x38 : retn 0x08 + // D3DDevice_Begin+0x38 : retn 0x08 { 0x38, 0xC2 }, // (Offset,Value)-Pair #10 { 0x39, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData2f +// * D3DDevice_SetVertexData2f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_3925, 14) - // IDirect3DDevice8_SetVertexData2f+0x11 : lea edx, ds:abs[ecx*8] +OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_3925, 14) + // D3DDevice_SetVertexData2f+0x11 : lea edx, ds:abs[ecx*8] { 0x11, 0x8D }, // (Offset,Value)-Pair #1 { 0x12, 0x14 }, // (Offset,Value)-Pair #2 { 0x13, 0xCD }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexData2f+0x1C : mov [eax], edx; mov edx, [esp+0x10] + // D3DDevice_SetVertexData2f+0x1C : mov [eax], edx; mov edx, [esp+0x10] { 0x1C, 0x89 }, // (Offset,Value)-Pair #4 { 0x1D, 0x10 }, // (Offset,Value)-Pair #5 { 0x1E, 0x8B }, // (Offset,Value)-Pair #6 @@ -602,74 +600,74 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_3925, 14) { 0x20, 0x24 }, // (Offset,Value)-Pair #8 { 0x21, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData2f+0x28 : add eax, 0x0C + // D3DDevice_SetVertexData2f+0x28 : add eax, 0x0C { 0x28, 0x83 }, // (Offset,Value)-Pair #10 { 0x29, 0xC0 }, // (Offset,Value)-Pair #11 { 0x2A, 0x0C }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetVertexData2f+0x2E : retn 0x0C + // D3DDevice_SetVertexData2f+0x2E : retn 0x0C { 0x2E, 0xC2 }, // (Offset,Value)-Pair #13 { 0x2F, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData2s +// * D3DDevice_SetVertexData2s // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2s_1_0_3925, 11) - // IDirect3DDevice8_SetVertexData2s+0x11 : lea edx, ds:abs[ecx*4] +OOVPA_NO_XREF(D3DDevice_SetVertexData2s_1_0_3925, 11) + // D3DDevice_SetVertexData2s+0x11 : lea edx, ds:abs[ecx*4] { 0x11, 0x8D }, // (Offset,Value)-Pair #1 { 0x12, 0x14 }, // (Offset,Value)-Pair #2 { 0x13, 0x8D }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexData2s+0x24 : shl ecx, 0x10 + // D3DDevice_SetVertexData2s+0x24 : shl ecx, 0x10 { 0x24, 0xC1 }, // (Offset,Value)-Pair #4 { 0x25, 0xE1 }, // (Offset,Value)-Pair #5 { 0x26, 0x10 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVertexData2s+0x29 : mov [eax+4], ecx + // D3DDevice_SetVertexData2s+0x29 : mov [eax+4], ecx { 0x29, 0x89 }, // (Offset,Value)-Pair #7 { 0x2A, 0x48 }, // (Offset,Value)-Pair #8 { 0x2B, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData2s+0x32 : retn 0x0C + // D3DDevice_SetVertexData2s+0x32 : retn 0x0C { 0x32, 0xC2 }, // (Offset,Value)-Pair #10 { 0x33, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData4f +// * D3DDevice_SetVertexData4f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_3925, 11) - // IDirect3DDevice8_SetVertexData4f+0x11 : cmp ecx, -1; jnz +0x07 +OOVPA_NO_XREF(D3DDevice_SetVertexData4f_1_0_3925, 11) + // D3DDevice_SetVertexData4f+0x11 : cmp ecx, -1; jnz +0x07 { 0x11, 0x83 }, // (Offset,Value)-Pair #1 { 0x12, 0xF9 }, // (Offset,Value)-Pair #2 { 0x13, 0xFF }, // (Offset,Value)-Pair #3 { 0x14, 0x75 }, // (Offset,Value)-Pair #4 { 0x15, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexData4f+0x1D : add ecx, 0x01A0 + // D3DDevice_SetVertexData4f+0x1D : add ecx, 0x01A0 { 0x1D, 0x81 }, // (Offset,Value)-Pair #6 { 0x1E, 0xC1 }, // (Offset,Value)-Pair #7 { 0x1F, 0xA0 }, // (Offset,Value)-Pair #8 { 0x20, 0x01 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData4f+0x50 : retn 0x14 + // D3DDevice_SetVertexData4f+0x50 : retn 0x14 { 0x50, 0xC2 }, // (Offset,Value)-Pair #10 { 0x51, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexDataColor +// * D3DDevice_SetVertexDataColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_3925, 17) - // IDirect3DDevice8_SetVertexDataColor+0x1F : mov byte ptr [esp+?] +OOVPA_NO_XREF(D3DDevice_SetVertexDataColor_1_0_3925, 17) + // D3DDevice_SetVertexDataColor+0x1F : mov byte ptr [esp+?] { 0x1F, 0x0F }, // (Offset,Value)-Pair #1 { 0x20, 0xB6 }, // (Offset,Value)-Pair #2 { 0x21, 0x54 }, // (Offset,Value)-Pair #3 { 0x22, 0x24 }, // (Offset,Value)-Pair #4 { 0x23, 0x12 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexDataColor+0x26 : add edi, 0xFF; shl edi, 0x10 + // D3DDevice_SetVertexDataColor+0x26 : add edi, 0xFF; shl edi, 0x10 { 0x26, 0x81 }, // (Offset,Value)-Pair #6 { 0x27, 0xE7 }, // (Offset,Value)-Pair #7 { 0x28, 0xFF }, // (Offset,Value)-Pair #8 @@ -677,7 +675,7 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_3925, 17) { 0x2D, 0xE7 }, // (Offset,Value)-Pair #10 { 0x2E, 0x10 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetVertexDataColor+0x31 : and ecx, 0xFF00FF00 + // D3DDevice_SetVertexDataColor+0x31 : and ecx, 0xFF00FF00 { 0x31, 0x81 }, // (Offset,Value)-Pair #12 { 0x32, 0xE1 }, // (Offset,Value)-Pair #13 { 0x33, 0x00 }, // (Offset,Value)-Pair #14 @@ -687,10 +685,10 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_3925, 17) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_End +// * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_3925, 12) - // IDirect3DDevice8_End+0x17 : mov dword ptr [eax], 0x417FC +OOVPA_NO_XREF(D3DDevice_End_1_0_3925, 12) + // D3DDevice_End+0x17 : mov dword ptr [eax], 0x417FC { 0x17, 0xC7 }, // (Offset,Value)-Pair #1 { 0x18, 0x00 }, // (Offset,Value)-Pair #2 { 0x19, 0xFC }, // (Offset,Value)-Pair #3 @@ -698,34 +696,34 @@ OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_3925, 12) { 0x1B, 0x04 }, // (Offset,Value)-Pair #5 { 0x1C, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_End+0x2C : test ah, 0x10 + // D3DDevice_End+0x2C : test ah, 0x10 { 0x2C, 0xF6 }, // (Offset,Value)-Pair #7 { 0x2D, 0xC4 }, // (Offset,Value)-Pair #8 { 0x2E, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_End+0x2F : jz +0x07 + // D3DDevice_End+0x2F : jz +0x07 { 0x2F, 0x74 }, // (Offset,Value)-Pair #10 { 0x30, 0x07 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_End+0x40 : retn + // D3DDevice_End+0x40 : retn { 0x40, 0xC3 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Clear_1_0_3925, 10) - // IDirect3DDevice8_Clear+0x00 : sub esp, 0x38 +OOVPA_NO_XREF(D3DDevice_Clear_1_0_3925, 10) + // D3DDevice_Clear+0x00 : sub esp, 0x38 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x25 : test cl, 1 + // D3DDevice_Clear+0x25 : test cl, 1 { 0x25, 0xF6 }, // (Offset,Value)-Pair #4 { 0x26, 0xC1 }, // (Offset,Value)-Pair #5 { 0x27, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_Clear+0x5D : mov [esi], eax; xor ebp, ebp + // D3DDevice_Clear+0x5D : mov [esi], eax; xor ebp, ebp { 0x5D, 0x89 }, // (Offset,Value)-Pair #7 { 0x5E, 0x06 }, // (Offset,Value)-Pair #8 { 0x5F, 0x33 }, // (Offset,Value)-Pair #9 @@ -733,168 +731,168 @@ OOVPA_NO_XREF(IDirect3DDevice8_Clear_1_0_3925, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreatePalette +// * D3DDevice_CreatePalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreatePalette_1_0_3925, 12) - // IDirect3DDevice8_CreatePalette+0x01 : push 0x0C +OOVPA_NO_XREF(D3DDevice_CreatePalette_1_0_3925, 12) + // D3DDevice_CreatePalette+0x01 : push 0x0C { 0x01, 0x6A }, // (Offset,Value)-Pair #1 { 0x02, 0x0C }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreatePalette+0x03 : push 0x40 + // D3DDevice_CreatePalette+0x03 : push 0x40 { 0x03, 0x6A }, // (Offset,Value)-Pair #3 { 0x04, 0x40 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreatePalette+0x10 : mov eax, 0x8007000E + // D3DDevice_CreatePalette+0x10 : mov eax, 0x8007000E { 0x10, 0xB8 }, // (Offset,Value)-Pair #5 { 0x11, 0x0E }, // (Offset,Value)-Pair #6 { 0x12, 0x00 }, // (Offset,Value)-Pair #7 { 0x13, 0x07 }, // (Offset,Value)-Pair #8 { 0x14, 0x80 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreatePalette+0x4E : shl esi, 0x1E + // D3DDevice_CreatePalette+0x4E : shl esi, 0x1E { 0x4E, 0xC1 }, // (Offset,Value)-Pair #10 { 0x4F, 0xE6 }, // (Offset,Value)-Pair #11 { 0x50, 0x1E }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_3925, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0BB0] +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_3925, 12) + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0BB0] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xB7 }, // (Offset,Value)-Pair #3 { 0x10, 0xB0 }, // (Offset,Value)-Pair #4 { 0x11, 0x0B }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x68 : add esi, 0x41B20 + // D3DDevice_SetPalette+0x68 : add esi, 0x41B20 { 0x68, 0x81 }, // (Offset,Value)-Pair #6 { 0x69, 0xC6 }, // (Offset,Value)-Pair #7 { 0x6A, 0x20 }, // (Offset,Value)-Pair #8 { 0x6B, 0x1B }, // (Offset,Value)-Pair #9 { 0x6C, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x7C : retn 0x08 + // D3DDevice_SetPalette+0x7C : retn 0x08 { 0x7C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x7D, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture +// * D3DDevice_CreateTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture_1_0_3925, 14) - // IDirect3DDevice8_CreateTexture+0x00 : mov eax, [esp+0x1C] +OOVPA_NO_XREF(D3DDevice_CreateTexture_1_0_3925, 14) + // D3DDevice_CreateTexture+0x00 : mov eax, [esp+0x1C] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x1C }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateTexture+0x0C : push eax + // D3DDevice_CreateTexture+0x0C : push eax { 0x0C, 0x50 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateTexture+0x11 : push 0 + // D3DDevice_CreateTexture+0x11 : push 0 { 0x11, 0x6A }, // (Offset,Value)-Pair #6 { 0x12, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateTexture+0x13 : push 0 + // D3DDevice_CreateTexture+0x13 : push 0 { 0x13, 0x6A }, // (Offset,Value)-Pair #8 { 0x14, 0x00 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreateTexture+0x15 : push ecx + // D3DDevice_CreateTexture+0x15 : push ecx { 0x15, 0x51 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateTexture+0x22 : push ecx + // D3DDevice_CreateTexture+0x22 : push ecx { 0x22, 0x51 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_CreateTexture+0x23 : push edx + // D3DDevice_CreateTexture+0x23 : push edx { 0x23, 0x52 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_CreateTexture+0x29 : retn 0x1C + // D3DDevice_CreateTexture+0x29 : retn 0x1C { 0x29, 0xC2 }, // (Offset,Value)-Pair #13 { 0x2A, 0x1C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVolumeTexture +// * D3DDevice_CreateVolumeTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVolumeTexture_1_0_3925, 15) - // IDirect3DDevice8_CreateVolumeTexture+0x00 : mov eax, [esp+0x1C] +OOVPA_NO_XREF(D3DDevice_CreateVolumeTexture_1_0_3925, 15) + // D3DDevice_CreateVolumeTexture+0x00 : mov eax, [esp+0x1C] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateVolumeTexture+0x0C : push eax + // D3DDevice_CreateVolumeTexture+0x0C : push eax { 0x0C, 0x50 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateVolumeTexture+0x11 : push 1 + // D3DDevice_CreateVolumeTexture+0x11 : push 1 { 0x11, 0x6A }, // (Offset,Value)-Pair #6 { 0x12, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateVolumeTexture+0x13 : push 0 + // D3DDevice_CreateVolumeTexture+0x13 : push 0 { 0x13, 0x6A }, // (Offset,Value)-Pair #8 { 0x14, 0x00 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreateVolumeTexture+0x16 : mov ecx, [esp+0x1C] + // D3DDevice_CreateVolumeTexture+0x16 : mov ecx, [esp+0x1C] { 0x16, 0x8B }, // (Offset,Value)-Pair #10 { 0x17, 0x4C }, // (Offset,Value)-Pair #11 { 0x18, 0x24 }, // (Offset,Value)-Pair #12 { 0x19, 0x1C }, // (Offset,Value)-Pair #13 - // IDirect3DDevice8_CreateVolumeTexture+0x2C : retn 0x20 + // D3DDevice_CreateVolumeTexture+0x2C : retn 0x20 { 0x2C, 0xC2 }, // (Offset,Value)-Pair #14 { 0x2D, 0x20 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateCubeTexture +// * D3DDevice_CreateCubeTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateCubeTexture_1_0_3925, 15) - // IDirect3DDevice8_CreateCubeTexture+0x00 : mov eax, [esp+0x1C] +OOVPA_NO_XREF(D3DDevice_CreateCubeTexture_1_0_3925, 15) + // D3DDevice_CreateCubeTexture+0x00 : mov eax, [esp+0x1C] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateCubeTexture+0x0C : push eax + // D3DDevice_CreateCubeTexture+0x0C : push eax { 0x0C, 0x50 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateCubeTexture+0x11 : push 0 + // D3DDevice_CreateCubeTexture+0x11 : push 0 { 0x11, 0x6A }, // (Offset,Value)-Pair #6 { 0x12, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateCubeTexture+0x13 : push 1 + // D3DDevice_CreateCubeTexture+0x13 : push 1 { 0x13, 0x6A }, // (Offset,Value)-Pair #8 { 0x14, 0x01 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreateCubeTexture+0x18 : mov eax, [esp+0x1C] + // D3DDevice_CreateCubeTexture+0x18 : mov eax, [esp+0x1C] { 0x18, 0x8B }, // (Offset,Value)-Pair #10 { 0x19, 0x44 }, // (Offset,Value)-Pair #11 { 0x1A, 0x24 }, // (Offset,Value)-Pair #12 { 0x1B, 0x1C }, // (Offset,Value)-Pair #13 - // IDirect3DDevice8_CreateCubeTexture+0x25 : retn 0x18 + // D3DDevice_CreateCubeTexture+0x25 : retn 0x18 { 0x25, 0xC2 }, // (Offset,Value)-Pair #14 { 0x26, 0x18 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateIndexBuffer +// * D3DDevice_CreateIndexBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, 13) - // IDirect3DDevice8_CreateIndexBuffer+0x13 : mov eax, 0x8007000E +OOVPA_NO_XREF(D3DDevice_CreateIndexBuffer_1_0_3925, 13) + // D3DDevice_CreateIndexBuffer+0x13 : mov eax, 0x8007000E { 0x13, 0xB8 }, // (Offset,Value)-Pair #1 { 0x14, 0x0E }, // (Offset,Value)-Pair #2 { 0x15, 0x00 }, // (Offset,Value)-Pair #3 { 0x16, 0x07 }, // (Offset,Value)-Pair #4 { 0x17, 0x80 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateIndexBuffer+0x18 : retn 0x14 + // D3DDevice_CreateIndexBuffer+0x18 : retn 0x14 { 0x18, 0xC2 }, // (Offset,Value)-Pair #6 { 0x19, 0x14 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateIndexBuffer+0x2E : mov dword ptr [eax], 0x1010001 + // D3DDevice_CreateIndexBuffer+0x2E : mov dword ptr [eax], 0x1010001 { 0x2E, 0xC7 }, // (Offset,Value)-Pair #8 { 0x2F, 0x00 }, // (Offset,Value)-Pair #9 { 0x30, 0x01 }, // (Offset,Value)-Pair #10 @@ -904,66 +902,66 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, 13) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexShader +// * D3DDevice_CreateVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_3925, 12) - // IDirect3DDevice8_CreateVertexShader+0x00 : push ecx; push ebx; push ebp +OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_3925, 12) + // D3DDevice_CreateVertexShader+0x00 : push ecx; push ebx; push ebp { 0x00, 0x51 }, // (Offset,Value)-Pair #1 { 0x01, 0x53 }, // (Offset,Value)-Pair #2 { 0x02, 0x55 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_CreateVertexShader+0x0A : jz +0x10 + // D3DDevice_CreateVertexShader+0x0A : jz +0x10 { 0x0A, 0x74 }, // (Offset,Value)-Pair #4 { 0x0B, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateVertexShader+0x43 : shl eax, 0x02 + // D3DDevice_CreateVertexShader+0x43 : shl eax, 0x02 { 0x43, 0xC1 }, // (Offset,Value)-Pair #6 { 0x44, 0xE0 }, // (Offset,Value)-Pair #7 { 0x45, 0x02 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateVertexShader+0x66 : retn 0x10 + // D3DDevice_CreateVertexShader+0x66 : retn 0x10 { 0x66, 0xC2 }, // (Offset,Value)-Pair #9 { 0x67, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateVertexShader+0x73 : rep stosb + // D3DDevice_CreateVertexShader+0x73 : rep stosb { 0x73, 0xF3 }, // (Offset,Value)-Pair #11 { 0x74, 0xAB }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant +// * D3DDevice_SetVertexShaderConstant // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant_1_0_3925, 10) - // IDirect3DDevice8_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x0C] +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant_1_0_3925, 10) + // D3DDevice_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x0C] { 0x11, 0x8A }, // (Offset,Value)-Pair #1 { 0x12, 0x4B }, // (Offset,Value)-Pair #2 { 0x13, 0x0C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant+0x1A : test cl, 0x10 + // D3DDevice_SetVertexShaderConstant+0x1A : test cl, 0x10 { 0x1A, 0xF6 }, // (Offset,Value)-Pair #4 { 0x1B, 0xC1 }, // (Offset,Value)-Pair #5 { 0x1C, 0x10 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVertexShaderConstant+0x63 : jle +0x19 + // D3DDevice_SetVertexShaderConstant+0x63 : jle +0x19 { 0x63, 0x7E }, // (Offset,Value)-Pair #7 { 0x64, 0x19 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant+0x9B : retn 0x0C + // D3DDevice_SetVertexShaderConstant+0x9B : retn 0x0C { 0x9B, 0xC2 }, // (Offset,Value)-Pair #9 { 0x9C, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_3925, 12) - // IDirect3DDevice8_SetFlickerFilter+0x0A : mov edx, [ecx+0x2308] +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_3925, 12) + // D3DDevice_SetFlickerFilter+0x0A : mov edx, [ecx+0x2308] { 0x0A, 0x8B }, // (Offset,Value)-Pair #1 { 0x0B, 0x91 }, // (Offset,Value)-Pair #2 { 0x0C, 0x08 }, // (Offset,Value)-Pair #3 { 0x0D, 0x23 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x10 : push 0; push eax; push 0x0B; push edx + // D3DDevice_SetFlickerFilter+0x10 : push 0; push eax; push 0x0B; push edx { 0x10, 0x6A }, // (Offset,Value)-Pair #5 { 0x11, 0x00 }, // (Offset,Value)-Pair #6 { 0x12, 0x50 }, // (Offset,Value)-Pair #7 @@ -971,22 +969,22 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_3925, 12) { 0x14, 0x0B }, // (Offset,Value)-Pair #9 { 0x15, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x1C : retn 0x08 + // D3DDevice_SetFlickerFilter+0x1C : retn 0x08 { 0x1C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1D, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetSoftDisplayFilter +// * D3DDevice_SetSoftDisplayFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_3925, 12) - // IDirect3DDevice8_SetSoftDisplayFilter+0x0A : mov edx, [ecx+0x2308] +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter_1_0_3925, 12) + // D3DDevice_SetSoftDisplayFilter+0x0A : mov edx, [ecx+0x2308] { 0x0A, 0x8B }, // (Offset,Value)-Pair #1 { 0x0B, 0x91 }, // (Offset,Value)-Pair #2 { 0x0C, 0x08 }, // (Offset,Value)-Pair #3 { 0x0D, 0x23 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetSoftDisplayFilter+0x10 : push 0; push eax; push 0x0E; push edx + // D3DDevice_SetSoftDisplayFilter+0x10 : push 0; push eax; push 0x0E; push edx { 0x10, 0x6A }, // (Offset,Value)-Pair #5 { 0x11, 0x00 }, // (Offset,Value)-Pair #6 { 0x12, 0x50 }, // (Offset,Value)-Pair #7 @@ -994,98 +992,98 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_3925, 12) { 0x14, 0x0E }, // (Offset,Value)-Pair #9 { 0x15, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetSoftDisplayFilter+0x1C : retn 0x08 + // D3DDevice_SetSoftDisplayFilter+0x1C : retn 0x08 { 0x1C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x1D, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_3925, 11) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07 +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_3925, 11) + // D3DDevice_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07 { 0x0B, 0xC1 }, // (Offset,Value)-Pair #1 { 0x0C, 0xE0 }, // (Offset,Value)-Pair #2 { 0x0D, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x24 : cmp eax, 0x20000 + // D3DDevice_SetTextureState_TexCoordIndex+0x24 : cmp eax, 0x20000 { 0x24, 0x81 }, // (Offset,Value)-Pair #4 { 0x25, 0xF9 }, // (Offset,Value)-Pair #5 { 0x28, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x3B : mov edi, 0x8511 + // D3DDevice_SetTextureState_TexCoordIndex+0x3B : mov edi, 0x8511 { 0x3B, 0xBF }, // (Offset,Value)-Pair #7 { 0x3C, 0x11 }, // (Offset,Value)-Pair #8 { 0x3D, 0x85 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x97 : shl eax, cl + // D3DDevice_SetTextureState_TexCoordIndex+0x97 : shl eax, cl { 0x97, 0xD3 }, // (Offset,Value)-Pair #10 { 0x98, 0xE0 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BorderColor +// * D3DDevice_SetTextureState_BorderColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BorderColor_1_0_3925, 13) - // IDirect3DDevice8_SetTextureState_BorderColor+0x13 : shl eax, 0x07 +OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor_1_0_3925, 13) + // D3DDevice_SetTextureState_BorderColor+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, // (Offset,Value)-Pair #1 { 0x14, 0xE2 }, // (Offset,Value)-Pair #2 { 0x15, 0x06 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_BorderColor+0x16 : add edx, 0x41B24 + // D3DDevice_SetTextureState_BorderColor+0x16 : add edx, 0x41B24 { 0x16, 0x81 }, // (Offset,Value)-Pair #4 { 0x17, 0xC2 }, // (Offset,Value)-Pair #5 { 0x18, 0x24 }, // (Offset,Value)-Pair #6 { 0x19, 0x1B }, // (Offset,Value)-Pair #7 { 0x1A, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTextureState_BorderColor+0x2A : shl ecx, 7 + // D3DDevice_SetTextureState_BorderColor+0x2A : shl ecx, 7 { 0x2A, 0xC1 }, // (Offset,Value)-Pair #9 { 0x2B, 0xE1 }, // (Offset,Value)-Pair #10 { 0x2C, 0x07 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetTextureState_BorderColor+0x34 : retn 0x08 + // D3DDevice_SetTextureState_BorderColor+0x34 : retn 0x08 { 0x34, 0xC2 }, // (Offset,Value)-Pair #12 { 0x35, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_PSTextureModes +// * D3DDevice_SetRenderState_PSTextureModes // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_PSTextureModes_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_PSTextureModes+0x0C : or edx, 0x400 +OOVPA_NO_XREF(D3DDevice_SetRenderState_PSTextureModes_1_0_3925, 11) + // D3DDevice_SetRenderState_PSTextureModes+0x0C : or edx, 0x400 { 0x0C, 0x81 }, // (Offset,Value)-Pair #1 { 0x0D, 0xCA }, // (Offset,Value)-Pair #2 { 0x0E, 0x00 }, // (Offset,Value)-Pair #3 { 0x0F, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_PSTextureModes+0x12 : mov [eax+0x420], ecx + // D3DDevice_SetRenderState_PSTextureModes+0x12 : mov [eax+0x420], ecx { 0x12, 0x89 }, // (Offset,Value)-Pair #5 { 0x13, 0x88 }, // (Offset,Value)-Pair #6 { 0x14, 0x20 }, // (Offset,Value)-Pair #7 { 0x15, 0x04 }, // (Offset,Value)-Pair #8 { 0x16, 0x00 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_PSTextureModes+0x21 : retn 4 + // D3DDevice_SetRenderState_PSTextureModes+0x21 : retn 4 { 0x21, 0xC2 }, // (Offset,Value)-Pair #10 { 0x22, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilFail +// * D3DDevice_SetRenderState_StencilFail // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilFail_1_0_3925, 12) - // IDirect3DDevice8_SetRenderState_StencilFail+0x19 : mov ecx, 2 +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail_1_0_3925, 12) + // D3DDevice_SetRenderState_StencilFail+0x19 : mov ecx, 2 { 0x19, 0xB9 }, // (Offset,Value)-Pair #1 { 0x1A, 0x02 }, // (Offset,Value)-Pair #2 { 0x1B, 0x00 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_StencilFail+0x3E : or ecx, 1 + // D3DDevice_SetRenderState_StencilFail+0x3E : or ecx, 1 { 0x3E, 0x83 }, // (Offset,Value)-Pair #4 { 0x3F, 0xC9 }, // (Offset,Value)-Pair #5 { 0x40, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_StencilFail+0x48 : mov dword ptr [eax], 0x00041D84 + // D3DDevice_SetRenderState_StencilFail+0x48 : mov dword ptr [eax], 0x00041D84 { 0x48, 0xC7 }, // (Offset,Value)-Pair #7 { 0x49, 0x00 }, // (Offset,Value)-Pair #8 { 0x4A, 0x84 }, // (Offset,Value)-Pair #9 @@ -1095,10 +1093,10 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilFail_1_0_3925, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_CullMode +// * D3DDevice_SetRenderState_CullMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, 15) - // IDirect3DDevice8_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C +OOVPA_NO_XREF(D3DDevice_SetRenderState_CullMode_1_0_3925, 15) + // D3DDevice_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C { 0x42, 0xC7 }, // (Offset,Value)-Pair #1 { 0x43, 0x40 }, // (Offset,Value)-Pair #2 { 0x44, 0x08 }, // (Offset,Value)-Pair #3 @@ -1106,16 +1104,16 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, 15) { 0x46, 0x03 }, // (Offset,Value)-Pair #5 { 0x47, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_CullMode+0x49 : add eax, 0x10 + // D3DDevice_SetRenderState_CullMode+0x49 : add eax, 0x10 { 0x49, 0x83 }, // (Offset,Value)-Pair #7 { 0x4A, 0xC0 }, // (Offset,Value)-Pair #8 { 0x4B, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_CullMode+0x5F : retn 4 + // D3DDevice_SetRenderState_CullMode+0x5F : retn 4 { 0x5F, 0xC2 }, // (Offset,Value)-Pair #10 { 0x60, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_CullMode+0x4D : add edx, 0x404 + // D3DDevice_SetRenderState_CullMode+0x4D : add edx, 0x404 { 0x4D, 0x81 }, // (Offset,Value)-Pair #12 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #13 { 0x4F, 0x04 }, // (Offset,Value)-Pair #14 @@ -1123,61 +1121,61 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, 15) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Simple +// * D3DDevice_SetRenderState_Simple // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Simple_1_0_3925, 13) - // IDirect3DDevice8_SetRenderState_Simple+0x05 : add eax, 0x08 +OOVPA_NO_XREF(D3DDevice_SetRenderState_Simple_1_0_3925, 13) + // D3DDevice_SetRenderState_Simple+0x05 : add eax, 0x08 { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_Simple+0x0E : jnb +0x0C + // D3DDevice_SetRenderState_Simple+0x0E : jnb +0x0C { 0x0E, 0x73 }, // (Offset,Value)-Pair #4 { 0x0F, 0x0C }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_Simple+0x15 : mov [eax-8], ecx + // D3DDevice_SetRenderState_Simple+0x15 : mov [eax-8], ecx { 0x15, 0x89 }, // (Offset,Value)-Pair #6 { 0x16, 0x48 }, // (Offset,Value)-Pair #7 { 0x17, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_Simple+0x18 : mov [eax-4], ecx + // D3DDevice_SetRenderState_Simple+0x18 : mov [eax-4], ecx { 0x18, 0x89 }, // (Offset,Value)-Pair #9 { 0x19, 0x50 }, // (Offset,Value)-Pair #10 { 0x1A, 0xFC }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_Simple+0x2B : jmp +0xD3 + // D3DDevice_SetRenderState_Simple+0x2B : jmp +0xD3 { 0x2B, 0xEB }, // (Offset,Value)-Pair #12 { 0x2C, 0xD3 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTransform +// * D3DDevice_SetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_3925, 10) - // IDirect3DDevice8_SetTransform+0x3A : fld dword ptr [edx+0x28] +OOVPA_NO_XREF(D3DDevice_SetTransform_1_0_3925, 10) + // D3DDevice_SetTransform+0x3A : fld dword ptr [edx+0x28] { 0x3A, 0xD9 }, // (Offset,Value)-Pair #1 { 0x3B, 0x42 }, // (Offset,Value)-Pair #2 { 0x3C, 0x28 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTransform+0x47 : test ah, 0x44 + // D3DDevice_SetTransform+0x47 : test ah, 0x44 { 0x47, 0xF6 }, // (Offset,Value)-Pair #4 { 0x48, 0xC4 }, // (Offset,Value)-Pair #5 { 0x49, 0x44 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTransform+0x55 : fnstsw ax + // D3DDevice_SetTransform+0x55 : fnstsw ax { 0x55, 0xDF }, // (Offset,Value)-Pair #7 { 0x56, 0xE0 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTransform+0x7A : fdivp st(1), st + // D3DDevice_SetTransform+0x7A : fdivp st(1), st { 0x7A, 0xDE }, // (Offset,Value)-Pair #9 { 0x7B, 0xF9 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FogColor +// * D3DDevice_SetRenderState_FogColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FogColor_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_FogColor+0x2E : mov dword ptr [eax], 0x402A8 +OOVPA_NO_XREF(D3DDevice_SetRenderState_FogColor_1_0_3925, 11) + // D3DDevice_SetRenderState_FogColor+0x2E : mov dword ptr [eax], 0x402A8 { 0x2E, 0xC7 }, // (Offset,Value)-Pair #1 { 0x2F, 0x00 }, // (Offset,Value)-Pair #2 { 0x30, 0xA8 }, // (Offset,Value)-Pair #3 @@ -1185,21 +1183,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FogColor_1_0_3925, 11) { 0x32, 0x04 }, // (Offset,Value)-Pair #5 { 0x33, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FogColor+0x37 : add eax, 0x08 + // D3DDevice_SetRenderState_FogColor+0x37 : add eax, 0x08 { 0x37, 0x83 }, // (Offset,Value)-Pair #7 { 0x38, 0xC0 }, // (Offset,Value)-Pair #8 { 0x39, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_FogColor+0x44 : retn 0x04 + // D3DDevice_SetRenderState_FogColor+0x44 : retn 0x04 { 0x44, 0xC2 }, // (Offset,Value)-Pair #10 { 0x45, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FillMode +// * D3DDevice_SetRenderState_FillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FillMode_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_FillMode+0x23 : mov dword ptr [eax], 0x8038C +OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode_1_0_3925, 11) + // D3DDevice_SetRenderState_FillMode+0x23 : mov dword ptr [eax], 0x8038C { 0x23, 0xC7 }, // (Offset,Value)-Pair #1 { 0x24, 0x00 }, // (Offset,Value)-Pair #2 { 0x25, 0x8C }, // (Offset,Value)-Pair #3 @@ -1207,21 +1205,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FillMode_1_0_3925, 11) { 0x27, 0x08 }, // (Offset,Value)-Pair #5 { 0x28, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FillMode+0x2F : add eax, 0x0C + // D3DDevice_SetRenderState_FillMode+0x2F : add eax, 0x0C { 0x2F, 0x83 }, // (Offset,Value)-Pair #7 { 0x30, 0xC0 }, // (Offset,Value)-Pair #8 { 0x31, 0x0C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_FillMode+0x3B : retn 0x04 + // D3DDevice_SetRenderState_FillMode+0x3B : retn 0x04 { 0x3B, 0xC2 }, // (Offset,Value)-Pair #10 { 0x3C, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilEnable +// * D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_StencilEnable+0x45 : mov dword ptr [eax], 0x41D84 +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable_1_0_3925, 11) + // D3DDevice_SetRenderState_StencilEnable+0x45 : mov dword ptr [eax], 0x41D84 { 0x45, 0xC7 }, // (Offset,Value)-Pair #1 { 0x46, 0x00 }, // (Offset,Value)-Pair #2 { 0x47, 0x84 }, // (Offset,Value)-Pair #3 @@ -1229,21 +1227,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_3925, 11) { 0x49, 0x04 }, // (Offset,Value)-Pair #5 { 0x4A, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x71 : add eax, 0x08 + // D3DDevice_SetRenderState_StencilEnable+0x71 : add eax, 0x08 { 0x71, 0x83 }, // (Offset,Value)-Pair #7 { 0x72, 0xC0 }, // (Offset,Value)-Pair #8 { 0x73, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x7D : retn 0x04 + // D3DDevice_SetRenderState_StencilEnable+0x7D : retn 0x04 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #10 { 0x7E, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x0C : mov eax, [esi+0x040C] +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_3925, 11) + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x0C : mov eax, [esi+0x040C] { 0x0C, 0x8B }, // (Offset,Value)-Pair #1 { 0x0D, 0x86 }, // (Offset,Value)-Pair #2 { 0x0E, 0x0C }, // (Offset,Value)-Pair #3 @@ -1251,130 +1249,130 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_3925, 11) { 0x10, 0x00 }, // (Offset,Value)-Pair #5 { 0x11, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x22 : cmp dl, 0x20 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x22 : cmp dl, 0x20 { 0x22, 0x80 }, // (Offset,Value)-Pair #7 { 0x23, 0xFA }, // (Offset,Value)-Pair #8 { 0x24, 0x20 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x74 : retn 0x04 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x74 : retn 0x04 { 0x74, 0xC2 }, // (Offset,Value)-Pair #10 { 0x75, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZBias +// * D3DDevice_SetRenderState_ZBias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZBias_1_0_3925, 10) - // IDirect3DDevice8_SetRenderState_ZBias+0x0B : setnz al +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZBias_1_0_3925, 10) + // D3DDevice_SetRenderState_ZBias+0x0B : setnz al { 0x0B, 0x0F }, // (Offset,Value)-Pair #1 { 0x0C, 0x95 }, // (Offset,Value)-Pair #2 { 0x0D, 0xC0 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_ZBias+0x14 : fild [esp+0x10] + // D3DDevice_SetRenderState_ZBias+0x14 : fild [esp+0x10] { 0x14, 0xDB }, // (Offset,Value)-Pair #4 { 0x15, 0x44 }, // (Offset,Value)-Pair #5 { 0x16, 0x24 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZBias+0x45 : push 0x4E + // D3DDevice_SetRenderState_ZBias+0x45 : push 0x4E { 0x45, 0x6A }, // (Offset,Value)-Pair #7 { 0x46, 0x4E }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_ZBias+0x45 : retn 0x04 + // D3DDevice_SetRenderState_ZBias+0x45 : retn 0x04 { 0x71, 0xC2 }, // (Offset,Value)-Pair #9 { 0x72, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_3925, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x13 : jz +0x11 +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_3925, 13) + // D3DDevice_SetRenderState_ZEnable+0x13 : jz +0x11 { 0x13, 0x74 }, // (Offset,Value)-Pair #1 { 0x14, 0x11 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x15 : mov edx, [esi+0x0410] + // D3DDevice_SetRenderState_ZEnable+0x15 : mov edx, [esi+0x0410] { 0x15, 0x8B }, // (Offset,Value)-Pair #3 { 0x16, 0x96 }, // (Offset,Value)-Pair #4 { 0x17, 0x10 }, // (Offset,Value)-Pair #5 { 0x18, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x28 : mov dword ptr [eax], 0x4030 + // D3DDevice_SetRenderState_ZEnable+0x28 : mov dword ptr [eax], 0x4030 { 0x28, 0xC7 }, // (Offset,Value)-Pair #7 { 0x29, 0x00 }, // (Offset,Value)-Pair #8 { 0x2A, 0x0C }, // (Offset,Value)-Pair #9 { 0x2B, 0x03 }, // (Offset,Value)-Pair #10 { 0x2C, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x69 : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x69 : retn 0x04 { 0x69, 0xC2 }, // (Offset,Value)-Pair #12 { 0x6A, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Release +// * D3DDevice_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_3925, 11) - // IDirect3DDevice8_Release+0x07 : mov eax, [edi+0x0408] +OOVPA_NO_XREF(D3DDevice_Release_1_0_3925, 11) + // D3DDevice_Release+0x07 : mov eax, [edi+0x0408] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x87 }, // (Offset,Value)-Pair #2 { 0x09, 0x08 }, // (Offset,Value)-Pair #3 { 0x0A, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_Release+0x0D : cmp eax, 1 + // D3DDevice_Release+0x0D : cmp eax, 1 { 0x0D, 0x83 }, // (Offset,Value)-Pair #5 { 0x0E, 0xF8 }, // (Offset,Value)-Pair #6 { 0x0F, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Release+0x1B : mov ecx, 0x0AE4 + // D3DDevice_Release+0x1B : mov ecx, 0x0AE4 { 0x1B, 0xB9 }, // (Offset,Value)-Pair #8 { 0x1C, 0xE4 }, // (Offset,Value)-Pair #9 { 0x1D, 0x0A }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_Release+0x2E : dec eax + // D3DDevice_Release+0x2E : dec eax { 0x2E, 0x48 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Present +// * D3DDevice_Present // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Present_1_0_3925, 10) - // IDirect3DDevice8_Present+0x0A : push 2 +OOVPA_NO_XREF(D3DDevice_Present_1_0_3925, 10) + // D3DDevice_Present+0x0A : push 2 { 0x0A, 0x6A }, // (Offset,Value)-Pair #1 { 0x0B, 0x02 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Present+0x11 : mov eax, [esi+2518] + // D3DDevice_Present+0x11 : mov eax, [esi+2518] { 0x11, 0x8B }, // (Offset,Value)-Pair #3 { 0x12, 0x86 }, // (Offset,Value)-Pair #4 { 0x13, 0x18 }, // (Offset,Value)-Pair #5 { 0x14, 0x25 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_Present+0xBE : shr ebx, 1 + // D3DDevice_Present+0xBE : shr ebx, 1 { 0xBE, 0xD1 }, // (Offset,Value)-Pair #7 { 0xBF, 0xEB }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_Present+0xC0 : xor edi, edi + // D3DDevice_Present+0xC0 : xor edi, edi { 0xC0, 0x33 }, // (Offset,Value)-Pair #9 { 0xC1, 0xFF }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetShaderConstantMode +// * D3DDevice_SetShaderConstantMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_3925, 12) +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode_1_0_3925, 12) - // IDirect3DDevice8_SetShaderConstantMode+0x26 : mov [ebp+0x2140], eax + // D3DDevice_SetShaderConstantMode+0x26 : mov [ebp+0x2140], eax { 0x26, 0x89 }, // (Offset,Value)-Pair #1 { 0x27, 0x85 }, // (Offset,Value)-Pair #2 { 0x28, 0x40 }, // (Offset,Value)-Pair #3 { 0x29, 0x21 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetShaderConstantMode+0x51 : mov dword ptr [ebx+0x04], 0x3C + // D3DDevice_SetShaderConstantMode+0x51 : mov dword ptr [ebx+0x04], 0x3C { 0x51, 0xC7 }, // (Offset,Value)-Pair #5 { 0x52, 0x43 }, // (Offset,Value)-Pair #6 { 0x53, 0x04 }, // (Offset,Value)-Pair #7 { 0x54, 0x3C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetShaderConstantMode+0xE4 : add ebx, 0x0124 + // D3DDevice_SetShaderConstantMode+0xE4 : add ebx, 0x0124 { 0xE4, 0x81 }, // (Offset,Value)-Pair #9 { 0xE5, 0xC3 }, // (Offset,Value)-Pair #10 { 0xE6, 0x24 }, // (Offset,Value)-Pair #11 @@ -1382,328 +1380,328 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_3925, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer +// * D3DDevice_GetBackBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer_1_0_3925, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer_1_0_3925, 12) - // IDirect3DDevice8_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF + // D3DDevice_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0xF8 }, // (Offset,Value)-Pair #2 { 0x06, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetBackBuffer+0x0D : jnz +0x07 + // D3DDevice_GetBackBuffer+0x0D : jnz +0x07 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer+0x1E : lea eax, [ecx+eax*8+0x2150] + // D3DDevice_GetBackBuffer+0x1E : lea eax, [ecx+eax*8+0x2150] { 0x1E, 0x8D }, // (Offset,Value)-Pair #6 { 0x1F, 0x84 }, // (Offset,Value)-Pair #7 { 0x20, 0xC1 }, // (Offset,Value)-Pair #8 { 0x21, 0x50 }, // (Offset,Value)-Pair #9 { 0x22, 0x21 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetBackBuffer+0x31 : retn 0x0C + // D3DDevice_GetBackBuffer+0x31 : retn 0x0C { 0x31, 0xC2 }, // (Offset,Value)-Pair #11 { 0x32, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget +// * D3DDevice_GetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget_1_0_3925, 9) - // IDirect3DDevice8_GetRenderTarget+0x00 : mov eax, [addr] + // D3DDevice_GetRenderTarget+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetRenderTarget+0x05 : mov eax, [eax + 0x040C] + // D3DDevice_GetRenderTarget+0x05 : mov eax, [eax + 0x040C] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x0C }, // (Offset,Value)-Pair #4 { 0x08, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetRenderTarget+0x11 : mov [ecx], eax + // D3DDevice_GetRenderTarget+0x11 : mov [ecx], eax { 0x11, 0x89 }, // (Offset,Value)-Pair #6 { 0x12, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetRenderTarget+0x1D : retn 0x04 + // D3DDevice_GetRenderTarget+0x1D : retn 0x04 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #8 { 0x1E, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDepthStencilSurface +// * D3DDevice_GetDepthStencilSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface_1_0_3925, 10) - // IDirect3DDevice8_GetDepthStencilSurface+0x00 : mov eax, [addr] + // D3DDevice_GetDepthStencilSurface+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetDepthStencilSurface+0x06 : mov eax, [eax + 0x0410] + // D3DDevice_GetDepthStencilSurface+0x06 : mov eax, [eax + 0x0410] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x10 }, // (Offset,Value)-Pair #4 { 0x08, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDepthStencilSurface+0x13 : jnz +0x04 + // D3DDevice_GetDepthStencilSurface+0x13 : jnz +0x04 { 0x13, 0x74 }, // (Offset,Value)-Pair #6 { 0x14, 0x0B }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetDepthStencilSurface+0x16 : call [addr] + // D3DDevice_GetDepthStencilSurface+0x16 : call [addr] { 0x16, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDepthStencilSurface+0x25 : retn + // D3DDevice_GetDepthStencilSurface+0x25 : retn { 0x25, 0xC2 }, // (Offset,Value)-Pair #9 { 0x26, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexBuffer +// * D3DDevice_CreateVertexBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, 13) +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer_1_0_3925, 13) - // IDirect3DDevice8_CreateVertexBuffer+0x03 : push 0x40 + // D3DDevice_CreateVertexBuffer+0x03 : push 0x40 { 0x03, 0x6A }, // (Offset,Value)-Pair #1 { 0x04, 0x40 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateVertexBuffer+0x10 : mov eax, [esp+8] + // D3DDevice_CreateVertexBuffer+0x10 : mov eax, [esp+8] { 0x10, 0x8B }, // (Offset,Value)-Pair #3 { 0x11, 0x44 }, // (Offset,Value)-Pair #4 { 0x12, 0x24 }, // (Offset,Value)-Pair #5 { 0x13, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_CreateVertexBuffer+0x48 : mov dword ptr [esi], 0x01000001 + // D3DDevice_CreateVertexBuffer+0x48 : mov dword ptr [esi], 0x01000001 { 0x48, 0xC7 }, // (Offset,Value)-Pair #7 { 0x49, 0x06 }, // (Offset,Value)-Pair #8 { 0x4A, 0x01 }, // (Offset,Value)-Pair #9 { 0x4B, 0x00 }, // (Offset,Value)-Pair #10 { 0x4D, 0x01 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_CreateVertexBuffer+0x53 : retn 0x14 + // D3DDevice_CreateVertexBuffer+0x53 : retn 0x14 { 0x53, 0xC2 }, // (Offset,Value)-Pair #12 { 0x54, 0x14 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock +// * D3DVertexBuffer_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_3925, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_3925, 11) - // IDirect3DVertexBuffer8_Lock+0x01 : mov bl, [esp+0x18] + // D3DVertexBuffer_Lock+0x01 : mov bl, [esp+0x18] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x1E }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock+0x29 : test bl, 0xA0 + // D3DVertexBuffer_Lock+0x29 : test bl, 0xA0 { 0x29, 0xF6 }, // (Offset,Value)-Pair #7 { 0x2A, 0xC3 }, // (Offset,Value)-Pair #8 { 0x2B, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock+0x4A : retn 0x14 + // D3DVertexBuffer_Lock+0x4A : retn 0x14 { 0x4A, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4B, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_Register +// * D3DResource_Register // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_Register_1_0_3925, 19) +OOVPA_NO_XREF(D3DResource_Register_1_0_3925, 19) - // IDirect3DResource8_Register+0x00 : mov ecx, [esp+0x04] + // D3DResource_Register+0x00 : mov ecx, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x4C }, // (Offset,Value)-Pair #2 { 0x03, 0x04 }, // (Offset,Value)-Pair #3 - // IDirect3DResource8_Register+0x04 : mov edx, [esp+0x08] + // D3DResource_Register+0x04 : mov edx, [esp+0x08] { 0x04, 0x8B }, // (Offset,Value)-Pair #4 { 0x05, 0x54 }, // (Offset,Value)-Pair #5 { 0x07, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_Register+0x08 : mov eax, [ecx+0x04] + // D3DResource_Register+0x08 : mov eax, [ecx+0x04] { 0x08, 0x8B }, // (Offset,Value)-Pair #7 { 0x09, 0x41 }, // (Offset,Value)-Pair #8 { 0x0A, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_Register+0x0F : and edx, 0x00070000 + // D3DResource_Register+0x0F : and edx, 0x00070000 { 0x0F, 0x81 }, // (Offset,Value)-Pair #10 { 0x10, 0xE2 }, // (Offset,Value)-Pair #11 { 0x13, 0x07 }, // (Offset,Value)-Pair #12 - // IDirect3DResource8_Register+0x15 : cmp edx, 0x00020000 + // D3DResource_Register+0x15 : cmp edx, 0x00020000 { 0x15, 0x81 }, // (Offset,Value)-Pair #13 { 0x16, 0xFA }, // (Offset,Value)-Pair #14 { 0x19, 0x02 }, // (Offset,Value)-Pair #15 - // IDirect3DResource8_Register+0x1B : jnz +0x05 + // D3DResource_Register+0x1B : jnz +0x05 { 0x1B, 0x74 }, // (Offset,Value)-Pair #16 { 0x1C, 0x05 }, // (Offset,Value)-Pair #17 - // IDirect3DResource8_Register+0x25 : retn 0x08 + // D3DResource_Register+0x25 : retn 0x08 { 0x25, 0xC2 }, // (Offset,Value)-Pair #18 { 0x26, 0x08 }, // (Offset,Value)-Pair #19 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_Release +// * D3DResource_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_Release_1_0_3925, 11) +OOVPA_NO_XREF(D3DResource_Release_1_0_3925, 11) - // IDirect3DResource8_Release+0x09 : and ecx, 0xFFFF + // D3DResource_Release+0x09 : and ecx, 0xFFFF { 0x09, 0x81 }, // (Offset,Value)-Pair #1 { 0x0A, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0B, 0xFF }, // (Offset,Value)-Pair #3 { 0x0C, 0xFF }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_Release+0x14 : and eax, 0x00070000 + // D3DResource_Release+0x14 : and eax, 0x00070000 { 0x14, 0x25 }, // (Offset,Value)-Pair #5 { 0x17, 0x07 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_Release+0x19 : cmp eax, 0x00050000 + // D3DResource_Release+0x19 : cmp eax, 0x00050000 { 0x19, 0x3D }, // (Offset,Value)-Pair #7 { 0x1C, 0x05 }, // (Offset,Value)-Pair #8 - // IDirect3DResource8_Release+0x3E : pop esi + // D3DResource_Release+0x3E : pop esi { 0x3E, 0x5E }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_Release+0x4B : retn 0x04 + // D3DResource_Release+0x4B : retn 0x04 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4C, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_AddRef +// * D3DResource_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_AddRef_1_0_3925, 10) +OOVPA_NO_XREF(D3DResource_AddRef_1_0_3925, 10) - // IDirect3DResource8_AddRef+0x07 : test eax, 0xFFFF + // D3DResource_AddRef+0x07 : test eax, 0xFFFF { 0x07, 0xA9 }, // (Offset,Value)-Pair #1 { 0x08, 0xFF }, // (Offset,Value)-Pair #2 { 0x09, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DResource8_AddRef+0x0E : and eax, 0x00070000 + // D3DResource_AddRef+0x0E : and eax, 0x00070000 { 0x0E, 0x25 }, // (Offset,Value)-Pair #4 { 0x11, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DResource8_AddRef+0x13 : cmp eax, 0x00050000 + // D3DResource_AddRef+0x13 : cmp eax, 0x00050000 { 0x13, 0x3D }, // (Offset,Value)-Pair #6 { 0x16, 0x05 }, // (Offset,Value)-Pair #7 - // IDirect3DResource8_AddRef+0x33 : pop esi + // D3DResource_AddRef+0x33 : pop esi { 0x33, 0x5E }, // (Offset,Value)-Pair #8 - // IDirect3DResource8_AddRef+0x34 : retn 0x04 + // D3DResource_AddRef+0x34 : retn 0x04 { 0x34, 0xC2 }, // (Offset,Value)-Pair #9 { 0x35, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_IsBusy +// * D3DResource_IsBusy // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_IsBusy_1_0_3925, 11) +OOVPA_NO_XREF(D3DResource_IsBusy_1_0_3925, 11) - // IDirect3DResource8_IsBusy+0x24 : test eax, 0x780000 + // D3DResource_IsBusy+0x24 : test eax, 0x780000 { 0x24, 0xA9 }, // (Offset,Value)-Pair #1 { 0x25, 0x00 }, // (Offset,Value)-Pair #2 { 0x26, 0x00 }, // (Offset,Value)-Pair #3 { 0x27, 0x78 }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_IsBusy+0x35 : jnz +0x44 + // D3DResource_IsBusy+0x35 : jnz +0x44 { 0x35, 0x75 }, // (Offset,Value)-Pair #5 { 0x36, 0x44 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_IsBusy+0x4E : mov eax, [ecx+0x14] + // D3DResource_IsBusy+0x4E : mov eax, [ecx+0x14] { 0x4E, 0x8B }, // (Offset,Value)-Pair #7 { 0x4F, 0x41 }, // (Offset,Value)-Pair #8 { 0x50, 0x14 }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_IsBusy+0x79 : jnb +0x09 + // D3DResource_IsBusy+0x79 : jnb +0x09 { 0x79, 0x73 }, // (Offset,Value)-Pair #10 { 0x7A, 0x09 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DSurface8_LockRect +// * D3DSurface_LockRect // ****************************************************************** -OOVPA_NO_XREF(IDirect3DSurface8_LockRect_1_0_3925, 16) +OOVPA_NO_XREF(D3DSurface_LockRect_1_0_3925, 16) - // IDirect3DSurface8_LockRect+0x00 : mov eax, [esp+0x10] + // D3DSurface_LockRect+0x00 : mov eax, [esp+0x10] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DSurface8_LockRect+0x04 : mov ecx, [esp+0x0C] + // D3DSurface_LockRect+0x04 : mov ecx, [esp+0x0C] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DSurface8_LockRect+0x0C : push eax + // D3DSurface_LockRect+0x0C : push eax { 0x0C, 0x50 }, // (Offset,Value)-Pair #9 - // IDirect3DSurface8_LockRect+0x11 : push ecx; push edx; push 0; push 0 + // D3DSurface_LockRect+0x11 : push ecx; push edx; push 0; push 0 { 0x11, 0x51 }, // (Offset,Value)-Pair #10 { 0x12, 0x52 }, // (Offset,Value)-Pair #11 { 0x13, 0x6A }, // (Offset,Value)-Pair #12 { 0x15, 0x6A }, // (Offset,Value)-Pair #13 - // IDirect3DSurface8_LockRect+0x18 : call [abs] + // D3DSurface_LockRect+0x18 : call [abs] { 0x18, 0xE8 }, // (Offset,Value)-Pair #14 - // IDirect3DSurface8_LockRect+0x11 : retn 0x10 + // D3DSurface_LockRect+0x11 : retn 0x10 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #15 { 0x1E, 0x10 }, // (Offset,Value)-Pair #16 OOVPA_END; // ****************************************************************** -// * IDirect3DPalette8_Lock +// * D3DPalette_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DPalette8_Lock_1_0_3925, 13) +OOVPA_NO_XREF(D3DPalette_Lock_1_0_3925, 13) - // IDirect3DPalette8_Lock+0x00 : test [esp+0x0C], 0xA0 + // D3DPalette_Lock+0x00 : test [esp+0x0C], 0xA0 { 0x00, 0xF6 }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x0C }, // (Offset,Value)-Pair #4 { 0x04, 0xA0 }, // (Offset,Value)-Pair #5 - // IDirect3DPalette8_Lock+0x0A : jnz +0x06 + // D3DPalette_Lock+0x0A : jnz +0x06 { 0x0A, 0x75 }, // (Offset,Value)-Pair #6 { 0x0B, 0x06 }, // (Offset,Value)-Pair #7 - // IDirect3DPalette8_Lock+0x18 : mov ecx, [esp+0x0C] + // D3DPalette_Lock+0x18 : mov ecx, [esp+0x0C] { 0x18, 0x8B }, // (Offset,Value)-Pair #8 { 0x19, 0x4C }, // (Offset,Value)-Pair #9 { 0x1A, 0x24 }, // (Offset,Value)-Pair #10 { 0x1B, 0x0C }, // (Offset,Value)-Pair #11 - // IDirect3DPalette8_Lock+0x1C : mov [ecx], eax + // D3DPalette_Lock+0x1C : mov [ecx], eax { 0x1C, 0x89 }, // (Offset,Value)-Pair #12 { 0x1D, 0x01 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_LockRect +// * D3DTexture_LockRect // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_LockRect_1_0_3925, 17) +OOVPA_NO_XREF(D3DTexture_LockRect_1_0_3925, 17) - // IDirect3DTexture8_LockRect+0x00 : mov eax, [esp+0x14] + // D3DTexture_LockRect+0x00 : mov eax, [esp+0x14] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x14 }, // (Offset,Value)-Pair #4 - // IDirect3DTexture8_LockRect+0x04 : mov ecx, [esp+0x10] + // D3DTexture_LockRect+0x04 : mov ecx, [esp+0x10] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DTexture8_LockRect+0x0C : push eax, push ecx, push edx, push eax, push 0 + // D3DTexture_LockRect+0x0C : push eax, push ecx, push edx, push eax, push 0 { 0x0C, 0x50 }, // (Offset,Value)-Pair #9 { 0x11, 0x51 }, // (Offset,Value)-Pair #10 { 0x16, 0x52 }, // (Offset,Value)-Pair #11 @@ -1711,93 +1709,93 @@ OOVPA_NO_XREF(IDirect3DTexture8_LockRect_1_0_3925, 17) { 0x18, 0x6A }, // (Offset,Value)-Pair #13 { 0x19, 0x00 }, // (Offset,Value)-Pair #14 - // IDirect3DTexture8_LockRect+0x1B : call [addr] + // D3DTexture_LockRect+0x1B : call [addr] { 0x1B, 0xE8 }, // (Offset,Value)-Pair #15 - // IDirect3DTexture8_LockRect+0x20 : retn 0x14 + // D3DTexture_LockRect+0x20 : retn 0x14 { 0x20, 0xC2 }, // (Offset,Value)-Pair #16 { 0x21, 0x14 }, // (Offset,Value)-Pair #17 OOVPA_END; // ****************************************************************** -// * IDirect3DVolumeTexture8_LockBox +// * D3DVolumeTexture_LockBox // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVolumeTexture8_LockBox_1_0_3925, 11) +OOVPA_NO_XREF(D3DVolumeTexture_LockBox_1_0_3925, 11) - // IDirect3DVolumeTexture8_LockBox+0x08 : test bl, 0x20 + // D3DVolumeTexture_LockBox+0x08 : test bl, 0x20 { 0x08, 0xF6 }, // (Offset,Value)-Pair #1 { 0x09, 0xC3 }, // (Offset,Value)-Pair #2 { 0x0A, 0x20 }, // (Offset,Value)-Pair #3 - // IDirect3DVolumeTexture8_LockBox+0x40 : test bl, 0x40 + // D3DVolumeTexture_LockBox+0x40 : test bl, 0x40 { 0x40, 0xF6 }, // (Offset,Value)-Pair #4 { 0x41, 0xC3 }, // (Offset,Value)-Pair #5 { 0x42, 0x40 }, // (Offset,Value)-Pair #6 - // IDirect3DVolumeTexture8_LockBox+0x83 : lea ecx, [eax+edx] + // D3DVolumeTexture_LockBox+0x83 : lea ecx, [eax+edx] { 0x83, 0x8D }, // (Offset,Value)-Pair #7 { 0x84, 0x0C }, // (Offset,Value)-Pair #8 { 0x85, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DVolumeTexture8_LockBox+0x99 : retn 0x14 + // D3DVolumeTexture_LockBox+0x99 : retn 0x14 { 0x99, 0xC2 }, // (Offset,Value)-Pair #10 { 0x9A, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DCubeTexture8_LockRect +// * D3DCubeTexture_LockRect // ****************************************************************** -OOVPA_NO_XREF(IDirect3DCubeTexture8_LockRect_1_0_3925, 11) +OOVPA_NO_XREF(D3DCubeTexture_LockRect_1_0_3925, 11) - // IDirect3DCubeTexture8_LockRect+0x06 : test bl, 0x20 + // D3DCubeTexture_LockRect+0x06 : test bl, 0x20 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x20 }, // (Offset,Value)-Pair #3 - // IDirect3DCubeTexture8_LockRect+0x3F : test bl, 0x40 + // D3DCubeTexture_LockRect+0x3F : test bl, 0x40 { 0x3F, 0xF6 }, // (Offset,Value)-Pair #4 { 0x40, 0xC3 }, // (Offset,Value)-Pair #5 { 0x41, 0x40 }, // (Offset,Value)-Pair #6 - // IDirect3DCubeTexture8_LockRect+0x71 : shr edx, 0x03 + // D3DCubeTexture_LockRect+0x71 : shr edx, 0x03 { 0x71, 0xC1 }, // (Offset,Value)-Pair #7 { 0x72, 0xEA }, // (Offset,Value)-Pair #8 { 0x73, 0x03 }, // (Offset,Value)-Pair #9 - // IDirect3DCubeTexture8_LockRect+0x98 : retn 0x18 + // D3DCubeTexture_LockRect+0x98 : retn 0x18 { 0x98, 0xC2 }, // (Offset,Value)-Pair #10 { 0x99, 0x18 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_GetSurfaceLevel +// * D3DTexture_GetSurfaceLevel // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_GetSurfaceLevel_1_0_3925, 11) +OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel_1_0_3925, 11) - // IDirect3DTexture8_GetSurfaceLevel+0x08 : lea [esp+0x14] + // D3DTexture_GetSurfaceLevel+0x08 : lea [esp+0x14] { 0x08, 0x8D }, // (Offset,Value)-Pair #1 { 0x0B, 0x14 }, // (Offset,Value)-Pair #2 - // IDirect3DTexture8_GetSurfaceLevel+0x17 : mov edx, [esp+0x24] + // D3DTexture_GetSurfaceLevel+0x17 : mov edx, [esp+0x24] { 0x17, 0x8B }, // (Offset,Value)-Pair #3 { 0x1A, 0x24 }, // (Offset,Value)-Pair #4 - // IDirect3DTexture8_GetSurfaceLevel+0x20 : lea ecx, [esp+0x28] + // D3DTexture_GetSurfaceLevel+0x20 : lea ecx, [esp+0x28] { 0x23, 0x28 }, // (Offset,Value)-Pair #4 - // IDirect3DTexture8_GetSurfaceLevel+0x24 : push ecx + // D3DTexture_GetSurfaceLevel+0x24 : push ecx { 0x24, 0x51 }, // (Offset,Value)-Pair #6 - // IDirect3DTexture8_GetSurfaceLevel+0x25 : push edx + // D3DTexture_GetSurfaceLevel+0x25 : push edx { 0x25, 0x52 }, // (Offset,Value)-Pair #7 - // IDirect3DTexture8_GetSurfaceLevel+0x26 : push 0 + // D3DTexture_GetSurfaceLevel+0x26 : push 0 { 0x26, 0x6A }, // (Offset,Value)-Pair #8 - // IDirect3DTexture8_GetSurfaceLevel+0x43 : call [abs] + // D3DTexture_GetSurfaceLevel+0x43 : call [abs] { 0x43, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DTexture8_GetSurfaceLevel+0x4C : retn 0x0C + // D3DTexture_GetSurfaceLevel+0x4C : retn 0x0C { 0x4C, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4D, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -1860,69 +1858,69 @@ OOVPA_NO_XREF(X_D3DDevice_GetVertexShaderSize_1_0_3925, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetGammaRamp +// * D3DDevice_SetGammaRamp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetGammaRamp_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_SetGammaRamp_1_0_3925, 9) - // IDirect3DDevice8_SetGammaRamp+0x11 : and eax, 1; push ebx + // D3DDevice_SetGammaRamp+0x11 : and eax, 1; push ebx { 0x11, 0x83 }, // (Offset,Value)-Pair #1 { 0x12, 0xE0 }, // (Offset,Value)-Pair #2 { 0x13, 0x01 }, // (Offset,Value)-Pair #3 { 0x14, 0x53 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetGammaRamp+0x2F : rep movsd + // D3DDevice_SetGammaRamp+0x2F : rep movsd { 0x2F, 0xF3 }, // (Offset,Value)-Pair #5 { 0x30, 0xA5 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetGammaRamp+0x3E : push ebx; mov ecx, edx + // D3DDevice_SetGammaRamp+0x3E : push ebx; mov ecx, edx { 0x3E, 0x53 }, // (Offset,Value)-Pair #7 { 0x3F, 0x8B }, // (Offset,Value)-Pair #8 { 0x40, 0xCA }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_3925, 11) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_3925, 11) - // IDirect3DDevice8_SetMaterial+0x0B : lea edi, [eax+0xB18] + // D3DDevice_SetMaterial+0x0B : lea edi, [eax+0xB18] { 0x0B, 0x8D }, // (Offset,Value)-Pair #1 { 0x0C, 0xB8 }, // (Offset,Value)-Pair #2 { 0x0D, 0x18 }, // (Offset,Value)-Pair #3 { 0x0E, 0x0B }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetMaterial+0x11 : mov ecx, 0x11 + // D3DDevice_SetMaterial+0x11 : mov ecx, 0x11 { 0x11, 0xB9 }, // (Offset,Value)-Pair #5 { 0x12, 0x11 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetMaterial+0x1C : or ecx, 0x20 + // D3DDevice_SetMaterial+0x1C : or ecx, 0x20 { 0x1B, 0x83 }, // (Offset,Value)-Pair #7 { 0x1C, 0xC9 }, // (Offset,Value)-Pair #8 { 0x1D, 0x20 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetMaterial+0x23 : retn 0x04 + // D3DDevice_SetMaterial+0x23 : retn 0x04 { 0x23, 0xC2 }, // (Offset,Value)-Pair #11 { 0x24, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_AddRef +// * D3DDevice_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_AddRef_1_0_3925, 10) - // IDirect3DDevice8_AddRef+0x00 : mov eax, [addr] + // D3DDevice_AddRef+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_AddRef+0x05 : mov ecx, [eax+0x0408] + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x0408] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x88 }, // (Offset,Value)-Pair #3 { 0x07, 0x08 }, // (Offset,Value)-Pair #4 { 0x08, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_AddRef+0x0B : inc ecx + // D3DDevice_AddRef+0x0B : inc ecx { 0x0B, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_AddRef+0x05 : mov [eax+0x0408], ecx + // D3DDevice_AddRef+0x05 : mov [eax+0x0408], ecx { 0x0C, 0x89 }, // (Offset,Value)-Pair #7 { 0x0D, 0x88 }, // (Offset,Value)-Pair #8 { 0x0E, 0x08 }, // (Offset,Value)-Pair #9 @@ -1930,52 +1928,52 @@ OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_3925, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Unknown1 +// * D3DDevice_Unknown1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Unknown1_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_Unknown1_1_0_3925, 9) - // IDirect3DDevice8_Unknown1+0x00 : xor eax, eax + // D3DDevice_Unknown1+0x00 : xor eax, eax { 0x00, 0x33 }, { 0x01, 0xC0 }, - // IDirect3DDevice8_Unknown1+0x13 : call ds:AvSendTVEncoderOption + // D3DDevice_Unknown1+0x13 : call ds:AvSendTVEncoderOption { 0x13, 0xFF }, { 0x14, 0x15 }, { 0x15, 0x10 }, { 0x16, 0x49 }, { 0x17, 0x2A }, { 0x18, 0x00 }, - // IDirect3DDevice8_Unknown1+0x1E : retn + // D3DDevice_Unknown1+0x1E : retn { 0x1E, 0xC3 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetViewport +// * D3DDevice_GetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_3925, 10) - // IDirect3DDevice8_GetViewport+0x05 : push esi; push edi + // D3DDevice_GetViewport+0x05 : push esi; push edi { 0x05, 0x56 }, // (Offset,Value)-Pair #1 { 0x06, 0x57 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetViewport+0x0B : lea esi, [eax+0x0B00] + // D3DDevice_GetViewport+0x0B : lea esi, [eax+0x0B00] { 0x0B, 0x8D }, // (Offset,Value)-Pair #3 { 0x0C, 0xB0 }, // (Offset,Value)-Pair #4 { 0x0D, 0x00 }, // (Offset,Value)-Pair #5 { 0x0E, 0x0B }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetViewport+0x11 : mov ecx, 6 + // D3DDevice_GetViewport+0x11 : mov ecx, 6 { 0x11, 0xB9 }, // (Offset,Value)-Pair #7 { 0x12, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetViewport+0x1A : retn 0x04 + // D3DDevice_GetViewport+0x1A : retn 0x04 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1B, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetGammaRamp +// * D3DDevice_GetGammaRamp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetGammaRamp_1_0_3925, 7) +OOVPA_NO_XREF(D3DDevice_GetGammaRamp_1_0_3925, 7) { 0x05, 0x8B }, { 0x0A, 0x00 }, @@ -1990,22 +1988,22 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus_1_0_3925, 14) - // IDirect3DDevice8_GetDisplayFieldStatus+0x05 : mov edx, [eax+0x2B28] + // D3DDevice_GetDisplayFieldStatus+0x05 : mov edx, [eax+0x2B28] { 0x05, 0x8B }, { 0x06, 0x90 }, { 0x07, 0x28 }, { 0x08, 0x2B }, - // IDirect3DDevice8_GetDisplayFieldStatus+0x12 : test [eax+0x2510], 0x1200000 + // D3DDevice_GetDisplayFieldStatus+0x12 : test [eax+0x2510], 0x1200000 { 0x12, 0xF7 }, { 0x13, 0x80 }, { 0x14, 0x10 }, { 0x15, 0x25 }, - // IDirect3DDevice8_GetDisplayFieldStatus+0x1E : mov dx, 0x80C0 + // D3DDevice_GetDisplayFieldStatus+0x1E : mov dx, 0x80C0 { 0x1E, 0x66 }, { 0x1F, 0xBA }, { 0x20, 0xC0 }, { 0x21, 0x80 }, - // IDirect3DDevice8_GetDisplayFieldStatus+0x3C : retn 4 + // D3DDevice_GetDisplayFieldStatus+0x3C : retn 4 { 0x3C, 0xC2 }, { 0x3D, 0x04 }, OOVPA_END; @@ -2025,46 +2023,46 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_3925, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_VertexBlend +// * D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_3925, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend_1_0_3925, 13) - // IDirect3DDevice8_SetRenderState_VertexBlend+0x0A : or ecx, 2 + // D3DDevice_SetRenderState_VertexBlend+0x0A : or ecx, 2 { 0x0A, 0x83 }, // (Offset,Value)-Pair #1 { 0x0B, 0xC9 }, // (Offset,Value)-Pair #2 { 0x0C, 0x02 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x1A : mov dword ptr [eax], 0x40328 + // D3DDevice_SetRenderState_VertexBlend+0x1A : mov dword ptr [eax], 0x40328 { 0x1A, 0xC7 }, // (Offset,Value)-Pair #4 { 0x1B, 0x00 }, // (Offset,Value)-Pair #5 { 0x1C, 0x28 }, // (Offset,Value)-Pair #6 { 0x1D, 0x03 }, // (Offset,Value)-Pair #7 { 0x1E, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x23 : add eax, 8 + // D3DDevice_SetRenderState_VertexBlend+0x23 : add eax, 8 { 0x23, 0x83 }, // (Offset,Value)-Pair #9 { 0x24, 0xC0 }, // (Offset,Value)-Pair #10 { 0x25, 0x08 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x2F : retn 0x04 + // D3DDevice_SetRenderState_VertexBlend+0x2F : retn 0x04 { 0x2F, 0xC2 }, // (Offset,Value)-Pair #12 { 0x30, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_BackFillMode +// * D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_3925, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode_1_0_3925, 12) - // IDirect3DDevice8_SetRenderState_BackFillMode+0x2B : jnz +0x2 + // D3DDevice_SetRenderState_BackFillMode+0x2B : jnz +0x2 { 0x2B, 0x75 }, // (Offset,Value)-Pair #1 { 0x2C, 0x02 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x32 : mov dword ptr [eax], abs + // D3DDevice_SetRenderState_BackFillMode+0x32 : mov dword ptr [eax], abs { 0x32, 0xC7 }, // (Offset,Value)-Pair #3 { 0x33, 0x00 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x3B : add eax, 0x0C; mov [edi], eax; pop edi + // D3DDevice_SetRenderState_BackFillMode+0x3B : add eax, 0x0C; mov [edi], eax; pop edi { 0x3B, 0x83 }, // (Offset,Value)-Pair #5 { 0x3C, 0xC0 }, // (Offset,Value)-Pair #6 { 0x3D, 0x0C }, // (Offset,Value)-Pair #7 @@ -2072,200 +2070,200 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_3925, 12) { 0x3F, 0x07 }, // (Offset,Value)-Pair #9 { 0x40, 0x5F }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x48 : retn 0x04 + // D3DDevice_SetRenderState_BackFillMode+0x48 : retn 0x04 { 0x48, 0xC2 }, // (Offset,Value)-Pair #11 { 0x49, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TwoSidedLighting +// * D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_3925, 13) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TwoSidedLighting_1_0_3925, 13) - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x06 : or dword ptr [eax+8], 0x20 + // D3DDevice_SetTextureState_TwoSidedLighting+0x06 : or dword ptr [eax+8], 0x20 { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0x48 }, // (Offset,Value)-Pair #2 { 0x08, 0x08 }, // (Offset,Value)-Pair #3 { 0x09, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x3B : mov dword ptr [eax], 0x8038C + // D3DDevice_SetTextureState_TwoSidedLighting+0x3B : mov dword ptr [eax], 0x8038C { 0x3B, 0xC7 }, // (Offset,Value)-Pair #5 { 0x3C, 0x00 }, // (Offset,Value)-Pair #6 { 0x3D, 0x8C }, // (Offset,Value)-Pair #7 { 0x3E, 0x03 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x44 : add eax, 0x0C + // D3DDevice_SetTextureState_TwoSidedLighting+0x44 : add eax, 0x0C { 0x44, 0x83 }, // (Offset,Value)-Pair #9 { 0x45, 0xC0 }, // (Offset,Value)-Pair #10 { 0x46, 0x0C }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x51 : retn 0x04 + // D3DDevice_SetTextureState_TwoSidedLighting+0x51 : retn 0x04 { 0x51, 0xC2 }, // (Offset,Value)-Pair #12 { 0x52, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormals +// * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_3925, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals_1_0_3925, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x1D : mov [esi], eax + // D3DDevice_SetRenderState_NormalizeNormals+0x1D : mov [esi], eax { 0x1D, 0x89 }, // (Offset,Value)-Pair #1 { 0x1E, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x1F : or dword ptr [esi+8], 2 + // D3DDevice_SetRenderState_NormalizeNormals+0x1F : or dword ptr [esi+8], 2 { 0x1F, 0x83 }, // (Offset,Value)-Pair #3 { 0x20, 0x4E }, // (Offset,Value)-Pair #4 { 0x21, 0x08 }, // (Offset,Value)-Pair #5 { 0x22, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x2A : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormals+0x2A : retn 0x04 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #7 { 0x2B, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FrontFace +// * D3DDevice_SetRenderState_FrontFace // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FrontFace_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_FrontFace_1_0_3925, 9) - // IDirect3DDevice8_SetRenderState_FrontFace+0x00 : push esi + // D3DDevice_SetRenderState_FrontFace+0x00 : push esi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_FrontFace+0x07 : push esi + // D3DDevice_SetRenderState_FrontFace+0x07 : push esi { 0x07, 0x56 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FrontFace+0xD : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_FrontFace+0xD : mov ecx, [esp+0x08] { 0x0D, 0x8B }, // (Offset,Value)-Pair #3 { 0x0E, 0x4C }, // (Offset,Value)-Pair #4 { 0x0F, 0x24 }, // (Offset,Value)-Pair #5 { 0x10, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FrontFace+0x1A : add eax, 8 + // D3DDevice_SetRenderState_FrontFace+0x1A : add eax, 8 { 0x1A, 0x83 }, // (Offset,Value)-Pair #7 { 0x1B, 0xC0 }, // (Offset,Value)-Pair #8 { 0x1C, 0x08 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_3925, 10) - // IDirect3DDevice8_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0414] + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0414] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x86 }, // (Offset,Value)-Pair #2 { 0x09, 0x14 }, // (Offset,Value)-Pair #3 { 0x0A, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x2E : rep stosd + // D3DDevice_SetRenderState_TextureFactor+0x2E : rep stosd { 0x2E, 0xF3 }, // (Offset,Value)-Pair #5 { 0x2F, 0xAB }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x3C : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x3C : retn 0x04 { 0x3C, 0xC2 }, // (Offset,Value)-Pair #7 { 0x3D, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x49 : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x49 : retn 0x04 { 0x49, 0xC2 }, // (Offset,Value)-Pair #9 { 0x4A, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LogicOp +// * D3DDevice_SetRenderState_LogicOp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LogicOp_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp_1_0_3925, 9) - // IDirect3DDevice8_SetRenderState_LogicOp+0x11 : test ecx, ecx + // D3DDevice_SetRenderState_LogicOp+0x11 : test ecx, ecx { 0x11, 0x85 }, // (Offset,Value)-Pair #1 { 0x12, 0xC9 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_LogicOp+0x2D : mov dword ptr [eax], 0x817BC + // D3DDevice_SetRenderState_LogicOp+0x2D : mov dword ptr [eax], 0x817BC { 0x2D, 0xC7 }, // (Offset,Value)-Pair #3 { 0x2E, 0x00 }, // (Offset,Value)-Pair #4 { 0x2F, 0xBC }, // (Offset,Value)-Pair #5 { 0x30, 0x17 }, // (Offset,Value)-Pair #6 { 0x31, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_LogicOp+0x49 : retn 0x04 + // D3DDevice_SetRenderState_LogicOp+0x49 : retn 0x04 { 0x49, 0xC2 }, // (Offset,Value)-Pair #8 { 0x4A, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_3925, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_3925, 11) - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x17 : mov [eax+0x04], ecx + // D3DDevice_SetRenderState_EdgeAntiAlias+0x17 : mov [eax+0x04], ecx { 0x17, 0x89 }, // (Offset,Value)-Pair #1 { 0x18, 0x48 }, // (Offset,Value)-Pair #2 { 0x19, 0x04 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x1A : mov [eax+0x08], ecx + // D3DDevice_SetRenderState_EdgeAntiAlias+0x1A : mov [eax+0x08], ecx { 0x1A, 0x89 }, // (Offset,Value)-Pair #4 { 0x1B, 0x48 }, // (Offset,Value)-Pair #5 { 0x1C, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x1D : add eax, 0x0C + // D3DDevice_SetRenderState_EdgeAntiAlias+0x1D : add eax, 0x0C { 0x1D, 0x83 }, // (Offset,Value)-Pair #7 { 0x1E, 0xC0 }, // (Offset,Value)-Pair #8 { 0x1F, 0x0C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x29 : retn 0x04 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x29 : retn 0x04 { 0x29, 0xC2 }, // (Offset,Value)-Pair #10 { 0x2A, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleMask +// * D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_3925, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask_1_0_3925, 13) - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x0B : mov ecx, esi + // D3DDevice_SetRenderState_MultiSampleMask+0x0B : mov ecx, esi { 0x0B, 0x8B }, // (Offset,Value)-Pair #1 { 0x0C, 0xCE }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x32 : and ecx, 0x0F; shl edx, 0x10 + // D3DDevice_SetRenderState_MultiSampleMask+0x32 : and ecx, 0x0F; shl edx, 0x10 { 0x32, 0x83 }, // (Offset,Value)-Pair #3 { 0x33, 0xE1 }, // (Offset,Value)-Pair #4 { 0x34, 0x0F }, // (Offset,Value)-Pair #5 { 0x35, 0xC1 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x3A : mov dword ptr [eax], 0x41D7C + // D3DDevice_SetRenderState_MultiSampleMask+0x3A : mov dword ptr [eax], 0x41D7C { 0x3A, 0xC7 }, // (Offset,Value)-Pair #7 { 0x3B, 0x00 }, // (Offset,Value)-Pair #8 { 0x3C, 0x7C }, // (Offset,Value)-Pair #9 { 0x3D, 0x1D }, // (Offset,Value)-Pair #10 { 0x3E, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x49 : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleMask+0x49 : retn 0x04 { 0x49, 0xC2 }, // (Offset,Value)-Pair #12 { 0x4A, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleMode +// * D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_3925, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode_1_0_3925, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x05 : mov ecx, [esp+4] + // D3DDevice_SetRenderState_MultiSampleMode+0x05 : mov ecx, [esp+4] { 0x05, 0x8B }, // (Offset,Value)-Pair #1 { 0x06, 0x4C }, // (Offset,Value)-Pair #2 { 0x07, 0x24 }, // (Offset,Value)-Pair #3 { 0x08, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x0F : mov edx, [eax+0x410] + // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov edx, [eax+0x410] { 0x0F, 0x8B }, // (Offset,Value)-Pair #5 { 0x10, 0x90 }, // (Offset,Value)-Pair #6 { 0x11, 0x10 }, // (Offset,Value)-Pair #7 { 0x12, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x15 : mov eax, [eax+0x40C] + // D3DDevice_SetRenderState_MultiSampleMode+0x15 : mov eax, [eax+0x40C] { 0x15, 0x8B }, // (Offset,Value)-Pair #9 { 0x16, 0x80 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x22 : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleMode+0x22 : retn 0x04 { 0x22, 0xC2 }, // (Offset,Value)-Pair #11 { 0x23, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -2295,14 +2293,14 @@ OOVPA_NO_XREF(D3DDevice_PersistDisplay_1_0_3925, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ShadowFunc +// * D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_3925, 14) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc_1_0_3925, 14) - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x00 : push esi + // D3DDevice_SetRenderState_ShadowFunc+0x00 : push esi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x11 : mov dword ptr [eax], 0x41E6C + // D3DDevice_SetRenderState_ShadowFunc+0x11 : mov dword ptr [eax], 0x41E6C { 0x11, 0xC7 }, // (Offset,Value)-Pair #2 { 0x12, 0x00 }, // (Offset,Value)-Pair #3 { 0x13, 0x6C }, // (Offset,Value)-Pair #4 @@ -2310,98 +2308,98 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_3925, 14) { 0x15, 0x04 }, // (Offset,Value)-Pair #6 { 0x16, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x17 : lea edx, [ecx-0x0200] + // D3DDevice_SetRenderState_ShadowFunc+0x17 : lea edx, [ecx-0x0200] { 0x17, 0x8D }, // (Offset,Value)-Pair #8 { 0x18, 0x91 }, // (Offset,Value)-Pair #9 { 0x19, 0x00 }, // (Offset,Value)-Pair #10 { 0x1A, 0xFE }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x20 : add eax, 0x08 + // D3DDevice_SetRenderState_ShadowFunc+0x20 : add eax, 0x08 { 0x20, 0x83 }, // (Offset,Value)-Pair #12 { 0x21, 0xC0 }, // (Offset,Value)-Pair #13 { 0x22, 0x08 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LineWidth +// * D3DDevice_SetRenderState_LineWidth // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LineWidth_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_3925, 10) - // IDirect3DDevice8_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x508] + // D3DDevice_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x508] { 0x15, 0xD8 }, // (Offset,Value)-Pair #1 { 0x16, 0x8E }, // (Offset,Value)-Pair #2 { 0x17, 0x08 }, // (Offset,Value)-Pair #3 { 0x18, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF { 0x32, 0x81 }, // (Offset,Value)-Pair #5 { 0x33, 0xFF }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF { 0x3A, 0xBF }, // (Offset,Value)-Pair #7 { 0x3B, 0xFF }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_LineWidth+0x5C : retn 0x04 + // D3DDevice_SetRenderState_LineWidth+0x5C : retn 0x04 { 0x5C, 0xC2 }, // (Offset,Value)-Pair #9 { 0x5D, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_YuvEnable +// * D3DDevice_SetRenderState_YuvEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_3925, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable_1_0_3925, 10) - // IDirect3DDevice8_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x04 : push edi + // D3DDevice_SetRenderState_YuvEnable+0x04 : push edi { 0x04, 0x56 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x0B : push edi + // D3DDevice_SetRenderState_YuvEnable+0x0B : push edi { 0x0B, 0x56 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x1F : mov [esi], eax + // D3DDevice_SetRenderState_YuvEnable+0x1F : mov [esi], eax { 0x1F, 0x89 }, // (Offset,Value)-Pair #7 { 0x20, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x22 : retn 0x04 + // D3DDevice_SetRenderState_YuvEnable+0x22 : retn 0x04 { 0x22, 0xC2 }, // (Offset,Value)-Pair #9 { 0x23, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_OcclusionCullEnable +// * D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_3925, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_3925, 12) - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x20 : jz +0x05 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x20 : jz +0x05 { 0x20, 0x74 }, // (Offset,Value)-Pair #1 { 0x21, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x3B : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x3B : cmp [abs], 0x1E00 { 0x3B, 0x81 }, // (Offset,Value)-Pair #3 { 0x41, 0x00 }, // (Offset,Value)-Pair #4 { 0x42, 0x1E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x4A : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x4A : mov dword ptr [eax], 0x41D84 { 0x4A, 0xC7 }, // (Offset,Value)-Pair #6 { 0x4B, 0x00 }, // (Offset,Value)-Pair #7 { 0x4C, 0x84 }, // (Offset,Value)-Pair #8 { 0x4D, 0x1D }, // (Offset,Value)-Pair #9 { 0x4E, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x59 : retn 0x04 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x59 : retn 0x04 { 0x59, 0xC2 }, // (Offset,Value)-Pair #11 { 0x5A, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilCullEnable +// * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilCullEnable_1_0_3925, 7) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilCullEnable_1_0_3925, 7) { 0x0B, 0x56 }, { 0x16, 0x8B }, @@ -2556,22 +2554,22 @@ OOVPA_NO_XREF(D3D_AllocContiguousMemory_1_0_3925, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Deferred +// * D3DDevice_SetRenderState_Deferred // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Deferred_1_0_3925, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Deferred_1_0_3925, 9) - // IDirect3DDevice8_SetRenderState_Deferred+0x00 : mov eax, ds:(g_DirtyFromRenderState)-148[ecx*4] + // D3DDevice_SetRenderState_Deferred+0x00 : mov eax, ds:(g_DirtyFromRenderState)-148[ecx*4] { 0x00, 0x8B }, { 0x01, 0x04 }, { 0x02, 0x8D }, - // IDirect3DDevice8_SetRenderState_Deferred+0x07 : or dword ptr ds:g_Device+8,eax + // D3DDevice_SetRenderState_Deferred+0x07 : or dword ptr ds:g_Device+8,eax { 0x07, 0x09 }, { 0x08, 0x05 }, - // IDirect3DDevice8_SetRenderState_Deferred+0x0D : mov dword ptr ds:D3D__RenderState[ecx*4], edx + // D3DDevice_SetRenderState_Deferred+0x0D : mov dword ptr ds:D3D__RenderState[ecx*4], edx { 0x0D, 0x89 }, { 0x0E, 0x14 }, { 0x0F, 0x8D }, - // IDirect3DDevice8_SetRenderState_Deferred+0x14 : retn + // D3DDevice_SetRenderState_Deferred+0x14 : retn { 0x14, 0xC3 }, OOVPA_END; @@ -2607,16 +2605,16 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_CreateVertexShader // ****************************************************************** -OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_3925, 8) +OOVPA_NO_XREF(X_D3DDevice_CreateVertexShader_1_0_3925, 8) - { 0x1E, 0x85 }, - { 0x3E, 0xE8 }, - { 0x5E, 0x5D }, - { 0x7E, 0x01 }, - { 0x9E, 0x24 }, - { 0xBE, 0x24 }, - { 0xDE, 0x83 }, - { 0xFE, 0xC7 }, + { 0x1E, 0x85 }, + { 0x3E, 0xE8 }, + { 0x5E, 0x5D }, + { 0x7E, 0x01 }, + { 0x9E, 0x24 }, + { 0xBE, 0x24 }, + { 0xDE, 0x83 }, + { 0xFE, 0xC7 }, OOVPA_END; // ****************************************************************** @@ -2749,7 +2747,7 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShaderProgram_1_0_3925, 7) OOVPA_END; // ****************************************************************** -// * D3D::KickOffAndWaitForIdle +// * D3D_KickOffAndWaitForIdle // ****************************************************************** // * This is for the real D3D::KickOffAndWaitForIdle // ****************************************************************** @@ -2910,78 +2908,78 @@ OOVPA_NO_XREF(D3DDevice_EndPushBuffer_1_0_3925, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +// * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_3925, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x09 : call [abs] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x0E : retn 0x04 + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_RopZRead +// * D3DDevice_SetRenderState_RopZRead // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_RopZRead_1_0_3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZRead_1_0_3925, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_ROPZREAD }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_RopZRead+0x09 : call [abs] + // D3DDevice_SetRenderState_RopZRead+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_RopZRead+0x0E : retn 0x04 + // D3DDevice_SetRenderState_RopZRead+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_DoNotCullUncompressed +// * D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_DoNotCullUncompressed_1_0_3925, 9, +OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_3925, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x09 : call [abs] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x0E : retn 0x04 + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 @@ -3302,314 +3300,314 @@ OOVPA_END; OOVPATable D3D8_1_0_3925[] = { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_3925, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_3925, D3D_CreateDevice), // IDirect3DDevice8::IsBusy - OOVPA_TABLE_PATCH(IDirect3DDevice8_IsBusy_1_0_3925, XTL::EmuIDirect3DDevice8_IsBusy), + OOVPA_TABLE_PATCH(D3DDevice_IsBusy_1_0_3925, D3DDevice_IsBusy), // IDirect3DDevice8::GetDeviceCaps - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // IDirect3DDevice8::BeginVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_3925, D3DDevice_BeginVisibilityTest), // IDirect3DDevice8::EndVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_EndVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_3925, D3DDevice_EndVisibilityTest), // IDirect3DDevice8::GetVisibilityTestResult - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), // IDirect3D8::KickOffAndWaitForIdle - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_3925, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_3925, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::GetMaterial - OOVPA_TABLE_PATCH(D3DDevice_GetMaterial_1_0_3925, XTL::EmuIDirect3DDevice8_GetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_GetMaterial_1_0_3925, D3DDevice_GetMaterial), // IDirect3DDevice8::GetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_3925, XTL::EmuIDirect3DDevice8_GetBackMaterial), + OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_3925, D3DDevice_GetBackMaterial), // IDirect3DDevice8::LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_3925, D3DDevice_LoadVertexShader), // IDirect3DDevice8::SelectVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_3925, D3DDevice_SelectVertexShader), // IDirect3DDevice8::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_3925, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_3925, D3DDevice_Release), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_3925, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_3925, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_3925, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_3925, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_3925, D3DDevice_SetRenderTarget), // IDirect3DDevice8::GetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_3925, XTL::EmuIDirect3DDevice8_GetTransform), + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_3925, D3DDevice_GetTransform), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_3925, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_3925, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_3925, D3DDevice_SetVertexShader), // IDirect3DDevice8::CreatePixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_3925, D3DDevice_SetPixelShader), // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_3925, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_3925, D3DDevice_SetIndices), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_3925, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_3925, D3DDevice_SetViewport), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_3925, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_3925, D3DDevice_SetTexture), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_3925, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_3925, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_3925, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_3925, D3DDevice_Begin), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_3925, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData2s - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2s_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData2s), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2s_1_0_3925, D3DDevice_SetVertexData2s), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_3925, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexDataColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexDataColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexDataColor), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_3925, D3DDevice_SetVertexDataColor), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_3925, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_3925, D3DDevice_End), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_3925, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_3925, D3DDevice_Clear), // IDirect3DDevice8::CreatePalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePalette), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette_1_0_3925, D3DDevice_CreatePalette), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_3925, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_3925, D3DDevice_SetPalette), // IDirect3DDevice8::CreateTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture_1_0_3925, D3DDevice_CreateTexture), // IDirect3DDevice8::CreateVolumeTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVolumeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVolumeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateVolumeTexture_1_0_3925, D3DDevice_CreateVolumeTexture), // IDirect3DDevice8::CreateCubeTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateCubeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateCubeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateCubeTexture_1_0_3925, D3DDevice_CreateCubeTexture), // IDirect3DDevice8::CreateIndexBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateIndexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer_1_0_3925, D3DDevice_CreateIndexBuffer), // IDirect3DDevice8::CreateVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetVertexShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_3925, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_3925, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_3925, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetTextureState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_3925, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetTextureState_BorderColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_3925, D3DDevice_SetTextureState_BorderColor), // IDirect3DDevice8::SetRenderState_PSTextureModes - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_PSTextureModes_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_PSTextureModes_1_0_3925, D3DDevice_SetRenderState_PSTextureModes), // IDirect3DDevice8::SetRenderState_StencilFail - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_3925, D3DDevice_SetRenderState_StencilFail), // IDirect3DDevice8::SetRenderState_CullMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_3925, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::SetRenderState_Simple - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_3925, D3DDevice_SetRenderState_Simple), // IDirect3DDevice8::SetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_3925, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_3925, D3DDevice_SetTransform), // IDirect3DDevice8::SetRenderState_FogColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_3925, D3DDevice_SetRenderState_FogColor), // IDirect3DDevice8::SetRenderState_FillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_3925, D3DDevice_SetRenderState_FillMode), // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_3925, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_3925, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_ZBias - 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_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_3925, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::Present - OOVPA_TABLE_PATCH(IDirect3DDevice8_Present_1_0_3925, XTL::EmuIDirect3DDevice8_Present), + OOVPA_TABLE_PATCH(D3DDevice_Present_1_0_3925, D3DDevice_Present), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_3925, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::GetBackBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_3925, D3DDevice_GetBackBuffer), // IDirect3DDevice8::GetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget_1_0_3925, XTL::EmuIDirect3DDevice8_GetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget_1_0_3925, D3DDevice_GetRenderTarget), // IDirect3DDevice8::GetDepthStencilSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface_1_0_3925, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface_1_0_3925, D3DDevice_GetDepthStencilSurface), // IDirect3DDevice8::CreateVertexBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer_1_0_3925, D3DDevice_CreateVertexBuffer), // IDirect3DVertexBuffer8::Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_3925, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_3925, D3DVertexBuffer_Lock), // IDirect3DResource8::Register - OOVPA_TABLE_PATCH(IDirect3DResource8_Register_1_0_3925, XTL::EmuIDirect3DResource8_Register), + OOVPA_TABLE_PATCH(D3DResource_Register_1_0_3925, D3DResource_Register), // IDirect3DResource8::Release - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_3925, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_3925, D3DResource_Release), // IDirect3DResource8::AddRef - OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef), + OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef), // IDirect3DResource8::IsBusy - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_3925, XTL::EmuIDirect3DResource8_IsBusy), + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_3925, D3DResource_IsBusy), // IDirect3DSurface8::LockRect - OOVPA_TABLE_PATCH(IDirect3DSurface8_LockRect_1_0_3925, XTL::EmuIDirect3DSurface8_LockRect), + OOVPA_TABLE_PATCH(D3DSurface_LockRect_1_0_3925, D3DSurface_LockRect), // IDirect3DPalette8::Lock - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock_1_0_3925, XTL::EmuIDirect3DPalette8_Lock), + OOVPA_TABLE_PATCH(D3DPalette_Lock_1_0_3925, D3DPalette_Lock), // IDirect3DTexture8::LockRect - OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_3925, D3DTexture_LockRect), // IDirect3DVolumeTexture8::LockBox - OOVPA_TABLE_PATCH(IDirect3DVolumeTexture8_LockBox_1_0_3925, XTL::EmuIDirect3DVolumeTexture8_LockBox), + OOVPA_TABLE_PATCH(D3DVolumeTexture_LockBox_1_0_3925, D3DVolumeTexture_LockBox), // IDirect3DCubeTexture8::LockRect - OOVPA_TABLE_PATCH(IDirect3DCubeTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DCubeTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DCubeTexture_LockRect_1_0_3925, D3DCubeTexture_LockRect), // IDirect3DTexture8::GetSurfaceLevel - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel_1_0_3925, XTL::EmuIDirect3DTexture8_GetSurfaceLevel), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel_1_0_3925, D3DTexture_GetSurfaceLevel), // Lock2DSurface - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), // Get2DSurfacDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, Get2DSurfaceDesc), // D3DDevice_GetVertexShaderSize - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderSize_1_0_3925, XTL::EmuIDirect3DDevice8_GetVertexShaderSize), - // IDirect3DDevice8_SetGammaRamp - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_3925, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderSize_1_0_3925, D3DDevice_GetVertexShaderSize), + // D3DDevice_SetGammaRamp + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_3925, D3DDevice_SetGammaRamp), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_3925, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_3925, D3DDevice_SetMaterial), // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_3925, XTL::EmuIDirect3DDevice8_AddRef), - // IDirect3DDevice8_Unknown1 - OOVPA_TABLE_PATCH(IDirect3DDevice8_Unknown1_1_0_3925, XTL::EmuIDirect3DDevice8_Unknown1), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_3925, D3DDevice_AddRef), + // D3DDevice_Unknown1 + OOVPA_TABLE_PATCH(D3DDevice_Unknown1_1_0_3925, D3DDevice_Unknown1), // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_3925, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_3925, D3DDevice_GetViewport), // IDirect3DDevice8::GetGammaRamp - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetGammaRamp_1_0_3925, XTL::EmuIDirect3DDevice8_GetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_GetGammaRamp_1_0_3925, D3DDevice_GetGammaRamp), // D3DDevice_GetDisplayFieldStatus - OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_3925, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_3925, D3DDevice_GetDisplayFieldStatus), // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_3925, D3DDevice_SetRenderState_MultiSampleAntiAlias), // IDirect3DDevice8::SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_3925, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_BackFillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_3925, D3DDevice_SetRenderState_BackFillMode), // IDirect3DDevice8::SetTextureState_TwoSidedLighting - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), - // IDirect3DDevice8_SetRenderState_NormalizeNormals - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_3925, D3DDevice_SetTextureState_TwoSidedLighting), + // D3DDevice_SetRenderState_NormalizeNormals + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_3925, D3DDevice_SetRenderState_NormalizeNormals), // IDirect3DDevice8::SetRenderState_FrontFace - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FrontFace_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FrontFace_1_0_3925, D3DDevice_SetRenderState_FrontFace), // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_3925, D3DDevice_SetRenderState_TextureFactor), // IDirect3DDevice8::SetRenderState_LogicOp - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LogicOp_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_3925, D3DDevice_SetRenderState_LogicOp), // IDirect3DDevice8::SetRenderState_EdgeAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_3925, D3DDevice_SetRenderState_EdgeAntiAlias), // IDirect3DDevice8::SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_3925, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_3925, D3DDevice_SetRenderState_MultiSampleMode), // D3DDevice_PersistDisplay - OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_3925, XTL::EmuIDirect3DDevice8_PersistDisplay), + OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_3925, D3DDevice_PersistDisplay), // IDirect3DDevice8::SetRenderState_ShadowFunc - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_3925, D3DDevice_SetRenderState_ShadowFunc), // IDirect3DDevice8::SetRenderState_LineWidth - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LineWidth_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_3925, D3DDevice_SetRenderState_LineWidth), // IDirect3DDevice8::SetRenderState_YuvEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_3925, D3DDevice_SetRenderState_YuvEnable), // IDirect3DDevice8::SetRenderState_OcclusionCullEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_3925, D3DDevice_SetRenderState_OcclusionCullEnable), // IDirect3DDevice8::SetRenderState_StencilCullEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilCullEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilCullEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilCullEnable_1_0_3925, D3DDevice_SetRenderState_StencilCullEnable), // D3DDevice_DrawVerticesUP - OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_3925, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_3925, D3DDevice_DrawVerticesUP), // D3DDevice_DrawIndexedVerticesUP - OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_3925, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_3925, D3DDevice_DrawIndexedVerticesUP), // D3DDevice_DrawVertices - OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_3925, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_3925, D3DDevice_DrawVertices), // D3DDevice_GetDisplayMode - OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_3925, XTL::EmuIDirect3DDevice8_GetDisplayMode), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_3925, D3DDevice_GetDisplayMode), // D3DDevice_SetTextureState_BumpEnv - OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_3925, D3DDevice_SetTextureState_BumpEnv), // D3DDevice_SetTextureState_ColorKeyColor - OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_3925, D3DDevice_SetTextureState_ColorKeyColor), // D3DDevice_SetVertexData4s - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4s_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData4s), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4s_1_0_3925, D3DDevice_SetVertexData4s), // IDirect3D8::SetPushBufferSize - OOVPA_TABLE_PATCH(Direct3D_SetPushBufferSize_1_0_3925, XTL::EmuIDirect3D8_SetPushBufferSize), + OOVPA_TABLE_PATCH(Direct3D_SetPushBufferSize_1_0_3925, D3D_SetPushBufferSize), // IDirect3DResource8::GetType // Probably not even necessary... - OOVPA_TABLE_PATCH(D3DResource_GetType_1_0_3925, XTL::EmuIDirect3DResource8_GetType), - // IDirect3D8_AllocContiguousMemory - OOVPA_TABLE_PATCH(D3D_AllocContiguousMemory_1_0_3925, XTL::EmuIDirect3D8_AllocContiguousMemory), - // IDirect3DDevice8_SetRenderState_Deferred + OOVPA_TABLE_PATCH(D3DResource_GetType_1_0_3925, D3DResource_GetType), + // D3D_AllocContiguousMemory + OOVPA_TABLE_PATCH(D3D_AllocContiguousMemory_1_0_3925, D3D_AllocContiguousMemory), + // D3DDevice_SetRenderState_Deferred /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Deferred_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Deferred), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Deferred_1_0_3925, D3DDevice_SetRenderState_Deferred), */ // D3DDevice_SetLight - OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_3925, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_3925, D3DDevice_SetLight), // D3DDevice_LightEnable - OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_3925, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_3925, D3DDevice_LightEnable), // D3DDevice_CreateVertexShader - OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_3948, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_3948, D3DDevice_SetRenderTarget), // IDirect3DSurface8::GetDesc - OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_3925, XTL::EmuIDirect3DSurface8_GetDesc), - // IDirect3DDevice8_GetProjectionViewportMatrix - OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_3925, XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix), + OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_3925, D3DSurface_GetDesc), + // D3DDevice_GetProjectionViewportMatrix + OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_3925, D3DDevice_GetProjectionViewportMatrix), // D3DDevice_GetTile - OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_3925, XTL::EmuIDirect3DDevice8_GetTile), + OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_3925, D3DDevice_GetTile), // D3DDevice_ApplyStateBlock - OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_ApplyStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_3925, D3DDevice_ApplyStateBlock), // D3DDevice_CaptureStateBlock - OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_CaptureStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_3925, D3DDevice_CaptureStateBlock), // D3DDevice_DeleteStateBlock - OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_3925, D3DDevice_DeleteStateBlock), // D3DDevice_CreateStateBlock - OOVPA_TABLE_PATCH(D3DDevice_CreateStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_CreateStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_CreateStateBlock_1_0_3925, D3DDevice_CreateStateBlock), // D3DDevice_DeletePixelShader - OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_3925, D3DDevice_DeletePixelShader), // D3DDevice_SetPixelShaderProgram - OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_3925, XTL::EmuIDirect3DDevice8_SetPixelShaderProgram), - // D3D::KickOffAndWaitForIdle - OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_3925, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_3925, D3DDevice_SetPixelShaderProgram), + // D3D::CDevice::KickOff + OOVPA_TABLE_PATCH(D3DDevice_KickOff_1_0_3925, D3DDevice_KickOff), // D3DDevice_SetModelView - OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_3925, XTL::EmuIDirect3DDevice8_SetModelView), + OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_3925, D3DDevice_SetModelView), // D3DDevice_FlushVertexCache - OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_3925, XTL::EmuIDirect3DDevice8_FlushVertexCache), + OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_3925, D3DDevice_FlushVertexCache), // D3DDevice_SetScissors - OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_3925, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_3925, D3DDevice_SetScissors), // D3DDevice_SetVertexShaderInput - OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderInput_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShaderInput), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderInput_1_0_3925, D3DDevice_SetVertexShaderInput), // D3DDevice_PrimeVertexCache - OOVPA_TABLE_PATCH(D3DDevice_PrimeVertexCache_1_0_3925, XTL::EmuIDirect3DDevice8_PrimeVertexCache), + OOVPA_TABLE_PATCH(D3DDevice_PrimeVertexCache_1_0_3925, D3DDevice_PrimeVertexCache), // IDirect3DDevice8::SetVertexData4ub - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData4ub), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_3925, D3DDevice_SetVertexData4ub), // IDirect3DDevice8::SetPixelShaderConstant - OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_3925, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), - // IDirect3DDevice8_InsertCallback - OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_3925, XTL::EmuIDirect3DDevice8_InsertCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_3925, D3DDevice_SetPixelShaderConstant), + // D3DDevice_InsertCallback + OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_3925, D3DDevice_InsertCallback), // IDirect3DDevice8::BeginPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_BeginPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_3925, D3DDevice_BeginPushBuffer), // IDirect3DDevice8::EndPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_EndPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_3925, D3DDevice_EndPushBuffer), // IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_3925, D3DDevice_SetRenderState_RopZCmpAlwaysRead), // IDirect3DDevice8::SetRenderState_RopZRead - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZRead_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_RopZRead), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZRead_1_0_3925, D3DDevice_SetRenderState_RopZRead), // IDirect3DDevice8::SetRenderState_DoNotCullUncompressed - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_DoNotCullUncompressed_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_3925, D3DDevice_SetRenderState_DoNotCullUncompressed), // XMETAL_StartPush /* - OOVPA_TABLE_PATCH(XMETAL_StartPush_1_0_3925, XTL::EmuXMETAL_StartPush), + OOVPA_TABLE_PATCH(XMETAL_StartPush_1_0_3925, XMETAL_StartPush), */ // D3D::SetFence (XREF) OOVPA_TABLE_XREF(D3D_SetFence_1_0_3925), // IDirect3DDevice8::InsertFence - OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_3925, XTL::EmuIDirect3DDevice8_InsertFence), + OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_3925, D3DDevice_InsertFence), // D3DDevice_LoadVertexShaderProgram - OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_3925, XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_3925, D3DDevice_LoadVertexShaderProgram), // D3DDevice_DeleteVertexShader - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), // IDirect3DDevice8::RunPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_RunPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_3925, D3DDevice_RunPushBuffer), // IDirect3DDevice8::BlockOnFence - OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_3925, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_3925, D3DDevice_BlockOnFence), // IDirect3DDevice8::Reset - OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_3925, XTL::EmuIDirect3DDevice8_Reset), + OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_3925, D3DDevice_Reset), // Direct3D_GetAdapterIdentifier - OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, XTL::EmuIDirect3D8_GetAdapterIdentifier), + OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, D3D_GetAdapterIdentifier), // Direct3D_GetDeviceCaps - OOVPA_TABLE_PATCH(Direct3D_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3D8_GetDeviceCaps), + OOVPA_TABLE_PATCH(Direct3D_GetDeviceCaps_1_0_3925, D3D_GetDeviceCaps), // D3D::SetCommonDebugRegisters - OOVPA_TABLE_PATCH(D3D_SetCommonDebugRegisters_1_0_3925, XTL::EmuD3D_SetCommonDebugRegisters), + OOVPA_TABLE_PATCH(D3D_SetCommonDebugRegisters_1_0_3925, D3D_SetCommonDebugRegisters), // D3DDevice_CreateImageSurface - OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_3925, XTL::EmuIDirect3DDevice8_CreateImageSurface), + OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_3925, D3DDevice_CreateImageSurface), // D3D::BlockOnTime - OOVPA_TABLE_PATCH(D3D_BlockOnTime_1_0_3925, XTL::EmuD3D_BlockOnTime), + OOVPA_TABLE_PATCH(D3D_BlockOnTime_1_0_3925, D3D_BlockOnTime), // D3D::BlockOnResource - OOVPA_TABLE_PATCH(D3D_BlockOnResource_1_0_3925, XTL::EmuD3D_BlockOnResource), + OOVPA_TABLE_PATCH(D3D_BlockOnResource_1_0_3925, D3D_BlockOnResource), // D3DDevice_BeginStateBlock - OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_BeginStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_3925, D3DDevice_BeginStateBlock), // D3DDevice_EndStateBlock - OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_3925, XTL::EmuIDirect3DDevice8_EndStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_3925, D3DDevice_EndStateBlock), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h index 74105c653..09e940ee8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 8a0712a83..fe2fa3ab4 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -33,9 +33,9 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3DDevice8_GetGammaRamp +// * D3DDevice_GetGammaRamp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetGammaRamp_1_0_4034, 7) +OOVPA_NO_XREF(D3DDevice_GetGammaRamp_1_0_4034, 7) { 0x05, 0x8B }, { 0x0A, 0x00 }, { 0x10, 0xE1 }, @@ -47,9 +47,9 @@ OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetCreationParameters +// * D3DDevice_GetCreationParameters // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetCreationParameters_1_0_4034, 7) +OOVPA_NO_XREF(D3DDevice_GetCreationParameters_1_0_4034, 7) { 0x06, 0x8B }, { 0x0E, 0x8B }, @@ -61,104 +61,104 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetCreationParameters_1_0_4034, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetViewport +// * D3DDevice_GetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_4034, 10) - // IDirect3DDevice8_GetViewport+0x05 : push esi; push edi + // D3DDevice_GetViewport+0x05 : push esi; push edi { 0x05, 0x56 }, // (Offset,Value)-Pair #1 { 0x06, 0x57 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetViewport+0x0B : lea esi, [eax+0x0B50] + // D3DDevice_GetViewport+0x0B : lea esi, [eax+0x0B50] { 0x0B, 0x8D }, // (Offset,Value)-Pair #3 { 0x0C, 0xB0 }, // (Offset,Value)-Pair #4 { 0x0D, 0x50 }, // (Offset,Value)-Pair #5 { 0x0E, 0x0B }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetViewport+0x11 : mov ecx, 6 + // D3DDevice_GetViewport+0x11 : mov ecx, 6 { 0x11, 0xB9 }, // (Offset,Value)-Pair #7 { 0x12, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetViewport+0x1A : retn 0x04 + // D3DDevice_GetViewport+0x1A : retn 0x04 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1B, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_4034, 10) - // IDirect3DDevice8_SetViewport+0x00 : sub esp, 0x08 + // D3DDevice_SetViewport+0x00 : sub esp, 0x08 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetViewport+0x2D : mov ebx, [esp+0x14] + // D3DDevice_SetViewport+0x2D : mov ebx, [esp+0x14] { 0x2D, 0x8B }, // (Offset,Value)-Pair #4 { 0x2E, 0x5C }, // (Offset,Value)-Pair #5 { 0x2F, 0x24 }, // (Offset,Value)-Pair #6 { 0x30, 0x14 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetViewport+0x53 : jnz +0x12 + // D3DDevice_SetViewport+0x53 : jnz +0x12 { 0x53, 0x75 }, // (Offset,Value)-Pair #8 { 0x54, 0x12 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetViewport+0x9B : inc edx + // D3DDevice_SetViewport+0x9B : inc edx { 0x9B, 0x42 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTransform +// * D3DDevice_SetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_SetTransform_1_0_4034, 10) - // IDirect3DDevice8_SetTransform+0x44 : fld dword ptr [edx+0x28] + // D3DDevice_SetTransform+0x44 : fld dword ptr [edx+0x28] { 0x44, 0xD9 }, // (Offset,Value)-Pair #1 { 0x45, 0x42 }, // (Offset,Value)-Pair #2 { 0x46, 0x28 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTransform+0x51 : test ah, 0x44 + // D3DDevice_SetTransform+0x51 : test ah, 0x44 { 0x51, 0xF6 }, // (Offset,Value)-Pair #4 { 0x52, 0xC4 }, // (Offset,Value)-Pair #5 { 0x53, 0x44 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTransform+0x5F : fnstsw ax + // D3DDevice_SetTransform+0x5F : fnstsw ax { 0x5F, 0xDF }, // (Offset,Value)-Pair #7 { 0x60, 0xE0 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTransform+0x84 : fdivp st(1), st + // D3DDevice_SetTransform+0x84 : fdivp st(1), st { 0x84, 0xDE }, // (Offset,Value)-Pair #9 { 0x85, 0xF9 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_CullMode +// * D3DDevice_SetRenderState_CullMode // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, 14, +OOVPA_XREF(D3DDevice_SetRenderState_CullMode_1_0_4034, 14, XREF_DXSRSCULLMODE, XRefZero) - // IDirect3DDevice8_SetRenderState_CullMode+0x00 : push esi + // D3DDevice_SetRenderState_CullMode+0x00 : push esi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308 + // D3DDevice_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308 { 0x19, 0xC7 }, // (Offset,Value)-Pair #2 { 0x1B, 0x08 }, // (Offset,Value)-Pair #3 { 0x1C, 0x03 }, // (Offset,Value)-Pair #4 { 0x1D, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_CullMode+0x24 : add eax, 8 + // D3DDevice_SetRenderState_CullMode+0x24 : add eax, 8 { 0x24, 0x83 }, // (Offset,Value)-Pair #6 { 0x25, 0xC0 }, // (Offset,Value)-Pair #7 { 0x26, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_CullMode+0x30 : retn 4 + // D3DDevice_SetRenderState_CullMode+0x30 : retn 4 { 0x30, 0xC2 }, // (Offset,Value)-Pair #9 { 0x31, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_CullMode+0x53 : add edx, 0x404 + // D3DDevice_SetRenderState_CullMode+0x53 : add edx, 0x404 { 0x53, 0x81 }, // (Offset,Value)-Pair #11 { 0x54, 0xC2 }, // (Offset,Value)-Pair #12 { 0x55, 0x04 }, // (Offset,Value)-Pair #13 @@ -223,24 +223,24 @@ OOVPA_NO_XREF(D3DDevice_DeletePatch_1_0_4034, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4034, 11) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_4034, 11) - // IDirect3DDevice8_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] + // D3DDevice_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0x46 }, // (Offset,Value)-Pair #2 { 0x10, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawIndexedVertices+0x20 : push 0x0209 + // D3DDevice_DrawIndexedVertices+0x20 : push 0x0209 { 0x20, 0x68 }, // (Offset,Value)-Pair #4 { 0x21, 0x09 }, // (Offset,Value)-Pair #5 { 0x22, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_DrawIndexedVertices+0x64 : dec eax + // D3DDevice_DrawIndexedVertices+0x64 : dec eax { 0x64, 0x48 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawIndexedVertices+0xF1 : prefetchnta byte ptr [esi+0x3C] + // D3DDevice_DrawIndexedVertices+0xF1 : prefetchnta byte ptr [esi+0x3C] { 0xF1, 0x0F }, // (Offset,Value)-Pair #8 { 0xF2, 0x18 }, // (Offset,Value)-Pair #9 { 0xF3, 0x46 }, // (Offset,Value)-Pair #10 @@ -248,31 +248,31 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4034, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetStreamSource +// * D3DDevice_SetStreamSource // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_4034, 14) +OOVPA_NO_XREF(D3DDevice_SetStreamSource_1_0_4034, 14) - // IDirect3DDevice8_SetStreamSource+0x08 : mov edi, [esp+8+0x04] + // D3DDevice_SetStreamSource+0x08 : mov edi, [esp+8+0x04] { 0x08, 0x8B }, // (Offset,Value)-Pair #1 { 0x09, 0x7C }, // (Offset,Value)-Pair #2 { 0x0A, 0x24 }, // (Offset,Value)-Pair #3 { 0x0B, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetStreamSource+0x28 : jz +0x26 + // D3DDevice_SetStreamSource+0x28 : jz +0x26 { 0x28, 0x74 }, // (Offset,Value)-Pair #5 { 0x29, 0x26 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetStreamSource+0x70 : or ecx, 0x40 + // D3DDevice_SetStreamSource+0x70 : or ecx, 0x40 { 0x70, 0x83 }, // (Offset,Value)-Pair #7 { 0x71, 0xC9 }, // (Offset,Value)-Pair #8 { 0x72, 0x40 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetStreamSource+0x7E : or ecx, 0x70 + // D3DDevice_SetStreamSource+0x7E : or ecx, 0x70 { 0x7E, 0x83 }, // (Offset,Value)-Pair #10 { 0x7F, 0xC9 }, // (Offset,Value)-Pair #11 { 0x80, 0x70 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetStreamSource+0x89 : retn 0x0C + // D3DDevice_SetStreamSource+0x89 : retn 0x0C { 0x89, 0xC2 }, // (Offset,Value)-Pair #13 { 0x8A, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; @@ -306,49 +306,49 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_1_0_4034, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVertices +// * D3DDevice_DrawVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_4034, 12) +OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_4034, 12) - // IDirect3DDevice8_DrawVertices+0x12 : mov edi, [esp+0x0C+0x0C] + // D3DDevice_DrawVertices+0x12 : mov edi, [esp+0x0C+0x0C] { 0x12, 0x8B }, // (Offset,Value)-Pair #1 { 0x13, 0x7C }, // (Offset,Value)-Pair #2 { 0x14, 0x24 }, // (Offset,Value)-Pair #3 { 0x15, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawVertices+0x16 : lea esi, [edi-1] + // D3DDevice_DrawVertices+0x16 : lea esi, [edi-1] { 0x16, 0x8D }, // (Offset,Value)-Pair #5 { 0x17, 0x77 }, // (Offset,Value)-Pair #6 { 0x18, 0xFF }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVertices+0x7E : shl edi, 0x18 + // D3DDevice_DrawVertices+0x7E : shl edi, 0x18 { 0x7E, 0xC1 }, // (Offset,Value)-Pair #8 { 0x7F, 0xE7 }, // (Offset,Value)-Pair #9 { 0x80, 0x18 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_DrawVertices+0x9C : retn 0x0C + // D3DDevice_DrawVertices+0x9C : retn 0x0C { 0x9C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x9D, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LoadVertexShader +// * D3DDevice_LoadVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LoadVertexShader_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_LoadVertexShader_1_0_4034, 10) - // IDirect3DDevice8_LoadVertexShader+0x07 : mov al, [ebx+0x08] + // D3DDevice_LoadVertexShader+0x07 : mov al, [ebx+0x08] { 0x07, 0x8A }, // (Offset,Value)-Pair #1 { 0x08, 0x43 }, // (Offset,Value)-Pair #2 { 0x09, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_LoadVertexShader+0x32 : mov dword ptr [eax], 0x00041E9C + // D3DDevice_LoadVertexShader+0x32 : mov dword ptr [eax], 0x00041E9C { 0x32, 0xC7 }, // (Offset,Value)-Pair #4 { 0x33, 0x00 }, // (Offset,Value)-Pair #5 { 0x34, 0x9C }, // (Offset,Value)-Pair #6 { 0x35, 0x1E }, // (Offset,Value)-Pair #7 { 0x36, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_LoadVertexShader+0x4E : mov [ebx], ebx + // D3DDevice_LoadVertexShader+0x4E : mov [ebx], ebx { 0x4E, 0x89 }, // (Offset,Value)-Pair #9 { 0x4F, 0x13 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -369,24 +369,24 @@ OOVPA_NO_XREF(D3DDevice_DrawRectPatch_1_0_4034, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_4034, 11) +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_4034, 11) - // IDirect3DDevice8_SetIndices+0x0E : jz +0x10 + // D3DDevice_SetIndices+0x0E : jz +0x10 { 0x0E, 0x74 }, // (Offset,Value)-Pair #1 { 0x0F, 0x10 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetIndices+0x1E : jmp +0x0A + // D3DDevice_SetIndices+0x1E : jmp +0x0A { 0x1E, 0xEB }, // (Offset,Value)-Pair #3 { 0x1F, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetIndices+0x59 : mov [esi+0x1C], ecx + // D3DDevice_SetIndices+0x59 : mov [esi+0x1C], ecx { 0x59, 0x89 }, // (Offset,Value)-Pair #5 { 0x5A, 0x4E }, // (Offset,Value)-Pair #6 { 0x5B, 0x1C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetIndices+0x76 : mov [esi+0x0504], edi + // D3DDevice_SetIndices+0x76 : mov [esi+0x0504], edi { 0x76, 0x89 }, // (Offset,Value)-Pair #8 { 0x77, 0xBE }, // (Offset,Value)-Pair #9 { 0x78, 0x04 }, // (Offset,Value)-Pair #10 @@ -534,30 +534,30 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc_1_0_4034, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Simple +// * D3DDevice_SetRenderState_Simple // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Simple_1_0_4034, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Simple_1_0_4034, 13) - // IDirect3DDevice8_SetRenderState_Simple+0x05 : add eax, 0x08 + // D3DDevice_SetRenderState_Simple+0x05 : add eax, 0x08 { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_Simple+0x0E : jnb +0x0C + // D3DDevice_SetRenderState_Simple+0x0E : jnb +0x0C { 0x0E, 0x73 }, // (Offset,Value)-Pair #4 { 0x0F, 0x0C }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_Simple+0x15 : mov [eax-8], ecx + // D3DDevice_SetRenderState_Simple+0x15 : mov [eax-8], ecx { 0x15, 0x89 }, // (Offset,Value)-Pair #6 { 0x16, 0x48 }, // (Offset,Value)-Pair #7 { 0x17, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_Simple+0x18 : mov [eax-4], ecx + // D3DDevice_SetRenderState_Simple+0x18 : mov [eax-4], ecx { 0x18, 0x89 }, // (Offset,Value)-Pair #9 { 0x19, 0x50 }, // (Offset,Value)-Pair #10 { 0x1A, 0xFC }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_Simple+0x25 : jmp +0xD9 + // D3DDevice_SetRenderState_Simple+0x25 : jmp +0xD9 { 0x25, 0xEB }, // (Offset,Value)-Pair #12 { 0x26, 0xD9 }, // (Offset,Value)-Pair #13 OOVPA_END; @@ -685,80 +685,80 @@ OOVPA_END; */ // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4034, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_4034, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ZEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] + // D3DDevice_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] { 0x1B, 0x8B }, // (Offset,Value)-Pair #3 { 0x1C, 0x96 }, // (Offset,Value)-Pair #4 { 0x1D, 0xF4 }, // (Offset,Value)-Pair #5 { 0x1E, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C + // D3DDevice_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C { 0x31, 0xC7 }, // (Offset,Value)-Pair #7 { 0x32, 0x00 }, // (Offset,Value)-Pair #8 { 0x33, 0x0C }, // (Offset,Value)-Pair #9 { 0x34, 0x03 }, // (Offset,Value)-Pair #10 { 0x35, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x98 : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x98 : retn 0x04 { 0x98, 0xC2 }, // (Offset,Value)-Pair #12 { 0x99, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_4034, 13) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_4034, 13) - // IDirect3DDevice8_LightEnable+0x0F : cmp ebx, [esi+0x050C] + // D3DDevice_LightEnable+0x0F : cmp ebx, [esi+0x050C] { 0x0F, 0x3B }, // (Offset,Value)-Pair #1 { 0x10, 0x9E }, // (Offset,Value)-Pair #2 { 0x11, 0x0C }, // (Offset,Value)-Pair #3 { 0x12, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_LightEnable+0x6B : test eax, eax + // D3DDevice_LightEnable+0x6B : test eax, eax { 0x6B, 0x85 }, // (Offset,Value)-Pair #5 { 0x6C, 0xC0 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_LightEnable+0x9E : mov eax, [eax+0x8C] + // D3DDevice_LightEnable+0x9E : mov eax, [eax+0x8C] { 0x9E, 0x8B }, // (Offset,Value)-Pair #7 { 0x9F, 0x80 }, // (Offset,Value)-Pair #8 { 0xA0, 0x8C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_LightEnable+0xBC : jz +0x12 + // D3DDevice_LightEnable+0xBC : jz +0x12 { 0xBC, 0x74 }, // (Offset,Value)-Pair #10 { 0xBD, 0x12 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_LightEnable+0xE1 : retn 0x08 + // D3DDevice_LightEnable+0xE1 : retn 0x08 { 0xE1, 0xC2 }, // (Offset,Value)-Pair #12 { 0xE2, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4034, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_4034, 9) - // IDirect3DDevice8_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x04E8] + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x04E8] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x86 }, // (Offset,Value)-Pair #2 { 0x09, 0xE8 }, // (Offset,Value)-Pair #3 { 0x0A, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x2F : nop + // D3DDevice_SetRenderState_TextureFactor+0x2F : nop { 0x2F, 0x90 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x41 : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x41 : retn 0x04 { 0x41, 0xC2 }, // (Offset,Value)-Pair #6 { 0x42, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x4E : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #8 { 0x4F, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; @@ -786,197 +786,197 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_4034, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_4034, 9) - // IDirect3DDevice8_Clear+0x0000 : sub esp, 38h +OOVPA_NO_XREF_LARGE(D3DDevice_Clear_1_0_4034, 9) + // D3DDevice_Clear+0x0000 : sub esp, 38h { 0x0000, 0x83 }, // (Offset,Value)-Pair #1 { 0x0001, 0xEC }, // (Offset,Value)-Pair #2 { 0x0002, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x000B : mov ebx, [ebp+0x21F4] + // D3DDevice_Clear+0x000B : mov ebx, [ebp+0x21F4] { 0x000B, 0x8B }, // (Offset,Value)-Pair #4 { 0x000C, 0x9D }, // (Offset,Value)-Pair #5 { 0x000D, 0xF4 }, // (Offset,Value)-Pair #6 { 0x000E, 0x21 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Clear+0x0399 : retn 0x18 + // D3DDevice_Clear+0x0399 : retn 0x18 { 0x0399, 0xC2 }, // (Offset,Value)-Pair #8 { 0x039A, 0x18 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_4034, 12) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_4034, 12) - // IDirect3DDevice8_SetLight+0x11 : mov edi, [ebp+0x50C] + // D3DDevice_SetLight+0x11 : mov edi, [ebp+0x50C] { 0x11, 0x8B }, // (Offset,Value)-Pair #1 { 0x12, 0xBD }, // (Offset,Value)-Pair #2 { 0x13, 0x0C }, // (Offset,Value)-Pair #3 { 0x14, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetLight+0x30 : shl eax, 0x04 + // D3DDevice_SetLight+0x30 : shl eax, 0x04 { 0x30, 0xC1 }, // (Offset,Value)-Pair #5 { 0x31, 0xE0 }, // (Offset,Value)-Pair #6 { 0x32, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetLight+0xBD : rep stosb + // D3DDevice_SetLight+0xBD : rep stosb { 0xBD, 0xF3 }, // (Offset,Value)-Pair #8 { 0xBE, 0xAB }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetLight+0xFD : mov ecx, [ebx+0x68] + // D3DDevice_SetLight+0xFD : mov ecx, [ebx+0x68] { 0xFD, 0x8B }, // (Offset,Value)-Pair #10 { 0xFE, 0x4B }, // (Offset,Value)-Pair #11 { 0xFF, 0x68 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock +// * D3DVertexBuffer_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_4034, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_4034, 11) - // IDirect3DVertexBuffer8_Lock+0x01 : mov bl, [esp+0x18] + // D3DVertexBuffer_Lock+0x01 : mov bl, [esp+0x18] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x24 }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock+0x2F : test bl, 0xA0 + // D3DVertexBuffer_Lock+0x2F : test bl, 0xA0 { 0x2F, 0xF6 }, // (Offset,Value)-Pair #7 { 0x30, 0xC3 }, // (Offset,Value)-Pair #8 { 0x31, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock+0x50 : retn 0x14 + // D3DVertexBuffer_Lock+0x50 : retn 0x14 { 0x50, 0xC2 }, // (Offset,Value)-Pair #10 { 0x51, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTexture +// * D3DDevice_SetTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_SetTexture_1_0_4034, 10) - // IDirect3DDevice8_SetTexture+0x09 : push edi + // D3DDevice_SetTexture+0x09 : push edi { 0x09, 0x57 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetTexture+0x21 : jz +0x20 + // D3DDevice_SetTexture+0x21 : jz +0x20 { 0x21, 0x74 }, // (Offset,Value)-Pair #2 { 0x22, 0x20 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTexture+0x33 : test ecx, 0x78FFFF + // D3DDevice_SetTexture+0x33 : test ecx, 0x78FFFF { 0x33, 0xF7 }, // (Offset,Value)-Pair #4 { 0x34, 0xC1 }, // (Offset,Value)-Pair #5 { 0x37, 0x78 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTexture+0x39 : mov [eax], edx + // D3DDevice_SetTexture+0x39 : mov [eax], edx { 0x39, 0x89 }, // (Offset,Value)-Pair #7 { 0x3A, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTexture+0xC9 : jz +0x4D + // D3DDevice_SetTexture+0xC9 : jz +0x4D { 0xC9, 0x74 }, // (Offset,Value)-Pair #9 { 0xCA, 0x4D }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_4034, 12) +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_4034, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0C08] + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0C08] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xBE }, // (Offset,Value)-Pair #3 { 0x10, 0x08 }, // (Offset,Value)-Pair #4 { 0x11, 0x0C }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x76 : add edi, 0x41B20 + // D3DDevice_SetPalette+0x76 : add edi, 0x41B20 { 0x76, 0x81 }, // (Offset,Value)-Pair #6 { 0x77, 0xC7 }, // (Offset,Value)-Pair #7 { 0x78, 0x20 }, // (Offset,Value)-Pair #8 { 0x79, 0x1B }, // (Offset,Value)-Pair #9 { 0x7A, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x8A : retn 0x08 + // D3DDevice_SetPalette+0x8A : retn 0x08 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x8B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4034, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_4034, 10) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 + // D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, // (Offset,Value)-Pair #1 { 0x14, 0xE0 }, // (Offset,Value)-Pair #2 { 0x15, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x25 : cmp eax, ecx + // D3DDevice_SetTextureState_TexCoordIndex+0x25 : cmp eax, ecx { 0x25, 0x3B }, // (Offset,Value)-Pair #4 { 0x26, 0xC1 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x6C : mov edi, 0x2400 + // D3DDevice_SetTextureState_TexCoordIndex+0x6C : mov edi, 0x2400 { 0x6C, 0xBF }, // (Offset,Value)-Pair #6 { 0x6E, 0x24 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0xB4 : shl edx, 0x04 + // D3DDevice_SetTextureState_TexCoordIndex+0xB4 : shl edx, 0x04 { 0xB4, 0xC1 }, // (Offset,Value)-Pair #8 { 0xB5, 0xE2 }, // (Offset,Value)-Pair #9 { 0xB6, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_4034, 12) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_4034, 12) - // IDirect3DDevice8_SetMaterial+0x0C : add edi, 0x0B70 + // D3DDevice_SetMaterial+0x0C : add edi, 0x0B70 { 0x0C, 0x81 }, // (Offset,Value)-Pair #1 { 0x0D, 0xC7 }, // (Offset,Value)-Pair #2 { 0x0E, 0x70 }, // (Offset,Value)-Pair #3 { 0x0F, 0x0B }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetMaterial+0x12 : mov ecx, 0x11 + // D3DDevice_SetMaterial+0x12 : mov ecx, 0x11 { 0x12, 0xB9 }, // (Offset,Value)-Pair #5 { 0x13, 0x11 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetMaterial+0x1F : or ecx, 0x1000 + // D3DDevice_SetMaterial+0x1F : or ecx, 0x1000 { 0x1F, 0x81 }, // (Offset,Value)-Pair #7 { 0x20, 0xC9 }, // (Offset,Value)-Pair #8 { 0x21, 0x00 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetMaterial+0x2D : retn 0x04 + // D3DDevice_SetMaterial+0x2D : retn 0x04 { 0x2D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2E, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_4034, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_4034, 14) - // IDirect3DDevice8_SetVertexShader+0x06 : test bl, 1 + // D3DDevice_SetVertexShader+0x06 : test bl, 1 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShader+0x11 : mov eax, [esi+0x04F8] + // D3DDevice_SetVertexShader+0x11 : mov eax, [esi+0x04F8] { 0x11, 0x8B }, // (Offset,Value)-Pair #4 { 0x12, 0x86 }, // (Offset,Value)-Pair #5 { 0x13, 0xF8 }, // (Offset,Value)-Pair #6 { 0x14, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShader+0x90 : retn 0x04 + // D3DDevice_SetVertexShader+0x90 : retn 0x04 { 0x90, 0xC2 }, // (Offset,Value)-Pair #8 { 0x91, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C + // D3DDevice_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C { 0xB0, 0xC7 }, // (Offset,Value)-Pair #10 { 0xB1, 0x00 }, // (Offset,Value)-Pair #11 { 0xB2, 0x4C }, // (Offset,Value)-Pair #12 @@ -989,95 +989,95 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_Swap_1_0_4034, 11) - // IDirect3DDevice8_Swap+0x10 : mov ebx, 5 + // D3DDevice_Swap+0x10 : mov ebx, 5 { 0x10, 0xBB }, // (Offset,Value)-Pair #1 { 0x11, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Swap+0x1D : test bl, 3 + // D3DDevice_Swap+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_Swap+0x30 : mov [esi+0x2C38], eax + // D3DDevice_Swap+0x30 : mov [esi+0x2C38], eax { 0x30, 0x89 }, // (Offset,Value)-Pair #6 { 0x31, 0x86 }, // (Offset,Value)-Pair #7 { 0x32, 0x38 }, // (Offset,Value)-Pair #8 { 0x33, 0x2C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xB0 : retn 4 + // D3DDevice_Swap+0xB0 : retn 4 { 0xB0, 0xC2 }, // (Offset,Value)-Pair #10 { 0xB1, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3D8_KickOffAndWaitForIdle +// * D3D_KickOffAndWaitForIdle // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle_1_0_4034, 9) +OOVPA_NO_XREF(D3D_KickOffAndWaitForIdle_1_0_4034, 9) - // IDirect3D8_KickOffAndWaitForIdle+0x00 : mov eax, [addr] + // D3D_KickOffAndWaitForIdle+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3D8_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x30] + // D3D_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x30] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x48 }, // (Offset,Value)-Pair #3 { 0x07, 0x30 }, // (Offset,Value)-Pair #4 - // IDirect3D8_KickOffAndWaitForIdle+0x08 : push 0 + // D3D_KickOffAndWaitForIdle+0x08 : push 0 { 0x08, 0x6A }, // (Offset,Value)-Pair #5 { 0x09, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3D8_KickOffAndWaitForIdle+0x0A : push ecx + // D3D_KickOffAndWaitForIdle+0x0A : push ecx { 0x0A, 0x51 }, // (Offset,Value)-Pair #7 - // IDirect3D8_KickOffAndWaitForIdle+0x0B : call [addr] + // D3D_KickOffAndWaitForIdle+0x0B : call [addr] { 0x0B, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3D8_KickOffAndWaitForIdle+0x10 : retn + // D3D_KickOffAndWaitForIdle+0x10 : retn { 0x10, 0xC3 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateImageSurface +// * D3DDevice_CreateImageSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateImageSurface_1_0_4034, 9) +OOVPA_NO_XREF(D3DDevice_CreateImageSurface_1_0_4034, 9) - // IDirect3DDevice8_CreateImageSurface+0x2A : push 0x18 + // D3DDevice_CreateImageSurface+0x2A : push 0x18 { 0x2A, 0x6A }, // (Offset,Value)-Pair #1 { 0x2B, 0x18 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateImageSurface+0x2C : push 0x40 + // D3DDevice_CreateImageSurface+0x2C : push 0x40 { 0x2C, 0x6A }, // (Offset,Value)-Pair #3 { 0x2D, 0x40 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateImageSurface+0x3B : push 0x0404 + // D3DDevice_CreateImageSurface+0x3B : push 0x0404 { 0x3B, 0x68 }, // (Offset,Value)-Pair #5 { 0x3C, 0x04 }, // (Offset,Value)-Pair #6 { 0x3D, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateImageSurface+0x61 : retn 0x10 + // D3DDevice_CreateImageSurface+0x61 : retn 0x10 { 0x61, 0xC2 }, // (Offset,Value)-Pair #8 { 0x62, 0x10 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer +// * D3DDevice_GetBackBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer_1_0_4034, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer_1_0_4034, 12) - // IDirect3DDevice8_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF + // D3DDevice_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0xF8 }, // (Offset,Value)-Pair #2 { 0x06, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetBackBuffer+0x0D : jnz +0x07 + // D3DDevice_GetBackBuffer+0x0D : jnz +0x07 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer+0x18 : sbb eax, eax + // D3DDevice_GetBackBuffer+0x18 : sbb eax, eax { 0x18, 0x1B }, // (Offset,Value)-Pair #6 { 0x19, 0xC0 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetBackBuffer+0x1D : mov eax, [ecx+eax*4+0x21FC] + // D3DDevice_GetBackBuffer+0x1D : mov eax, [ecx+eax*4+0x21FC] { 0x1D, 0x8B }, // (Offset,Value)-Pair #8 { 0x1E, 0x84 }, // (Offset,Value)-Pair #9 { 0x1F, 0x81 }, // (Offset,Value)-Pair #10 @@ -1091,268 +1091,268 @@ OOVPA_END; OOVPATable D3D8_1_0_4034[] = { // IDirect3D8::CreateDevice (* unchanged since 1.0.3925 *) - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_3925, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_3925, D3D_CreateDevice), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_4034, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_4034, D3DDevice_Clear), // IDirect3DResource8::Register - OOVPA_TABLE_PATCH(IDirect3DResource8_Register_1_0_3925, XTL::EmuIDirect3DResource8_Register), + OOVPA_TABLE_PATCH(D3DResource_Register_1_0_3925, D3DResource_Register), // ********************** BEG WARNING UNTESTED!!! ******************* #if 0 // IDirect3DDevice8::BeginVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_3925, D3DDevice_BeginVisibilityTest), // IDirect3DDevice8::EndVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_EndVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_3925, D3DDevice_EndVisibilityTest), // IDirect3DDevice8::LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_3925, D3DDevice_LoadVertexShader), // IDirect3DDevice8::SelectVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_3925, D3DDevice_SelectVertexShader), // IDirect3DDevice8::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_3925, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_3925, D3DDevice_Release), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_3925, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_3925, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_3925, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_3925, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_3925, D3DDevice_SetRenderTarget), // IDirect3DDevice8::GetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_3925, XTL::EmuIDirect3DDevice8_GetTransform), + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_3925, D3DDevice_GetTransform), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_3925, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_3925, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_3925, D3DDevice_SetVertexShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_3925, D3DDevice_SetPixelShader), // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_3925, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_3925, D3DDevice_SetIndices), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_3925, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_3925, D3DDevice_SetViewport), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_3925, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_3925, D3DDevice_SetTexture), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_3925, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_3925, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_3925, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_3925, D3DDevice_Begin), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_3925, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_3925, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexDataColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexDataColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexDataColor), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_3925, D3DDevice_SetVertexDataColor), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_3925, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_3925, D3DDevice_End), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_3925, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_3925, D3DDevice_Clear), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_3925, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_3925, D3DDevice_SetPalette), // IDirect3DDevice8::SetVertexShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_3925, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_3925, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_3925, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetTextureState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_3925, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetTextureState_BorderColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_3925, D3DDevice_SetTextureState_BorderColor), // IDirect3DDevice8::SetRenderState_PSTextureModes - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_PSTextureModes_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_PSTextureModes_1_0_3925, D3DDevice_SetRenderState_PSTextureModes), // IDirect3DDevice8::SetRenderState_StencilFail - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_3925, D3DDevice_SetRenderState_StencilFail), // IDirect3DDevice8::SetRenderState_CullMode /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_3925, D3DDevice_SetRenderState_CullMode), */ // IDirect3DDevice8::SetRenderState_Simple - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_3925, D3DDevice_SetRenderState_Simple), // IDirect3DDevice8::SetRenderState_FogColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_3925, D3DDevice_SetRenderState_FogColor), // IDirect3DDevice8::SetRenderState_FillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_3925, D3DDevice_SetRenderState_FillMode), // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_3925, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_3925, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_3925, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::Present - OOVPA_TABLE_PATCH(IDirect3DDevice8_Present_1_0_3925, XTL::EmuIDirect3DDevice8_Present), + OOVPA_TABLE_PATCH(D3DDevice_Present_1_0_3925, D3DDevice_Present), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_3925, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::GetBackBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_3925, D3DDevice_GetBackBuffer), // IDirect3DDevice8::GetDepthStencilSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface_1_0_3925, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface_1_0_3925, D3DDevice_GetDepthStencilSurface), // IDirect3DVertexBuffer8::Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_3925, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_3925, D3DVertexBuffer_Lock), // IDirect3DResource8::IsBusy - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_3925, XTL::EmuIDirect3DResource8_IsBusy), + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_3925, D3DResource_IsBusy), // Get2DSurfacDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, Get2DSurfaceDesc), // ********************** END WARNING UNTESTED!!! ******************* #endif // IDirect3DDevice8::GetGammaRamp - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetGammaRamp_1_0_4034, XTL::EmuIDirect3DDevice8_GetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_GetGammaRamp_1_0_4034, D3DDevice_GetGammaRamp), // IDirect3DDevice8::GetCreationParameters - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetCreationParameters_1_0_4034, XTL::EmuIDirect3DDevice8_GetCreationParameters), + OOVPA_TABLE_PATCH(D3DDevice_GetCreationParameters_1_0_4034, D3DDevice_GetCreationParameters), // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_4034, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_4034, D3DDevice_GetViewport), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_4034, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_4034, D3DDevice_SetViewport), // IDirect3DDevice8::SetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4034, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4034, D3DDevice_SetTransform), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // 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::SetRenderState_CullMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_4034, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::CreateCubeTexture (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateCubeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateCubeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateCubeTexture_1_0_3925, D3DDevice_CreateCubeTexture), // IDirect3DDevice8::GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // IDirect3DDevice8::CreatePalette (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePalette), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette_1_0_3925, D3DDevice_CreatePalette), // IDirect3DDevice8::CreateTexture (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture_1_0_3925, D3DDevice_CreateTexture), // IDirect3DDevice8::CreateVolumeTexture (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVolumeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVolumeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateVolumeTexture_1_0_3925, D3DDevice_CreateVolumeTexture), // IDirect3DDevice8::CreateIndexBuffer (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateIndexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer_1_0_3925, D3DDevice_CreateIndexBuffer), // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // 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::CreateVertexBuffer (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer_1_0_3925, D3DDevice_CreateVertexBuffer), // 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::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), // IDirect3DPalette8::Lock (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock_1_0_3925, XTL::EmuIDirect3DPalette8_Lock), + OOVPA_TABLE_PATCH(D3DPalette_Lock_1_0_3925, D3DPalette_Lock), // IDirect3DTexture8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_3925, D3DTexture_LockRect), // IDirect3DVolumeTexture8::LockBox (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DVolumeTexture8_LockBox_1_0_3925, XTL::EmuIDirect3DVolumeTexture8_LockBox), + OOVPA_TABLE_PATCH(D3DVolumeTexture_LockBox_1_0_3925, D3DVolumeTexture_LockBox), // IDirect3DCubeTexture8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DCubeTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DCubeTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DCubeTexture_LockRect_1_0_3925, D3DCubeTexture_LockRect), // IDirect3DTexture8::GetSurfaceLevel (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel_1_0_3925, XTL::EmuIDirect3DTexture8_GetSurfaceLevel), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel_1_0_3925, D3DTexture_GetSurfaceLevel), // 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), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), - // IDirect3DDevice8_SetGammaRamp (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_3925, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), + // D3DDevice_SetGammaRamp (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_3925, D3DDevice_SetGammaRamp), // IDirect3DDevice8::DrawVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_4034, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_4034, D3DDevice_DrawVertices), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_4034, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_4034, D3DDevice_DrawIndexedVertices), // D3DDevice_BeginVisibilityTest - OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_4034, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_4034, D3DDevice_BeginVisibilityTest), // D3DDevice_EndVisibilityTest - OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_4034, XTL::EmuIDirect3DDevice8_EndVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_4034, D3DDevice_EndVisibilityTest), // D3DDevice_CopyRects - OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_4034, XTL::EmuIDirect3DDevice8_CopyRects), + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_4034, D3DDevice_CopyRects), // D3DDevice_DeletePatch (TODO) /* - OOVPA_TABLE_PATCH(D3DDevice_DeletePatch_1_0_4034, XTL::EmuIDirect3DDevice8_DeletePatch), + OOVPA_TABLE_PATCH(D3DDevice_DeletePatch_1_0_4034, D3DDevice_DeletePatch), */ // D3DDevice_SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_4034, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_4034, D3DDevice_SetStreamSource), // D3DDevice_SetTextureState_BorderColor - OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_4034, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_4034, D3DDevice_SetTextureState_BorderColor), // D3DDevice_SetTextureState_ColorKeyColor - OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_4034, XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_4034, D3DDevice_SetTextureState_ColorKeyColor), // D3DDevice_LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_4034, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_4034, D3DDevice_LoadVertexShader), // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), // D3DDevice_DrawRectPatch - OOVPA_TABLE_PATCH(D3DDevice_DrawRectPatch_1_0_4034, XTL::EmuIDirect3DDevice8_DrawRectPatch), + OOVPA_TABLE_PATCH(D3DDevice_DrawRectPatch_1_0_4034, D3DDevice_DrawRectPatch), // D3DDevice_SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_4034, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_4034, D3DDevice_SetIndices), // D3DDevice_SetRenderState_EdgeAntiAlias - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4034, D3DDevice_SetRenderState_EdgeAntiAlias), // D3DDevice_SetRenderState_FillMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_4034, D3DDevice_SetRenderState_FillMode), // D3DDevice_SetRenderState_BackFillMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4034, D3DDevice_SetRenderState_BackFillMode), // D3DDevice_SetRenderState_FogColor - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_4034, D3DDevice_SetRenderState_FogColor), // D3DDevice_SetRenderState_FrontFace - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FrontFace_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FrontFace_1_0_4034, D3DDevice_SetRenderState_FrontFace), // D3DDevice_SetRenderState_LogicOp - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4034, D3DDevice_SetRenderState_LogicOp), // D3DDevice_SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4034, D3DDevice_SetRenderState_MultiSampleAntiAlias), // D3DDevice_SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4034, D3DDevice_SetRenderState_MultiSampleMask), // D3DDevice_SetRenderState_NormalizeNormals - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4034, D3DDevice_SetRenderState_NormalizeNormals), // D3DDevice_SetRenderState_ShadowFunc - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_4034, D3DDevice_SetRenderState_ShadowFunc), // D3DDevice_SetRenderState_Simple - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_4034, D3DDevice_SetRenderState_Simple), // D3DDevice_SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4034, D3DDevice_SetRenderState_StencilEnable), // D3DDevice_SetRenderState_StencilFail - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4034, D3DDevice_SetRenderState_StencilFail), // D3DDevice_SetRenderState_YuvEnable - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_4034, D3DDevice_SetRenderState_YuvEnable), // D3DDevice_SetRenderState_TwoSidedLighting - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_4034, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_4034, D3DDevice_SetTextureState_TwoSidedLighting), // D3DDevice_SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), - // IDirect3D8_CheckDeviceFormat - OOVPA_TABLE_PATCH(Direct3D_CheckDeviceFormat_1_0_4034, XTL::EmuIDirect3D8_CheckDeviceFormat), - // IDirect3D8_SetPushBufferSize - OOVPA_TABLE_PATCH(Direct3D_SetPushBufferSize_1_0_4034, XTL::EmuIDirect3D8_SetPushBufferSize), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4034, D3DDevice_SetRenderState_VertexBlend), + // D3D_CheckDeviceFormat + OOVPA_TABLE_PATCH(Direct3D_CheckDeviceFormat_1_0_4034, D3D_CheckDeviceFormat), + // D3D_SetPushBufferSize + OOVPA_TABLE_PATCH(Direct3D_SetPushBufferSize_1_0_4034, D3D_SetPushBufferSize), // Get2DSurfacDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4034, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4034, Get2DSurfaceDesc), // D3DDevice_SetRenderState_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_4034, D3DDevice_SetRenderState_ZEnable), // D3DDevice_LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_4034, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_4034, D3DDevice_LightEnable), // D3DDevice_SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_4034, D3DDevice_SetRenderState_TextureFactor), // Direct3D_GetAdapterIdentifier (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, XTL::EmuIDirect3D8_GetAdapterIdentifier), + OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, D3D_GetAdapterIdentifier), // IDirect3DSurface8::GetDesc (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_3925, XTL::EmuIDirect3DSurface8_GetDesc), + OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_3925, D3DSurface_GetDesc), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_4034, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_4034, D3DDevice_SetLight), // IDirect3DVertexBuffer8::Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_4034, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_4034, D3DVertexBuffer_Lock), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_4034, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_4034, D3DDevice_SetTexture), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_4034, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_4034, D3DDevice_SetPalette), // IDirect3DDevice8::SetRenderState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4034, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4034, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4034, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4034, D3DDevice_SetMaterial), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_4034, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_4034, D3DDevice_SetVertexShader), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4034, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4034, D3DDevice_Swap), // IDirect3D8::KickOffAndWaitForIdle - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_4034, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_4034, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::CreateImageSurface (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateImageSurface_1_0_4034, XTL::EmuIDirect3DDevice8_CreateImageSurface), + OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_4034, D3DDevice_CreateImageSurface), // IDirect3DDevice8::GetBackBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_4034, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_4034, D3DDevice_GetBackBuffer), // D3DDevice_ /* - OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, XTL::EmuIDirect3DDevice8_), + OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, D3DDevice_), // D3DDevice_ - OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, XTL::EmuIDirect3DDevice8_), + OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, D3DDevice_), // D3DDevice_ - OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, XTL::EmuIDirect3DDevice8_), + OOVPA_TABLE_PATCH(D3DDevice__1_0_4034, D3DDevice_), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h index b566e972e..975f2e8a5 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index bc5ce7ba7..1398efa68 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -33,117 +33,117 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_4134, 10) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 + // D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, // (Offset,Value)-Pair #1 { 0x14, 0xE0 }, // (Offset,Value)-Pair #2 { 0x15, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x25 : cmp eax, ecx + // D3DDevice_SetTextureState_TexCoordIndex+0x25 : cmp eax, ecx { 0x25, 0x3B }, // (Offset,Value)-Pair #4 { 0x26, 0xC1 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x6C : mov edi, 0x2400 + // D3DDevice_SetTextureState_TexCoordIndex+0x6C : mov edi, 0x2400 { 0x6C, 0xBF }, // (Offset,Value)-Pair #6 { 0x6E, 0x24 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0xB3 : shl edx, 0x04 + // D3DDevice_SetTextureState_TexCoordIndex+0xB3 : shl edx, 0x04 { 0xB4, 0xC1 }, // (Offset,Value)-Pair #8 { 0xB5, 0xE2 }, // (Offset,Value)-Pair #9 { 0xB6, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTransform +// * D3DDevice_SetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetTransform_1_0_4134, 10) - // IDirect3DDevice8_SetTransform+0x16 : lea edi, [ecx+ebx+0x750] + // D3DDevice_SetTransform+0x16 : lea edi, [ecx+ebx+0x750] { 0x16, 0x8D }, // (Offset,Value)-Pair #1 { 0x17, 0xBC }, // (Offset,Value)-Pair #2 { 0x18, 0x19 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTransform+0x24 : repe movsd + // D3DDevice_SetTransform+0x24 : repe movsd { 0x24, 0xF3 }, // (Offset,Value)-Pair #4 { 0x25, 0xA5 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTransform+0x78 : fld [edx+0x3C] + // D3DDevice_SetTransform+0x78 : fld [edx+0x3C] { 0x78, 0xD9 }, // (Offset,Value)-Pair #6 { 0x79, 0x42 }, // (Offset,Value)-Pair #7 { 0x7A, 0x3C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTransform+0x92 : jmp +0x10 + // D3DDevice_SetTransform+0x92 : jmp +0x10 { 0x92, 0xEB }, // (Offset,Value)-Pair #9 { 0x93, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3D8_CheckDeviceFormat +// * D3D_CheckDeviceFormat // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CheckDeviceFormat_1_0_4134, 8) +OOVPA_NO_XREF(D3D_CheckDeviceFormat_1_0_4134, 8) - // IDirect3D8_CheckDeviceFormat+0x0D : retn 0x18 + // D3D_CheckDeviceFormat+0x0D : retn 0x18 { 0x0D, 0xC2 }, // (Offset,Value)-Pair #1 { 0x0E, 0x18 }, // (Offset,Value)-Pair #2 - // IDirect3D8_CheckDeviceFormat+0x15 : jz +0x08 + // D3D_CheckDeviceFormat+0x15 : jz +0x08 { 0x15, 0x74 }, // (Offset,Value)-Pair #3 { 0x16, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3D8_CheckDeviceFormat+0x29 : mov cl, 0x80 + // D3D_CheckDeviceFormat+0x29 : mov cl, 0x80 { 0x29, 0xB1 }, // (Offset,Value)-Pair #5 { 0x2A, 0x80 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CheckDeviceFormat+0x61 : retn 0x18 + // D3D_CheckDeviceFormat+0x61 : retn 0x18 { 0x61, 0xC2 }, // (Offset,Value)-Pair #7 { 0x62, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3D8_GetAdapterModeCount +// * D3D_GetAdapterModeCount // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_GetAdapterModeCount_1_0_4134, 12) +OOVPA_NO_XREF(D3D_GetAdapterModeCount_1_0_4134, 12) - // IDirect3D8_GetAdapterModeCount+0x25 : add edx, 0xFF + // D3D_GetAdapterModeCount+0x25 : add edx, 0xFF { 0x25, 0x81 }, // (Offset,Value)-Pair #1 { 0x26, 0xE2 }, // (Offset,Value)-Pair #2 { 0x27, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3D8_GetAdapterModeCount+0x47 : cmp edi, 0x04 + // D3D_GetAdapterModeCount+0x47 : cmp edi, 0x04 { 0x47, 0x83 }, // (Offset,Value)-Pair #4 { 0x48, 0xFF }, // (Offset,Value)-Pair #5 { 0x49, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3D8_GetAdapterModeCount+0x95 : shl eax, 0x02 + // D3D_GetAdapterModeCount+0x95 : shl eax, 0x02 { 0x95, 0xC1 }, // (Offset,Value)-Pair #7 { 0x96, 0xE0 }, // (Offset,Value)-Pair #8 { 0x97, 0x02 }, // (Offset,Value)-Pair #9 - // IDirect3D8_GetAdapterModeCount+0x99 : add esp, 0x08 + // D3D_GetAdapterModeCount+0x99 : add esp, 0x08 { 0x99, 0x83 }, // (Offset,Value)-Pair #10 { 0x9A, 0xC4 }, // (Offset,Value)-Pair #11 { 0x9B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3D8_EnumAdapterModes +// * D3D_EnumAdapterModes // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_EnumAdapterModes_1_0_4134, 10) +OOVPA_NO_XREF(D3D_EnumAdapterModes_1_0_4134, 10) - // IDirect3D8_EnumAdapterModes+0x00 : sub esp, 0x08 + // D3D_EnumAdapterModes+0x00 : sub esp, 0x08 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3D8_EnumAdapterModes+0xD1 : and edx, 0x0A + // D3D_EnumAdapterModes+0xD1 : and edx, 0x0A { 0xD1, 0x83 }, // (Offset,Value)-Pair #4 { 0xD2, 0xE2 }, // (Offset,Value)-Pair #5 { 0xD3, 0x0A }, // (Offset,Value)-Pair #6 - // IDirect3D8_EnumAdapterModes+0xF5 : mov dword ptr[edi+0x10], 0x1E + // D3D_EnumAdapterModes+0xF5 : mov dword ptr[edi+0x10], 0x1E { 0xF5, 0xC7 }, // (Offset,Value)-Pair #7 { 0xF6, 0x47 }, // (Offset,Value)-Pair #8 { 0xF7, 0x10 }, // (Offset,Value)-Pair #9 @@ -151,115 +151,115 @@ OOVPA_NO_XREF(IDirect3D8_EnumAdapterModes_1_0_4134, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LoadVertexShader +// * D3DDevice_LoadVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LoadVertexShader_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_LoadVertexShader_1_0_4134, 10) - // IDirect3DDevice8_LoadVertexShader+0x07 : mov al, [ebx+0x08] + // D3DDevice_LoadVertexShader+0x07 : mov al, [ebx+0x08] { 0x07, 0x8A }, // (Offset,Value)-Pair #1 { 0x08, 0x43 }, // (Offset,Value)-Pair #2 { 0x09, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_LoadVertexShader+0x32 : mov dword ptr [eax], 0x00041E9C + // D3DDevice_LoadVertexShader+0x32 : mov dword ptr [eax], 0x00041E9C { 0x32, 0xC7 }, // (Offset,Value)-Pair #4 { 0x33, 0x00 }, // (Offset,Value)-Pair #5 { 0x34, 0x9C }, // (Offset,Value)-Pair #6 { 0x35, 0x1E }, // (Offset,Value)-Pair #7 { 0x36, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_LoadVertexShader+0x4E : mov [ebx], ebx + // D3DDevice_LoadVertexShader+0x4E : mov [ebx], ebx { 0x4E, 0x89 }, // (Offset,Value)-Pair #9 { 0x4F, 0x13 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FogColor +// * D3DDevice_SetRenderState_FogColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FogColor_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_FogColor_1_0_4134, 10) - // IDirect3DDevice8_SetRenderState_FogColor+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_FogColor+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FogColor+0x09 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_FogColor+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #3 { 0x0A, 0x46 }, // (Offset,Value)-Pair #4 { 0x0B, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_FogColor+0x25 : shl edi, 0x10 + // D3DDevice_SetRenderState_FogColor+0x25 : shl edi, 0x10 { 0x25, 0xC1 }, // (Offset,Value)-Pair #6 { 0x26, 0xE7 }, // (Offset,Value)-Pair #7 { 0x27, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FogColor+0x40 : mov [esi], eax + // D3DDevice_SetRenderState_FogColor+0x40 : mov [esi], eax { 0x40, 0x89 }, // (Offset,Value)-Pair #9 { 0x41, 0x06 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_4134, 11) - // IDirect3DDevice8_Swap+0x10 : mov ebx, 5 + // D3DDevice_Swap+0x10 : mov ebx, 5 { 0x10, 0xBB }, // (Offset,Value)-Pair #1 { 0x11, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Swap+0x1D : test bl, 3 + // D3DDevice_Swap+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_Swap+0x46 : inc dword ptr [esi+0x2ABC] + // D3DDevice_Swap+0x46 : inc dword ptr [esi+0x2ABC] { 0x46, 0xFF }, // (Offset,Value)-Pair #6 { 0x47, 0x86 }, // (Offset,Value)-Pair #7 { 0x48, 0xBC }, // (Offset,Value)-Pair #8 { 0x49, 0x2A }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xAE : retn 4 + // D3DDevice_Swap+0xAE : retn 4 { 0xAE, 0xC2 }, // (Offset,Value)-Pair #10 { 0xAF, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_4134, 9) - // IDirect3DDevice8_Clear+0x0000 : sub esp, 38h +OOVPA_NO_XREF_LARGE(D3DDevice_Clear_1_0_4134, 9) + // D3DDevice_Clear+0x0000 : sub esp, 38h { 0x0000, 0x83 }, // (Offset,Value)-Pair #1 { 0x0001, 0xEC }, // (Offset,Value)-Pair #2 { 0x0002, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x000B : mov ebx, [ebp+0x2074] + // D3DDevice_Clear+0x000B : mov ebx, [ebp+0x2074] { 0x000B, 0x8B }, // (Offset,Value)-Pair #4 { 0x000C, 0x9D }, // (Offset,Value)-Pair #5 { 0x000D, 0x74 }, // (Offset,Value)-Pair #6 { 0x000E, 0x20 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Clear+0x0399 : retn 0x18 + // D3DDevice_Clear+0x0399 : retn 0x18 { 0x0399, 0xC2 }, // (Offset,Value)-Pair #8 { 0x039A, 0x18 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer +// * D3DDevice_GetBackBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer_1_0_4134, 12) - // IDirect3DDevice8_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF + // D3DDevice_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0xF8 }, // (Offset,Value)-Pair #2 { 0x06, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetBackBuffer+0x0D : jnz +0x07 + // D3DDevice_GetBackBuffer+0x0D : jnz +0x07 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer+0x18 : sbb eax, eax + // D3DDevice_GetBackBuffer+0x18 : sbb eax, eax { 0x18, 0x1B }, // (Offset,Value)-Pair #6 { 0x19, 0xC0 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetBackBuffer+0x1D : mov eax, [ecx+eax*4+0x207C] + // D3DDevice_GetBackBuffer+0x1D : mov eax, [ecx+eax*4+0x207C] { 0x1D, 0x8B }, // (Offset,Value)-Pair #8 { 0x1E, 0x84 }, // (Offset,Value)-Pair #9 { 0x1F, 0x81 }, // (Offset,Value)-Pair #10 @@ -268,213 +268,213 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer_1_0_4134, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDepthStencilSurface +// * D3DDevice_GetDepthStencilSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface_1_0_4134, 9) - // IDirect3DDevice8_GetDepthStencilSurface+0x00 : mov eax, [addr] + // D3DDevice_GetDepthStencilSurface+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetDepthStencilSurface+0x05 : mov eax, [eax + 0x2074] + // D3DDevice_GetDepthStencilSurface+0x05 : mov eax, [eax + 0x2074] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x74 }, // (Offset,Value)-Pair #4 { 0x08, 0x20 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDepthStencilSurface+0x11 : mov [ecx], eax + // D3DDevice_GetDepthStencilSurface+0x11 : mov [ecx], eax { 0x11, 0x89 }, // (Offset,Value)-Pair #6 { 0x12, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetDepthStencilSurface+0x1D : retn 0x04 + // D3DDevice_GetDepthStencilSurface+0x1D : retn 0x04 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #8 { 0x1E, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderTarget +// * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderTarget_1_0_4134, 9) - // IDirect3DDevice8_SetRenderTarget+0x00 : sub esp, 0x3C + // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x3C { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x3C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderTarget+014 : jnz +0x0C + // D3DDevice_SetRenderTarget+014 : jnz +0x0C { 0x14, 0x75 }, // (Offset,Value)-Pair #4 { 0x15, 0x0C }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderTarget+0x44 : push ebp + // D3DDevice_SetRenderTarget+0x44 : push ebp { 0x44, 0x55 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderTarget+0x79 : shr ecx, 0x14 + // D3DDevice_SetRenderTarget+0x79 : shr ecx, 0x14 { 0x79, 0xC1 }, // (Offset,Value)-Pair #7 { 0x7A, 0xE9 }, // (Offset,Value)-Pair #8 { 0x7B, 0x14 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SelectVertexShader +// * D3DDevice_SelectVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SelectVertexShader_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SelectVertexShader_1_0_4134, 11) - // IDirect3DDevice8_SelectVertexShader+0x13 : mov [esi+0x384], eax + // D3DDevice_SelectVertexShader+0x13 : mov [esi+0x384], eax { 0x13, 0x89 }, // (Offset,Value)-Pair #1 { 0x14, 0x86 }, // (Offset,Value)-Pair #2 { 0x15, 0x84 }, // (Offset,Value)-Pair #3 { 0x16, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SelectVertexShader+0x3B : mov dword ptr [eax], 0x00081E94 + // D3DDevice_SelectVertexShader+0x3B : mov dword ptr [eax], 0x00081E94 { 0x3B, 0xC7 }, // (Offset,Value)-Pair #5 { 0x3C, 0x00 }, // (Offset,Value)-Pair #6 { 0x3D, 0x94 }, // (Offset,Value)-Pair #7 { 0x3E, 0x1E }, // (Offset,Value)-Pair #8 { 0x3F, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SelectVertexShader+0x55 : mov [esi], eax + // D3DDevice_SelectVertexShader+0x55 : mov [esi], eax { 0x55, 0x89 }, // (Offset,Value)-Pair #10 { 0x56, 0x06 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CopyRects +// * D3DDevice_CopyRects // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_CopyRects_1_0_4134, 10) - // IDirect3DDevice8_CopyRects+0x00 : sub esp, 0x01A0 + // D3DDevice_CopyRects+0x00 : sub esp, 0x01A0 { 0x00, 0x81 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0xA0 }, // (Offset,Value)-Pair #3 { 0x03, 0x01 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CopyRects+0x6E : mov esi, [eax+0x201C] + // D3DDevice_CopyRects+0x6E : mov esi, [eax+0x201C] { 0x6E, 0x8B }, // (Offset,Value)-Pair #5 { 0x6F, 0xB0 }, // (Offset,Value)-Pair #6 { 0x70, 0x1C }, // (Offset,Value)-Pair #7 { 0x71, 0x20 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CopyRects+0xDD : jnz +0x22 + // D3DDevice_CopyRects+0xDD : jnz +0x22 { 0xDD, 0x75 }, // (Offset,Value)-Pair #9 { 0xDE, 0x22 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateImageSurface +// * D3DDevice_CreateImageSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateImageSurface_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_CreateImageSurface_1_0_4134, 9) - // IDirect3DDevice8_CreateImageSurface+0x2A : push 0x18 + // D3DDevice_CreateImageSurface+0x2A : push 0x18 { 0x2A, 0x6A }, // (Offset,Value)-Pair #1 { 0x2B, 0x18 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateImageSurface+0x2C : push 0x40 + // D3DDevice_CreateImageSurface+0x2C : push 0x40 { 0x2C, 0x6A }, // (Offset,Value)-Pair #3 { 0x2D, 0x40 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateImageSurface+0x3B : push 0x0404 + // D3DDevice_CreateImageSurface+0x3B : push 0x0404 { 0x3B, 0x68 }, // (Offset,Value)-Pair #5 { 0x3C, 0x04 }, // (Offset,Value)-Pair #6 { 0x3D, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateImageSurface+0x61 : retn 0x10 + // D3DDevice_CreateImageSurface+0x61 : retn 0x10 { 0x61, 0xC2 }, // (Offset,Value)-Pair #8 { 0x62, 0x10 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant +// * D3DDevice_SetVertexShaderConstant // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant_1_0_4134, 10) - // IDirect3DDevice8_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x08] + // D3DDevice_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x08] { 0x11, 0x8A }, // (Offset,Value)-Pair #1 { 0x12, 0x4B }, // (Offset,Value)-Pair #2 { 0x13, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant+0x1A : test cl, 0x10 + // D3DDevice_SetVertexShaderConstant+0x1A : test cl, 0x10 { 0x1A, 0xF6 }, // (Offset,Value)-Pair #4 { 0x1B, 0xC1 }, // (Offset,Value)-Pair #5 { 0x1C, 0x10 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVertexShaderConstant+0x60 : jle +0x19 + // D3DDevice_SetVertexShaderConstant+0x60 : jle +0x19 { 0x60, 0x7E }, // (Offset,Value)-Pair #7 { 0x61, 0x19 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant+0x98 : retn 0x0C + // D3DDevice_SetVertexShaderConstant+0x98 : retn 0x0C { 0x98, 0xC2 }, // (Offset,Value)-Pair #9 { 0x99, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_4134, 10) - // IDirect3DDevice8_SetPixelShader+0x0E : mov esi, [ebx+0x0370] + // D3DDevice_SetPixelShader+0x0E : mov esi, [ebx+0x0370] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0xB3 }, // (Offset,Value)-Pair #2 { 0x10, 0x70 }, // (Offset,Value)-Pair #3 { 0x11, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x3A : or eax, 0x2000 + // D3DDevice_SetPixelShader+0x3A : or eax, 0x2000 { 0x3A, 0x0D }, // (Offset,Value)-Pair #5 { 0x3C, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x78 : retn 0x04 + // D3DDevice_SetPixelShader+0x78 : retn 0x04 { 0x78, 0xC2 }, // (Offset,Value)-Pair #7 { 0x79, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd + // D3DDevice_SetPixelShader+0xE3 : rep movsd { 0xE3, 0xF3 }, // (Offset,Value)-Pair #9 { 0xE4, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BumpEnv +// * D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv_1_0_4134, 12) - // IDirect3DDevice8_SetTextureState_BumpEnv+0x18 : jnz +0x03 + // D3DDevice_SetTextureState_BumpEnv+0x18 : jnz +0x03 { 0x18, 0x75 }, // (Offset,Value)-Pair #1 { 0x19, 0x03 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x1D : test bl, 3 + // D3DDevice_SetTextureState_BumpEnv+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x32 : mov ecx, [esp+0x14] + // D3DDevice_SetTextureState_BumpEnv+0x32 : mov ecx, [esp+0x14] { 0x32, 0x8B }, // (Offset,Value)-Pair #6 { 0x33, 0x4C }, // (Offset,Value)-Pair #7 { 0x34, 0x24 }, // (Offset,Value)-Pair #8 { 0x35, 0x18 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x50 : shl esi, 5 + // D3DDevice_SetTextureState_BumpEnv+0x50 : shl esi, 5 { 0x50, 0xC1 }, // (Offset,Value)-Pair #10 { 0x51, 0xE6 }, // (Offset,Value)-Pair #11 { 0x52, 0x05 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_4134, 11) - // IDirect3DDevice8_SetIndices+0x0E : jz +0x10 + // D3DDevice_SetIndices+0x0E : jz +0x10 { 0x0E, 0x74 }, // (Offset,Value)-Pair #1 { 0x0F, 0x10 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetIndices+0x1E : jmp +0x0A + // D3DDevice_SetIndices+0x1E : jmp +0x0A { 0x1E, 0xEB }, // (Offset,Value)-Pair #3 { 0x1F, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetIndices+0x59 : mov [esi+0x1C], ecx + // D3DDevice_SetIndices+0x59 : mov [esi+0x1C], ecx { 0x59, 0x89 }, // (Offset,Value)-Pair #5 { 0x5A, 0x4E }, // (Offset,Value)-Pair #6 { 0x5B, 0x1C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetIndices+0x76 : mov [esi+0x038C], edi + // D3DDevice_SetIndices+0x76 : mov [esi+0x038C], edi { 0x76, 0x89 }, // (Offset,Value)-Pair #8 { 0x77, 0xBE }, // (Offset,Value)-Pair #9 { 0x78, 0x8C }, // (Offset,Value)-Pair #10 @@ -482,238 +482,238 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_4134, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_VertexBlend +// * D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend_1_0_4134, 11) - // IDirect3DDevice8_SetRenderState_VertexBlend+0x06 : or edx, 0x200 + // D3DDevice_SetRenderState_VertexBlend+0x06 : or edx, 0x200 { 0x06, 0x81 }, // (Offset,Value)-Pair #1 { 0x07, 0xCA }, // (Offset,Value)-Pair #2 { 0x08, 0x00 }, // (Offset,Value)-Pair #3 { 0x09, 0x02 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x1E : jb +0x05 + // D3DDevice_SetRenderState_VertexBlend+0x1E : jb +0x05 { 0x1E, 0x72 }, // (Offset,Value)-Pair #5 { 0x1F, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x2F : mov [eax+4], ecx + // D3DDevice_SetRenderState_VertexBlend+0x2F : mov [eax+4], ecx { 0x2F, 0x89 }, // (Offset,Value)-Pair #7 { 0x30, 0x48 }, // (Offset,Value)-Pair #8 { 0x31, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x3E : retn 0x04 + // D3DDevice_SetRenderState_VertexBlend+0x3E : retn 0x04 { 0x3E, 0xC2 }, // (Offset,Value)-Pair #10 { 0x3F, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_4134, 9) - // IDirect3DDevice8_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0370] + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0370] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x86 }, // (Offset,Value)-Pair #2 { 0x09, 0x70 }, // (Offset,Value)-Pair #3 { 0x0A, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x2F : nop + // D3DDevice_SetRenderState_TextureFactor+0x2F : nop { 0x2F, 0x90 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x41 : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x41 : retn 0x04 { 0x41, 0xC2 }, // (Offset,Value)-Pair #6 { 0x42, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x4E : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #8 { 0x4F, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4134, 10) - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x0C : jb +0x05 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #3 { 0x0D, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x13 : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x13 : mov ecx, [esp+0x08] { 0x13, 0x8B }, // (Offset,Value)-Pair #5 { 0x14, 0x4C }, // (Offset,Value)-Pair #6 { 0x15, 0x24 }, // (Offset,Value)-Pair #7 { 0x16, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x2F : retn 0x04 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x2F : retn 0x04 { 0x2F, 0xC2 }, // (Offset,Value)-Pair #9 { 0x30, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_4134, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ZEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] + // D3DDevice_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] { 0x1B, 0x8B }, // (Offset,Value)-Pair #3 { 0x1C, 0x96 }, // (Offset,Value)-Pair #4 { 0x1D, 0x74 }, // (Offset,Value)-Pair #5 { 0x1E, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C + // D3DDevice_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C { 0x31, 0xC7 }, // (Offset,Value)-Pair #7 { 0x32, 0x00 }, // (Offset,Value)-Pair #8 { 0x33, 0x0C }, // (Offset,Value)-Pair #9 { 0x34, 0x03 }, // (Offset,Value)-Pair #10 { 0x35, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x98 : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x98 : retn 0x04 { 0x98, 0xC2 }, // (Offset,Value)-Pair #12 { 0x99, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilEnable +// * D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable_1_0_4134, 11) - // IDirect3DDevice8_SetRenderState_StencilEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_StencilEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x2C : jz +0x19 + // D3DDevice_SetRenderState_StencilEnable+0x2C : jz +0x19 { 0x2C, 0x74 }, // (Offset,Value)-Pair #3 { 0x2D, 0x19 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x4D : mov dword ptr [eax], 0x00041D84 + // D3DDevice_SetRenderState_StencilEnable+0x4D : mov dword ptr [eax], 0x00041D84 { 0x4D, 0xC7 }, // (Offset,Value)-Pair #5 { 0x4E, 0x00 }, // (Offset,Value)-Pair #6 { 0x4F, 0x84 }, // (Offset,Value)-Pair #7 { 0x50, 0x1D }, // (Offset,Value)-Pair #8 { 0x51, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x81 : retn 0x04 + // D3DDevice_SetRenderState_StencilEnable+0x81 : retn 0x04 { 0x81, 0xC2 }, // (Offset,Value)-Pair #10 { 0x82, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4134, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x04 : push esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x04 : push esi { 0x04, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x05 : mov esi, dword ptr [addr] + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x05 : mov esi, dword ptr [addr] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x35 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x0B : mov ecx, esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x0B : mov ecx, esi { 0x0B, 0x8B }, // (Offset,Value)-Pair #4 { 0x0C, 0xCE }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x1C : jb +0x05 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x1C : jb +0x05 { 0x1C, 0x72 }, // (Offset,Value)-Pair #6 { 0x1D, 0x05 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 { 0x38, 0xC1 }, // (Offset,Value)-Pair #8 { 0x39, 0xE1 }, // (Offset,Value)-Pair #9 { 0x3A, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x50, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetTransform +// * D3DDevice_GetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetTransform_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_GetTransform_1_0_4134, 12) - // IDirect3DDevice8_GetTransform+0x0A : shl ecx, 0x06 + // D3DDevice_GetTransform+0x0A : shl ecx, 0x06 { 0x0A, 0xC1 }, // (Offset,Value)-Pair #1 { 0x0B, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0C, 0x06 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetTransform+0x12 : lea esi, [ecx+eax+*numb*] + // D3DDevice_GetTransform+0x12 : lea esi, [ecx+eax+*numb*] { 0x12, 0x8D }, // (Offset,Value)-Pair #4 { 0x13, 0xB4 }, // (Offset,Value)-Pair #5 { 0x14, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetTransform+0x19 : mov ecx, 0x10 + // D3DDevice_GetTransform+0x19 : mov ecx, 0x10 { 0x19, 0xB9 }, // (Offset,Value)-Pair #7 { 0x1A, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetTransform+0x20 : pop edi, pop esi + // D3DDevice_GetTransform+0x20 : pop edi, pop esi { 0x20, 0x5F }, // (Offset,Value)-Pair #9 { 0x21, 0x5E }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetTransform+0x22 : retn 0x08 + // D3DDevice_GetTransform+0x22 : retn 0x08 { 0x22, 0xC2 }, // (Offset,Value)-Pair #11 { 0x23, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetStreamSource +// * D3DDevice_SetStreamSource // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_4134, 14) +OOVPA_NO_XREF(D3DDevice_SetStreamSource_1_0_4134, 14) - // IDirect3DDevice8_SetStreamSource+0x08 : mov edi, [esp+8+0x04] + // D3DDevice_SetStreamSource+0x08 : mov edi, [esp+8+0x04] { 0x08, 0x8B }, // (Offset,Value)-Pair #1 { 0x09, 0x7C }, // (Offset,Value)-Pair #2 { 0x0A, 0x24 }, // (Offset,Value)-Pair #3 { 0x0B, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetStreamSource+0x28 : jz +0x26 + // D3DDevice_SetStreamSource+0x28 : jz +0x26 { 0x28, 0x74 }, // (Offset,Value)-Pair #5 { 0x29, 0x26 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetStreamSource+0x70 : or ecx, 0x40 + // D3DDevice_SetStreamSource+0x70 : or ecx, 0x40 { 0x70, 0x83 }, // (Offset,Value)-Pair #7 { 0x71, 0xC9 }, // (Offset,Value)-Pair #8 { 0x72, 0x40 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetStreamSource+0x7E : or ecx, 0x70 + // D3DDevice_SetStreamSource+0x7E : or ecx, 0x70 { 0x7E, 0x83 }, // (Offset,Value)-Pair #10 { 0x7F, 0xC9 }, // (Offset,Value)-Pair #11 { 0x80, 0x70 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetStreamSource+0x89 : retn 0x0C + // D3DDevice_SetStreamSource+0x89 : retn 0x0C { 0x89, 0xC2 }, // (Offset,Value)-Pair #13 { 0x8A, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_4134, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_4134, 14) - // IDirect3DDevice8_SetVertexShader+0x06 : test bl, 1 + // D3DDevice_SetVertexShader+0x06 : test bl, 1 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShader+0x11 : mov eax, [esi+0x0380] + // D3DDevice_SetVertexShader+0x11 : mov eax, [esi+0x0380] { 0x11, 0x8B }, // (Offset,Value)-Pair #4 { 0x12, 0x86 }, // (Offset,Value)-Pair #5 { 0x13, 0x80 }, // (Offset,Value)-Pair #6 { 0x14, 0x03 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShader+0x90 : retn 0x04 + // D3DDevice_SetVertexShader+0x90 : retn 0x04 { 0x90, 0xC2 }, // (Offset,Value)-Pair #8 { 0x91, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C + // D3DDevice_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C { 0xB0, 0xC7 }, // (Offset,Value)-Pair #10 { 0xB1, 0x00 }, // (Offset,Value)-Pair #11 { 0xB2, 0x4C }, // (Offset,Value)-Pair #12 @@ -722,159 +722,159 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_4134, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_4134, 10) - // IDirect3DDevice8_DrawVerticesUP+0x03 : sub esp, 0x14 + // D3DDevice_DrawVerticesUP+0x03 : sub esp, 0x14 { 0x03, 0x83 }, // (Offset,Value)-Pair #1 { 0x04, 0xEC }, // (Offset,Value)-Pair #2 { 0x05, 0x14 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawVerticesUP+0x2F : mov edx, [edi+0x744] + // D3DDevice_DrawVerticesUP+0x2F : mov edx, [edi+0x744] { 0x2F, 0x8B }, // (Offset,Value)-Pair #4 { 0x30, 0x97 }, // (Offset,Value)-Pair #5 { 0x31, 0x44 }, // (Offset,Value)-Pair #6 { 0x32, 0x07 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVerticesUP+0xC1 : cmp esi, 0x80 + // D3DDevice_DrawVerticesUP+0xC1 : cmp esi, 0x80 { 0xC1, 0x81 }, // (Offset,Value)-Pair #8 { 0xC2, 0xFE }, // (Offset,Value)-Pair #9 { 0xC3, 0x80 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_4134, 12) - // IDirect3DDevice8_SetLight+0x11 : mov edi, [ebp+0x394] + // D3DDevice_SetLight+0x11 : mov edi, [ebp+0x394] { 0x11, 0x8B }, // (Offset,Value)-Pair #1 { 0x12, 0xBD }, // (Offset,Value)-Pair #2 { 0x13, 0x94 }, // (Offset,Value)-Pair #3 { 0x14, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetLight+0x30 : shl eax, 0x04 + // D3DDevice_SetLight+0x30 : shl eax, 0x04 { 0x30, 0xC1 }, // (Offset,Value)-Pair #5 { 0x31, 0xE0 }, // (Offset,Value)-Pair #6 { 0x32, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetLight+0xBD : rep stosb + // D3DDevice_SetLight+0xBD : rep stosb { 0xBD, 0xF3 }, // (Offset,Value)-Pair #8 { 0xBE, 0xAB }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetLight+0xFD : mov ecx, [ebx+0x68] + // D3DDevice_SetLight+0xFD : mov ecx, [ebx+0x68] { 0xFD, 0x8B }, // (Offset,Value)-Pair #10 { 0xFE, 0x4B }, // (Offset,Value)-Pair #11 { 0xFF, 0x68 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_4134, 12) - // IDirect3DDevice8_SetMaterial+0x0C : add edi, 0x0940 + // D3DDevice_SetMaterial+0x0C : add edi, 0x0940 { 0x0C, 0x81 }, // (Offset,Value)-Pair #1 { 0x0D, 0xC7 }, // (Offset,Value)-Pair #2 { 0x0E, 0xF0 }, // (Offset,Value)-Pair #3 { 0x0F, 0x09 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetMaterial+0x12 : mov ecx, 0x11 + // D3DDevice_SetMaterial+0x12 : mov ecx, 0x11 { 0x12, 0xB9 }, // (Offset,Value)-Pair #5 { 0x13, 0x11 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetMaterial+0x1F : or ecx, 0x1000 + // D3DDevice_SetMaterial+0x1F : or ecx, 0x1000 { 0x1F, 0x81 }, // (Offset,Value)-Pair #7 { 0x20, 0xC9 }, // (Offset,Value)-Pair #8 { 0x21, 0x00 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetMaterial+0x2D : retn 0x04 + // D3DDevice_SetMaterial+0x2D : retn 0x04 { 0x2D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2E, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_4134, 13) - // IDirect3DDevice8_LightEnable+0x0F : cmp ebx, [esi+0x0394] + // D3DDevice_LightEnable+0x0F : cmp ebx, [esi+0x0394] { 0x0F, 0x3B }, // (Offset,Value)-Pair #1 { 0x10, 0x9E }, // (Offset,Value)-Pair #2 { 0x11, 0x94 }, // (Offset,Value)-Pair #3 { 0x12, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_LightEnable+0x6B : test eax, eax + // D3DDevice_LightEnable+0x6B : test eax, eax { 0x6B, 0x85 }, // (Offset,Value)-Pair #5 { 0x6C, 0xC0 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_LightEnable+0x9E : mov eax, [eax+0x8C] + // D3DDevice_LightEnable+0x9E : mov eax, [eax+0x8C] { 0x9E, 0x8B }, // (Offset,Value)-Pair #7 { 0x9F, 0x80 }, // (Offset,Value)-Pair #8 { 0xA0, 0x8C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_LightEnable+0xBC : jz +0x12 + // D3DDevice_LightEnable+0xBC : jz +0x12 { 0xBC, 0x74 }, // (Offset,Value)-Pair #10 { 0xBD, 0x12 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_LightEnable+0xE1 : retn 0x08 + // D3DDevice_LightEnable+0xE1 : retn 0x08 { 0xE1, 0xC2 }, // (Offset,Value)-Pair #12 { 0xE2, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DSurface8_GetDesc +// * D3DSurface_GetDesc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DSurface8_GetDesc_1_0_4134, 15) +OOVPA_NO_XREF(D3DSurface_GetDesc_1_0_4134, 15) - // IDirect3DSurface8_GetDesc+0x00 : mov eax, [esp+0x08] + // D3DSurface_GetDesc+0x00 : mov eax, [esp+0x08] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3DSurface8_GetDesc+0x04 : mov ecx, [esp+0x04] + // D3DSurface_GetDesc+0x04 : mov ecx, [esp+0x04] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DSurface8_GetDesc+0x08 : push eax + // D3DSurface_GetDesc+0x08 : push eax { 0x08, 0x50 }, // (Offset,Value)-Pair #9 - // IDirect3DSurface8_GetDesc+0x09 : push 0 + // D3DSurface_GetDesc+0x09 : push 0 { 0x09, 0x6A }, // (Offset,Value)-Pair #10 { 0x0A, 0x00 }, // (Offset,Value)-Pair #11 - // IDirect3DSurface8_GetDesc+0x0B : push ecx + // D3DSurface_GetDesc+0x0B : push ecx { 0x0B, 0x51 }, // (Offset,Value)-Pair #12 - // IDirect3DSurface8_GetDesc+0x0C : call [abs] + // D3DSurface_GetDesc+0x0C : call [abs] { 0x0C, 0xE8 }, // (Offset,Value)-Pair #13 - // IDirect3DSurface8_GetDesc+0x11 : retn 0x08 + // D3DSurface_GetDesc+0x11 : retn 0x08 { 0x11, 0xC2 }, // (Offset,Value)-Pair #14 { 0x12, 0x08 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormals +// * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4134, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals_1_0_4134, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 + // D3DDevice_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 { 0x25, 0x81 }, // (Offset,Value)-Pair #3 { 0x26, 0x0D }, // (Offset,Value)-Pair #4 { 0x2B, 0x00 }, // (Offset,Value)-Pair #5 { 0x2C, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x36 : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormals+0x36 : retn 0x04 { 0x36, 0xC2 }, // (Offset,Value)-Pair #7 { 0x37, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; @@ -902,70 +902,70 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_4134, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Reset +// * D3DDevice_Reset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Reset_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_Reset_1_0_4134, 10) - // IDirect3DDevice8_Reset+0x15 : mov ecx, ebp + // D3DDevice_Reset+0x15 : mov ecx, ebp { 0x15, 0x8B }, // (Offset,Value)-Pair #1 { 0x16, 0xCD }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Reset+0x1E : jnz +0xF5 + // D3DDevice_Reset+0x1E : jnz +0xF5 { 0x1E, 0x75 }, // (Offset,Value)-Pair #3 { 0x1F, 0xF5 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_Reset+0x27 : mov esi, [esp+0x14] + // D3DDevice_Reset+0x27 : mov esi, [esp+0x14] { 0x27, 0x8B }, // (Offset,Value)-Pair #5 { 0x28, 0x74 }, // (Offset,Value)-Pair #6 { 0x29, 0x24 }, // (Offset,Value)-Pair #7 { 0x2A, 0x14 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_Reset+0x37 : jge +0x10 + // D3DDevice_Reset+0x37 : jge +0x10 { 0x37, 0x7D }, // (Offset,Value)-Pair #9 { 0x38, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TwoSidedLighting +// * D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, 13) - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x11 : or edx, 0x1000 + // D3DDevice_SetTextureState_TwoSidedLighting+0x11 : or edx, 0x1000 { 0x11, 0x81 }, // (Offset,Value)-Pair #1 { 0x12, 0xCA }, // (Offset,Value)-Pair #2 { 0x13, 0x00 }, // (Offset,Value)-Pair #3 { 0x14, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x24 : cmp eax, [esi+4]; push edi + // D3DDevice_SetTextureState_TwoSidedLighting+0x24 : cmp eax, [esi+4]; push edi { 0x24, 0x3B }, // (Offset,Value)-Pair #5 { 0x25, 0x46 }, // (Offset,Value)-Pair #6 { 0x26, 0x04 }, // (Offset,Value)-Pair #7 { 0x27, 0x57 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x53 : add eax, 0x0C + // D3DDevice_SetTextureState_TwoSidedLighting+0x53 : add eax, 0x0C { 0x53, 0x83 }, // (Offset,Value)-Pair #9 { 0x54, 0xC0 }, // (Offset,Value)-Pair #10 { 0x55, 0x0C }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x60 : retn 0x04 + // D3DDevice_SetTextureState_TwoSidedLighting+0x60 : retn 0x04 { 0x60, 0xC2 }, // (Offset,Value)-Pair #12 { 0x61, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_BackFillMode +// * D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode_1_0_4134, 13) - // IDirect3DDevice8_SetRenderState_BackFillMode+0x1C : jb +0x05 + // D3DDevice_SetRenderState_BackFillMode+0x1C : jb +0x05 { 0x1C, 0x72 }, // (Offset,Value)-Pair #1 { 0x1D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x35 : mov dword ptr [eax], abs + // D3DDevice_SetRenderState_BackFillMode+0x35 : mov dword ptr [eax], abs { 0x35, 0xC7 }, // (Offset,Value)-Pair #3 { 0x36, 0x00 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x3B : add eax, 0x0C; mov [esi], eax; mov [abs], edi + // D3DDevice_SetRenderState_BackFillMode+0x3B : add eax, 0x0C; mov [esi], eax; mov [abs], edi { 0x41, 0x83 }, // (Offset,Value)-Pair #5 { 0x42, 0xC0 }, // (Offset,Value)-Pair #6 { 0x43, 0x0C }, // (Offset,Value)-Pair #7 @@ -974,21 +974,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, 13) { 0x46, 0x89 }, // (Offset,Value)-Pair #10 { 0x47, 0x3D }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_BackFillMode+0x4E : retn 0x04 + // D3DDevice_SetRenderState_BackFillMode+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #12 { 0x4F, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_ColorKeyColor +// * D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_1_0_4134, 12) - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x0C : jb +0x05 + // D3DDevice_SetTextureState_ColorKeyColor+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x27 : add eax, 8; mov [esi], eax; shl ecx, 7 + // D3DDevice_SetTextureState_ColorKeyColor+0x27 : add eax, 8; mov [esi], eax; shl ecx, 7 { 0x27, 0x83 }, // (Offset,Value)-Pair #3 { 0x28, 0xC0 }, // (Offset,Value)-Pair #4 { 0x29, 0x08 }, // (Offset,Value)-Pair #5 @@ -998,446 +998,446 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4134, 12) { 0x2D, 0xE1 }, // (Offset,Value)-Pair #9 { 0x2E, 0x07 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x36 : retn 0x08 + // D3DDevice_SetTextureState_ColorKeyColor+0x36 : retn 0x08 { 0x36, 0xC2 }, // (Offset,Value)-Pair #11 { 0x37, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FrontFace +// * D3DDevice_SetRenderState_FrontFace // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_FrontFace_1_0_4134, 11, +OOVPA_XREF(D3DDevice_SetRenderState_FrontFace_1_0_4134, 11, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_FrontFace+0x36 : jmp IDirect3DDevice8_SetRenderState_CullMode + // D3DDevice_SetRenderState_FrontFace+0x36 : jmp D3DDevice_SetRenderState_CullMode { 0x36, XREF_DXSRSCULLMODE}, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_FrontFace+0x09 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_FrontFace+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #2 { 0x0A, 0x46 }, // (Offset,Value)-Pair #3 { 0x0B, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_FrontFace+0x13 : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_FrontFace+0x13 : mov ecx, [esp+0x08] { 0x13, 0x8B }, // (Offset,Value)-Pair #5 { 0x14, 0x4C }, // (Offset,Value)-Pair #6 { 0x15, 0x24 }, // (Offset,Value)-Pair #7 { 0x16, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FrontFace+0x20 : add eax, 8 + // D3DDevice_SetRenderState_FrontFace+0x20 : add eax, 8 { 0x20, 0x83 }, // (Offset,Value)-Pair #9 { 0x21, 0xC0 }, // (Offset,Value)-Pair #10 { 0x22, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LogicOp +// * D3DDevice_SetRenderState_LogicOp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LogicOp_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp_1_0_4134, 9) - // IDirect3DDevice8_SetRenderState_LogicOp+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_LogicOp+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_LogicOp+0x1B : mov dword ptr [eax], 0x417BC + // D3DDevice_SetRenderState_LogicOp+0x1B : mov dword ptr [eax], 0x417BC { 0x1B, 0xC7 }, // (Offset,Value)-Pair #3 { 0x1C, 0x00 }, // (Offset,Value)-Pair #4 { 0x1D, 0xBC }, // (Offset,Value)-Pair #5 { 0x1E, 0x17 }, // (Offset,Value)-Pair #6 { 0x1F, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_LogicOp+0x4F : retn 0x04 + // D3DDevice_SetRenderState_LogicOp+0x4F : retn 0x04 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #8 { 0x50, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilFail +// * D3DDevice_SetRenderState_StencilFail // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail_1_0_4134, 12) - // IDirect3DDevice8_SetRenderState_StencilFail+0x0C : jb +0x05 + // D3DDevice_SetRenderState_StencilFail+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_StencilFail+0x38 : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_StencilFail+0x38 : cmp [abs], 0x1E00 { 0x38, 0x81 }, // (Offset,Value)-Pair #3 { 0x3E, 0x00 }, // (Offset,Value)-Pair #4 { 0x3F, 0x1E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_StencilFail+0x47 : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_StencilFail+0x47 : mov dword ptr [eax], 0x41D84 { 0x47, 0xC7 }, // (Offset,Value)-Pair #6 { 0x48, 0x00 }, // (Offset,Value)-Pair #7 { 0x49, 0x84 }, // (Offset,Value)-Pair #8 { 0x4A, 0x1D }, // (Offset,Value)-Pair #9 { 0x4B, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_StencilFail+0x6A : retn 0x04 + // D3DDevice_SetRenderState_StencilFail+0x6A : retn 0x04 { 0x6A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x6B, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_OcclusionCullEnable +// * D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_4134, 12) - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x15 : jb +0x05 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x15 : jb +0x05 { 0x15, 0x72 }, // (Offset,Value)-Pair #1 { 0x16, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x41 : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x41 : cmp [abs], 0x1E00 { 0x41, 0x81 }, // (Offset,Value)-Pair #3 { 0x47, 0x00 }, // (Offset,Value)-Pair #4 { 0x48, 0x1E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x50 : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x50 : mov dword ptr [eax], 0x41D84 { 0x50, 0xC7 }, // (Offset,Value)-Pair #6 { 0x51, 0x00 }, // (Offset,Value)-Pair #7 { 0x52, 0x84 }, // (Offset,Value)-Pair #8 { 0x53, 0x1D }, // (Offset,Value)-Pair #9 { 0x54, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x5F : retn 0x04 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x5F : retn 0x04 { 0x5F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x60, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilCullEnable +// * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_StencilCullEnable_1_0_4134, 13, +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable_1_0_4134, 13, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE] + // D3DDevice_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE] { 0x0C, XREF_D3DRS_STENCILCULLENABLE }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_StencilCullEnable+0x15 : jb +0x05 + // D3DDevice_SetRenderState_StencilCullEnable+0x15 : jb +0x05 { 0x15, 0x72 }, // (Offset,Value)-Pair #2 { 0x16, 0x05 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_StencilCullEnable+0x41 : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_StencilCullEnable+0x41 : cmp [abs], 0x1E00 { 0x41, 0x81 }, // (Offset,Value)-Pair #4 { 0x47, 0x00 }, // (Offset,Value)-Pair #5 { 0x48, 0x1E }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_StencilCullEnable+0x50 : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_StencilCullEnable+0x50 : mov dword ptr [eax], 0x41D84 { 0x50, 0xC7 }, // (Offset,Value)-Pair #7 { 0x51, 0x00 }, // (Offset,Value)-Pair #8 { 0x52, 0x84 }, // (Offset,Value)-Pair #9 { 0x53, 0x1D }, // (Offset,Value)-Pair #10 { 0x54, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_StencilCullEnable+0x5F : retn 0x04 + // D3DDevice_SetRenderState_StencilCullEnable+0x5F : retn 0x04 { 0x5F, 0xC2 }, // (Offset,Value)-Pair #12 { 0x60, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FillMode +// * D3DDevice_SetRenderState_FillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FillMode_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode_1_0_4134, 11) - // IDirect3DDevice8_SetRenderState_FillMode+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_FillMode+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FillMode+0x21 : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_FillMode+0x21 : mov ecx, [esp+0x08] { 0x21, 0x8B }, // (Offset,Value)-Pair #3 { 0x22, 0x4C }, // (Offset,Value)-Pair #4 { 0x23, 0x24 }, // (Offset,Value)-Pair #5 { 0x24, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FillMode+0x25 : jnz +0x02 + // D3DDevice_SetRenderState_FillMode+0x25 : jnz +0x02 { 0x25, 0x75 }, // (Offset,Value)-Pair #7 { 0x26, 0x02 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FillMode+0x35 : add eax, 0x0C + // D3DDevice_SetRenderState_FillMode+0x35 : add eax, 0x0C { 0x35, 0x83 }, // (Offset,Value)-Pair #9 { 0x36, 0xC0 }, // (Offset,Value)-Pair #10 { 0x37, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead +// * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_4134, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_4134, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x09 : call [abs] + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead+0x0E : retn 0x04 + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_RopZRead +// * D3DDevice_SetRenderState_RopZRead // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_RopZRead_1_0_4134, 9, +OOVPA_XREF(D3DDevice_SetRenderState_RopZRead_1_0_4134, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_ROPZREAD }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_RopZRead+0x09 : call [abs] + // D3DDevice_SetRenderState_RopZRead+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_RopZRead+0x0E : retn 0x04 + // D3DDevice_SetRenderState_RopZRead+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_DoNotCullUncompressed +// * D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_DoNotCullUncompressed_1_0_4134, 9, +OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_4134, 9, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] { 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x09 : call [abs] + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x09 : call [abs] { 0x09, 0xE8 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_DoNotCullUncompressed+0x0E : retn 0x04 + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x0E : retn 0x04 { 0x0E, 0xC2 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 { 0x10, 0x00 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4134, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4134, 9) - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x0C : mov eax, [edi+0x2070] + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x0C : mov eax, [edi+0x2070] { 0x0C, 0x8B }, // (Offset,Value)-Pair #1 { 0x0D, 0x86 }, // (Offset,Value)-Pair #2 { 0x0E, 0x70 }, // (Offset,Value)-Pair #3 { 0x0F, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x6E : add eax, 0x18 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x6E : add eax, 0x18 { 0x6E, 0x83 }, // (Offset,Value)-Pair #5 { 0x6F, 0xC0 }, // (Offset,Value)-Pair #6 { 0x70, 0x18 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x7C : retn 0x04 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x7C : retn 0x04 { 0x7C, 0xC2 }, // (Offset,Value)-Pair #8 { 0x7D, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleMask +// * D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask_1_0_4134, 13) - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x1C : jb +0x05 + // D3DDevice_SetRenderState_MultiSampleMask+0x1C : jb +0x05 { 0x1C, 0x72 }, // (Offset,Value)-Pair #1 { 0x1D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x38 : and ecx, 0x0F; shl edx, 0x10 + // D3DDevice_SetRenderState_MultiSampleMask+0x38 : and ecx, 0x0F; shl edx, 0x10 { 0x38, 0x83 }, // (Offset,Value)-Pair #3 { 0x39, 0xE1 }, // (Offset,Value)-Pair #4 { 0x3A, 0x0F }, // (Offset,Value)-Pair #5 { 0x3B, 0xC1 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x3E : mov dword ptr [eax], 0x41D7C + // D3DDevice_SetRenderState_MultiSampleMask+0x3E : mov dword ptr [eax], 0x41D7C { 0x3E, 0xC7 }, // (Offset,Value)-Pair #7 { 0x3F, 0x00 }, // (Offset,Value)-Pair #8 { 0x40, 0x7C }, // (Offset,Value)-Pair #9 { 0x41, 0x1D }, // (Offset,Value)-Pair #10 { 0x42, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_MultiSampleMask+0x4F : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleMask+0x4F : retn 0x04 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #12 { 0x50, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleMode +// * D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode_1_0_4134, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x0F : mov ecx, [eax+0x2070] + // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov ecx, [eax+0x2070] { 0x0F, 0x8B }, // (Offset,Value)-Pair #1 { 0x10, 0x88 }, // (Offset,Value)-Pair #2 { 0x11, 0x70 }, // (Offset,Value)-Pair #3 { 0x12, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x15 : cmp ecx, [eax+0x207C] + // D3DDevice_SetRenderState_MultiSampleMode+0x15 : cmp ecx, [eax+0x207C] { 0x15, 0x3B }, // (Offset,Value)-Pair #5 { 0x16, 0x88 }, // (Offset,Value)-Pair #6 { 0x17, 0x7C }, // (Offset,Value)-Pair #7 { 0x18, 0x20 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x1B : jnz +0x0D + // D3DDevice_SetRenderState_MultiSampleMode+0x1B : jnz +0x0D { 0x1B, 0x75 }, // (Offset,Value)-Pair #9 { 0x1C, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x2A : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleMode+0x2A : retn 0x04 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2B, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +// * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode+0x0F : mov ecx, [eax+0x2070] + // D3DDevice_SetRenderState_MultiSampleRenderTargetMode+0x0F : mov ecx, [eax+0x2070] { 0x0F, 0x8B }, // (Offset,Value)-Pair #1 { 0x10, 0x88 }, // (Offset,Value)-Pair #2 { 0x11, 0x70 }, // (Offset,Value)-Pair #3 { 0x12, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode+0x15 : cmp ecx, [eax+0x207C] + // D3DDevice_SetRenderState_MultiSampleRenderTargetMode+0x15 : cmp ecx, [eax+0x207C] { 0x15, 0x3B }, // (Offset,Value)-Pair #5 { 0x16, 0x88 }, // (Offset,Value)-Pair #6 { 0x17, 0x7C }, // (Offset,Value)-Pair #7 { 0x18, 0x20 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode+0x1B : jz +0x0D + // D3DDevice_SetRenderState_MultiSampleRenderTargetMode+0x1B : jz +0x0D { 0x1B, 0x74 }, // (Offset,Value)-Pair #9 { 0x1C, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode+0x2A : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleRenderTargetMode+0x2A : retn 0x04 { 0x2A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2B, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ShadowFunc +// * D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc_1_0_4134, 13) - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x00 : push esi + // D3DDevice_SetRenderState_ShadowFunc+0x00 : push esi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x09 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_ShadowFunc+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #2 { 0x0A, 0x46 }, // (Offset,Value)-Pair #3 { 0x0B, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ShadowFunc+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #5 { 0x0D, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x1D : lea edx, [ecx-0x0200] + // D3DDevice_SetRenderState_ShadowFunc+0x1D : lea edx, [ecx-0x0200] { 0x1D, 0x8D }, // (Offset,Value)-Pair #7 { 0x1E, 0x91 }, // (Offset,Value)-Pair #8 { 0x1F, 0x00 }, // (Offset,Value)-Pair #9 { 0x20, 0xFE }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x26 : add eax, 0x08 + // D3DDevice_SetRenderState_ShadowFunc+0x26 : add eax, 0x08 { 0x26, 0x83 }, // (Offset,Value)-Pair #11 { 0x27, 0xC0 }, // (Offset,Value)-Pair #12 { 0x28, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_YuvEnable +// * D3DDevice_SetRenderState_YuvEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable_1_0_4134, 13) - // IDirect3DDevice8_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x10 : mov eax, [esi] + // D3DDevice_SetRenderState_YuvEnable+0x10 : mov eax, [esi] { 0x10, 0x8B }, // (Offset,Value)-Pair #5 { 0x11, 0x06 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x12 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_YuvEnable+0x12 : cmp eax, [esi+4] { 0x12, 0x3B }, // (Offset,Value)-Pair #7 { 0x13, 0x46 }, // (Offset,Value)-Pair #8 { 0x14, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x15 : jb +0x05 + // D3DDevice_SetRenderState_YuvEnable+0x15 : jb +0x05 { 0x15, 0x72 }, // (Offset,Value)-Pair #10 { 0x16, 0x05 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x28 : retn 0x04 + // D3DDevice_SetRenderState_YuvEnable+0x28 : retn 0x04 { 0x28, 0xC2 }, // (Offset,Value)-Pair #12 { 0x29, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVerticesUP +// * D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP_1_0_4134, 10) - // IDirect3DDevice8_DrawIndexedVerticesUP+0x4A : or edx, 0x800 + // D3DDevice_DrawIndexedVerticesUP+0x4A : or edx, 0x800 { 0x4A, 0x81 }, // (Offset,Value)-Pair #1 { 0x4B, 0xCA }, // (Offset,Value)-Pair #2 { 0x4C, 0x00 }, // (Offset,Value)-Pair #3 { 0x4D, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0x6C4] + // D3DDevice_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0x6C4] { 0x5C, 0x8D }, // (Offset,Value)-Pair #5 { 0x5D, 0x97 }, // (Offset,Value)-Pair #6 { 0x5E, 0xC4 }, // (Offset,Value)-Pair #7 { 0x5F, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 + // D3DDevice_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 { 0x6A, 0xB8 }, // (Offset,Value)-Pair #9 { 0x6B, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShaderConstant +// * D3DDevice_SetPixelShaderConstant // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShaderConstant_1_0_4134, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShaderConstant_1_0_4134, 10) - // IDirect3DDevice8_SetPixelShaderConstant+0x17 : test eax, eax + // D3DDevice_SetPixelShaderConstant+0x17 : test eax, eax { 0x17, 0x85 }, // (Offset,Value)-Pair #1 { 0x18, 0xC0 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetPixelShaderConstant+0x32 : add edi, 0x04 + // D3DDevice_SetPixelShaderConstant+0x32 : add edi, 0x04 { 0x32, 0x83 }, // (Offset,Value)-Pair #3 { 0x33, 0xC7 }, // (Offset,Value)-Pair #4 { 0x34, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPixelShaderConstant+0x47 : jmp +0x07 + // D3DDevice_SetPixelShaderConstant+0x47 : jmp +0x07 { 0x47, 0xEB }, // (Offset,Value)-Pair #6 { 0x48, 0x07 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetPixelShaderConstant+0xC7 : fstp [esp+??] + // D3DDevice_SetPixelShaderConstant+0xC7 : fstp [esp+??] { 0xC7, 0xD9 }, // (Offset,Value)-Pair #8 { 0xC8, 0x1C }, // (Offset,Value)-Pair #9 { 0xC9, 0x24 }, // (Offset,Value)-Pair #10 @@ -1446,7 +1446,7 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_DeletePixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DeletePixelShader_1_0_4134, 7) +OOVPA_NO_XREF(D3DDevice_DeletePixelShader_1_0_4134, 7) { 0x02, 0x24 }, { 0x06, 0x75 }, @@ -1458,29 +1458,29 @@ OOVPA_NO_XREF(IDirect3DDevice8_DeletePixelShader_1_0_4134, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_CullModeB +// * D3DDevice_SetRenderState_CullModeB // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, 13, +OOVPA_XREF(D3DDevice_SetRenderState_CullModeB_1_0_4134, 13, XREF_DXSRSCULLMODE, XRefZero) - // IDirect3DDevice8_SetRenderState_CullModeB+0x22 : mov dword ptr [eax], 0x40308 + // D3DDevice_SetRenderState_CullModeB+0x22 : mov dword ptr [eax], 0x40308 { 0x22, 0xC7 }, // (Offset,Value)-Pair #1 { 0x24, 0x08 }, // (Offset,Value)-Pair #2 { 0x25, 0x03 }, // (Offset,Value)-Pair #3 { 0x26, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_CullModeB+0x2D : add eax, 8 + // D3DDevice_SetRenderState_CullModeB+0x2D : add eax, 8 { 0x2D, 0x83 }, // (Offset,Value)-Pair #5 { 0x2E, 0xC0 }, // (Offset,Value)-Pair #6 { 0x2F, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_CullModeB+0x39 : retn 4 + // D3DDevice_SetRenderState_CullModeB+0x39 : retn 4 { 0x39, 0xC2 }, // (Offset,Value)-Pair #8 { 0x3A, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_CullModeB+0x5C : add edx, 0x404 + // D3DDevice_SetRenderState_CullModeB+0x5C : add edx, 0x404 { 0x5C, 0x81 }, // (Offset,Value)-Pair #10 { 0x5D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x5E, 0x04 }, // (Offset,Value)-Pair #12 @@ -1501,9 +1501,9 @@ OOVPA_NO_XREF(X_D3DDevice_DeleteVertexShader_1_0_4134, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScreenSpaceOffset +// * D3DDevice_SetScreenSpaceOffset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScreenSpaceOffset_1_0_4134, 7) +OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset_1_0_4134, 7) { 0x06, 0x56 }, { 0x07, 0xD8 }, @@ -1551,11 +1551,11 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_4134, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_4134, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -1563,87 +1563,87 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4134, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x2430 + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x2430 { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x30 }, // (Offset,Value)-Pair #8 { 0x19, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetSwapCallback +// * D3DDevice_SetSwapCallback // ****************************************************************** /* This may look the same as 4361, but accuracy is not gauranteed. It might be a SetVerticalBlankCallback that has an identical signature... */ -OOVPA_NO_XREF(IDirect3DDevice8_SetSwapCallback_1_0_4134, 12) +OOVPA_NO_XREF(D3DDevice_SetSwapCallback_1_0_4134, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x242C], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x242C], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x2C }, // (Offset,Value)-Pair #9 { 0x0D, 0x24 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetTile +// * D3DDevice_GetTile // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetTile_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_GetTile_1_0_4134, 11) - // IDirect3DDevice8_GetTile+0x13 : lea esi, [ecx+eax*8+0x211C] + // D3DDevice_GetTile+0x13 : lea esi, [ecx+eax*8+0x211C] { 0x13, 0x8D }, // (Offset,Value)-Pair #1 { 0x14, 0xB4 }, // (Offset,Value)-Pair #2 { 0x15, 0xC1 }, // (Offset,Value)-Pair #3 { 0x16, 0x1C }, // (Offset,Value)-Pair #4 { 0x17, 0x21 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetTile+0x1A : mov ecx, 0x06 + // D3DDevice_GetTile+0x1A : mov ecx, 0x06 { 0x1A, 0xB9 }, // (Offset,Value)-Pair #6 { 0x1B, 0x06 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetTile+0x21 : pop edi; pop esi + // D3DDevice_GetTile+0x21 : pop edi; pop esi { 0x21, 0x5F }, // (Offset,Value)-Pair #8 { 0x22, 0x5E }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetTile+0x23 : retn 0x08 + // D3DDevice_GetTile+0x23 : retn 0x08 { 0x23, 0xC2 }, // (Offset,Value)-Pair #10 { 0x24, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTile +// * D3DDevice_SetTile // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTile_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_SetTile_1_0_4134, 11) - // IDirect3DDevice8_SetTileNoWait+0x00 : sub esp, 0x18 + // D3DDevice_SetTileNoWait+0x00 : sub esp, 0x18 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x18 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTileNoWait+0x16 : cmp [esi+4], eax + // D3DDevice_SetTileNoWait+0x16 : cmp [esi+4], eax { 0x16, 0x39 }, // (Offset,Value)-Pair #4 { 0x17, 0x46 }, // (Offset,Value)-Pair #5 { 0x18, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x211C] + // D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x211C] { 0x3D, 0x8D }, // (Offset,Value)-Pair #7 { 0x3E, 0xBC }, // (Offset,Value)-Pair #8 { 0x3F, 0xCB }, // (Offset,Value)-Pair #9 @@ -1718,55 +1718,55 @@ OOVPA_NO_XREF(D3DDevice_GetRenderTarget_1_0_4134, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Release +// * D3DDevice_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_4134, 11) +OOVPA_NO_XREF(D3DDevice_Release_1_0_4134, 11) - // IDirect3DDevice8_Release+0x07 : mov eax, [edi+0x043C] + // D3DDevice_Release+0x07 : mov eax, [edi+0x043C] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x87 }, // (Offset,Value)-Pair #2 { 0x09, 0x3C }, // (Offset,Value)-Pair #3 { 0x0A, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_Release+0x0D : cmp eax, 1 + // D3DDevice_Release+0x0D : cmp eax, 1 { 0x0D, 0x83 }, // (Offset,Value)-Pair #5 { 0x0E, 0xF8 }, // (Offset,Value)-Pair #6 { 0x0F, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Release+0x1B : mov ecx, 0x0AB8 + // D3DDevice_Release+0x1B : mov ecx, 0x0AB8 { 0x1B, 0xB9 }, // (Offset,Value)-Pair #8 { 0x1C, 0xB8 }, // (Offset,Value)-Pair #9 { 0x1D, 0x0A }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_Release+0x2E : dec eax + // D3DDevice_Release+0x2E : dec eax { 0x2E, 0x48 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayMode +// * D3DDevice_GetDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayMode_1_0_4134, 13) +OOVPA_NO_XREF(D3DDevice_GetDisplayMode_1_0_4134, 13) - // IDirect3DDevice8_GetDisplayMode+0x01 : mov esi, ds:[*] + // D3DDevice_GetDisplayMode+0x01 : mov esi, ds:[*] { 0x01, 0x8B }, // (Offset,Value)-Pair #1 { 0x02, 0x35 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDisplayMode+0x18 : shr ecx, 0x14 + // D3DDevice_GetDisplayMode+0x18 : shr ecx, 0x14 { 0x18, 0xC1 }, // (Offset,Value)-Pair #3 { 0x19, 0xE9 }, // (Offset,Value)-Pair #4 { 0x1A, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDisplayMode+0x50 : shr eax, 0x0C + // D3DDevice_GetDisplayMode+0x50 : shr eax, 0x0C { 0x50, 0xC1 }, // (Offset,Value)-Pair #6 { 0x51, 0xE8 }, // (Offset,Value)-Pair #7 { 0x52, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDisplayMode+0x6B : and eax, 0x0A + // D3DDevice_GetDisplayMode+0x6B : and eax, 0x0A { 0x6B, 0x83 }, // (Offset,Value)-Pair #9 { 0x6C, 0xE0 }, // (Offset,Value)-Pair #10 { 0x6D, 0x0A }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_GetDisplayMode+0x92 : retn 0x04 + // D3DDevice_GetDisplayMode+0x92 : retn 0x04 { 0x92, 0xC2 }, // (Offset,Value)-Pair #12 { 0x93, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; @@ -1791,325 +1791,325 @@ OOVPA_END; OOVPATable D3D8_1_0_4134[] = { // IDirect3D8::CreateDevice (* unchanged since 1.0.3925 *) - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_3925, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_3925, D3D_CreateDevice), // IDirect3D8::CheckDeviceFormat - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceFormat_1_0_4134, XTL::EmuIDirect3D8_CheckDeviceFormat), + OOVPA_TABLE_PATCH(D3D_CheckDeviceFormat_1_0_4134, D3D_CheckDeviceFormat), // IDirect3DDevice8::SetRenderState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4134, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_4034, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::SetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4134, D3DDevice_SetTransform), // IDirect3DDevice8::SetRenderState_FogColor - 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::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_4134, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4134, D3DDevice_Swap), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_4134, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_4134, D3DDevice_Clear), // ********************** BEG WARNING UNTESTED!!! ******************* // IDirect3DDevice8::GetDeviceCaps - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // IDirect3DDevice8::BeginVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_3925, D3DDevice_BeginVisibilityTest), // IDirect3DDevice8::EndVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_3925, XTL::EmuIDirect3DDevice8_EndVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_3925, D3DDevice_EndVisibilityTest), // IDirect3DDevice8::LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_3925, D3DDevice_LoadVertexShader), // IDirect3DDevice8::LoadVertexShader (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_4034, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_4034, D3DDevice_LoadVertexShader), // IDirect3DDevice8::SelectVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_3925, D3DDevice_SelectVertexShader), // IDirect3DDevice8::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_3925, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_3925, D3DDevice_Release), // IDirect3DDevice8::BlockUntilVerticalBlank /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_3925, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_3925, D3DDevice_BlockUntilVerticalBlank), */ // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_3925, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_3925, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::GetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_3925, XTL::EmuIDirect3DDevice8_GetTransform), + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_3925, D3DDevice_GetTransform), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_3925, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_3925, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShader /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_3925, D3DDevice_SetVertexShader), */ // IDirect3DDevice8::SetPixelShader /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_3925, D3DDevice_SetPixelShader), */ // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_3925, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_3925, D3DDevice_SetIndices), // IDirect3DDevice8::SetViewport (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_4034, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_4034, D3DDevice_SetViewport), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_3925, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_3925, D3DDevice_SetTexture), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_3925, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_3925, D3DDevice_Begin), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_3925, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_3925, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexDataColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexDataColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexDataColor), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_3925, D3DDevice_SetVertexDataColor), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_3925, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_3925, D3DDevice_End), // IDirect3DDevice8::CreatePalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePalette), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette_1_0_3925, D3DDevice_CreatePalette), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_3925, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_3925, D3DDevice_SetPalette), // IDirect3DDevice8::CreateTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture_1_0_3925, D3DDevice_CreateTexture), // IDirect3DDevice8::CreateVolumeTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVolumeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVolumeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateVolumeTexture_1_0_3925, D3DDevice_CreateVolumeTexture), // IDirect3DDevice8::CreateCubeTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateCubeTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateCubeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateCubeTexture_1_0_3925, D3DDevice_CreateCubeTexture), // IDirect3DDevice8::CreateIndexBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateIndexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer_1_0_3925, D3DDevice_CreateIndexBuffer), // IDirect3DDevice8::CreateVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetVertexShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_3925, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_3925, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_3925, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_3925, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_3925, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetTextureState_BorderColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_3925, D3DDevice_SetTextureState_BorderColor), // IDirect3DDevice8::SetRenderState_PSTextureModes - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_PSTextureModes_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_PSTextureModes_1_0_3925, D3DDevice_SetRenderState_PSTextureModes), // IDirect3DDevice8::SetRenderState_StencilFail /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_3925, D3DDevice_SetRenderState_StencilFail), */ // IDirect3DDevice8::SetRenderState_Simple /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_3925, D3DDevice_SetRenderState_Simple), */ // IDirect3DDevice8::SetRenderState_FogColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_3925, D3DDevice_SetRenderState_FogColor), // IDirect3DDevice8::SetRenderState_FillMode /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_3925, D3DDevice_SetRenderState_FillMode), */ // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_3925, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_3925, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_ZBias - 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_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_3925, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::Present - OOVPA_TABLE_PATCH(IDirect3DDevice8_Present_1_0_3925, XTL::EmuIDirect3DDevice8_Present), + OOVPA_TABLE_PATCH(D3DDevice_Present_1_0_3925, D3DDevice_Present), // IDirect3DDevice8::SetShaderConstantMode /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_3925, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_3925, D3DDevice_SetShaderConstantMode), */ // IDirect3DDevice8::GetBackBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_3925, D3DDevice_GetBackBuffer), // IDirect3DDevice8::CreateVertexBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer_1_0_3925, D3DDevice_CreateVertexBuffer), // IDirect3DVertexBuffer8::Lock /* - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_3925, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_3925, D3DVertexBuffer_Lock), */ // IDirect3DResource8::Register - OOVPA_TABLE_PATCH(IDirect3DResource8_Register_1_0_3925, XTL::EmuIDirect3DResource8_Register), + OOVPA_TABLE_PATCH(D3DResource_Register_1_0_3925, D3DResource_Register), // IDirect3DResource8::Release - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_3925, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_3925, D3DResource_Release), // IDirect3DResource8::AddRef - OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef), + OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef), // IDirect3DResource8::IsBusy - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_3925, XTL::EmuIDirect3DResource8_IsBusy), + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_3925, D3DResource_IsBusy), // IDirect3DPalette8::Lock - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock_1_0_3925, XTL::EmuIDirect3DPalette8_Lock), + OOVPA_TABLE_PATCH(D3DPalette_Lock_1_0_3925, D3DPalette_Lock), // IDirect3DTexture8::LockRect - OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_3925, D3DTexture_LockRect), // IDirect3DVolumeTexture8::LockBox - OOVPA_TABLE_PATCH(IDirect3DVolumeTexture8_LockBox_1_0_3925, XTL::EmuIDirect3DVolumeTexture8_LockBox), + OOVPA_TABLE_PATCH(D3DVolumeTexture_LockBox_1_0_3925, D3DVolumeTexture_LockBox), // IDirect3DCubeTexture8::LockRect - OOVPA_TABLE_PATCH(IDirect3DCubeTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DCubeTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DCubeTexture_LockRect_1_0_3925, D3DCubeTexture_LockRect), // IDirect3DTexture8::GetSurfaceLevel - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel_1_0_3925, XTL::EmuIDirect3DTexture8_GetSurfaceLevel), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel_1_0_3925, D3DTexture_GetSurfaceLevel), // Get2DSurfacDesc /* - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_3925, Get2DSurfaceDesc), */ // ********************** END WARNING UNTESTED!!! ******************* // IDirect3DDevice8::GetBackBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_4134, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_4134, D3DDevice_GetBackBuffer), // IDirect3DDevice8::GetDepthStencilSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface_1_0_4134, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface_1_0_4134, D3DDevice_GetDepthStencilSurface), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_4134, D3DDevice_SetRenderTarget), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // 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), // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), - // IDirect3DDevice8_SetGammaRamp (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_3925, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), + // D3DDevice_SetGammaRamp (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_3925, D3DDevice_SetGammaRamp), // IDirect3DDevice8::LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_4134, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_4134, D3DDevice_LoadVertexShader), // IDirect3DDevice8::SelectVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_4134, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_4134, D3DDevice_SelectVertexShader), // IDirect3DDevice8::CopyRects - OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_4134, XTL::EmuIDirect3DDevice8_CopyRects), + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_4134, D3DDevice_CopyRects), // IDirect3DDevice8::CreateImageSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateImageSurface_1_0_4034, XTL::EmuIDirect3DDevice8_CreateImageSurface), + OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_4034, D3DDevice_CreateImageSurface), // IDirect3DDevice8::SetVertexShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_4134, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_4134, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_4134, D3DDevice_SetPixelShader), // IDirect3DDevice8::SetTextureState_BumpEnv - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_4134, D3DDevice_SetTextureState_BumpEnv), // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_4134, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_4134, D3DDevice_SetIndices), // IDirect3DDevice8::SetTexture (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_4034, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_4034, D3DDevice_SetTexture), // IDirect3DDevice8::SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4134, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_4134, D3DDevice_SetRenderState_TextureFactor), // IDirect3DDevice8::SetRenderState_EdgeAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4134, D3DDevice_SetRenderState_EdgeAntiAlias), // IDirect3DDevice8::SetRenderState_Simple (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_4034, D3DDevice_SetRenderState_Simple), // IDirect3DDevice8::SetRenderState_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_4134, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4134, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4134, D3DDevice_SetRenderState_MultiSampleAntiAlias), // IDirect3DDevice8::GetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_GetTransform), + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_4134, D3DDevice_GetTransform), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_4134, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_4134, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_4134, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_4134, D3DDevice_SetVertexShader), // IDirect3DDevice8::DrawVertices (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_4034, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_4034, D3DDevice_DrawVertices), // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_4134, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_4134, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::DrawIndexedVertices (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_4034, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_4034, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_4134, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_4134, D3DDevice_SetLight), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4134, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4134, D3DDevice_SetMaterial), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_4134, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_4134, D3DDevice_LightEnable), // IDirect3DVertexBuffer8::Lock (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_4034, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_4034, D3DVertexBuffer_Lock), // Get2DSurfacDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4134, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4134, Get2DSurfaceDesc), // IDirect3DSurface8::GetDesc - OOVPA_TABLE_PATCH(IDirect3DSurface8_GetDesc_1_0_4134, XTL::EmuIDirect3DSurface8_GetDesc), - // IDirect3DDevice8_SetRenderState_StencilFail - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), - // IDirect3DDevice8_SetRenderState_NormalizeNormals - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), + OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_4134, D3DSurface_GetDesc), + // D3DDevice_SetRenderState_StencilFail + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), + // D3DDevice_SetRenderState_NormalizeNormals + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4134, D3DDevice_SetRenderState_NormalizeNormals), // IDirect3DDevice8::Reset - OOVPA_TABLE_PATCH(IDirect3DDevice8_Reset_1_0_4134, XTL::EmuIDirect3DDevice8_Reset), + OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_4134, D3DDevice_Reset), // IDirect3D8::KickOffAndWaitForIdle (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_4034, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_4034, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::SetTextureState_TwoSidedLighting - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, D3DDevice_SetTextureState_TwoSidedLighting), // IDirect3DDevice8::SetRenderState_BackFillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // IDirect3DDevice8::SetTextureState_ColorKeyColor - 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::SetRenderState_FrontFace - 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::SetRenderState_LogicOp - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LogicOp_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4134, D3DDevice_SetRenderState_LogicOp), // IDirect3DDevice8::SetRenderState_OcclusionCullEnable - 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_StencilCullEnable - 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_FillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_4134, D3DDevice_SetRenderState_FillMode), // IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead - 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 - 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 - 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::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4134, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4134, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // IDirect3DDevice8::SetRenderState_ShadowFunc - 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 - 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::DrawIndexedVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4134, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_4134, D3DDevice_DrawIndexedVerticesUP), // IDirect3DDevice8::SetPixelShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderConstant_1_0_4134, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_4134, D3DDevice_SetPixelShaderConstant), // IDirect3DDevice8::DeletePixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_DeletePixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_4134, D3DDevice_DeletePixelShader), // IDirect3DDevice8::SetRenderState_CullModeB (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullModeB_1_0_4134, D3DDevice_SetRenderState_CullMode), // D3DDevice_DeleteVertexShader (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeleteVertexShader), - // IDirect3DDevice8_SetScreenSpaceOffset - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_4134, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_4134, D3DDevice_DeleteVertexShader), + // D3DDevice_SetScreenSpaceOffset + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_4134, D3DDevice_SetScreenSpaceOffset), // D3D::SetFence (XREF) OOVPA_TABLE_XREF(D3D_SetFence_1_0_4134), // IDirect3DDevice8::SetRenderState_LineWidth - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4134, D3DDevice_SetRenderState_LineWidth), // 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), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4134, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_4134, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetSwapCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSwapCallback_1_0_4134, XTL::EmuIDirect3DDevice8_SetSwapCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_4134, D3DDevice_SetSwapCallback), // IDirect3DDevice8::GetTile - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTile_1_0_4134, XTL::EmuIDirect3DDevice8_GetTile), + OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_4134, D3DDevice_GetTile), // IDirect3DDevice8::SetTile - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTile_1_0_4134, XTL::EmuIDirect3DDevice8_SetTileNoWait), + OOVPA_TABLE_PATCH(D3DDevice_SetTile_1_0_4134, D3DDevice_SetTileNoWait), // IDirect3DDevice8::IsBusy - OOVPA_TABLE_PATCH(D3DDevice_IsBusy_1_0_4134, XTL::EmuIDirect3DDevice8_IsBusy), + OOVPA_TABLE_PATCH(D3DDevice_IsBusy_1_0_4134, D3DDevice_IsBusy), // 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), // D3D::CDevice::KickOff - OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_4134, XTL::EmuD3DDevice_KickOff), + OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_4134, D3DDevice_KickOff), // IDirect3DDevice8::InsertFence (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_3925, XTL::EmuIDirect3DDevice8_InsertFence), + OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_3925, D3DDevice_InsertFence), // IDirect3DDevice8::BlockOnFence - OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4134, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4134, D3DDevice_BlockOnFence), // IDirect3DDevice8::GetRenderTarget - OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget_1_0_4134, XTL::EmuIDirect3DDevice8_GetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget_1_0_4134, D3DDevice_GetRenderTarget), // IDirect3DDevice8::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_4134, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_4134, D3DDevice_Release), // IDirect3DDevice8::GetDisplayMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4134, XTL::EmuIDirect3DDevice8_GetDisplayMode), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4134, D3DDevice_GetDisplayMode), // Direct3D_GetAdapterIdentifier (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, XTL::EmuIDirect3D8_GetAdapterIdentifier), + OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, D3D_GetAdapterIdentifier), // D3DDevice_SetShaderConstantMode - OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_4134, D3DDevice_SetShaderConstantMode), // 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::GetVisibilityTestResult (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h index ca06d6f2b..150dbfdaf 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 4af04eeac..ea97a2871 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -33,52 +33,52 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_4361, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A +OOVPA_NO_XREF(D3D_CreateDevice_1_0_4361, 8) + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x86 : repe stosd + // D3D_CreateDevice+0x86 : repe stosd { 0x86, 0xF3 }, // (Offset,Value)-Pair #3 { 0x87, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x89 : mov eax, esi + // D3D_CreateDevice+0x89 : mov eax, esi { 0x89, 0x8B }, // (Offset,Value)-Pair #5 { 0x8A, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0xA0 : retn 0x18 + // D3D_CreateDevice+0xA0 : retn 0x18 { 0xA0, 0xC2 }, // (Offset,Value)-Pair #7 { 0xA1, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3D8_CheckDeviceFormat +// * D3D_CheckDeviceFormat // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CheckDeviceFormat_1_0_4361, 8) +OOVPA_NO_XREF(D3D_CheckDeviceFormat_1_0_4361, 8) - // IDirect3D8_CheckDeviceFormat+0x0D : retn 0x18 + // D3D_CheckDeviceFormat+0x0D : retn 0x18 { 0x0D, 0xC2 }, // (Offset,Value)-Pair #1 { 0x0E, 0x18 }, // (Offset,Value)-Pair #2 - // IDirect3D8_CheckDeviceFormat+0x15 : jz +0x08 + // D3D_CheckDeviceFormat+0x15 : jz +0x08 { 0x15, 0x74 }, // (Offset,Value)-Pair #3 { 0x16, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3D8_CheckDeviceFormat+0x29 : mov cl, 0x80 + // D3D_CheckDeviceFormat+0x29 : mov cl, 0x80 { 0x29, 0xB1 }, // (Offset,Value)-Pair #5 { 0x2A, 0x80 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CheckDeviceFormat+0x61 : retn 0x18 + // D3D_CheckDeviceFormat+0x61 : retn 0x18 { 0x61, 0xC2 }, // (Offset,Value)-Pair #7 { 0x62, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4361, 6) +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_4361, 6) { 0x01, 0x44 }, { 0x03, 0x04 }, @@ -89,74 +89,74 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4361, 6) OOVPA_END; // ****************************************************************** -// * IDirect3D8_GetAdapterModeCount +// * D3D_GetAdapterModeCount // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_GetAdapterModeCount_1_0_4361, 12) +OOVPA_NO_XREF(D3D_GetAdapterModeCount_1_0_4361, 12) - // IDirect3D8_GetAdapterModeCount+0x25 : add edx, 0xFF + // D3D_GetAdapterModeCount+0x25 : add edx, 0xFF { 0x25, 0x81 }, // (Offset,Value)-Pair #1 { 0x26, 0xE2 }, // (Offset,Value)-Pair #2 { 0x27, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3D8_GetAdapterModeCount+0x47 : cmp edi, 0x04 + // D3D_GetAdapterModeCount+0x47 : cmp edi, 0x04 { 0x47, 0x83 }, // (Offset,Value)-Pair #4 { 0x48, 0xFF }, // (Offset,Value)-Pair #5 { 0x49, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3D8_GetAdapterModeCount+0x95 : shl eax, 0x02 + // D3D_GetAdapterModeCount+0x95 : shl eax, 0x02 { 0x95, 0xC1 }, // (Offset,Value)-Pair #7 { 0x96, 0xE0 }, // (Offset,Value)-Pair #8 { 0x97, 0x02 }, // (Offset,Value)-Pair #9 - // IDirect3D8_GetAdapterModeCount+0x99 : add esp, 0x08 + // D3D_GetAdapterModeCount+0x99 : add esp, 0x08 { 0x99, 0x83 }, // (Offset,Value)-Pair #10 { 0x9A, 0xC4 }, // (Offset,Value)-Pair #11 { 0x9B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3D8_GetAdapterDisplayMode +// * D3D_GetAdapterDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_GetAdapterDisplayMode_1_0_4361, 13) +OOVPA_NO_XREF(D3D_GetAdapterDisplayMode_1_0_4361, 13) - // IDirect3D8_GetAdapterDisplayMode+0x08 : mov eax, 0x8876086C + // D3D_GetAdapterDisplayMode+0x08 : mov eax, 0x8876086C { 0x08, 0xB8 }, // (Offset,Value)-Pair #1 { 0x09, 0x6C }, // (Offset,Value)-Pair #2 { 0x0A, 0x08 }, // (Offset,Value)-Pair #3 { 0x0B, 0x76 }, // (Offset,Value)-Pair #4 { 0x0C, 0x88 }, // (Offset,Value)-Pair #5 - // IDirect3D8_GetAdapterDisplayMode+0x18 : jnz +0x17 + // D3D_GetAdapterDisplayMode+0x18 : jnz +0x17 { 0x18, 0x75 }, // (Offset,Value)-Pair #6 { 0x19, 0x17 }, // (Offset,Value)-Pair #7 - // IDirect3D8_GetAdapterDisplayMode+0x31 : mov ecx, [edx+0x2080] + // D3D_GetAdapterDisplayMode+0x31 : mov ecx, [edx+0x2080] { 0x31, 0x8B }, // (Offset,Value)-Pair #8 { 0x32, 0x8A }, // (Offset,Value)-Pair #9 { 0x33, 0x80 }, // (Offset,Value)-Pair #10 { 0x34, 0x20 }, // (Offset,Value)-Pair #11 - // IDirect3D8_GetAdapterDisplayMode+0xBD : retn 0x08 + // D3D_GetAdapterDisplayMode+0xBD : retn 0x08 { 0xBD, 0xC2 }, // (Offset,Value)-Pair #12 { 0xBE, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3D8_EnumAdapterModes +// * D3D_EnumAdapterModes // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_EnumAdapterModes_1_0_4361, 10) +OOVPA_NO_XREF(D3D_EnumAdapterModes_1_0_4361, 10) - // IDirect3D8_EnumAdapterModes+0x00 : sub esp, 0x08 + // D3D_EnumAdapterModes+0x00 : sub esp, 0x08 { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3D8_EnumAdapterModes+0xD1 : and edx, 0x0A + // D3D_EnumAdapterModes+0xD1 : and edx, 0x0A { 0xD1, 0x83 }, // (Offset,Value)-Pair #4 { 0xD2, 0xE2 }, // (Offset,Value)-Pair #5 { 0xD3, 0x0A }, // (Offset,Value)-Pair #6 - // IDirect3D8_EnumAdapterModes+0xF5 : mov dword ptr[edi+0x10], 0x1E + // D3D_EnumAdapterModes+0xF5 : mov dword ptr[edi+0x10], 0x1E { 0xF5, 0xC7 }, // (Offset,Value)-Pair #7 { 0xF6, 0x47 }, // (Offset,Value)-Pair #8 { 0xF7, 0x10 }, // (Offset,Value)-Pair #9 @@ -164,46 +164,46 @@ OOVPA_NO_XREF(IDirect3D8_EnumAdapterModes_1_0_4361, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SelectVertexShader +// * D3DDevice_SelectVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SelectVertexShader_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SelectVertexShader_1_0_4361, 11) - // IDirect3DDevice8_SelectVertexShader+0x13 : mov [esi+0x384], eax + // D3DDevice_SelectVertexShader+0x13 : mov [esi+0x384], eax { 0x13, 0x89 }, // (Offset,Value)-Pair #1 { 0x14, 0x86 }, // (Offset,Value)-Pair #2 { 0x15, 0x84 }, // (Offset,Value)-Pair #3 { 0x16, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SelectVertexShader+0x3B : mov dword ptr [eax], 0x00081E94 + // D3DDevice_SelectVertexShader+0x3B : mov dword ptr [eax], 0x00081E94 { 0x3B, 0xC7 }, // (Offset,Value)-Pair #5 { 0x3C, 0x00 }, // (Offset,Value)-Pair #6 { 0x3D, 0x94 }, // (Offset,Value)-Pair #7 { 0x3E, 0x1E }, // (Offset,Value)-Pair #8 { 0x3F, 0x08 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SelectVertexShader+0x55 : mov [esi], eax + // D3DDevice_SelectVertexShader+0x55 : mov [esi], eax { 0x55, 0x89 }, // (Offset,Value)-Pair #10 { 0x56, 0x06 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_AddRef +// * D3DDevice_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_AddRef_1_0_4361, 10) - // IDirect3DDevice8_AddRef+0x00 : mov eax, [addr] + // D3DDevice_AddRef+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_AddRef+0x05 : mov ecx, [eax+0x0440] + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x0440] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x88 }, // (Offset,Value)-Pair #3 { 0x07, 0x40 }, // (Offset,Value)-Pair #4 { 0x08, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_AddRef+0x0B : inc ecx + // D3DDevice_AddRef+0x0B : inc ecx { 0x0B, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_AddRef+0x05 : mov [eax+0x0440], ecx + // D3DDevice_AddRef+0x05 : mov [eax+0x0440], ecx { 0x0C, 0x89 }, // (Offset,Value)-Pair #7 { 0x0D, 0x88 }, // (Offset,Value)-Pair #8 { 0x0E, 0x40 }, // (Offset,Value)-Pair #9 @@ -260,41 +260,41 @@ OOVPA_XREF(IDirect3D_RecordStateBlock_1_0_4361, 10, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetGammaRamp +// * D3DDevice_SetGammaRamp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetGammaRamp_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_SetGammaRamp_1_0_4361, 9) - // IDirect3DDevice8_SetGammaRamp+0x11 : and eax, 1; push ebx + // D3DDevice_SetGammaRamp+0x11 : and eax, 1; push ebx { 0x11, 0x83 }, // (Offset,Value)-Pair #1 { 0x12, 0xE0 }, // (Offset,Value)-Pair #2 { 0x13, 0x01 }, // (Offset,Value)-Pair #3 { 0x14, 0x53 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetGammaRamp+0x2F : rep movsd + // D3DDevice_SetGammaRamp+0x2F : rep movsd { 0x2F, 0xF3 }, // (Offset,Value)-Pair #5 { 0x30, 0xA5 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetGammaRamp+0x3E : push ebx; mov ecx, edx + // D3DDevice_SetGammaRamp+0x3E : push ebx; mov ecx, edx { 0x3E, 0x53 }, // (Offset,Value)-Pair #7 { 0x3F, 0x8B }, // (Offset,Value)-Pair #8 { 0x40, 0xCA }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginStateBlock +// * D3DDevice_BeginStateBlock // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_BeginStateBlock_1_0_4361, 6, +OOVPA_XREF(D3DDevice_BeginStateBlock_1_0_4361, 6, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_BeginStateBlock+0x0F : call [ClearStateBlockFlags] + // D3DDevice_BeginStateBlock+0x0F : call [ClearStateBlockFlags] { 0x0A, XREF_CLEARSTATEBLOCKFLAGS }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_BeginStateBlock+0x00 : mov eax, [addr] + // D3DDevice_BeginStateBlock+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_BeginStateBlock+0x05 : mov [eax+8], 0x20 + // D3DDevice_BeginStateBlock+0x05 : mov [eax+8], 0x20 { 0x05, 0x83 }, // (Offset,Value)-Pair #3 { 0x06, 0x48 }, // (Offset,Value)-Pair #4 { 0x07, 0x08 }, // (Offset,Value)-Pair #5 @@ -302,18 +302,18 @@ OOVPA_XREF(IDirect3DDevice8_BeginStateBlock_1_0_4361, 6, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CaptureStateBlock +// * D3DDevice_CaptureStateBlock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CaptureStateBlock_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_CaptureStateBlock_1_0_4361, 9) - // IDirect3DDevice8_CaptureStateBlock+0x36 : mov eax, [edi+eax*4+0x0A78] + // D3DDevice_CaptureStateBlock+0x36 : mov eax, [edi+eax*4+0x0A78] { 0x36, 0x8B }, // (Offset,Value)-Pair #1 { 0x37, 0x84 }, // (Offset,Value)-Pair #2 { 0x38, 0x87 }, // (Offset,Value)-Pair #3 { 0x39, 0x78 }, // (Offset,Value)-Pair #4 { 0x3A, 0x0A }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CaptureStateBlock+0xA9 : cmp dword ptr [esi+0x0C], 0 + // D3DDevice_CaptureStateBlock+0xA9 : cmp dword ptr [esi+0x0C], 0 { 0xA9, 0x83 }, // (Offset,Value)-Pair #6 { 0xAA, 0x7E }, // (Offset,Value)-Pair #7 { 0xAB, 0x0C }, // (Offset,Value)-Pair #8 @@ -335,41 +335,41 @@ OOVPA_NO_XREF(D3DDevice_DeleteStateBlock_1_0_4361, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_ApplyStateBlock +// * D3DDevice_ApplyStateBlock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_ApplyStateBlock_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_ApplyStateBlock_1_0_4361, 9) - // IDirect3DDevice8_ApplyStateBlock+0x0E : lea esi, [edi+0x3C] + // D3DDevice_ApplyStateBlock+0x0E : lea esi, [edi+0x3C] { 0x0E, 0x8D }, // (Offset,Value)-Pair #1 { 0x0F, 0x77 }, // (Offset,Value)-Pair #2 { 0x10, 0x3C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_ApplyStateBlock+0x34 : cmp [edi+8], ebp + // D3DDevice_ApplyStateBlock+0x34 : cmp [edi+8], ebp { 0x34, 0x39 }, // (Offset,Value)-Pair #4 { 0x35, 0x6F }, // (Offset,Value)-Pair #5 { 0x36, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_ApplyStateBlock+0x9E : sub eax, 0x60 + // D3DDevice_ApplyStateBlock+0x9E : sub eax, 0x60 { 0x9E, 0x83 }, // (Offset,Value)-Pair #7 { 0x9F, 0xE8 }, // (Offset,Value)-Pair #8 { 0xA0, 0x60 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EndStateBlock +// * D3DDevice_EndStateBlock // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_EndStateBlock_1_0_4361, 6, +OOVPA_XREF(D3DDevice_EndStateBlock_1_0_4361, 6, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_EndStateBlock+0x0F : call [ClearStateBlockFlags] + // D3DDevice_EndStateBlock+0x0F : call [ClearStateBlockFlags] { 0x0A, XREF_RECORDSTATEBLOCK }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_EndStateBlock+0x00 : mov eax, [addr] + // D3DDevice_EndStateBlock+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_EndStateBlock+0x05 : and [eax+8], 0xFFFFFFDF + // D3DDevice_EndStateBlock+0x05 : and [eax+8], 0xFFFFFFDF { 0x05, 0x83 }, // (Offset,Value)-Pair #3 { 0x06, 0x60 }, // (Offset,Value)-Pair #4 { 0x07, 0x08 }, // (Offset,Value)-Pair #5 @@ -377,188 +377,188 @@ OOVPA_XREF(IDirect3DDevice8_EndStateBlock_1_0_4361, 6, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CopyRects +// * D3DDevice_CopyRects // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_CopyRects_1_0_4361, 10) - // IDirect3DDevice8_CopyRects+0x00 : sub esp, 0x01A0 + // D3DDevice_CopyRects+0x00 : sub esp, 0x01A0 { 0x00, 0x81 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0xA0 }, // (Offset,Value)-Pair #3 { 0x03, 0x01 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CopyRects+0x6E : mov esi, [eax+0x201C] + // D3DDevice_CopyRects+0x6E : mov esi, [eax+0x201C] { 0x6E, 0x8B }, // (Offset,Value)-Pair #5 { 0x6F, 0xB0 }, // (Offset,Value)-Pair #6 { 0x70, 0x1C }, // (Offset,Value)-Pair #7 { 0x71, 0x20 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CopyRects+0xDD : jnz +0x22 + // D3DDevice_CopyRects+0xDD : jnz +0x22 { 0xDD, 0x75 }, // (Offset,Value)-Pair #9 { 0xDE, 0x22 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateImageSurface +// * D3DDevice_CreateImageSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateImageSurface_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_CreateImageSurface_1_0_4361, 9) - // IDirect3DDevice8_CreateImageSurface+0x2A : push 0x18 + // D3DDevice_CreateImageSurface+0x2A : push 0x18 { 0x2A, 0x6A }, // (Offset,Value)-Pair #1 { 0x2B, 0x18 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateImageSurface+0x2C : push 0x40 + // D3DDevice_CreateImageSurface+0x2C : push 0x40 { 0x2C, 0x6A }, // (Offset,Value)-Pair #3 { 0x2D, 0x40 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_CreateImageSurface+0x3B : push 0x0404 + // D3DDevice_CreateImageSurface+0x3B : push 0x0404 { 0x3B, 0x68 }, // (Offset,Value)-Pair #5 { 0x3C, 0x04 }, // (Offset,Value)-Pair #6 { 0x3D, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateImageSurface+0x61 : retn 0x10 + // D3DDevice_CreateImageSurface+0x61 : retn 0x10 { 0x61, 0xC2 }, // (Offset,Value)-Pair #8 { 0x62, 0x10 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget +// * D3DDevice_GetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget_1_0_4361, 9) - // IDirect3DDevice8_GetRenderTarget+0x00 : mov eax, [addr] + // D3DDevice_GetRenderTarget+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetRenderTarget+0x05 : mov eax, [eax + 0x2070] + // D3DDevice_GetRenderTarget+0x05 : mov eax, [eax + 0x2070] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x70 }, // (Offset,Value)-Pair #4 { 0x08, 0x20 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetRenderTarget+0x11 : mov [ecx], eax + // D3DDevice_GetRenderTarget+0x11 : mov [ecx], eax { 0x11, 0x89 }, // (Offset,Value)-Pair #6 { 0x12, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetRenderTarget+0x1D : retn 0x04 + // D3DDevice_GetRenderTarget+0x1D : retn 0x04 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #8 { 0x1E, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant +// * D3DDevice_SetVertexShaderConstant // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant_1_0_4361, 10) - // IDirect3DDevice8_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x08] + // D3DDevice_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x08] { 0x11, 0x8A }, // (Offset,Value)-Pair #1 { 0x12, 0x4B }, // (Offset,Value)-Pair #2 { 0x13, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant+0x1A : test cl, 0x10 + // D3DDevice_SetVertexShaderConstant+0x1A : test cl, 0x10 { 0x1A, 0xF6 }, // (Offset,Value)-Pair #4 { 0x1B, 0xC1 }, // (Offset,Value)-Pair #5 { 0x1C, 0x10 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVertexShaderConstant+0x60 : jle +0x19 + // D3DDevice_SetVertexShaderConstant+0x60 : jle +0x19 { 0x60, 0x7E }, // (Offset,Value)-Pair #7 { 0x61, 0x19 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant+0x98 : retn 0x0C + // D3DDevice_SetVertexShaderConstant+0x98 : retn 0x0C { 0x98, 0xC2 }, // (Offset,Value)-Pair #9 { 0x99, 0x0C }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_4361, 10) - // IDirect3DDevice8_SetPixelShader+0x0E : mov esi, [ebx+0x0370] + // D3DDevice_SetPixelShader+0x0E : mov esi, [ebx+0x0370] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0xB3 }, // (Offset,Value)-Pair #2 { 0x10, 0x70 }, // (Offset,Value)-Pair #3 { 0x11, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x3A : or eax, 0x2000 + // D3DDevice_SetPixelShader+0x3A : or eax, 0x2000 { 0x3A, 0x0D }, // (Offset,Value)-Pair #5 { 0x3C, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x78 : retn 0x04 + // D3DDevice_SetPixelShader+0x78 : retn 0x04 { 0x78, 0xC2 }, // (Offset,Value)-Pair #7 { 0x79, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd + // D3DDevice_SetPixelShader+0xE3 : rep movsd { 0xE3, 0xF3 }, // (Offset,Value)-Pair #9 { 0xE4, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetViewport +// * D3DDevice_GetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_4361, 10) - // IDirect3DDevice8_GetViewport+0x05 : push esi; push edi + // D3DDevice_GetViewport+0x05 : push esi; push edi { 0x05, 0x56 }, // (Offset,Value)-Pair #1 { 0x06, 0x57 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetViewport+0x0B : lea esi, [eax+0x9D0] + // D3DDevice_GetViewport+0x0B : lea esi, [eax+0x9D0] { 0x0B, 0x8D }, // (Offset,Value)-Pair #3 { 0x0C, 0xB0 }, // (Offset,Value)-Pair #4 { 0x0D, 0xD0 }, // (Offset,Value)-Pair #5 { 0x0E, 0x09 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetViewport+0x11 : mov ecx, 6 + // D3DDevice_GetViewport+0x11 : mov ecx, 6 { 0x11, 0xB9 }, // (Offset,Value)-Pair #7 { 0x12, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetViewport+0x1A : retn 0x04 + // D3DDevice_GetViewport+0x1A : retn 0x04 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1B, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BumpEnv +// * D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv_1_0_4361, 12) - // IDirect3DDevice8_SetTextureState_BumpEnv+0x18 : jnz +0x03 + // D3DDevice_SetTextureState_BumpEnv+0x18 : jnz +0x03 { 0x18, 0x75 }, // (Offset,Value)-Pair #1 { 0x19, 0x03 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x1D : test bl, 3 + // D3DDevice_SetTextureState_BumpEnv+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x32 : mov ecx, [esp+0x14] + // D3DDevice_SetTextureState_BumpEnv+0x32 : mov ecx, [esp+0x14] { 0x32, 0x8B }, // (Offset,Value)-Pair #6 { 0x33, 0x4C }, // (Offset,Value)-Pair #7 { 0x34, 0x24 }, // (Offset,Value)-Pair #8 { 0x35, 0x18 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x50 : shl esi, 5 + // D3DDevice_SetTextureState_BumpEnv+0x50 : shl esi, 5 { 0x50, 0xC1 }, // (Offset,Value)-Pair #10 { 0x51, 0xE6 }, // (Offset,Value)-Pair #11 { 0x52, 0x05 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BorderColor +// * D3DDevice_SetTextureState_BorderColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BorderColor_1_0_4361, 15) +OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor_1_0_4361, 15) - // IDirect3DDevice8_SetTextureState_BorderColor+0x0C : jb +0x05 + // D3DDevice_SetTextureState_BorderColor+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_BorderColor+0x19 : shl edx, 6 + // D3DDevice_SetTextureState_BorderColor+0x19 : shl edx, 6 { 0x19, 0xC1 }, // (Offset,Value)-Pair #3 { 0x1A, 0xE2 }, // (Offset,Value)-Pair #4 { 0x1B, 0x06 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_BorderColor+0x2B : add eax, 8; mov [esi], eax; shl ecx, 7 + // D3DDevice_SetTextureState_BorderColor+0x2B : add eax, 8; mov [esi], eax; shl ecx, 7 { 0x2B, 0x83 }, // (Offset,Value)-Pair #6 { 0x2C, 0xC0 }, // (Offset,Value)-Pair #7 { 0x2D, 0x08 }, // (Offset,Value)-Pair #8 @@ -568,30 +568,30 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BorderColor_1_0_4361, 15) { 0x31, 0xE1 }, // (Offset,Value)-Pair #12 { 0x32, 0x07 }, // (Offset,Value)-Pair #13 - // IDirect3DDevice8_SetTextureState_BorderColor+0x3A : retn 0x08 + // D3DDevice_SetTextureState_BorderColor+0x3A : retn 0x08 { 0x3A, 0xC2 }, // (Offset,Value)-Pair #14 { 0x3B, 0x08 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_4361, 11) - // IDirect3DDevice8_SetIndices+0x0E : jz +0x10 + // D3DDevice_SetIndices+0x0E : jz +0x10 { 0x0E, 0x74 }, // (Offset,Value)-Pair #1 { 0x0F, 0x10 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetIndices+0x1E : jmp +0x0A + // D3DDevice_SetIndices+0x1E : jmp +0x0A { 0x1E, 0xEB }, // (Offset,Value)-Pair #3 { 0x1F, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetIndices+0x59 : mov [esi+0x1C], ecx + // D3DDevice_SetIndices+0x59 : mov [esi+0x1C], ecx { 0x59, 0x89 }, // (Offset,Value)-Pair #5 { 0x5A, 0x4E }, // (Offset,Value)-Pair #6 { 0x5B, 0x1C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetIndices+0x76 : mov [esi+0x038C], edi + // D3DDevice_SetIndices+0x76 : mov [esi+0x038C], edi { 0x76, 0x89 }, // (Offset,Value)-Pair #8 { 0x77, 0xBE }, // (Offset,Value)-Pair #9 { 0x78, 0x8C }, // (Offset,Value)-Pair #10 @@ -599,153 +599,153 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_4361, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTexture +// * D3DDevice_SetTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SetTexture_1_0_4361, 10) - // IDirect3DDevice8_SetTexture+0x09 : push edi + // D3DDevice_SetTexture+0x09 : push edi { 0x09, 0x57 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetTexture+0x21 : jz +0x20 + // D3DDevice_SetTexture+0x21 : jz +0x20 { 0x21, 0x74 }, // (Offset,Value)-Pair #2 { 0x22, 0x20 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTexture+0x33 : test ecx, 0x78FFFF + // D3DDevice_SetTexture+0x33 : test ecx, 0x78FFFF { 0x33, 0xF7 }, // (Offset,Value)-Pair #4 { 0x34, 0xC1 }, // (Offset,Value)-Pair #5 { 0x37, 0x78 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTexture+0x39 : mov [eax], edx + // D3DDevice_SetTexture+0x39 : mov [eax], edx { 0x39, 0x89 }, // (Offset,Value)-Pair #7 { 0x3A, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTexture+0xC9 : jz +0x4D + // D3DDevice_SetTexture+0xC9 : jz +0x4D { 0xC9, 0x74 }, // (Offset,Value)-Pair #9 { 0xCA, 0x4D }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SwitchTexture +// * D3DDevice_SwitchTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SwitchTexture_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SwitchTexture_1_0_4361, 10) - // IDirect3DDevice8_SwitchTexture+0x00 : mov eax, [addr] + // D3DDevice_SwitchTexture+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SwitchTexture+0x05 : add eax, 0x0C + // D3DDevice_SwitchTexture+0x05 : add eax, 0x0C { 0x05, 0x83 }, // (Offset,Value)-Pair #2 { 0x06, 0xC0 }, // (Offset,Value)-Pair #3 { 0x07, 0x0C }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SwitchTexture+0x0E : jnb +0x15 + // D3DDevice_SwitchTexture+0x0E : jnb +0x15 { 0x0E, 0x73 }, // (Offset,Value)-Pair #5 { 0x0F, 0x15 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SwitchTexture+0x22 : retn 0x04 + // D3DDevice_SwitchTexture+0x22 : retn 0x04 { 0x22, 0xC2 }, // (Offset,Value)-Pair #7 { 0x23, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SwitchTexture+0x2E : jmp +0xD0 + // D3DDevice_SwitchTexture+0x2E : jmp +0xD0 { 0x2E, 0xEB }, // (Offset,Value)-Pair #9 { 0x2F, 0xD0 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayMode +// * D3DDevice_GetDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayMode_1_0_4361, 13) +OOVPA_NO_XREF(D3DDevice_GetDisplayMode_1_0_4361, 13) - // IDirect3DDevice8_GetDisplayMode+0x01 : mov esi, ds:[*] + // D3DDevice_GetDisplayMode+0x01 : mov esi, ds:[*] { 0x01, 0x8B }, // (Offset,Value)-Pair #1 { 0x02, 0x35 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDisplayMode+0x18 : shr ecx, 0x14 + // D3DDevice_GetDisplayMode+0x18 : shr ecx, 0x14 { 0x18, 0xC1 }, // (Offset,Value)-Pair #3 { 0x19, 0xE9 }, // (Offset,Value)-Pair #4 { 0x1A, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDisplayMode+0x50 : shr eax, 0x0C + // D3DDevice_GetDisplayMode+0x50 : shr eax, 0x0C { 0x50, 0xC1 }, // (Offset,Value)-Pair #6 { 0x51, 0xE8 }, // (Offset,Value)-Pair #7 { 0x52, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDisplayMode+0x6B : and eax, 0x0A + // D3DDevice_GetDisplayMode+0x6B : and eax, 0x0A { 0x6B, 0x83 }, // (Offset,Value)-Pair #9 { 0x6C, 0xE0 }, // (Offset,Value)-Pair #10 { 0x6D, 0x0A }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_GetDisplayMode+0x92 : retn 0x04 + // D3DDevice_GetDisplayMode+0x92 : retn 0x04 { 0x92, 0xC2 }, // (Offset,Value)-Pair #12 { 0x93, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_4361, 11) - // IDirect3DDevice8_Swap+0x10 : mov ebx, 5 + // D3DDevice_Swap+0x10 : mov ebx, 5 { 0x10, 0xBB }, // (Offset,Value)-Pair #1 { 0x11, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Swap+0x1D : test bl, 3 + // D3DDevice_Swap+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_Swap+0x46 : inc dword ptr [esi+0x2AC4] + // D3DDevice_Swap+0x46 : inc dword ptr [esi+0x2AC4] { 0x46, 0xFF }, // (Offset,Value)-Pair #6 { 0x47, 0x86 }, // (Offset,Value)-Pair #7 { 0x48, 0xC4 }, // (Offset,Value)-Pair #8 { 0x49, 0x2A }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xAE : retn 4 + // D3DDevice_Swap+0xAE : retn 4 { 0xAE, 0xC2 }, // (Offset,Value)-Pair #10 { 0xAF, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EnableOverlay +// * D3DDevice_EnableOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_EnableOverlay_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_EnableOverlay_1_0_4361, 11) - // IDirect3DDevice8_EnableOverlay+0x0B : mov ecx, [eax+0x8700] + // D3DDevice_EnableOverlay+0x0B : mov ecx, [eax+0x8700] { 0x0B, 0x8B }, // (Offset,Value)-Pair #1 { 0x0C, 0x88 }, // (Offset,Value)-Pair #2 { 0x0E, 0x87 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_EnableOverlay+0x15 : jz +0x0A + // D3DDevice_EnableOverlay+0x15 : jz +0x0A { 0x15, 0x74 }, // (Offset,Value)-Pair #4 { 0x16, 0x0A }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_EnableOverlay+0x5A : mov [eax+0x8918], ecx + // D3DDevice_EnableOverlay+0x5A : mov [eax+0x8918], ecx { 0x5A, 0x89 }, // (Offset,Value)-Pair #6 { 0x5B, 0x88 }, // (Offset,Value)-Pair #7 { 0x5C, 0x18 }, // (Offset,Value)-Pair #8 { 0x5D, 0x89 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_EnableOverlay+0x60 : retn 0x04 + // D3DDevice_EnableOverlay+0x60 : retn 0x04 { 0x60, 0xC2 }, // (Offset,Value)-Pair #10 { 0x61, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_UpdateOverlay +// * D3DDevice_UpdateOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_UpdateOverlay_1_0_4361, 11) - // IDirect3DDevice8_UpdateOverlay+0x0F : mov [eax+0x2A90], ecx + // D3DDevice_UpdateOverlay+0x0F : mov [eax+0x2A90], ecx { 0x0F, 0x89 }, // (Offset,Value)-Pair #1 { 0x10, 0x88 }, // (Offset,Value)-Pair #2 { 0x11, 0x90 }, // (Offset,Value)-Pair #3 { 0x12, 0x2A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_UpdateOverlay+0x86 : and ecx, 0xFFFFFFFE + // D3DDevice_UpdateOverlay+0x86 : and ecx, 0xFFFFFFFE { 0x86, 0x83 }, // (Offset,Value)-Pair #5 { 0x87, 0xE1 }, // (Offset,Value)-Pair #6 { 0x88, 0xFE }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_UpdateOverlay+0xA2 : mov [esi+0x8920], ecx + // D3DDevice_UpdateOverlay+0xA2 : mov [esi+0x8920], ecx { 0xA2, 0x89 }, // (Offset,Value)-Pair #8 { 0xA3, 0x8E }, // (Offset,Value)-Pair #9 { 0xA4, 0x20 }, // (Offset,Value)-Pair #10 @@ -753,11 +753,11 @@ OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4361, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_4361, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -765,329 +765,329 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4361, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x2434 + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x2434 { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x34 }, // (Offset,Value)-Pair #8 { 0x19, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_4361, 10) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07 + // D3DDevice_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07 { 0x0D, 0xC1 }, // (Offset,Value)-Pair #1 { 0x0E, 0xE0 }, // (Offset,Value)-Pair #2 { 0x0F, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x24 : cmp eax, ecx + // D3DDevice_SetTextureState_TexCoordIndex+0x24 : cmp eax, ecx { 0x24, 0x3B }, // (Offset,Value)-Pair #4 { 0x25, 0xC1 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x6B : mov esi, 0x2400 + // D3DDevice_SetTextureState_TexCoordIndex+0x6B : mov esi, 0x2400 { 0x6B, 0xBE }, // (Offset,Value)-Pair #6 { 0x6D, 0x24 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0xB3 : shl edx, 0x04 + // D3DDevice_SetTextureState_TexCoordIndex+0xB3 : shl edx, 0x04 { 0xB3, 0xC1 }, // (Offset,Value)-Pair #8 { 0xB4, 0xE2 }, // (Offset,Value)-Pair #9 { 0xB5, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_VertexBlend +// * D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend_1_0_4361, 11) - // IDirect3DDevice8_SetRenderState_VertexBlend+0x06 : or edx, 0x200 + // D3DDevice_SetRenderState_VertexBlend+0x06 : or edx, 0x200 { 0x06, 0x81 }, // (Offset,Value)-Pair #1 { 0x07, 0xCA }, // (Offset,Value)-Pair #2 { 0x08, 0x00 }, // (Offset,Value)-Pair #3 { 0x09, 0x02 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x1E : jb +0x05 + // D3DDevice_SetRenderState_VertexBlend+0x1E : jb +0x05 { 0x1E, 0x72 }, // (Offset,Value)-Pair #5 { 0x1F, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x2F : mov [eax+4], ecx + // D3DDevice_SetRenderState_VertexBlend+0x2F : mov [eax+4], ecx { 0x2F, 0x89 }, // (Offset,Value)-Pair #7 { 0x30, 0x48 }, // (Offset,Value)-Pair #8 { 0x31, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_VertexBlend+0x3E : retn 0x04 + // D3DDevice_SetRenderState_VertexBlend+0x3E : retn 0x04 { 0x3E, 0xC2 }, // (Offset,Value)-Pair #10 { 0x3F, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4361, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_4361, 9) - // IDirect3DDevice8_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0370] + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0370] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x86 }, // (Offset,Value)-Pair #2 { 0x09, 0x70 }, // (Offset,Value)-Pair #3 { 0x0A, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x2F : nop + // D3DDevice_SetRenderState_TextureFactor+0x2F : nop { 0x2F, 0x90 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x41 : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x41 : retn 0x04 { 0x41, 0xC2 }, // (Offset,Value)-Pair #6 { 0x42, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x4E : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #8 { 0x4F, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4361, 10) - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x0C : jb +0x05 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #3 { 0x0D, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x13 : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x13 : mov ecx, [esp+0x08] { 0x13, 0x8B }, // (Offset,Value)-Pair #5 { 0x14, 0x4C }, // (Offset,Value)-Pair #6 { 0x15, 0x24 }, // (Offset,Value)-Pair #7 { 0x16, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x2F : retn 0x04 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x2F : retn 0x04 { 0x2F, 0xC2 }, // (Offset,Value)-Pair #9 { 0x30, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FillMode +// * D3DDevice_SetRenderState_FillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FillMode_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode_1_0_4361, 11) - // IDirect3DDevice8_SetRenderState_FillMode+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_FillMode+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FillMode+0x21 : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_FillMode+0x21 : mov ecx, [esp+0x08] { 0x21, 0x8B }, // (Offset,Value)-Pair #3 { 0x22, 0x4C }, // (Offset,Value)-Pair #4 { 0x23, 0x24 }, // (Offset,Value)-Pair #5 { 0x24, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FillMode+0x25 : jnz +0x02 + // D3DDevice_SetRenderState_FillMode+0x25 : jnz +0x02 { 0x25, 0x75 }, // (Offset,Value)-Pair #7 { 0x26, 0x02 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FillMode+0x35 : add eax, 0x0C + // D3DDevice_SetRenderState_FillMode+0x35 : add eax, 0x0C { 0x35, 0x83 }, // (Offset,Value)-Pair #9 { 0x36, 0xC0 }, // (Offset,Value)-Pair #10 { 0x37, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Simple +// * D3DDevice_SetRenderState_Simple // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Simple_1_0_4361, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Simple_1_0_4361, 13) - // IDirect3DDevice8_SetRenderState_Simple+0x05 : add eax, 0x08 + // D3DDevice_SetRenderState_Simple+0x05 : add eax, 0x08 { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x08 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_Simple+0x0E : jnb +0x0C + // D3DDevice_SetRenderState_Simple+0x0E : jnb +0x0C { 0x0E, 0x73 }, // (Offset,Value)-Pair #4 { 0x0F, 0x0C }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_Simple+0x15 : mov [eax-8], ecx + // D3DDevice_SetRenderState_Simple+0x15 : mov [eax-8], ecx { 0x15, 0x89 }, // (Offset,Value)-Pair #6 { 0x16, 0x48 }, // (Offset,Value)-Pair #7 { 0x17, 0xF8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_Simple+0x18 : mov [eax-4], ecx + // D3DDevice_SetRenderState_Simple+0x18 : mov [eax-4], ecx { 0x18, 0x89 }, // (Offset,Value)-Pair #9 { 0x19, 0x50 }, // (Offset,Value)-Pair #10 { 0x1A, 0xFC }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_Simple+0x25 : jmp +0xD9 + // D3DDevice_SetRenderState_Simple+0x25 : jmp +0xD9 { 0x25, 0xEB }, // (Offset,Value)-Pair #12 { 0x26, 0xD9 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4361, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_4361, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ZEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] + // D3DDevice_SetRenderState_ZEnable+0x1B : mov edx, [esi+0x2074h] { 0x1B, 0x8B }, // (Offset,Value)-Pair #3 { 0x1C, 0x96 }, // (Offset,Value)-Pair #4 { 0x1D, 0x74 }, // (Offset,Value)-Pair #5 { 0x1E, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C + // D3DDevice_SetRenderState_ZEnable+0x31 : mov dword ptr [eax], 0x4030C { 0x31, 0xC7 }, // (Offset,Value)-Pair #7 { 0x32, 0x00 }, // (Offset,Value)-Pair #8 { 0x33, 0x0C }, // (Offset,Value)-Pair #9 { 0x34, 0x03 }, // (Offset,Value)-Pair #10 { 0x35, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x98 : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x98 : retn 0x04 { 0x98, 0xC2 }, // (Offset,Value)-Pair #12 { 0x99, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilEnable +// * D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable_1_0_4361, 11) - // IDirect3DDevice8_SetRenderState_StencilEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_StencilEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x2C : jz +0x19 + // D3DDevice_SetRenderState_StencilEnable+0x2C : jz +0x19 { 0x2C, 0x74 }, // (Offset,Value)-Pair #3 { 0x2D, 0x19 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x4D : mov dword ptr [eax], 0x00041D84 + // D3DDevice_SetRenderState_StencilEnable+0x4D : mov dword ptr [eax], 0x00041D84 { 0x4D, 0xC7 }, // (Offset,Value)-Pair #5 { 0x4E, 0x00 }, // (Offset,Value)-Pair #6 { 0x4F, 0x84 }, // (Offset,Value)-Pair #7 { 0x50, 0x1D }, // (Offset,Value)-Pair #8 { 0x51, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_StencilEnable+0x81 : retn 0x04 + // D3DDevice_SetRenderState_StencilEnable+0x81 : retn 0x04 { 0x81, 0xC2 }, // (Offset,Value)-Pair #10 { 0x82, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4361, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x04 : push esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x04 : push esi { 0x04, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x05 : mov esi, dword ptr [addr] + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x05 : mov esi, dword ptr [addr] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x35 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x0B : mov ecx, esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x0B : mov ecx, esi { 0x0B, 0x8B }, // (Offset,Value)-Pair #4 { 0x0C, 0xCE }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x1C : jb +0x05 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x1C : jb +0x05 { 0x1C, 0x72 }, // (Offset,Value)-Pair #6 { 0x1D, 0x05 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 { 0x38, 0xC1 }, // (Offset,Value)-Pair #8 { 0x39, 0xE1 }, // (Offset,Value)-Pair #9 { 0x3A, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x50, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetTransform +// * D3DDevice_GetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetTransform_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_GetTransform_1_0_4361, 12) - // IDirect3DDevice8_GetTransform+0x0A : shl ecx, 0x06 + // D3DDevice_GetTransform+0x0A : shl ecx, 0x06 { 0x0A, 0xC1 }, // (Offset,Value)-Pair #1 { 0x0B, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0C, 0x06 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetTransform+0x12 : lea esi, [ecx+eax+*numb*] + // D3DDevice_GetTransform+0x12 : lea esi, [ecx+eax+*numb*] { 0x12, 0x8D }, // (Offset,Value)-Pair #4 { 0x13, 0xB4 }, // (Offset,Value)-Pair #5 { 0x14, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetTransform+0x19 : mov ecx, 0x10 + // D3DDevice_GetTransform+0x19 : mov ecx, 0x10 { 0x19, 0xB9 }, // (Offset,Value)-Pair #7 { 0x1A, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetTransform+0x20 : pop edi, pop esi + // D3DDevice_GetTransform+0x20 : pop edi, pop esi { 0x20, 0x5F }, // (Offset,Value)-Pair #9 { 0x21, 0x5E }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetTransform+0x22 : retn 0x08 + // D3DDevice_GetTransform+0x22 : retn 0x08 { 0x22, 0xC2 }, // (Offset,Value)-Pair #11 { 0x23, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetStreamSource +// * D3DDevice_SetStreamSource // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_4361, 14) +OOVPA_NO_XREF(D3DDevice_SetStreamSource_1_0_4361, 14) - // IDirect3DDevice8_SetStreamSource+0x08 : mov edi, [esp+8+0x04] + // D3DDevice_SetStreamSource+0x08 : mov edi, [esp+8+0x04] { 0x08, 0x8B }, // (Offset,Value)-Pair #1 { 0x09, 0x7C }, // (Offset,Value)-Pair #2 { 0x0A, 0x24 }, // (Offset,Value)-Pair #3 { 0x0B, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetStreamSource+0x28 : jz +0x26 + // D3DDevice_SetStreamSource+0x28 : jz +0x26 { 0x28, 0x74 }, // (Offset,Value)-Pair #5 { 0x29, 0x26 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetStreamSource+0x70 : or ecx, 0x40 + // D3DDevice_SetStreamSource+0x70 : or ecx, 0x40 { 0x70, 0x83 }, // (Offset,Value)-Pair #7 { 0x71, 0xC9 }, // (Offset,Value)-Pair #8 { 0x72, 0x40 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetStreamSource+0x7E : or ecx, 0x70 + // D3DDevice_SetStreamSource+0x7E : or ecx, 0x70 { 0x7E, 0x83 }, // (Offset,Value)-Pair #10 { 0x7F, 0xC9 }, // (Offset,Value)-Pair #11 { 0x80, 0x70 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetStreamSource+0x89 : retn 0x0C + // D3DDevice_SetStreamSource+0x89 : retn 0x0C { 0x89, 0xC2 }, // (Offset,Value)-Pair #13 { 0x8A, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_4361, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_4361, 14) - // IDirect3DDevice8_SetVertexShader+0x06 : test bl, 1 + // D3DDevice_SetVertexShader+0x06 : test bl, 1 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShader+0x11 : mov eax, [esi+0x0380] + // D3DDevice_SetVertexShader+0x11 : mov eax, [esi+0x0380] { 0x11, 0x8B }, // (Offset,Value)-Pair #4 { 0x12, 0x86 }, // (Offset,Value)-Pair #5 { 0x13, 0x80 }, // (Offset,Value)-Pair #6 { 0x14, 0x03 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShader+0x90 : retn 0x04 + // D3DDevice_SetVertexShader+0x90 : retn 0x04 { 0x90, 0xC2 }, // (Offset,Value)-Pair #8 { 0x91, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C + // D3DDevice_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C { 0xB0, 0xC7 }, // (Offset,Value)-Pair #10 { 0xB1, 0x00 }, // (Offset,Value)-Pair #11 { 0xB2, 0x4C }, // (Offset,Value)-Pair #12 @@ -1096,72 +1096,72 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_4361, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVertices +// * D3DDevice_DrawVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_4361, 12) - // IDirect3DDevice8_DrawVertices+0x12 : mov edi, [esp+0x0C+0x0C] + // D3DDevice_DrawVertices+0x12 : mov edi, [esp+0x0C+0x0C] { 0x12, 0x8B }, // (Offset,Value)-Pair #1 { 0x13, 0x7C }, // (Offset,Value)-Pair #2 { 0x14, 0x24 }, // (Offset,Value)-Pair #3 { 0x15, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawVertices+0x16 : lea esi, [edi-1] + // D3DDevice_DrawVertices+0x16 : lea esi, [edi-1] { 0x16, 0x8D }, // (Offset,Value)-Pair #5 { 0x17, 0x77 }, // (Offset,Value)-Pair #6 { 0x18, 0xFF }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVertices+0x7E : shl edi, 0x18 + // D3DDevice_DrawVertices+0x7E : shl edi, 0x18 { 0x7E, 0xC1 }, // (Offset,Value)-Pair #8 { 0x7F, 0xE7 }, // (Offset,Value)-Pair #9 { 0x80, 0x18 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_DrawVertices+0x9C : retn 0x0C + // D3DDevice_DrawVertices+0x9C : retn 0x0C { 0x9C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x9D, 0x0C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_4361, 10) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_4361, 10) - // IDirect3DDevice8_DrawVerticesUP+0x03 : sub esp, 0x14 + // D3DDevice_DrawVerticesUP+0x03 : sub esp, 0x14 { 0x03, 0x83 }, // (Offset,Value)-Pair #1 { 0x04, 0xEC }, // (Offset,Value)-Pair #2 { 0x05, 0x14 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawVerticesUP+0x2F : mov edx, [edi+0x744] + // D3DDevice_DrawVerticesUP+0x2F : mov edx, [edi+0x744] { 0x2F, 0x8B }, // (Offset,Value)-Pair #4 { 0x30, 0x97 }, // (Offset,Value)-Pair #5 { 0x31, 0x44 }, // (Offset,Value)-Pair #6 { 0x32, 0x07 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVerticesUP+0xC1 : cmp esi, 0x80 + // D3DDevice_DrawVerticesUP+0xC1 : cmp esi, 0x80 { 0xC1, 0x81 }, // (Offset,Value)-Pair #8 { 0xC2, 0xFE }, // (Offset,Value)-Pair #9 { 0xC3, 0x80 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_4361, 11) - // IDirect3DDevice8_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] + // D3DDevice_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0x46 }, // (Offset,Value)-Pair #2 { 0x10, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawIndexedVertices+0x20 : push 0x0209 + // D3DDevice_DrawIndexedVertices+0x20 : push 0x0209 { 0x20, 0x68 }, // (Offset,Value)-Pair #4 { 0x21, 0x09 }, // (Offset,Value)-Pair #5 { 0x22, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_DrawIndexedVertices+0x64 : dec eax + // D3DDevice_DrawIndexedVertices+0x64 : dec eax { 0x64, 0x48 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawIndexedVertices+0xF1 : prefetchnta byte ptr [esi+0x3C] + // D3DDevice_DrawIndexedVertices+0xF1 : prefetchnta byte ptr [esi+0x3C] { 0xF1, 0x0F }, // (Offset,Value)-Pair #8 { 0xF2, 0x18 }, // (Offset,Value)-Pair #9 { 0xF3, 0x46 }, // (Offset,Value)-Pair #10 @@ -1169,223 +1169,223 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4361, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_4361, 12) - // IDirect3DDevice8_SetLight+0x11 : mov edi, [ebp+0x394] + // D3DDevice_SetLight+0x11 : mov edi, [ebp+0x394] { 0x11, 0x8B }, // (Offset,Value)-Pair #1 { 0x12, 0xBD }, // (Offset,Value)-Pair #2 { 0x13, 0x94 }, // (Offset,Value)-Pair #3 { 0x14, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetLight+0x30 : shl eax, 0x04 + // D3DDevice_SetLight+0x30 : shl eax, 0x04 { 0x30, 0xC1 }, // (Offset,Value)-Pair #5 { 0x31, 0xE0 }, // (Offset,Value)-Pair #6 { 0x32, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetLight+0xBD : rep stosb + // D3DDevice_SetLight+0xBD : rep stosb { 0xBD, 0xF3 }, // (Offset,Value)-Pair #8 { 0xBE, 0xAB }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetLight+0xFD : mov ecx, [ebx+0x68] + // D3DDevice_SetLight+0xFD : mov ecx, [ebx+0x68] { 0xFD, 0x8B }, // (Offset,Value)-Pair #10 { 0xFE, 0x4B }, // (Offset,Value)-Pair #11 { 0xFF, 0x68 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_4361, 12) - // IDirect3DDevice8_SetMaterial+0x0C : add edi, 0x0940 + // D3DDevice_SetMaterial+0x0C : add edi, 0x0940 { 0x0C, 0x81 }, // (Offset,Value)-Pair #1 { 0x0D, 0xC7 }, // (Offset,Value)-Pair #2 { 0x0E, 0xF0 }, // (Offset,Value)-Pair #3 { 0x0F, 0x09 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetMaterial+0x12 : mov ecx, 0x11 + // D3DDevice_SetMaterial+0x12 : mov ecx, 0x11 { 0x12, 0xB9 }, // (Offset,Value)-Pair #5 { 0x13, 0x11 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetMaterial+0x1F : or ecx, 0x1000 + // D3DDevice_SetMaterial+0x1F : or ecx, 0x1000 { 0x1F, 0x81 }, // (Offset,Value)-Pair #7 { 0x20, 0xC9 }, // (Offset,Value)-Pair #8 { 0x21, 0x00 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetMaterial+0x2D : retn 0x04 + // D3DDevice_SetMaterial+0x2D : retn 0x04 { 0x2D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2E, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_4361, 13) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_4361, 13) - // IDirect3DDevice8_LightEnable+0x0F : cmp ebx, [esi+0x0394] + // D3DDevice_LightEnable+0x0F : cmp ebx, [esi+0x0394] { 0x0F, 0x3B }, // (Offset,Value)-Pair #1 { 0x10, 0x9E }, // (Offset,Value)-Pair #2 { 0x11, 0x94 }, // (Offset,Value)-Pair #3 { 0x12, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_LightEnable+0x6B : test eax, eax + // D3DDevice_LightEnable+0x6B : test eax, eax { 0x6B, 0x85 }, // (Offset,Value)-Pair #5 { 0x6C, 0xC0 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_LightEnable+0x9E : mov eax, [eax+0x8C] + // D3DDevice_LightEnable+0x9E : mov eax, [eax+0x8C] { 0x9E, 0x8B }, // (Offset,Value)-Pair #7 { 0x9F, 0x80 }, // (Offset,Value)-Pair #8 { 0xA0, 0x8C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_LightEnable+0xBC : jz +0x12 + // D3DDevice_LightEnable+0xBC : jz +0x12 { 0xBC, 0x74 }, // (Offset,Value)-Pair #10 { 0xBD, 0x12 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_LightEnable+0xE1 : retn 0x08 + // D3DDevice_LightEnable+0xE1 : retn 0x08 { 0xE1, 0xC2 }, // (Offset,Value)-Pair #12 { 0xE2, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock +// * D3DVertexBuffer_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_4361, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_4361, 11) - // IDirect3DVertexBuffer8_Lock+0x01 : mov bl, [esp+0x18] + // D3DVertexBuffer_Lock+0x01 : mov bl, [esp+0x18] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x24 }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock+0x2F : test bl, 0xA0 + // D3DVertexBuffer_Lock+0x2F : test bl, 0xA0 { 0x2F, 0xF6 }, // (Offset,Value)-Pair #7 { 0x30, 0xC3 }, // (Offset,Value)-Pair #8 { 0x31, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock+0x50 : retn 0x14 + // D3DVertexBuffer_Lock+0x50 : retn 0x14 { 0x50, 0xC2 }, // (Offset,Value)-Pair #10 { 0x51, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_Release +// * D3DResource_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_Release_1_0_4361, 13) +OOVPA_NO_XREF(D3DResource_Release_1_0_4361, 13) - // IDirect3DResource8_Release+0x09 : and ecx, 0xFFFF + // D3DResource_Release+0x09 : and ecx, 0xFFFF { 0x09, 0x81 }, // (Offset,Value)-Pair #1 { 0x0A, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0B, 0xFF }, // (Offset,Value)-Pair #3 { 0x0C, 0xFF }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_Release+0x0F : cmp ecx, 1 + // D3DResource_Release+0x0F : cmp ecx, 1 { 0x0F, 0x83 }, // (Offset,Value)-Pair #5 { 0x10, 0xF9 }, // (Offset,Value)-Pair #6 { 0x11, 0x01 }, // (Offset,Value)-Pair #7 - // IDirect3DResource8_Release+0x12 : jnz +0x2E + // D3DResource_Release+0x12 : jnz +0x2E { 0x12, 0x75 }, // (Offset,Value)-Pair #8 { 0x13, 0x2E }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_Release+0x2F : test eax, 0x780000 + // D3DResource_Release+0x2F : test eax, 0x780000 { 0x2F, 0xA9 }, // (Offset,Value)-Pair #10 { 0x32, 0x78 }, // (Offset,Value)-Pair #11 - // IDirect3DResource8_Release+0x4B : retn 0x04 + // D3DResource_Release+0x4B : retn 0x04 { 0x4B, 0xC2 }, // (Offset,Value)-Pair #12 { 0x4C, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_IsBusy +// * D3DResource_IsBusy // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_IsBusy_1_0_4361, 11) +OOVPA_NO_XREF(D3DResource_IsBusy_1_0_4361, 11) - // IDirect3DResource8_IsBusy+0x24 : test eax, 0x780000 + // D3DResource_IsBusy+0x24 : test eax, 0x780000 { 0x24, 0xA9 }, // (Offset,Value)-Pair #1 { 0x25, 0x00 }, // (Offset,Value)-Pair #2 { 0x26, 0x00 }, // (Offset,Value)-Pair #3 { 0x27, 0x78 }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_IsBusy+0x35 : jnz +0x41 + // D3DResource_IsBusy+0x35 : jnz +0x41 { 0x35, 0x75 }, // (Offset,Value)-Pair #5 { 0x36, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_IsBusy+0x4E : mov eax, [ecx+0x14] + // D3DResource_IsBusy+0x4E : mov eax, [ecx+0x14] { 0x4E, 0x8B }, // (Offset,Value)-Pair #7 { 0x4F, 0x41 }, // (Offset,Value)-Pair #8 { 0x50, 0x14 }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_IsBusy+0x76 : jnb +0x09 + // D3DResource_IsBusy+0x76 : jnb +0x09 { 0x76, 0x73 }, // (Offset,Value)-Pair #10 { 0x77, 0x09 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DSurface8_GetDesc +// * D3DSurface_GetDesc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DSurface8_GetDesc_1_0_4361, 15) +OOVPA_NO_XREF(D3DSurface_GetDesc_1_0_4361, 15) - // IDirect3DSurface8_GetDesc+0x00 : mov eax, [esp+0x08] + // D3DSurface_GetDesc+0x00 : mov eax, [esp+0x08] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3DSurface8_GetDesc+0x04 : mov ecx, [esp+0x04] + // D3DSurface_GetDesc+0x04 : mov ecx, [esp+0x04] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DSurface8_GetDesc+0x08 : push eax + // D3DSurface_GetDesc+0x08 : push eax { 0x08, 0x50 }, // (Offset,Value)-Pair #9 - // IDirect3DSurface8_GetDesc+0x09 : push 0 + // D3DSurface_GetDesc+0x09 : push 0 { 0x09, 0x6A }, // (Offset,Value)-Pair #10 { 0x0A, 0x00 }, // (Offset,Value)-Pair #11 - // IDirect3DSurface8_GetDesc+0x0B : push ecx + // D3DSurface_GetDesc+0x0B : push ecx { 0x0B, 0x51 }, // (Offset,Value)-Pair #12 - // IDirect3DSurface8_GetDesc+0x0C : call [abs] + // D3DSurface_GetDesc+0x0C : call [abs] { 0x0C, 0xE8 }, // (Offset,Value)-Pair #13 - // IDirect3DSurface8_GetDesc+0x11 : retn 0x08 + // D3DSurface_GetDesc+0x11 : retn 0x08 { 0x11, 0xC2 }, // (Offset,Value)-Pair #14 { 0x12, 0x08 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DBaseTexture8_GetLevelCount +// * D3DBaseTexture_GetLevelCount // ****************************************************************** -OOVPA_NO_XREF(IDirect3DBaseTexture8_GetLevelCount_1_0_4361, 13) +OOVPA_NO_XREF(D3DBaseTexture_GetLevelCount_1_0_4361, 13) - // IDirect3DBaseTexture8_GetLevelCount+0x00 : mov eax, [esp+0x04] + // D3DBaseTexture_GetLevelCount+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DBaseTexture8_GetLevelCount+0x04 : movzx eax, [eax+0x0E] + // D3DBaseTexture_GetLevelCount+0x04 : movzx eax, [eax+0x0E] { 0x04, 0x0F }, // (Offset,Value)-Pair #5 { 0x05, 0xB6 }, // (Offset,Value)-Pair #6 { 0x06, 0x40 }, // (Offset,Value)-Pair #7 { 0x07, 0x0E }, // (Offset,Value)-Pair #8 - // IDirect3DBaseTexture8_GetLevelCount+0x08 : and eax, 0x0F + // D3DBaseTexture_GetLevelCount+0x08 : and eax, 0x0F { 0x08, 0x83 }, // (Offset,Value)-Pair #9 { 0x09, 0xE0 }, // (Offset,Value)-Pair #10 { 0x0A, 0x0F }, // (Offset,Value)-Pair #11 - // IDirect3DBaseTexture8_GetLevelCount+0x0B : retn 0x04 + // D3DBaseTexture_GetLevelCount+0x0B : retn 0x04 { 0x0B, 0xC2 }, // (Offset,Value)-Pair #12 { 0x0C, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; @@ -1413,95 +1413,95 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_4361, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilFail +// * D3DDevice_SetRenderState_StencilFail // ****************************************************************** /* Blueshogun96 8/29/08: This is the same as 4432. Copied and pasted. Lazy, I know... */ -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail_1_0_4361, 12) - // IDirect3DDevice8_SetRenderState_StencilFail+0x0C : jb +0x05 + // D3DDevice_SetRenderState_StencilFail+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_StencilFail+0x38 : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_StencilFail+0x38 : cmp [abs], 0x1E00 { 0x38, 0x81 }, // (Offset,Value)-Pair #3 { 0x3E, 0x00 }, // (Offset,Value)-Pair #4 { 0x3F, 0x1E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_StencilFail+0x47 : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_StencilFail+0x47 : mov dword ptr [eax], 0x41D84 { 0x47, 0xC7 }, // (Offset,Value)-Pair #6 { 0x48, 0x00 }, // (Offset,Value)-Pair #7 { 0x49, 0x84 }, // (Offset,Value)-Pair #8 { 0x4A, 0x1D }, // (Offset,Value)-Pair #9 { 0x4B, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_StencilFail+0x6A : retn 0x04 + // D3DDevice_SetRenderState_StencilFail+0x6A : retn 0x04 { 0x6A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x6B, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormals +// * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4361, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals_1_0_4361, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 + // D3DDevice_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 { 0x25, 0x81 }, // (Offset,Value)-Pair #3 { 0x26, 0x0D }, // (Offset,Value)-Pair #4 { 0x2B, 0x00 }, // (Offset,Value)-Pair #5 { 0x2C, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x36 : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormals+0x36 : retn 0x04 { 0x36, 0xC2 }, // (Offset,Value)-Pair #7 { 0x37, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_4361, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xBE }, // (Offset,Value)-Pair #3 { 0x10, 0x88 }, // (Offset,Value)-Pair #4 { 0x11, 0x0A }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x76 : add edi, 0x41B20 + // D3DDevice_SetPalette+0x76 : add edi, 0x41B20 { 0x76, 0x81 }, // (Offset,Value)-Pair #6 { 0x77, 0xC7 }, // (Offset,Value)-Pair #7 { 0x78, 0x20 }, // (Offset,Value)-Pair #8 { 0x79, 0x1B }, // (Offset,Value)-Pair #9 { 0x7A, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x8A : retn 0x08 + // D3DDevice_SetPalette+0x8A : retn 0x08 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x8B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetShaderConstantMode +// * D3DDevice_SetShaderConstantMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode_1_0_4361, 12) - // IDirect3DDevice8_SetShaderConstantMode+0x26 : mov [ebx+0x20D8], eax + // D3DDevice_SetShaderConstantMode+0x26 : mov [ebx+0x20D8], eax { 0x26, 0x89 }, // (Offset,Value)-Pair #1 { 0x27, 0x83 }, // (Offset,Value)-Pair #2 { 0x28, 0x18 }, // (Offset,Value)-Pair #3 { 0x29, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetShaderConstantMode+0x50 : mov dword ptr [eax+0x04], 0x3C + // D3DDevice_SetShaderConstantMode+0x50 : mov dword ptr [eax+0x04], 0x3C { 0x50, 0xC7 }, // (Offset,Value)-Pair #5 { 0x51, 0x40 }, // (Offset,Value)-Pair #6 { 0x52, 0x04 }, // (Offset,Value)-Pair #7 { 0x53, 0x3C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetShaderConstantMode+0xE7 : add esi, 0x0124 + // D3DDevice_SetShaderConstantMode+0xE7 : add esi, 0x0124 { 0xE7, 0x81 }, // (Offset,Value)-Pair #9 { 0xE8, 0xC6 }, // (Offset,Value)-Pair #10 { 0xE9, 0x24 }, // (Offset,Value)-Pair #11 @@ -1509,16 +1509,16 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_4361, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_4361, 11) +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_4361, 11) - // IDirect3DDevice8_SetFlickerFilter+0x1C : mov eax, [eax+0x2268] + // D3DDevice_SetFlickerFilter+0x1C : mov eax, [eax+0x2268] { 0x1D, 0x80 }, // (Offset,Value)-Pair #2 { 0x1E, 0x7C }, // (Offset,Value)-Pair #3 { 0x1F, 0x22 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax + // D3DDevice_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax { 0x22, 0x6A }, // (Offset,Value)-Pair #5 { 0x23, 0x00 }, // (Offset,Value)-Pair #6 { 0x24, 0x56 }, // (Offset,Value)-Pair #7 @@ -1526,23 +1526,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_4361, 11) { 0x26, 0x0B }, // (Offset,Value)-Pair #9 { 0x27, 0x50 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x3F : retn 0x04 + // D3DDevice_SetFlickerFilter+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x40, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4361, 12) +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter_1_0_4361, 12) - // IDirect3DDevice8_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x2268] + // D3DDevice_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x2268] { 0x25, 0x8B }, // (Offset,Value)-Pair #1 { 0x26, 0x90 }, // (Offset,Value)-Pair #2 { 0x27, 0x68 }, // (Offset,Value)-Pair #3 { 0x28, 0x22 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx + // D3DDevice_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx { 0x2B, 0x6A }, // (Offset,Value)-Pair #5 { 0x2C, 0x00 }, // (Offset,Value)-Pair #6 { 0x2D, 0x56 }, // (Offset,Value)-Pair #7 @@ -1550,7 +1550,7 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4361, 12) { 0x2F, 0x0E }, // (Offset,Value)-Pair #9 { 0x30, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetSoftDisplayFilter+0x4E : retn 0x04 + // D3DDevice_SetSoftDisplayFilter+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x4F, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -1776,281 +1776,281 @@ OOVPA_END; OOVPATable D3D8_1_0_4361[] = { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_4361, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_4361, D3D_CreateDevice), // IDirect3D8::CheckDeviceFormat - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceFormat_1_0_4361, XTL::EmuIDirect3D8_CheckDeviceFormat), + OOVPA_TABLE_PATCH(D3D_CheckDeviceFormat_1_0_4361, D3D_CheckDeviceFormat), // IDirect3DDevice8::LoadVertexShader (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_4034, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_4034, D3DDevice_LoadVertexShader), // IDirect3DDevice8::SelectVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_4361, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_4361, D3DDevice_SelectVertexShader), // IDirect3DDevice8::SetRenderTarget (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_4134, D3DDevice_SetRenderTarget), // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_4361, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_4361, D3DDevice_AddRef), // IDirect3D::ClearStateBlockFlags OOVPA_TABLE_XREF(IDirect3D_ClearStateBlockFlags_1_0_4361), // IDirect3DDevice8::SetGammaRamp - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4361, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4361, D3DDevice_SetGammaRamp), // IDirect3D::RecordStateBlock OOVPA_TABLE_XREF(IDirect3D_RecordStateBlock_1_0_4361), // IDirect3DDevice8::BeginStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_BeginStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_4361, D3DDevice_BeginStateBlock), // IDirect3DDevice8::CaptureStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_CaptureStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_CaptureStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_4361, D3DDevice_CaptureStateBlock), // D3DDevice_DeleteStateBlock - OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_DeleteStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_4361, D3DDevice_DeleteStateBlock), // IDirect3DDevice8::ApplyStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_ApplyStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_ApplyStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_4361, D3DDevice_ApplyStateBlock), // IDirect3DDevice8::EndStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_EndStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_4361, D3DDevice_EndStateBlock), // IDirect3DDevice8::CopyRects - OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_4361, XTL::EmuIDirect3DDevice8_CopyRects), + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_4361, D3DDevice_CopyRects), // IDirect3DDevice8::CreateImageSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateImageSurface_1_0_4361, XTL::EmuIDirect3DDevice8_CreateImageSurface), + OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_4361, D3DDevice_CreateImageSurface), // IDirect3DDevice8::GetBackBuffer (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_4134, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_4134, D3DDevice_GetBackBuffer), // IDirect3DDevice8::GetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget_1_0_4361, XTL::EmuIDirect3DDevice8_GetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget_1_0_4361, D3DDevice_GetRenderTarget), // IDirect3DDevice8::GetDepthStencilSurface (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface_1_0_4134, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface_1_0_4134, D3DDevice_GetDepthStencilSurface), // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetVertexShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_4361, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_4361, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_4361, D3DDevice_SetPixelShader), // IDirect3DDevice8::SetViewport (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_4034, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_4034, D3DDevice_SetViewport), // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_4361, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_4361, D3DDevice_GetViewport), // IDirect3DDevice8::SetTextureState_BumpEnv - 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 - 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::CreateTexture (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture_1_0_3925, D3DDevice_CreateTexture), // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_4361, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_4361, D3DDevice_SetIndices), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_4361, D3DDevice_SetTexture), // IDirect3DDevice8::SwitchTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // IDirect3DDevice8::GetDisplayMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4361, XTL::EmuIDirect3DDevice8_GetDisplayMode), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4361, D3DDevice_GetDisplayMode), // IDirect3DDevice8::Clear (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_4134, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_4134, D3DDevice_Clear), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_4361, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4361, D3DDevice_Swap), // IDirect3DDevice8::CreateVertexBuffer (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer_1_0_3925, D3DDevice_CreateVertexBuffer), // IDirect3DDevice8::EnableOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_EnableOverlay_1_0_4361, XTL::EmuIDirect3DDevice8_EnableOverlay), + OOVPA_TABLE_PATCH(D3DDevice_EnableOverlay_1_0_4361, D3DDevice_EnableOverlay), // IDirect3DDevice8::UpdateOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_UpdateOverlay_1_0_4361, XTL::EmuIDirect3DDevice8_UpdateOverlay), + OOVPA_TABLE_PATCH(D3DDevice_UpdateOverlay_1_0_4361, D3DDevice_UpdateOverlay), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4361, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_4361, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetTextureState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4361, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4361, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_4034, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_4361, D3DDevice_SetRenderState_TextureFactor), // IDirect3DDevice8::SetRenderState_EdgeAntiAlias - 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 - 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 - 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 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_4361, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4361, D3DDevice_SetRenderState_MultiSampleAntiAlias), // IDirect3DDevice8::SetTransform (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4134, D3DDevice_SetTransform), // IDirect3DDevice8::GetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_4361, XTL::EmuIDirect3DDevice8_GetTransform), + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_4361, D3DDevice_GetTransform), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_4361, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_4361, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_4361, D3DDevice_SetVertexShader), // IDirect3DDevice8::DrawVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_4361, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_4361, D3DDevice_DrawVertices), // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_4361, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_4361, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_4361, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_4361, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_4361, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_4361, D3DDevice_SetLight), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4361, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4361, D3DDevice_SetMaterial), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_4361, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_4361, D3DDevice_LightEnable), // IDirect3DVertexBuffer8::Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_4361, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_4361, D3DVertexBuffer_Lock), // 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::Release - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_4361, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_4361, D3DResource_Release), // IDirect3DResource8::IsBusy - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_4361, XTL::EmuIDirect3DResource8_IsBusy), + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_4361, D3DResource_IsBusy), // Get2DSurfacDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4361, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4361, Get2DSurfaceDesc), // IDirect3DSurface8::GetDesc - OOVPA_TABLE_PATCH(IDirect3DSurface8_GetDesc_1_0_4361, XTL::EmuIDirect3DSurface8_GetDesc), + OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_4361, D3DSurface_GetDesc), // 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 - OOVPA_TABLE_PATCH(IDirect3DBaseTexture8_GetLevelCount_1_0_4361, XTL::EmuIDirect3DBaseTexture8_GetLevelCount), + OOVPA_TABLE_PATCH(D3DBaseTexture_GetLevelCount_1_0_4361, D3DBaseTexture_GetLevelCount), // IDirect3DTexture8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_3925, D3DTexture_LockRect), // IDirect3DTexture8::GetSurfaceLevel (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel_1_0_3925, XTL::EmuIDirect3DTexture8_GetSurfaceLevel), - // IDirect3DDevice8_SetRenderState_StencilFail - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), - // IDirect3DDevice8_SetRenderState_NormalizeNormals - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel_1_0_3925, D3DTexture_GetSurfaceLevel), + // D3DDevice_SetRenderState_StencilFail + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4361, D3DDevice_SetRenderState_StencilFail), + // D3DDevice_SetRenderState_NormalizeNormals + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4361, D3DDevice_SetRenderState_NormalizeNormals), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // IDirect3DDevice8::CreatePalette (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePalette), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette_1_0_3925, D3DDevice_CreatePalette), // IDirect3DDevice8::CreateIndexBuffer // TODO: This needs to be verified on 4361, not just 4242! - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateIndexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer_1_0_3925, D3DDevice_CreateIndexBuffer), // IDirect3DDevice8::SetRenderState_ZBias - 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), // IDirect3DResource8::AddRef - OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef), + OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef), // IDirect3DResource8::Release - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_3925, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_3925, D3DResource_Release), // IDirect3DPalette8::Lock (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock_1_0_3925, XTL::EmuIDirect3DPalette8_Lock), + OOVPA_TABLE_PATCH(D3DPalette_Lock_1_0_3925, D3DPalette_Lock), // IDirect3DCubeTexture8::LockRect // TODO: This needs to be verified on 4361, not just 4242! - OOVPA_TABLE_PATCH(IDirect3DCubeTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DCubeTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DCubeTexture_LockRect_1_0_3925, D3DCubeTexture_LockRect), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_4361, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_4361, D3DDevice_SetPalette), // 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), // IDirect3D8::KickOffAndWaitForIdle (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_4034, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_4034, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::SetTextureState_TwoSidedLighting (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, D3DDevice_SetTextureState_TwoSidedLighting), // IDirect3DDevice8::SetRenderState_BackFillMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // 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::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::SetRenderState_LogicOp (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LogicOp_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4134, D3DDevice_SetRenderState_LogicOp), // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), // 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_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 (* 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::SetRenderState_Dxt1NoiseEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4134, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_MultiSampleMask (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4134, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetRenderState_MultiSampleMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // 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::DrawIndexedVerticesUP (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4134, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_4134, D3DDevice_DrawIndexedVerticesUP), // IDirect3DDevice8::SetPixelShaderConstant (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderConstant_1_0_4134, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_4134, D3DDevice_SetPixelShaderConstant), // IDirect3DDevice8::DeletePixelShader (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DeletePixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_4134, D3DDevice_DeletePixelShader), // IDirect3DDevice8::SetRenderState_CullModeB (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullModeB_1_0_4134, D3DDevice_SetRenderState_CullMode), // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), - // IDirect3DDevice8_SetScreenSpaceOffset (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_4134, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), + // D3DDevice_SetScreenSpaceOffset (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_4134, D3DDevice_SetScreenSpaceOffset), // D3D::SetFence (XREF) (* unchanged since 4134 *) OOVPA_TABLE_XREF(D3D_SetFence_1_0_4134), // IDirect3DDevice8::SetRenderState_LineWidth (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4134, D3DDevice_SetRenderState_LineWidth), // IDirect3DDevice8::SetSwapCallback (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSwapCallback_1_0_4134, XTL::EmuIDirect3DDevice8_SetSwapCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_4134, D3DDevice_SetSwapCallback), // IDirect3DDevice8::GetTile (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTile_1_0_4134, XTL::EmuIDirect3DDevice8_GetTile), + OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_4134, D3DDevice_GetTile), // IDirect3DDevice8::SetTile (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTile_1_0_4134, XTL::EmuIDirect3DDevice8_SetTileNoWait), + OOVPA_TABLE_PATCH(D3DDevice_SetTile_1_0_4134, D3DDevice_SetTileNoWait), // IDirect3DDevice8::IsBusy (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(D3DDevice_IsBusy_1_0_4134, XTL::EmuIDirect3DDevice8_IsBusy), + OOVPA_TABLE_PATCH(D3DDevice_IsBusy_1_0_4134, D3DDevice_IsBusy), // 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), // 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::GetVisibilityTestResult (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_4361, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_4361, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_4361, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_4361, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4361, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_4361, D3DDevice_SetSoftDisplayFilter), // D3DDevice_PrimeVertexCache - OOVPA_TABLE_PATCH(D3DDevice_PrimeVertexCache_1_0_4361, XTL::EmuIDirect3DDevice8_PrimeVertexCache), + OOVPA_TABLE_PATCH(D3DDevice_PrimeVertexCache_1_0_4361, D3DDevice_PrimeVertexCache), // D3DDevice_BeginPush - OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_4361, XTL::EmuIDirect3DDevice8_BeginPush), + OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_4361, D3DDevice_BeginPush), // D3DDevice_EndPush - OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4361, XTL::EmuIDirect3DDevice8_EndPush), + OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4361, D3DDevice_EndPush), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_4361, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_4361, D3DDevice_Begin), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(D3DDevice_End_1_0_4361, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_4361, D3DDevice_End), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4361, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_4361, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4361, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexData4ub - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4ub), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, D3DDevice_SetVertexData4ub), // 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::BlockOnFence (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4134, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4134, D3DDevice_BlockOnFence), // Direct3D_GetAdapterIdentifier (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, XTL::EmuIDirect3D8_GetAdapterIdentifier), + OOVPA_TABLE_PATCH(Direct3D_GetAdapterIdentifier_1_0_3925, D3D_GetAdapterIdentifier), // IDirect3DDevice8::Release - OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_4361, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_4361, D3DDevice_Release), // IDirect3DDevice8::BeginPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_4361, XTL::EmuIDirect3DDevice8_BeginPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_4361, D3DDevice_BeginPushBuffer), // IDirect3DDevice8::EndPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_4361, XTL::EmuIDirect3DDevice8_EndPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_4361, D3DDevice_EndPushBuffer), // IDirect3DDevice8::RunPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_4361, XTL::EmuIDirect3DDevice8_RunPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_4361, D3DDevice_RunPushBuffer), // IDirect3DDevice8::GetPushBufferOffset - OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_4361, XTL::EmuIDirect3DDevice8_GetPushBufferOffset), + OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_4361, D3DDevice_GetPushBufferOffset), // IDirect3DDevice8::CreateCubeTexture - OOVPA_TABLE_PATCH(D3DDevice_CreateCubeTexture_1_0_4361, XTL::EmuIDirect3DDevice8_CreateCubeTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateCubeTexture_1_0_4361, D3DDevice_CreateCubeTexture), // IDirect3DCubeTexture8::GetCubeMapSurface - OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface_1_0_4361, XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface), + OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface_1_0_4361, D3DCubeTexture_GetCubeMapSurface), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index af47cdf0e..13fd6399e 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -33,146 +33,146 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_4432, 8) +OOVPA_NO_XREF(D3D_CreateDevice_1_0_4432, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x86 : repe stosd + // D3D_CreateDevice+0x86 : repe stosd { 0x86, 0xF3 }, // (Offset,Value)-Pair #3 { 0x87, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x89 : mov eax, esi + // D3D_CreateDevice+0x89 : mov eax, esi { 0x89, 0x8B }, // (Offset,Value)-Pair #5 { 0x8A, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0xA0 : retn 0x18 + // D3D_CreateDevice+0xA0 : retn 0x18 { 0xA0, 0xC2 }, // (Offset,Value)-Pair #7 { 0xA1, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget +// * D3DDevice_GetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget_1_0_4432, 11) - // IDirect3DDevice8_GetRenderTarget+0x00 : mov eax, [addr] + // D3DDevice_GetRenderTarget+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetRenderTarget+0x05 : mov eax, [eax + 0x2070] + // D3DDevice_GetRenderTarget+0x05 : mov eax, [eax + 0x2070] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x70 }, // (Offset,Value)-Pair #4 { 0x08, 0x20 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetRenderTarget+0x15 : push eax + // D3DDevice_GetRenderTarget+0x15 : push eax { 0x15, 0x50 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetRenderTarget+0x13 : jz + 0x06 + // D3DDevice_GetRenderTarget+0x13 : jz + 0x06 { 0x13, 0x74 }, // (Offset,Value)-Pair #7 { 0x14, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetRenderTarget+0x16 : call [addr] + // D3DDevice_GetRenderTarget+0x16 : call [addr] { 0x16, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetRenderTarget+0x1D : retn 0x04 + // D3DDevice_GetRenderTarget+0x1D : retn 0x04 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #10 { 0x1E, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDepthStencilSurface +// * D3DDevice_GetDepthStencilSurface // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface_1_0_4432, 11) - // IDirect3DDevice8_GetDepthStencilSurface+0x00 : mov eax, [addr] + // D3DDevice_GetDepthStencilSurface+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetDepthStencilSurface+0x05 : mov eax, [eax + 0x2074] + // D3DDevice_GetDepthStencilSurface+0x05 : mov eax, [eax + 0x2074] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x80 }, // (Offset,Value)-Pair #3 { 0x07, 0x74 }, // (Offset,Value)-Pair #4 { 0x08, 0x20 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDepthStencilSurface+0x15 : push eax + // D3DDevice_GetDepthStencilSurface+0x15 : push eax { 0x15, 0x50 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetDepthStencilSurface+0x13 : jnz +0x0B + // D3DDevice_GetDepthStencilSurface+0x13 : jnz +0x0B { 0x13, 0x74 }, // (Offset,Value)-Pair #7 { 0x14, 0x0B }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDepthStencilSurface+0x16 : call [addr] + // D3DDevice_GetDepthStencilSurface+0x16 : call [addr] { 0x16, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetDepthStencilSurface+0x25 : retn 0x04 + // D3DDevice_GetDepthStencilSurface+0x25 : retn 0x04 { 0x25, 0xC2 }, // (Offset,Value)-Pair #10 { 0x26, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_4432, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_4432, 10) - // IDirect3DDevice8_SetPixelShader+0x22 : or ecx, 0x4800 + // D3DDevice_SetPixelShader+0x22 : or ecx, 0x4800 { 0x22, 0x81 }, // (Offset,Value)-Pair #1 { 0x23, 0xC9 }, // (Offset,Value)-Pair #2 { 0x24, 0x00 }, // (Offset,Value)-Pair #3 { 0x25, 0x48 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x3A : or eax, 0x2000 + // D3DDevice_SetPixelShader+0x3A : or eax, 0x2000 { 0x3A, 0x0D }, // (Offset,Value)-Pair #5 { 0x3C, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x78 : retn 0x04 + // D3DDevice_SetPixelShader+0x78 : retn 0x04 { 0x78, 0xC2 }, // (Offset,Value)-Pair #7 { 0x79, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd + // D3DDevice_SetPixelShader+0xE3 : rep movsd { 0xE3, 0xF3 }, // (Offset,Value)-Pair #9 { 0xE4, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TwoSidedLighting +// * D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4432, 13) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4432, 13) - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x11 : or edx, 0x1000 + // D3DDevice_SetTextureState_TwoSidedLighting+0x11 : or edx, 0x1000 { 0x11, 0x81 }, // (Offset,Value)-Pair #1 { 0x12, 0xCA }, // (Offset,Value)-Pair #2 { 0x13, 0x00 }, // (Offset,Value)-Pair #3 { 0x14, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x24 : cmp eax, [esi+4]; push edi + // D3DDevice_SetTextureState_TwoSidedLighting+0x24 : cmp eax, [esi+4]; push edi { 0x24, 0x3B }, // (Offset,Value)-Pair #5 { 0x25, 0x46 }, // (Offset,Value)-Pair #6 { 0x26, 0x04 }, // (Offset,Value)-Pair #7 { 0x27, 0x57 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x53 : add eax, 0x0C + // D3DDevice_SetTextureState_TwoSidedLighting+0x53 : add eax, 0x0C { 0x53, 0x83 }, // (Offset,Value)-Pair #9 { 0x54, 0xC0 }, // (Offset,Value)-Pair #10 { 0x55, 0x0C }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x60 : retn 0x04 + // D3DDevice_SetTextureState_TwoSidedLighting+0x60 : retn 0x04 { 0x60, 0xC2 }, // (Offset,Value)-Pair #12 { 0x61, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_ColorKeyColor +// * D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4432, 12) +OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_1_0_4432, 12) - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x0C : jb +0x05 + // D3DDevice_SetTextureState_ColorKeyColor+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x27 : add eax, 8; mov [esi], eax; shl ecx, 7 + // D3DDevice_SetTextureState_ColorKeyColor+0x27 : add eax, 8; mov [esi], eax; shl ecx, 7 { 0x27, 0x83 }, // (Offset,Value)-Pair #3 { 0x28, 0xC0 }, // (Offset,Value)-Pair #4 { 0x29, 0x08 }, // (Offset,Value)-Pair #5 @@ -182,198 +182,198 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4432, 12) { 0x2D, 0xE1 }, // (Offset,Value)-Pair #9 { 0x2E, 0x07 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x36 : retn 0x08 + // D3DDevice_SetTextureState_ColorKeyColor+0x36 : retn 0x08 { 0x36, 0xC2 }, // (Offset,Value)-Pair #11 { 0x37, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormals +// * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4432, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals_1_0_4432, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 + // D3DDevice_SetRenderState_NormalizeNormals+0x25 : or [addr], 0x200 { 0x25, 0x81 }, // (Offset,Value)-Pair #3 { 0x26, 0x0D }, // (Offset,Value)-Pair #4 { 0x2B, 0x00 }, // (Offset,Value)-Pair #5 { 0x2C, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x36 : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormals+0x36 : retn 0x04 { 0x36, 0xC2 }, // (Offset,Value)-Pair #7 { 0x37, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4432, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_4432, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ZEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x1B : mov ecx, [esi+0x2074] + // D3DDevice_SetRenderState_ZEnable+0x1B : mov ecx, [esi+0x2074] { 0x1B, 0x8B }, // (Offset,Value)-Pair #3 { 0x1C, 0x8E }, // (Offset,Value)-Pair #4 { 0x1D, 0x74 }, // (Offset,Value)-Pair #5 { 0x1E, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x2E : mov dword ptr [eax], 0x4030C + // D3DDevice_SetRenderState_ZEnable+0x2E : mov dword ptr [eax], 0x4030C { 0x2E, 0xC7 }, // (Offset,Value)-Pair #7 { 0x2F, 0x00 }, // (Offset,Value)-Pair #8 { 0x30, 0x0C }, // (Offset,Value)-Pair #9 { 0x31, 0x03 }, // (Offset,Value)-Pair #10 { 0x32, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x8C : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x8C : retn 0x04 { 0x8C, 0xC2 }, // (Offset,Value)-Pair #12 { 0x8D, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4432, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4432, 9) - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x04 : push esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x04 : push esi { 0x04, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x12 : call [abs] + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x12 : call [abs] { 0x12, 0xE8 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x38 : shl ecx, 0x10 { 0x38, 0xC1 }, // (Offset,Value)-Pair #3 { 0x39, 0xE1 }, // (Offset,Value)-Pair #4 { 0x3A, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x44 : or ecx, edx + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x44 : or ecx, edx { 0x44, 0x0B }, // (Offset,Value)-Pair #6 { 0x45, 0xCA }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x4F : retn 0x04 { 0x4F, 0xC2 }, // (Offset,Value)-Pair #8 { 0x50, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LineWidth +// * D3DDevice_SetRenderState_LineWidth // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LineWidth_1_0_4432, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_4432, 10) - // IDirect3DDevice8_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x460] + // D3DDevice_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x460] { 0x15, 0xD8 }, // (Offset,Value)-Pair #1 { 0x16, 0x8E }, // (Offset,Value)-Pair #2 { 0x17, 0x60 }, // (Offset,Value)-Pair #3 { 0x18, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF { 0x32, 0x81 }, // (Offset,Value)-Pair #5 { 0x33, 0xFF }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF { 0x3A, 0xBF }, // (Offset,Value)-Pair #7 { 0x3B, 0xFF }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_LineWidth+0x62 : retn 0x04 + // D3DDevice_SetRenderState_LineWidth+0x62 : retn 0x04 { 0x62, 0xC2 }, // (Offset,Value)-Pair #9 { 0x63, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_4432, 12) +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_4432, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xBE }, // (Offset,Value)-Pair #3 { 0x10, 0x88 }, // (Offset,Value)-Pair #4 { 0x11, 0x0A }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x76 : add esi, 0x41B20 + // D3DDevice_SetPalette+0x76 : add esi, 0x41B20 { 0x76, 0x81 }, // (Offset,Value)-Pair #6 { 0x77, 0xC7 }, // (Offset,Value)-Pair #7 { 0x78, 0x20 }, // (Offset,Value)-Pair #8 { 0x79, 0x1B }, // (Offset,Value)-Pair #9 { 0x7A, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x8A : retn 0x08 + // D3DDevice_SetPalette+0x8A : retn 0x08 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x8B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_4432, 11) - // IDirect3DDevice8_Swap+0x10 : mov ebx, 5 + // D3DDevice_Swap+0x10 : mov ebx, 5 { 0x10, 0xBB }, // (Offset,Value)-Pair #1 { 0x11, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Swap+0x1D : test bl, 3 + // D3DDevice_Swap+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_Swap+0x46 : inc dword ptr [esi+0x2AD8] + // D3DDevice_Swap+0x46 : inc dword ptr [esi+0x2AD8] { 0x46, 0xFF }, // (Offset,Value)-Pair #6 { 0x47, 0x86 }, // (Offset,Value)-Pair #7 { 0x48, 0xD8 }, // (Offset,Value)-Pair #8 { 0x49, 0x2A }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xAE : retn 4 + // D3DDevice_Swap+0xAE : retn 4 { 0xAE, 0xC2 }, // (Offset,Value)-Pair #10 { 0xAF, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_4531, 11) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_4531, 11) - // IDirect3DDevice8_Swap+0x10 : mov ebx, 5 + // D3DDevice_Swap+0x10 : mov ebx, 5 { 0x10, 0xBB }, // (Offset,Value)-Pair #1 { 0x11, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_Swap+0x1D : test bl, 3 + // D3DDevice_Swap+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_Swap+0x46 : inc dword ptr [esi+0x2AD8] + // D3DDevice_Swap+0x46 : inc dword ptr [esi+0x2AD8] { 0x46, 0xFF }, // (Offset,Value)-Pair #6 { 0x47, 0x86 }, // (Offset,Value)-Pair #7 { 0x48, 0xD8 }, // (Offset,Value)-Pair #8 { 0x49, 0x2A }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xAE : retn 4 + // D3DDevice_Swap+0xAE : retn 4 { 0xB9, 0xC2 }, // (Offset,Value)-Pair #10 { 0xBA, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_UpdateOverlay +// * D3DDevice_UpdateOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_UpdateOverlay_1_0_4432, 11) - // IDirect3DDevice8_UpdateOverlay+0x0F : mov [eax+0x2AA4], ecx + // D3DDevice_UpdateOverlay+0x0F : mov [eax+0x2AA4], ecx { 0x0F, 0x89 }, // (Offset,Value)-Pair #1 { 0x10, 0x88 }, // (Offset,Value)-Pair #2 { 0x11, 0xA4 }, // (Offset,Value)-Pair #3 { 0x12, 0x2A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_UpdateOverlay+0x86 : and ecx, 0xFFFFFFFE + // D3DDevice_UpdateOverlay+0x86 : and ecx, 0xFFFFFFFE { 0x86, 0x83 }, // (Offset,Value)-Pair #5 { 0x87, 0xE1 }, // (Offset,Value)-Pair #6 { 0x88, 0xFE }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_UpdateOverlay+0xA2 : mov [esi+0x8920], ecx + // D3DDevice_UpdateOverlay+0xA2 : mov [esi+0x8920], ecx { 0xA2, 0x89 }, // (Offset,Value)-Pair #8 { 0xA3, 0x8E }, // (Offset,Value)-Pair #9 { 0xA4, 0x20 }, // (Offset,Value)-Pair #10 @@ -381,11 +381,11 @@ OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4432, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_4432, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -393,48 +393,48 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4432, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x2448 + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x2448 { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x48 }, // (Offset,Value)-Pair #8 { 0x19, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4432, 12) +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_4432, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x2444], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x2444], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x44 }, // (Offset,Value)-Pair #9 { 0x0D, 0x24 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_BackFillMode +// * D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4531, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode_1_0_4531, 9) { 0x04, 0x56 }, { 0x10, 0x8B }, @@ -479,7 +479,7 @@ OOVPA_END; // * D3DDevice_DeletePixelShader // ****************************************************************** // TODO: Add -OOVPA_NO_XREF(IDirect3DDevice8_DeletePixelShader_1_0_4531, 7) +OOVPA_NO_XREF(D3DDevice_DeletePixelShader_1_0_4531, 7) { 0x02, 0x24 }, { 0x06, 0x75 }, @@ -491,9 +491,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DeletePixelShader_1_0_4531, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Release +// * D3DDevice_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_Release_1_0_4432, 11) { 0x07, 0x8B }, { 0x08, 0x87 }, @@ -509,78 +509,78 @@ OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_4432, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_GetSurfaceLevel +// * D3DTexture_GetSurfaceLevel // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_GetSurfaceLevel_1_0_4432, 14) +OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel_1_0_4432, 14) - // IDirect3DTexture8_GetSurfaceLevel+0x00 : sub esp, 0x0C + // D3DTexture_GetSurfaceLevel+0x00 : sub esp, 0x0C { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x0C }, // (Offset,Value)-Pair #3 - // IDirect3DTexture8_GetSurfaceLevel+0x04 : mov esi, [esp+0x14] + // D3DTexture_GetSurfaceLevel+0x04 : mov esi, [esp+0x14] { 0x04, 0x8B }, // (Offset,Value)-Pair #4 { 0x07, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DTexture8_GetSurfaceLevel+0x04 : lea eax, [esp+0x14] + // D3DTexture_GetSurfaceLevel+0x04 : lea eax, [esp+0x14] { 0x08, 0x8D }, // (Offset,Value)-Pair #6 { 0x0B, 0x14 }, // (Offset,Value)-Pair #7 - // IDirect3DTexture8_GetSurfaceLevel+0x17 : mov edx, [esp+0x24] + // D3DTexture_GetSurfaceLevel+0x17 : mov edx, [esp+0x24] { 0x17, 0x8B }, // (Offset,Value)-Pair #8 { 0x1A, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DTexture8_GetSurfaceLevel+0x1B : lea eax, [esp+0x18] + // D3DTexture_GetSurfaceLevel+0x1B : lea eax, [esp+0x18] { 0x1B, 0x8D }, // (Offset,Value)-Pair #10 { 0x1E, 0x18 }, // (Offset,Value)-Pair #11 - // IDirect3DTexture8_GetSurfaceLevel+0x29 : call [abs] + // D3DTexture_GetSurfaceLevel+0x29 : call [abs] { 0x29, 0xE8 }, // (Offset,Value)-Pair #12 - // IDirect3DTexture8_GetSurfaceLevel+0x4C : retn 0x0C + // D3DTexture_GetSurfaceLevel+0x4C : retn 0x0C { 0x4C, 0xC2 }, // (Offset,Value)-Pair #13 { 0x4D, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayMode +// * D3DDevice_GetDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayMode_1_0_4432, 12) +OOVPA_NO_XREF(D3DDevice_GetDisplayMode_1_0_4432, 12) - // IDirect3DDevice8_GetDisplayMode+0x01 : mov esi, ds:[*] + // D3DDevice_GetDisplayMode+0x01 : mov esi, ds:[*] { 0x01, 0x8B }, // (Offset,Value)-Pair #1 { 0x02, 0x35 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDisplayMode+0x18 : shr ecx, 0x14 + // D3DDevice_GetDisplayMode+0x18 : shr ecx, 0x14 { 0x18, 0xC1 }, // (Offset,Value)-Pair #3 { 0x19, 0xE9 }, // (Offset,Value)-Pair #4 { 0x1A, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDisplayMode+0x50 : shr eax, 0x0C + // D3DDevice_GetDisplayMode+0x50 : shr eax, 0x0C { 0x50, 0xC1 }, // (Offset,Value)-Pair #6 { 0x51, 0xE8 }, // (Offset,Value)-Pair #7 { 0x52, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDisplayMode+0x6B : and eax, 0x0A + // D3DDevice_GetDisplayMode+0x6B : and eax, 0x0A { 0x6B, 0x83 }, // (Offset,Value)-Pair #9 { 0x6C, 0xE0 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetDisplayMode+0x92 : retn 4 + // D3DDevice_GetDisplayMode+0x92 : retn 4 { 0x92, 0xC2 }, // (Offset,Value)-Pair #11 { 0x93, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_4432, 11) +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_4432, 11) - // IDirect3DDevice8_SetFlickerFilter+0x1C : mov eax, [eax+0x227C] + // D3DDevice_SetFlickerFilter+0x1C : mov eax, [eax+0x227C] { 0x1D, 0x80 }, // (Offset,Value)-Pair #2 { 0x1E, 0x7C }, // (Offset,Value)-Pair #3 { 0x1F, 0x22 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax + // D3DDevice_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax { 0x22, 0x6A }, // (Offset,Value)-Pair #5 { 0x23, 0x00 }, // (Offset,Value)-Pair #6 { 0x24, 0x56 }, // (Offset,Value)-Pair #7 @@ -588,23 +588,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_4432, 11) { 0x26, 0x0B }, // (Offset,Value)-Pair #9 { 0x27, 0x50 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x3F : retn 0x04 + // D3DDevice_SetFlickerFilter+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x40, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4432, 12) +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter_1_0_4432, 12) - // IDirect3DDevice8_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x227C] + // D3DDevice_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x227C] { 0x25, 0x8B }, // (Offset,Value)-Pair #1 { 0x26, 0x90 }, // (Offset,Value)-Pair #2 { 0x27, 0x7C }, // (Offset,Value)-Pair #3 { 0x28, 0x22 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx + // D3DDevice_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx { 0x2B, 0x6A }, // (Offset,Value)-Pair #5 { 0x2C, 0x00 }, // (Offset,Value)-Pair #6 { 0x2D, 0x56 }, // (Offset,Value)-Pair #7 @@ -612,32 +612,32 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4432, 12) { 0x2F, 0x0E }, // (Offset,Value)-Pair #9 { 0x30, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetSoftDisplayFilter+0x4E : retn 0x04 + // D3DDevice_SetSoftDisplayFilter+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x4F, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock +// * D3DVertexBuffer_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_4531, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_4531, 11) - // IDirect3DVertexBuffer8_Lock+0x01 : mov bl, [esp+0x18] + // D3DVertexBuffer_Lock+0x01 : mov bl, [esp+0x18] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x24 }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock+0x2F : test bl, 0xA0 + // D3DVertexBuffer_Lock+0x2F : test bl, 0xA0 { 0x2F, 0xF6 }, // (Offset,Value)-Pair #7 { 0x30, 0xC3 }, // (Offset,Value)-Pair #8 { 0x31, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock+0x50 : retn 0x14 + // D3DVertexBuffer_Lock+0x50 : retn 0x14 { 0x54, 0xC2 }, // (Offset,Value)-Pair #10 { 0x55, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -691,237 +691,237 @@ OOVPA_END; OOVPATable D3D8_1_0_4432[] { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_4432, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_4432, D3D_CreateDevice), // IDirect3D8::CheckDeviceFormat (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceFormat_1_0_4361, XTL::EmuIDirect3D8_CheckDeviceFormat), + OOVPA_TABLE_PATCH(D3D_CheckDeviceFormat_1_0_4361, D3D_CheckDeviceFormat), // IDirect3DDevice8::SetRenderTarget (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_4134, D3DDevice_SetRenderTarget), // IDirect3DDevice8::AddRef (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_4361, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_4361, D3DDevice_AddRef), // IDirect3DDevice8::GetBackBuffer (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer_1_0_4134, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_4134, D3DDevice_GetBackBuffer), // 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), // IDirect3DDevice8::GetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget_1_0_4432, XTL::EmuIDirect3DDevice8_GetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget_1_0_4432, D3DDevice_GetRenderTarget), // IDirect3DDevice8::GetDepthStencilSurface - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface_1_0_4432, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface_1_0_4432, D3DDevice_GetDepthStencilSurface), // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_4432, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_4432, D3DDevice_SetPixelShader), // IDirect3D8::KickOffAndWaitForIdle (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_4034, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_4034, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::SetViewport (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_4034, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_4034, D3DDevice_SetViewport), // IDirect3DDevice8::SetTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_4361, D3DDevice_SetTexture), // 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), // 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_TwoSidedLighting (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, D3DDevice_SetTextureState_TwoSidedLighting), // IDirect3DDevice8::SetRenderState_BackFillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // 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::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::SetTextureState_TexCoordIndex (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4361, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetRenderState_VertexBlend (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4361, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_4034, D3DDevice_SetRenderState_CullMode), // 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::SetRenderState_LogicOp (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LogicOp_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4134, D3DDevice_SetRenderState_LogicOp), // IDirect3DDevice8::SetRenderState_NormalizeNormals - 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_TextureFactor (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_4361, D3DDevice_SetRenderState_TextureFactor), // 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::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::GetVisibilityTestResult (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), // 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_StencilEnable (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_LineWidth - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LineWidth_1_0_4432, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4432, D3DDevice_SetRenderState_LineWidth), // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), // 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_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 (* 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::SetRenderState_Dxt1NoiseEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4134, D3DDevice_SetRenderState_Dxt1NoiseEnable), // IDirect3DDevice8::SetRenderState_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4432, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_4432, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4432, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4432, D3DDevice_SetRenderState_MultiSampleAntiAlias), // IDirect3DDevice8::SetRenderState_MultiSampleMask (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMask_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4134, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetRenderState_MultiSampleMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4134, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // 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::SwitchTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // 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::SetTransform (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4134, D3DDevice_SetTransform), // 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::Clear (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_4134, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_4134, D3DDevice_Clear), // IDirect3DDevice8::CreatePalette (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePalette), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette_1_0_3925, D3DDevice_CreatePalette), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_4432, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_4432, D3DDevice_SetPalette), // IDirect3DDevice8::CreateTexture (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture_1_0_3925, XTL::EmuIDirect3DDevice8_CreateTexture), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture_1_0_3925, D3DDevice_CreateTexture), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_4432, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4432, D3DDevice_Swap), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_4531, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4531, D3DDevice_Swap), // IDirect3DDevice8::UpdateOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_UpdateOverlay_1_0_4432, XTL::EmuIDirect3DDevice8_UpdateOverlay), + OOVPA_TABLE_PATCH(D3DDevice_UpdateOverlay_1_0_4432, D3DDevice_UpdateOverlay), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4432, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_4432, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4432, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_4432, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::DrawIndexedVerticesUP (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4134, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_4134, D3DDevice_DrawIndexedVerticesUP), // 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), // IDirect3DDevice8::SetVertexShader (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_4361, D3DDevice_SetVertexShader), // IDirect3DDevice8::DrawVerticesUP (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_4361, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_4361, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::SetLight (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_4361, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_4361, D3DDevice_SetLight), // IDirect3DDevice8::LightEnable (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_4361, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_4361, D3DDevice_LightEnable), // 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), // IDirect3DTexture8::GetSurfaceLevel - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel_1_0_4432, XTL::EmuIDirect3DTexture8_GetSurfaceLevel), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel_1_0_4432, D3DTexture_GetSurfaceLevel), // IDirect3DPalette8::Lock (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock_1_0_3925, XTL::EmuIDirect3DPalette8_Lock), + OOVPA_TABLE_PATCH(D3DPalette_Lock_1_0_3925, D3DPalette_Lock), // IDirect3DSurface8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DSurface8_LockRect_1_0_3925, XTL::EmuIDirect3DSurface8_LockRect), - // IDirect3DDevice8_Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_4432, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DSurface_LockRect_1_0_3925, D3DSurface_LockRect), + // D3DDevice_Release + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_4432, D3DDevice_Release), // IDirect3DDevice8::SetMaterial (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4361, XTL::EmuIDirect3DDevice8_SetMaterial), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), - // IDirect3DDevice8_BackFillMode_4531 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4531, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4361, D3DDevice_SetMaterial), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), + // D3DDevice_BackFillMode_4531 + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4531, D3DDevice_SetRenderState_BackFillMode), // 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), // Get2DSurfacDesc (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4361, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4361, Get2DSurfaceDesc), // IDirect3DDevice8::SetPixelShaderConstant (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderConstant_1_0_4134, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_4134, D3DDevice_SetPixelShaderConstant), // IDirect3DDevice8::DeletePixelShader (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DeletePixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_4134, D3DDevice_DeletePixelShader), // IDirect3DDevice8::SetRenderState_CullModeB (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullModeB_1_0_4134, D3DDevice_SetRenderState_CullMode), // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), - // IDirect3DDevice8_SetScreenSpaceOffset (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_4134, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), + // D3DDevice_SetScreenSpaceOffset (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_4134, D3DDevice_SetScreenSpaceOffset), // D3D::SetFence (XREF) (* unchanged since 4134 *) OOVPA_TABLE_XREF(D3D_SetFence_1_0_4134), // 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), // IDirect3DDevice8::GetDisplayMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4432, XTL::EmuIDirect3DDevice8_GetDisplayMode), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4432, D3DDevice_GetDisplayMode), // IDirect3DDevice8::CreateVertexBuffer (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer_1_0_3925, D3DDevice_CreateVertexBuffer), // IDirect3DVertexBuffer8::Lock (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_4361, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_4361, D3DVertexBuffer_Lock), // IDirect3DVertexBuffer8::Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_4531, XTL::EmuIDirect3DVertexBuffer8_Lock), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_4531, D3DVertexBuffer_Lock), // IDirect3DDevice8::SetShaderConstantMode (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_4361, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_4361, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::SetVertexShaderConstant (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant_1_0_4361, D3DDevice_SetVertexShaderConstant), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // IDirect3DDevice8::GetViewport (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_4361, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_4361, D3DDevice_GetViewport), // IDirect3DDevice8::DrawVertices (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_4361, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_4361, D3DDevice_DrawVertices), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_4432, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_4432, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_4432, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_4432, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetGammaRamp (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4361, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4361, D3DDevice_SetGammaRamp), // IDirect3DDevice8::DrawIndexedVertices (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_4361, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_4361, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::Begin (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_4361, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_4361, D3DDevice_Begin), // IDirect3DDevice8::End (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_End_1_0_4361, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_4361, D3DDevice_End), // IDirect3DDevice8::SetVertexData2f (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4361, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData4f (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexData4ub (* un`anged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4ub), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, D3DDevice_SetVertexData4ub), // IDirect3DDevice8::SetIndices (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_4361, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_4361, D3DDevice_SetIndices), // 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::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), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), // IDirect3DBaseTexture8::GetLevelCount (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DBaseTexture8_GetLevelCount_1_0_4361, XTL::EmuIDirect3DBaseTexture8_GetLevelCount), - // IDirect3DDevice8_GetProjectionViewportMatrix - OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_4432, XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix), + OOVPA_TABLE_PATCH(D3DBaseTexture_GetLevelCount_1_0_4361, D3DBaseTexture_GetLevelCount), + // D3DDevice_GetProjectionViewportMatrix + OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_4432, D3DDevice_GetProjectionViewportMatrix), // D3DDevice_SetVertexShaderInputDirect - OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderInput_1_0_4432, XTL::EmuIDirect3DDevice8_SetVertexShaderInput), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderInput_1_0_4432, D3DDevice_SetVertexShaderInput), // D3DDevice_SetModelView - OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_4432, XTL::EmuIDirect3DDevice8_SetModelView), + OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_4432, D3DDevice_SetModelView), // IDirect3DDevice8::BeginPush - OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_4432, XTL::EmuIDirect3DDevice8_BeginPush), + OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_4432, D3DDevice_BeginPush), // IDirect3DDevice8::EndPush - OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4432, XTL::EmuIDirect3DDevice8_EndPush), + OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4432, D3DDevice_EndPush), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h index 7fe81d321..eb1986478 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index d0c9c0c4e..edaf52dad 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -33,208 +33,208 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_4627, 8) +OOVPA_NO_XREF(D3D_CreateDevice_1_0_4627, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x80 : repe stosd + // D3D_CreateDevice+0x80 : repe stosd { 0x80, 0xF3 }, // (Offset,Value)-Pair #3 { 0x81, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x83 : mov eax, esi + // D3D_CreateDevice+0x83 : mov eax, esi { 0x83, 0x8B }, // (Offset,Value)-Pair #5 { 0x84, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0x90 : retn 0x18 + // D3D_CreateDevice+0x90 : retn 0x18 { 0x90, 0xC2 }, // (Offset,Value)-Pair #7 { 0x91, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3D8_CreateDeviceX (From D3D8X) +// * D3D_CreateDeviceX (From D3D8X) // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDeviceX_1_0_4627, 8) +OOVPA_NO_XREF(D3D_CreateDeviceX_1_0_4627, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x7F : repe stosd + // D3D_CreateDevice+0x7F : repe stosd { 0x7F, 0xF3 }, // (Offset,Value)-Pair #3 { 0x80, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x82 : mov eax, esi + // D3D_CreateDevice+0x82 : mov eax, esi { 0x82, 0x8B }, // (Offset,Value)-Pair #5 { 0x83, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0xA0 : retn 0x18 + // D3D_CreateDevice+0xA0 : retn 0x18 { 0xA0, 0xC2 }, // (Offset,Value)-Pair #7 { 0xA1, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginVisibilityTest +// * D3DDevice_BeginVisibilityTest // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BeginVisibilityTest_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest_1_0_4627, 11) - // IDirect3DDevice8_BeginVisibilityTest+0x13 : mov dword ptr [eax], 0x000817C8 + // D3DDevice_BeginVisibilityTest+0x13 : mov dword ptr [eax], 0x000817C8 { 0x13, 0xC7 }, // (Offset,Value)-Pair #1 { 0x14, 0x00 }, // (Offset,Value)-Pair #2 { 0x15, 0xC8 }, // (Offset,Value)-Pair #3 { 0x16, 0x17 }, // (Offset,Value)-Pair #4 { 0x17, 0x08 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_BeginVisibilityTest+0x19 : mov ecx, 1 + // D3DDevice_BeginVisibilityTest+0x19 : mov ecx, 1 { 0x19, 0xB9 }, // (Offset,Value)-Pair #6 { 0x1A, 0x01 }, // (Offset,Value)-Pair #7 { 0x1B, 0x00 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_BeginVisibilityTest+0x24 : add eax, 0x0C + // D3DDevice_BeginVisibilityTest+0x24 : add eax, 0x0C { 0x24, 0x83 }, // (Offset,Value)-Pair #9 { 0x25, 0xC0 }, // (Offset,Value)-Pair #10 { 0x26, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_5028, 8) +OOVPA_NO_XREF(D3D_CreateDevice_1_0_5028, 8) - // IDirect3D8_CreateDevice+0x0A : jnz +0x0A + // D3D_CreateDevice+0x0A : jnz +0x0A { 0x0A, 0x75 }, // (Offset,Value)-Pair #1 { 0x0B, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x80 : repe stosd + // D3D_CreateDevice+0x80 : repe stosd { 0x80, 0xF3 }, // (Offset,Value)-Pair #3 { 0x81, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x83 : mov eax, esi + // D3D_CreateDevice+0x83 : mov eax, esi { 0x83, 0x8B }, // (Offset,Value)-Pair #5 { 0x84, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0x91 : retn 0x18 + // D3D_CreateDevice+0x91 : retn 0x18 { 0x91, 0xC2 }, // (Offset,Value)-Pair #7 { 0x92, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EndVisibilityTest +// * D3DDevice_EndVisibilityTest // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_4627, 13) +OOVPA_NO_XREF(D3DDevice_EndVisibilityTest_1_0_4627, 13) - // IDirect3DDevice8_EndVisibilityTest+0x11 : mov eax, 0x8007000E + // D3DDevice_EndVisibilityTest+0x11 : mov eax, 0x8007000E { 0x11, 0xB8 }, // (Offset,Value)-Pair #1 { 0x12, 0x0E }, // (Offset,Value)-Pair #2 { 0x13, 0x00 }, // (Offset,Value)-Pair #3 { 0x14, 0x07 }, // (Offset,Value)-Pair #4 { 0x15, 0x80 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_EndVisibilityTest+0x2D : mov dword ptr [eax], 0x000817CC + // D3DDevice_EndVisibilityTest+0x2D : mov dword ptr [eax], 0x000817CC { 0x2D, 0xC7 }, // (Offset,Value)-Pair #6 { 0x2E, 0x00 }, // (Offset,Value)-Pair #7 { 0x2F, 0xCC }, // (Offset,Value)-Pair #8 { 0x30, 0x17 }, // (Offset,Value)-Pair #9 { 0x31, 0x08 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_EndVisibilityTest+0x49 : add eax, 0x0C + // D3DDevice_EndVisibilityTest+0x49 : add eax, 0x0C { 0x49, 0x83 }, // (Offset,Value)-Pair #11 { 0x4A, 0xC0 }, // (Offset,Value)-Pair #12 { 0x4B, 0x0C }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3D8_GetAdapterDisplayMode +// * D3D_GetAdapterDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_GetAdapterDisplayMode_1_0_4627, 13) +OOVPA_NO_XREF(D3D_GetAdapterDisplayMode_1_0_4627, 13) - // IDirect3D8_GetAdapterDisplayMode+0x08 : mov eax, 0x8876086C + // D3D_GetAdapterDisplayMode+0x08 : mov eax, 0x8876086C { 0x08, 0xB8 }, // (Offset,Value)-Pair #1 { 0x09, 0x6C }, // (Offset,Value)-Pair #2 { 0x0A, 0x08 }, // (Offset,Value)-Pair #3 { 0x0B, 0x76 }, // (Offset,Value)-Pair #4 { 0x0C, 0x88 }, // (Offset,Value)-Pair #5 - // IDirect3D8_GetAdapterDisplayMode+0x19 : jnz +0x18 + // D3D_GetAdapterDisplayMode+0x19 : jnz +0x18 { 0x19, 0x75 }, // (Offset,Value)-Pair #6 { 0x1A, 0x18 }, // (Offset,Value)-Pair #7 - // IDirect3D8_GetAdapterDisplayMode+0x33 : mov ecx, [esi+0x21C4] + // D3D_GetAdapterDisplayMode+0x33 : mov ecx, [esi+0x21C4] { 0x33, 0x8B }, // (Offset,Value)-Pair #8 { 0x34, 0x8E }, // (Offset,Value)-Pair #9 { 0x35, 0xC4 }, // (Offset,Value)-Pair #10 { 0x36, 0x21 }, // (Offset,Value)-Pair #11 - // IDirect3D8_GetAdapterDisplayMode+0xB6 : retn 0x08 + // D3D_GetAdapterDisplayMode+0xB6 : retn 0x08 { 0xB6, 0xC2 }, // (Offset,Value)-Pair #12 { 0xB7, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3D8_KickOffAndWaitForIdle +// * D3D_KickOffAndWaitForIdle // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle_1_0_4627, 9) +OOVPA_NO_XREF(D3D_KickOffAndWaitForIdle_1_0_4627, 9) - // IDirect3D8_KickOffAndWaitForIdle+0x00 : mov eax, [addr] + // D3D_KickOffAndWaitForIdle+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3D8_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x30] + // D3D_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x30] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x48 }, // (Offset,Value)-Pair #3 { 0x07, 0x30 }, // (Offset,Value)-Pair #4 - // IDirect3D8_KickOffAndWaitForIdle+0x08 : push 2 + // D3D_KickOffAndWaitForIdle+0x08 : push 2 { 0x08, 0x6A }, // (Offset,Value)-Pair #5 { 0x09, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3D8_KickOffAndWaitForIdle+0x0A : push ecx + // D3D_KickOffAndWaitForIdle+0x0A : push ecx { 0x0A, 0x51 }, // (Offset,Value)-Pair #7 - // IDirect3D8_KickOffAndWaitForIdle+0x0B : call [addr] + // D3D_KickOffAndWaitForIdle+0x0B : call [addr] { 0x0B, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3D8_KickOffAndWaitForIdle+0x10 : retn + // D3D_KickOffAndWaitForIdle+0x10 : retn { 0x10, 0xC3 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3D8_KickOffAndWaitForIdle2 +// * D3D_KickOffAndWaitForIdle2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle2_1_0_4627, 11) +OOVPA_NO_XREF(D3D_KickOffAndWaitForIdle2_1_0_4627, 11) - // IDirect3D8_KickOffAndWaitForIdle2+0x00 : mov eax, [addr] + // D3D_KickOffAndWaitForIdle2+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3D8_KickOffAndWaitForIdle2+0x05 : mov ecx, [eax+0x30] + // D3D_KickOffAndWaitForIdle2+0x05 : mov ecx, [eax+0x30] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x48 }, // (Offset,Value)-Pair #3 { 0x07, 0x30 }, // (Offset,Value)-Pair #4 - // IDirect3D8_KickOffAndWaitForIdle2+0x08 : push 2 + // D3D_KickOffAndWaitForIdle2+0x08 : push 2 { 0x08, 0x6A }, // (Offset,Value)-Pair #5 { 0x09, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3D8_KickOffAndWaitForIdle2+0x0A : push ecx + // D3D_KickOffAndWaitForIdle2+0x0A : push ecx { 0x0A, 0x51 }, // (Offset,Value)-Pair #7 - // IDirect3D8_KickOffAndWaitForIdle2+0x0B : call [addr] + // D3D_KickOffAndWaitForIdle2+0x0B : call [addr] { 0x0B, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3D8_KickOffAndWaitForIdle2+0x18 : call [addr] + // D3D_KickOffAndWaitForIdle2+0x18 : call [addr] { 0x18, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3D8_KickOffAndWaitForIdle2+0x1D : retn 0x08 + // D3D_KickOffAndWaitForIdle2+0x1D : retn 0x08 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #10 { 0x1E, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginPush +// * D3DDevice_BeginPush // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BeginPush_1_0_4627, 7) +OOVPA_NO_XREF(D3DDevice_BeginPush_1_0_4627, 7) { 0x08, 0x00 }, { 0x12, 0x8B }, @@ -246,21 +246,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_BeginPush_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_4627, 9) +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_4627, 9) - // IDirect3DDevice8_SetViewport+0x0A : mov eax, [esi+0x21B4] + // D3DDevice_SetViewport+0x0A : mov eax, [esi+0x21B4] { 0x0A, 0x8B }, // (Offset,Value)-Pair #1 { 0x0B, 0x86 }, // (Offset,Value)-Pair #2 { 0x0C, 0xB4 }, // (Offset,Value)-Pair #3 { 0x0D, 0x21 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetViewport+0x63 : shl edi, cl + // D3DDevice_SetViewport+0x63 : shl edi, cl { 0x63, 0xD3 }, // (Offset,Value)-Pair #5 { 0x64, 0xE7 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetViewport+0xDF : and ecx, 0x0F + // D3DDevice_SetViewport+0xDF : and ecx, 0x0F { 0xDF, 0x83 }, // (Offset,Value)-Pair #7 { 0xE0, 0xE1 }, // (Offset,Value)-Pair #8 { 0xE1, 0x0F }, // (Offset,Value)-Pair #9 @@ -324,55 +324,55 @@ OOVPA_XREF(D3D_CommonSetRenderTargetB_1_0_4627, 11, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderTarget +// * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderTarget_1_0_4627, 13, +OOVPA_XREF(D3DDevice_SetRenderTarget_1_0_4627, 13, XRefNoSaveIndex, XRefOne) - // IDirect3DDevice8_SetRenderTarget+0x10 : call [D3D_CommonSetRenderTarget] + // D3DDevice_SetRenderTarget+0x10 : call [D3D_CommonSetRenderTarget] { 0x10, XREF_COMMONSETRENDERTARGET }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderTarget+0x00 : mov eax, [esp+0x08] + // D3DDevice_SetRenderTarget+0x00 : mov eax, [esp+0x08] { 0x00, 0x8B }, // (Offset,Value)-Pair #2 { 0x01, 0x44 }, // (Offset,Value)-Pair #3 { 0x02, 0x24 }, // (Offset,Value)-Pair #4 { 0x03, 0x08 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderTarget+0x04 : mov ecx, [esp+0x04] + // D3DDevice_SetRenderTarget+0x04 : mov ecx, [esp+0x04] { 0x04, 0x8B }, // (Offset,Value)-Pair #6 { 0x05, 0x4C }, // (Offset,Value)-Pair #7 { 0x06, 0x24 }, // (Offset,Value)-Pair #8 { 0x07, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderTarget+0x0D : push eax; push ecx + // D3DDevice_SetRenderTarget+0x0D : push eax; push ecx { 0x0D, 0x50 }, // (Offset,Value)-Pair #10 { 0x0E, 0x51 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderTarget+0x14 : retn 0x08 + // D3DDevice_SetRenderTarget+0x14 : retn 0x08 { 0x14, 0xC2 }, // (Offset,Value)-Pair #12 { 0x15, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_AddRef +// * D3DDevice_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_AddRef_1_0_4627, 10) - // IDirect3DDevice8_AddRef+0x00 : mov eax, [addr] + // D3DDevice_AddRef+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_AddRef+0x05 : mov ecx, [eax+0x0500] + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x0500] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x88 }, // (Offset,Value)-Pair #3 { 0x07, 0x00 }, // (Offset,Value)-Pair #4 { 0x08, 0x05 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_AddRef+0x0B : inc ecx + // D3DDevice_AddRef+0x0B : inc ecx { 0x0B, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_AddRef+0x0C : mov [eax+0x0500], ecx + // D3DDevice_AddRef+0x0C : mov [eax+0x0500], ecx { 0x0C, 0x89 }, // (Offset,Value)-Pair #7 { 0x0D, 0x88 }, // (Offset,Value)-Pair #8 { 0x0E, 0x00 }, // (Offset,Value)-Pair #9 @@ -380,9 +380,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_4627, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetGammaRamp +// * D3DDevice_SetGammaRamp // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetGammaRamp_1_0_4928, 9) +OOVPA_NO_XREF(D3DDevice_SetGammaRamp_1_0_4928, 9) { 0x25, 0x57 }, // (Offset,Value)-Pair #1 { 0x26, 0x83 }, // (Offset,Value)-Pair #2 @@ -398,23 +398,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetGammaRamp_1_0_4928, 9) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetShaderConstantMode +// * D3DDevice_SetShaderConstantMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode_1_0_4627, 12) - // IDirect3DDevice8_SetShaderConstantMode+0x26 : mov [ebx+0x20D8], eax + // D3DDevice_SetShaderConstantMode+0x26 : mov [ebx+0x20D8], eax { 0x26, 0x89 }, // (Offset,Value)-Pair #1 { 0x27, 0x83 }, // (Offset,Value)-Pair #2 { 0x28, 0xD8 }, // (Offset,Value)-Pair #3 { 0x29, 0x20 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetShaderConstantMode+0x50 : mov dword ptr [eax+0x04], 0x3C + // D3DDevice_SetShaderConstantMode+0x50 : mov dword ptr [eax+0x04], 0x3C { 0x50, 0xC7 }, // (Offset,Value)-Pair #5 { 0x51, 0x40 }, // (Offset,Value)-Pair #6 { 0x52, 0x04 }, // (Offset,Value)-Pair #7 { 0x53, 0x3C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetShaderConstantMode+0xE7 : add esi, 0x0124 + // D3DDevice_SetShaderConstantMode+0xE7 : add esi, 0x0124 { 0xE7, 0x81 }, // (Offset,Value)-Pair #9 { 0xE8, 0xC6 }, // (Offset,Value)-Pair #10 { 0xE9, 0x24 }, // (Offset,Value)-Pair #11 @@ -422,9 +422,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_4627, 12) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CopyRects +// * D3DDevice_CopyRects // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_4627, 8) +OOVPA_NO_XREF(D3DDevice_CopyRects_1_0_4627, 8) { 0x1E, 0x57 }, { 0x3E, 0xF6 }, @@ -437,210 +437,210 @@ OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_4627, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer2 +// * D3DDevice_GetBackBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_4627, 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_GetBackBuffer+0x0D : jnz +0x19 + // D3DDevice_GetBackBuffer+0x0D : jnz +0x19 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x19 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer+0x15 : mov esi, [ecx+eax*4+0x21C0] + // D3DDevice_GetBackBuffer+0x15 : 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, 0xC0 }, // (Offset,Value)-Pair #9 { 0x19, 0x21 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetBackBuffer+0x40 : retn 0x04 + // D3DDevice_GetBackBuffer+0x40 : retn 0x04 { 0x40, 0xC2 }, // (Offset,Value)-Pair #11 { 0x41, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer2B +// * D3DDevice_GetBackBuffer2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2B_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2B_1_0_4627, 12) - // IDirect3DDevice8_GetBackBuffer2B+0x04 : cmp eax, 0xFFFFFFFF + // D3DDevice_GetBackBuffer2B+0x04 : cmp eax, 0xFFFFFFFF { 0x04, 0x83 }, // (Offset,Value)-Pair #1 { 0x05, 0xF8 }, // (Offset,Value)-Pair #2 { 0x06, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetBackBuffer2B+0x0D : jnz +0x07 + // D3DDevice_GetBackBuffer2B+0x0D : jnz +0x07 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer2B+0x1E : mov esi, [ecx+eax*4+0x21C0] + // D3DDevice_GetBackBuffer2B+0x1E : mov esi, [ecx+eax*4+0x21C0] { 0x1E, 0x8B }, // (Offset,Value)-Pair #6 { 0x1F, 0xB4 }, // (Offset,Value)-Pair #7 { 0x20, 0x81 }, // (Offset,Value)-Pair #8 { 0x21, 0xC0 }, // (Offset,Value)-Pair #9 { 0x22, 0x21 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetBackBuffer2B+0x4C : retn 0x04 + // D3DDevice_GetBackBuffer2B+0x4C : retn 0x04 { 0x4C, 0xC2 }, // (Offset,Value)-Pair #11 { 0x4D, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget2 +// * D3DDevice_GetRenderTarget2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget2_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget2_1_0_4627, 10) - // IDirect3DDevice8_GetRenderTarget2+0x00 : mov eax, [addr] + // D3DDevice_GetRenderTarget2+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetRenderTarget2+0x05 : push esi + // D3DDevice_GetRenderTarget2+0x05 : push esi { 0x05, 0x56 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetRenderTarget2+0x06 : mov esi, [eax + 0x21B4] + // D3DDevice_GetRenderTarget2+0x06 : mov esi, [eax + 0x21B4] { 0x06, 0x8B }, // (Offset,Value)-Pair #3 { 0x07, 0xB0 }, // (Offset,Value)-Pair #4 { 0x08, 0xB4 }, // (Offset,Value)-Pair #5 { 0x09, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetRenderTarget2+0x0E : jz + 0x06 + // D3DDevice_GetRenderTarget2+0x0E : jz + 0x06 { 0x0E, 0x74 }, // (Offset,Value)-Pair #7 { 0x0F, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetRenderTarget2+0x11 : call [addr] + // D3DDevice_GetRenderTarget2+0x11 : call [addr] { 0x11, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetRenderTarget2+0x19 : retn + // D3DDevice_GetRenderTarget2+0x19 : retn { 0x19, 0xC3 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget2B +// * D3DDevice_GetRenderTarget2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget2B_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget2B_1_0_4627, 10) - // IDirect3DDevice8_GetRenderTarget2B+0x00 : mov eax, [addr] + // D3DDevice_GetRenderTarget2B+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetRenderTarget2B+0x05 : push esi + // D3DDevice_GetRenderTarget2B+0x05 : push esi { 0x05, 0x56 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetRenderTarget2B+0x06 : mov esi, [eax + 0x21B4] + // D3DDevice_GetRenderTarget2B+0x06 : mov esi, [eax + 0x21B4] { 0x06, 0x8B }, // (Offset,Value)-Pair #3 { 0x07, 0xB0 }, // (Offset,Value)-Pair #4 { 0x08, 0xB4 }, // (Offset,Value)-Pair #5 { 0x09, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetRenderTarget2B+0x2A : jz + 0x06 + // D3DDevice_GetRenderTarget2B+0x2A : jz + 0x06 { 0x2A, 0x74 }, // (Offset,Value)-Pair #7 { 0x2B, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetRenderTarget2B+0x2D : call [addr] + // D3DDevice_GetRenderTarget2B+0x2D : call [addr] { 0x2D, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetRenderTarget2B+0x37 : retn + // D3DDevice_GetRenderTarget2B+0x37 : retn { 0x37, 0xC3 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDepthStencilSurface2 +// * D3DDevice_GetDepthStencilSurface2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface2_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2_1_0_4627, 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 + 0x21B8] + // D3DDevice_GetDepthStencilSurface2+0x06 : mov esi, [eax + 0x21B8] { 0x06, 0x8B }, // (Offset,Value)-Pair #3 { 0x07, 0xB0 }, // (Offset,Value)-Pair #4 { 0x08, 0xB8 }, // (Offset,Value)-Pair #5 { 0x09, 0x21 }, // (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_GetDepthStencilSurface2B +// * D3DDevice_GetDepthStencilSurface2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface2B_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2B_1_0_4627, 10) - // IDirect3DDevice8_GetDepthStencilSurface2B+0x00 : mov eax, [addr] + // D3DDevice_GetDepthStencilSurface2B+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_GetDepthStencilSurface2B+0x05 : push esi + // D3DDevice_GetDepthStencilSurface2B+0x05 : push esi { 0x05, 0x56 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDepthStencilSurface2B+0x06 : mov esi, [eax + 0x21B8] + // D3DDevice_GetDepthStencilSurface2B+0x06 : mov esi, [eax + 0x21B8] { 0x06, 0x8B }, // (Offset,Value)-Pair #3 { 0x07, 0xB0 }, // (Offset,Value)-Pair #4 { 0x08, 0xB8 }, // (Offset,Value)-Pair #5 { 0x09, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetDepthStencilSurface2B+0x0E : jnz +0x04 + // D3DDevice_GetDepthStencilSurface2B+0x0E : jnz +0x04 { 0x0E, 0x75 }, // (Offset,Value)-Pair #7 { 0x0F, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDepthStencilSurface2B+0x31 : call [addr] + // D3DDevice_GetDepthStencilSurface2B+0x31 : call [addr] { 0x31, 0xE8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetDepthStencilSurface2B+0x3B : retn + // D3DDevice_GetDepthStencilSurface2B+0x3B : retn { 0x3B, 0xC3 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetTile +// * D3DDevice_GetTile // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetTile_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_GetTile_1_0_4627, 11) - // IDirect3DDevice8_GetTile+0x13 : lea esi, [ecx+eax*8+0x2260] + // D3DDevice_GetTile+0x13 : lea esi, [ecx+eax*8+0x2260] { 0x13, 0x8D }, // (Offset,Value)-Pair #1 { 0x14, 0xB4 }, // (Offset,Value)-Pair #2 { 0x15, 0xC1 }, // (Offset,Value)-Pair #3 { 0x16, 0x60 }, // (Offset,Value)-Pair #4 { 0x17, 0x22 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetTile+0x1A : mov ecx, 0x06 + // D3DDevice_GetTile+0x1A : mov ecx, 0x06 { 0x1A, 0xB9 }, // (Offset,Value)-Pair #6 { 0x1B, 0x06 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_GetTile+0x21 : pop edi; pop esi + // D3DDevice_GetTile+0x21 : pop edi; pop esi { 0x21, 0x5F }, // (Offset,Value)-Pair #8 { 0x22, 0x5E }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetTile+0x23 : retn 0x08 + // D3DDevice_GetTile+0x23 : retn 0x08 { 0x23, 0xC2 }, // (Offset,Value)-Pair #10 { 0x24, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTileNoWait +// * D3DDevice_SetTileNoWait // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTileNoWait_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_SetTileNoWait_1_0_4627, 11) - // IDirect3DDevice8_SetTileNoWait+0x06 : sub esp, 0x18 + // D3DDevice_SetTileNoWait+0x06 : sub esp, 0x18 { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0xEC }, // (Offset,Value)-Pair #2 { 0x08, 0x18 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTileNoWait+0x15 : cmp [esi+4], eax + // D3DDevice_SetTileNoWait+0x15 : cmp [esi+4], eax { 0x15, 0x39 }, // (Offset,Value)-Pair #4 { 0x16, 0x46 }, // (Offset,Value)-Pair #5 { 0x17, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x2260] + // D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x2260] { 0x3D, 0x8D }, // (Offset,Value)-Pair #7 { 0x3E, 0xBC }, // (Offset,Value)-Pair #8 { 0x3F, 0xCA }, // (Offset,Value)-Pair #9 @@ -649,9 +649,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTileNoWait_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateIndexBuffer2 +// * D3DDevice_CreateIndexBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateIndexBuffer2_1_0_4627, 7) +OOVPA_NO_XREF(D3DDevice_CreateIndexBuffer2_1_0_4627, 7) { 0x05, 0xC0 }, { 0x0F, 0x85 }, @@ -663,24 +663,24 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateIndexBuffer2_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShaderConstant +// * D3DDevice_SetPixelShaderConstant // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShaderConstant_1_0_4928, 13) +OOVPA_NO_XREF(D3DDevice_SetPixelShaderConstant_1_0_4928, 13) - // IDirect3DDevice8_SetPixelShaderConstant+0x1E : test eax, eax + // D3DDevice_SetPixelShaderConstant+0x1E : test eax, eax { 0x1E, 0x85 }, // (Offset,Value)-Pair #1 { 0x1F, 0xC0 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetPixelShaderConstant+0x32 : mov [ebp+0x10], eax + // D3DDevice_SetPixelShaderConstant+0x32 : mov [ebp+0x10], eax { 0x32, 0x89 }, // (Offset,Value)-Pair #3 { 0x33, 0x45 }, // (Offset,Value)-Pair #4 { 0x34, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPixelShaderConstant+0x84 : or eax, ebx + // D3DDevice_SetPixelShaderConstant+0x84 : or eax, ebx { 0x84, 0x0B }, // (Offset,Value)-Pair #6 { 0x85, 0xC3 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetPixelShaderConstant+0xBD : mov dword ptr [eax], 0x406A0 + // D3DDevice_SetPixelShaderConstant+0xBD : mov dword ptr [eax], 0x406A0 { 0xBD, 0xC7 }, // (Offset,Value)-Pair #8 { 0xBE, 0x00 }, // (Offset,Value)-Pair #9 { 0xBF, 0x60 }, // (Offset,Value)-Pair #10 @@ -690,219 +690,219 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShaderConstant_1_0_4928, 13) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant1 +// * D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1_1_0_4627, 11) - // IDirect3DDevice8_SetVertexShaderConstant1+0x06 : add eax, 0x1C + // D3DDevice_SetVertexShaderConstant1+0x06 : add eax, 0x1C { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0xC0 }, // (Offset,Value)-Pair #2 { 0x08, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant1+0x0F : jnb +0x43 + // D3DDevice_SetVertexShaderConstant1+0x0F : jnb +0x43 { 0x0F, 0x73 }, // (Offset,Value)-Pair #4 { 0x10, 0x43 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstant1+0x27 : shl ecx, 0x04 + // D3DDevice_SetVertexShaderConstant1+0x27 : shl ecx, 0x04 { 0x27, 0xC1 }, // (Offset,Value)-Pair #6 { 0x28, 0xE1 }, // (Offset,Value)-Pair #7 { 0x29, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant1+0x53 : retn + // D3DDevice_SetVertexShaderConstant1+0x53 : retn { 0x53, 0xC3 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstant1+0x5D : jmp +0xA2 + // D3DDevice_SetVertexShaderConstant1+0x5D : jmp +0xA2 { 0x5D, 0xEB }, // (Offset,Value)-Pair #10 { 0x5E, 0xA2 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant4 +// * D3DDevice_SetVertexShaderConstant4 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant4_1_0_4627, 12) - // IDirect3DDevice8_SetVertexShaderConstant4+0x05 : add eax, 0x4C + // D3DDevice_SetVertexShaderConstant4+0x05 : add eax, 0x4C { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x4C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant4+0x34 : movq mm7, qword ptr [edx+0x38] + // D3DDevice_SetVertexShaderConstant4+0x34 : movq mm7, qword ptr [edx+0x38] { 0x34, 0x0F }, // (Offset,Value)-Pair #4 { 0x35, 0x6F }, // (Offset,Value)-Pair #5 { 0x36, 0x7A }, // (Offset,Value)-Pair #6 { 0x37, 0x38 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShaderConstant4+0x42 : shl ecx, 0x04 + // D3DDevice_SetVertexShaderConstant4+0x42 : shl ecx, 0x04 { 0x42, 0xC1 }, // (Offset,Value)-Pair #8 { 0x43, 0xE1 }, // (Offset,Value)-Pair #9 { 0x44, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVertexShaderConstant4+0x91 : emms + // D3DDevice_SetVertexShaderConstant4+0x91 : emms { 0x91, 0x0F }, // (Offset,Value)-Pair #11 { 0x92, 0x77 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstantNotInline +// * D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstantNotInline_1_0_4627, 12) - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x02 : test byte ptr ds:[abs], 0x10 + // D3DDevice_SetVertexShaderConstantNotInline+0x02 : test byte ptr ds:[abs], 0x10 { 0x02, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0x00 }, // (Offset,Value)-Pair #2 { 0x08, 0x10 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x0E : jnz +0x15 + // D3DDevice_SetVertexShaderConstantNotInline+0x0E : jnz +0x15 { 0x0E, 0x75 }, // (Offset,Value)-Pair #4 { 0x0F, 0x15 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x42 : push esi; push edi; mov edi, eax + // D3DDevice_SetVertexShaderConstantNotInline+0x42 : push esi; push edi; mov edi, eax { 0x10, 0x56 }, // (Offset,Value)-Pair #6 { 0x11, 0x57 }, // (Offset,Value)-Pair #7 { 0x12, 0x8B }, // (Offset,Value)-Pair #8 { 0x13, 0xF8 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x21 : rep movsd + // D3DDevice_SetVertexShaderConstantNotInline+0x21 : rep movsd { 0x21, 0xF3 }, // (Offset,Value)-Pair #10 { 0x22, 0xA5 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x28 : call [abs] + // D3DDevice_SetVertexShaderConstantNotInline+0x28 : call [abs] { 0x28, 0xE8 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_4627, 10) - // IDirect3DDevice8_SetPixelShader+0x26 : or ecx, 0x4800 + // D3DDevice_SetPixelShader+0x26 : or ecx, 0x4800 { 0x26, 0x81 }, // (Offset,Value)-Pair #1 { 0x27, 0xC9 }, // (Offset,Value)-Pair #2 { 0x28, 0x00 }, // (Offset,Value)-Pair #3 { 0x29, 0x48 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x3E : or eax, 0x2000 + // D3DDevice_SetPixelShader+0x3E : or eax, 0x2000 { 0x3E, 0x0D }, // (Offset,Value)-Pair #5 { 0x40, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x7D : retn 0x04 + // D3DDevice_SetPixelShader+0x7D : retn 0x04 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #7 { 0x7E, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xDE : rep movsd + // D3DDevice_SetPixelShader+0xDE : rep movsd { 0xDE, 0xF3 }, // (Offset,Value)-Pair #9 { 0xDF, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2 +// * D3DDevice_CreateTexture2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_CreateTexture2_1_0_4627, 12) - // IDirect3DDevice8_CreateTexture2+0x02 : lea eax, [esp+0x20] + // D3DDevice_CreateTexture2+0x02 : lea eax, [esp+0x20] { 0x02, 0x8D }, // (Offset,Value)-Pair #1 { 0x05, 0x20 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateTexture2+0x0E : setz dl + // D3DDevice_CreateTexture2+0x0E : setz dl { 0x0E, 0x0F }, // (Offset,Value)-Pair #3 { 0x0F, 0x94 }, // (Offset,Value)-Pair #4 { 0x10, 0xC2 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateTexture2+0x2A : push 0x00 + // D3DDevice_CreateTexture2+0x2A : push 0x00 { 0x2A, 0x6A }, // (Offset,Value)-Pair #6 { 0x2B, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateTexture2+0x53 : call [abs] + // D3DDevice_CreateTexture2+0x53 : call [abs] { 0x53, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateTexture2+0x78 : jnz +0x0D + // D3DDevice_CreateTexture2+0x78 : jnz +0x0D { 0x78, 0x75 }, // (Offset,Value)-Pair #9 { 0x79, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateTexture2+0xAE : retn 0x1C + // D3DDevice_CreateTexture2+0xAE : retn 0x1C { 0xAE, 0xC2 }, // (Offset,Value)-Pair #11 { 0xAF, 0x1C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2B +// * D3DDevice_CreateTexture2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2B_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_CreateTexture2B_1_0_4627, 12) - // IDirect3DDevice8_CreateTexture2B+0x02 : lea eax, [esp+0x20] + // D3DDevice_CreateTexture2B+0x02 : lea eax, [esp+0x20] { 0x02, 0x8D }, // (Offset,Value)-Pair #1 { 0x05, 0x20 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateTexture2B+0x0E : setz dl + // D3DDevice_CreateTexture2B+0x0E : setz dl { 0x0E, 0x0F }, // (Offset,Value)-Pair #3 { 0x0F, 0x94 }, // (Offset,Value)-Pair #4 { 0x10, 0xC2 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateTexture2B+0x2A : push 0x00 + // D3DDevice_CreateTexture2B+0x2A : push 0x00 { 0x25, 0x6A }, // (Offset,Value)-Pair #6 { 0x26, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateTexture2B+0x53 : call [abs] + // D3DDevice_CreateTexture2B+0x53 : call [abs] { 0x50, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateTexture2B+0x78 : jnz +0x0D + // D3DDevice_CreateTexture2B+0x78 : jnz +0x0D { 0x75, 0x75 }, // (Offset,Value)-Pair #9 { 0x76, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateTexture2B+0xAE : retn 0x1C + // D3DDevice_CreateTexture2B+0xAE : retn 0x1C { 0x81, 0xC2 }, // (Offset,Value)-Pair #11 { 0x82, 0x1C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2C +// * D3DDevice_CreateTexture2C // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2C_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_CreateTexture2C_1_0_4627, 12) - // IDirect3DDevice8_CreateTexture2C+0x02 : lea eax, [esp+0x20] + // D3DDevice_CreateTexture2C+0x02 : lea eax, [esp+0x20] { 0x04, 0x8D }, // (Offset,Value)-Pair #1 { 0x07, 0x20 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateTexture2C+0x0E : setz dl + // D3DDevice_CreateTexture2C+0x0E : setz dl { 0x10, 0x0F }, // (Offset,Value)-Pair #3 { 0x11, 0x94 }, // (Offset,Value)-Pair #4 { 0x12, 0xC2 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateTexture2C+0x2A : push 0x00 + // D3DDevice_CreateTexture2C+0x2A : push 0x00 { 0x2E, 0x6A }, // (Offset,Value)-Pair #6 { 0x2F, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateTexture2C+0x53 : call [abs] + // D3DDevice_CreateTexture2C+0x53 : call [abs] { 0x57, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateTexture2C+0x78 : jnz +0x0D + // D3DDevice_CreateTexture2C+0x78 : jnz +0x0D { 0x7C, 0x75 }, // (Offset,Value)-Pair #9 { 0x7D, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateTexture2C+0xAE : retn 0x1C + // D3DDevice_CreateTexture2C+0xAE : retn 0x1C { 0x88, 0xC2 }, // (Offset,Value)-Pair #11 { 0x89, 0x1C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndicesB +// * D3DDevice_SetIndicesB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndicesB_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_SetIndicesB_1_0_4627, 11) - // IDirect3DDevice8_SetIndicesB+0x0F : jz +0x10 + // D3DDevice_SetIndicesB+0x0F : jz +0x10 { 0x0F, 0x74 }, // (Offset,Value)-Pair #1 { 0x10, 0x10 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetIndicesB+0x1F : jmp +0x0A + // D3DDevice_SetIndicesB+0x1F : jmp +0x0A { 0x1F, 0xEB }, // (Offset,Value)-Pair #3 { 0x20, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetIndicesB+0x58 : mov [esi+0x1C], ecx + // D3DDevice_SetIndicesB+0x58 : mov [esi+0x1C], ecx { 0x58, 0x89 }, // (Offset,Value)-Pair #5 { 0x59, 0x4E }, // (Offset,Value)-Pair #6 { 0x5A, 0x1C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetIndicesB+0x78 : mov [esi+0x038C], ebx + // D3DDevice_SetIndicesB+0x78 : mov [esi+0x038C], ebx { 0x78, 0x89 }, // (Offset,Value)-Pair #8 { 0x79, 0x9E }, // (Offset,Value)-Pair #9 { 0x7A, 0x8C }, // (Offset,Value)-Pair #10 @@ -910,35 +910,35 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndicesB_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureB +// * D3DDevice_SetTextureB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureB_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureB_1_0_4627, 10) - // IDirect3DDevice8_SetTextureB+0x0F : push edi + // D3DDevice_SetTextureB+0x0F : push edi { 0x0F, 0x57 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetTextureB+0x21 : jz +0x1E + // D3DDevice_SetTextureB+0x21 : jz +0x1E { 0x21, 0x74 }, // (Offset,Value)-Pair #2 { 0x22, 0x1E }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureB+0x33 : test ecx, 0x78FFFF + // D3DDevice_SetTextureB+0x33 : test ecx, 0x78FFFF { 0x33, 0xA9 }, // (Offset,Value)-Pair #4 { 0x34, 0xFF }, // (Offset,Value)-Pair #5 { 0x36, 0x78 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTextureB+0x38 : mov [edi], ecx + // D3DDevice_SetTextureB+0x38 : mov [edi], ecx { 0x38, 0x89 }, // (Offset,Value)-Pair #7 { 0x39, 0x0F }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetTextureB+0xD9 : jz +0x4D + // D3DDevice_SetTextureB+0xD9 : jz +0x4D { 0xD9, 0x74 }, // (Offset,Value)-Pair #9 { 0xDA, 0x4D }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureC +// * D3DDevice_SetTextureC // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureC_1_0_4928, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureC_1_0_4928, 10) { 0x0B, 0x56 }, // (Offset,Value)-Pair #1 @@ -957,67 +957,67 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureC_1_0_4928, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayMode +// * D3DDevice_GetDisplayMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayMode_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_GetDisplayMode_1_0_4627, 12) - // IDirect3DDevice8_GetDisplayMode+0x01 : mov esi, ds:[*] + // D3DDevice_GetDisplayMode+0x01 : mov esi, ds:[*] { 0x01, 0x8B }, // (Offset,Value)-Pair #1 { 0x02, 0x35 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetDisplayMode+0x18 : shr ecx, 0x14 + // D3DDevice_GetDisplayMode+0x18 : shr ecx, 0x14 { 0x18, 0xC1 }, // (Offset,Value)-Pair #3 { 0x19, 0xE9 }, // (Offset,Value)-Pair #4 { 0x1A, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetDisplayMode+0x50 : shr eax, 0x0C + // D3DDevice_GetDisplayMode+0x50 : shr eax, 0x0C { 0x50, 0xC1 }, // (Offset,Value)-Pair #6 { 0x51, 0xE8 }, // (Offset,Value)-Pair #7 { 0x52, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetDisplayMode+0x6A : or edx, eax + // D3DDevice_GetDisplayMode+0x6A : or edx, eax { 0x6A, 0x0B }, // (Offset,Value)-Pair #9 { 0x6B, 0xD0 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetDisplayMode+0x7F : jmp +0x1C + // D3DDevice_GetDisplayMode+0x7F : jmp +0x1C { 0x7F, 0xEB }, // (Offset,Value)-Pair #11 { 0x80, 0x1C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_RunPushBuffer +// * D3DDevice_RunPushBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_RunPushBuffer_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_RunPushBuffer_1_0_4627, 10) - // IDirect3DDevice8_RunPushBuffer+0x3C : mov edx, [esi+30h] + // D3DDevice_RunPushBuffer+0x3C : mov edx, [esi+30h] { 0x3C, 0x8B }, // (Offset,Value)-Pair #1 { 0x3D, 0x56 }, // (Offset,Value)-Pair #2 { 0x3E, 0x30 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_RunPushBuffer+0xCA : mov edi, ebp + // D3DDevice_RunPushBuffer+0xCA : mov edi, ebp { 0xCA, 0x8B }, // (Offset,Value)-Pair #4 { 0xCB, 0xFD }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_RunPushBuffer+0xDC : jmp +0x12 + // D3DDevice_RunPushBuffer+0xDC : jmp +0x12 { 0xDC, 0xEB }, // (Offset,Value)-Pair #6 { 0xDD, 0x12 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_RunPushBuffer+0xED : lea edi, [eax+4] + // D3DDevice_RunPushBuffer+0xED : lea edi, [eax+4] { 0xED, 0x8D }, // (Offset,Value)-Pair #8 { 0xEE, 0x78 }, // (Offset,Value)-Pair #9 { 0xEF, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Begin +// * D3DDevice_Begin // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_4627, 14) +OOVPA_NO_XREF(D3DDevice_Begin_1_0_4627, 14) - // IDirect3DDevice8_Begin+0x19 : shl edx, 6 + // D3DDevice_Begin+0x19 : shl edx, 6 { 0x19, 0xD1 }, // (Offset,Value)-Pair #7 { 0x1A, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_Begin+0x25 : mov dword ptr [eax], 0x417FC + // D3DDevice_Begin+0x25 : mov dword ptr [eax], 0x417FC { 0x25, 0xC7 }, // (Offset,Value)-Pair #1 { 0x26, 0x00 }, // (Offset,Value)-Pair #2 { 0x27, 0xFC }, // (Offset,Value)-Pair #3 @@ -1025,28 +1025,28 @@ OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_4627, 14) { 0x29, 0x04 }, // (Offset,Value)-Pair #5 { 0x2A, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_Begin+0x33 : or dword ptr [esi+8], 0x800 + // D3DDevice_Begin+0x33 : or dword ptr [esi+8], 0x800 { 0x33, 0x81 }, // (Offset,Value)-Pair #9 { 0x34, 0x4E }, // (Offset,Value)-Pair #10 { 0x35, 0x08 }, // (Offset,Value)-Pair #11 { 0x37, 0x08 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_Begin+0x3B : retn 0x08 + // D3DDevice_Begin+0x3B : retn 0x08 { 0x3B, 0xC2 }, // (Offset,Value)-Pair #13 { 0x3C, 0x04 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData2f +// * D3DDevice_SetVertexData2f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_4627, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_4627, 14) - // IDirect3DDevice8_SetVertexData2f+0x20 : lea edx, ds:abs[ecx*8] + // D3DDevice_SetVertexData2f+0x20 : lea edx, ds:abs[ecx*8] { 0x20, 0x8D }, // (Offset,Value)-Pair #1 { 0x21, 0x14 }, // (Offset,Value)-Pair #2 { 0x22, 0xCD }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexData2f+0x2B : mov [eax], edx; mov edx, [esp+0x10] + // D3DDevice_SetVertexData2f+0x2B : mov [eax], edx; mov edx, [esp+0x10] { 0x2B, 0x89 }, // (Offset,Value)-Pair #4 { 0x2C, 0x10 }, // (Offset,Value)-Pair #5 { 0x2D, 0x8B }, // (Offset,Value)-Pair #6 @@ -1054,45 +1054,45 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_4627, 14) { 0x2F, 0x24 }, // (Offset,Value)-Pair #8 { 0x30, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData2f+0x37 : add eax, 0x0C + // D3DDevice_SetVertexData2f+0x37 : add eax, 0x0C { 0x37, 0x83 }, // (Offset,Value)-Pair #10 { 0x38, 0xC0 }, // (Offset,Value)-Pair #11 { 0x39, 0x0C }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetVertexData2f+0x3D : retn 0x0C + // D3DDevice_SetVertexData2f+0x3D : retn 0x0C { 0x3D, 0xC2 }, // (Offset,Value)-Pair #13 { 0x3E, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData4f +// * D3DDevice_SetVertexData4f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_SetVertexData4f_1_0_4627, 11) - // IDirect3DDevice8_SetVertexData4f+0x20 : cmp ecx, -1; jnz +0x07 + // D3DDevice_SetVertexData4f+0x20 : cmp ecx, -1; jnz +0x07 { 0x20, 0x83 }, // (Offset,Value)-Pair #1 { 0x21, 0xF9 }, // (Offset,Value)-Pair #2 { 0x22, 0xFF }, // (Offset,Value)-Pair #3 { 0x23, 0x75 }, // (Offset,Value)-Pair #4 { 0x24, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexData4f+0x2C : add ecx, 0x01A0 + // D3DDevice_SetVertexData4f+0x2C : add ecx, 0x01A0 { 0x2C, 0x81 }, // (Offset,Value)-Pair #6 { 0x2D, 0xC1 }, // (Offset,Value)-Pair #7 { 0x2E, 0xA0 }, // (Offset,Value)-Pair #8 { 0x2F, 0x01 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData4f+0x5F : retn 0x14 + // D3DDevice_SetVertexData4f+0x5F : retn 0x14 { 0x5F, 0xC2 }, // (Offset,Value)-Pair #10 { 0x60, 0x14 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_End +// * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_End_1_0_4627, 12) - // IDirect3DDevice8_End+0x1C : mov dword ptr [eax], 0x417FC + // D3DDevice_End+0x1C : mov dword ptr [eax], 0x417FC { 0x1C, 0xC7 }, // (Offset,Value)-Pair #1 { 0x1D, 0x00 }, // (Offset,Value)-Pair #2 { 0x1E, 0xFC }, // (Offset,Value)-Pair #3 @@ -1100,128 +1100,128 @@ OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_4627, 12) { 0x20, 0x04 }, // (Offset,Value)-Pair #5 { 0x21, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_End+0x31 : test ah, 0x10 + // D3DDevice_End+0x31 : test ah, 0x10 { 0x31, 0xF6 }, // (Offset,Value)-Pair #7 { 0x32, 0xC4 }, // (Offset,Value)-Pair #8 { 0x33, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_End+0x34 : jz +0x07 + // D3DDevice_End+0x34 : jz +0x07 { 0x34, 0x74 }, // (Offset,Value)-Pair #10 { 0x35, 0x07 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_End+0x45 : retn + // D3DDevice_End+0x45 : retn { 0x45, 0xC3 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_4627, 9) - // IDirect3DDevice8_Clear+0x0000 : sub esp, 38h +OOVPA_NO_XREF_LARGE(D3DDevice_Clear_1_0_4627, 9) + // D3DDevice_Clear+0x0000 : sub esp, 38h { 0x0000, 0x83 }, // (Offset,Value)-Pair #1 { 0x0001, 0xEC }, // (Offset,Value)-Pair #2 { 0x0002, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x000B : mov ebx, [ebp+0x21B8] + // D3DDevice_Clear+0x000B : mov ebx, [ebp+0x21B8] { 0x000B, 0x8B }, // (Offset,Value)-Pair #4 { 0x000C, 0x9D }, // (Offset,Value)-Pair #5 { 0x000D, 0xB8 }, // (Offset,Value)-Pair #6 { 0x000E, 0x21 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Clear+0x0399 : retn 0x18 + // D3DDevice_Clear+0x0399 : retn 0x18 { 0x0399, 0xC2 }, // (Offset,Value)-Pair #8 { 0x039A, 0x18 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_ClearB +// * D3DDevice_ClearB // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_ClearB_1_0_4627, 9) - // IDirect3DDevice8_Clear+0x0000 : sub esp, 38h +OOVPA_NO_XREF_LARGE(D3DDevice_ClearB_1_0_4627, 9) + // D3DDevice_Clear+0x0000 : sub esp, 38h { 0x0000, 0x83 }, // (Offset,Value)-Pair #1 { 0x0001, 0xEC }, // (Offset,Value)-Pair #2 { 0x0002, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x001C : mov ebx, [ebp+0x21B8] + // D3DDevice_Clear+0x001C : mov ebx, [ebp+0x21B8] { 0x001C, 0x8B }, // (Offset,Value)-Pair #4 { 0x001D, 0xB5 }, // (Offset,Value)-Pair #5 { 0x001E, 0xB8 }, // (Offset,Value)-Pair #6 { 0x001F, 0x21 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Clear+0x03C6 : retn 0x18 + // D3DDevice_Clear+0x03C6 : retn 0x18 { 0x03C6, 0xC2 }, // (Offset,Value)-Pair #8 { 0x03C7, 0x18 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_4627, 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+0x2C10] + // D3DDevice_Swap+0x60 : inc dword ptr [esi+0x2C10] { 0x60, 0xFF }, // (Offset,Value)-Pair #6 { 0x61, 0x86 }, // (Offset,Value)-Pair #7 { 0x62, 0x10 }, // (Offset,Value)-Pair #8 { 0x63, 0x2C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_Swap+0xD8 : retn 4 + // D3DDevice_Swap+0xD8 : retn 4 { 0xD8, 0xC2 }, // (Offset,Value)-Pair #10 { 0xD9, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexBuffer2 +// * D3DDevice_CreateVertexBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_4627, 13) +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2_1_0_4627, 13) - // IDirect3DDevice8_CreateVertexBuffer2+0x03 : push 0x40 + // D3DDevice_CreateVertexBuffer2+0x03 : push 0x40 { 0x03, 0x6A }, // (Offset,Value)-Pair #1 { 0x04, 0x40 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateVertexBuffer2+0x10 : mov eax, [esp+8] + // D3DDevice_CreateVertexBuffer2+0x10 : mov eax, [esp+8] { 0x10, 0x8B }, // (Offset,Value)-Pair #3 { 0x11, 0x44 }, // (Offset,Value)-Pair #4 { 0x12, 0x24 }, // (Offset,Value)-Pair #5 { 0x13, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_CreateVertexBuffer2+0x41 : mov dword ptr [esi], 0x01000001 + // D3DDevice_CreateVertexBuffer2+0x41 : mov dword ptr [esi], 0x01000001 { 0x41, 0xC7 }, // (Offset,Value)-Pair #7 { 0x42, 0x06 }, // (Offset,Value)-Pair #8 { 0x43, 0x01 }, // (Offset,Value)-Pair #9 { 0x44, 0x00 }, // (Offset,Value)-Pair #10 { 0x46, 0x01 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_CreateVertexBuffer2+0x4A : retn 0x04 + // D3DDevice_CreateVertexBuffer2+0x4A : retn 0x04 { 0x4A, 0xC2 }, // (Offset,Value)-Pair #12 { 0x4B, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_UpdateOverlay +// * D3DDevice_UpdateOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_UpdateOverlay_1_0_4627, 11) - // IDirect3DDevice8_UpdateOverlay+0x0F : mov [eax+0x2BA8], ecx + // D3DDevice_UpdateOverlay+0x0F : mov [eax+0x2BA8], ecx { 0x0F, 0x89 }, // (Offset,Value)-Pair #1 { 0x10, 0x88 }, // (Offset,Value)-Pair #2 { 0x11, 0xA8 }, // (Offset,Value)-Pair #3 { 0x12, 0x2B }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_UpdateOverlay+0x8E : and eax, 0xFFFFFFFE + // D3DDevice_UpdateOverlay+0x8E : and eax, 0xFFFFFFFE { 0x8E, 0x83 }, // (Offset,Value)-Pair #5 { 0x8F, 0xE0 }, // (Offset,Value)-Pair #6 { 0x90, 0xFE }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_UpdateOverlay+0xAC : mov [esi+0x8930], eax + // D3DDevice_UpdateOverlay+0xAC : mov [esi+0x8930], eax { 0xAC, 0x89 }, // (Offset,Value)-Pair #8 { 0xAD, 0x86 }, // (Offset,Value)-Pair #9 { 0xAE, 0x30 }, // (Offset,Value)-Pair #10 @@ -1229,37 +1229,37 @@ OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetOverlayUpdateStatus +// * D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus_1_0_4627, 12) - // IDirect3DDevice8_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x2BA8] + // D3DDevice_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x2BA8] { 0x05, 0x8B }, // (Offset,Value)-Pair #1 { 0x06, 0x88 }, // (Offset,Value)-Pair #2 { 0x07, 0xA8 }, // (Offset,Value)-Pair #3 { 0x08, 0x2B }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x2580] + // D3DDevice_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x2580] { 0x0C, 0x8B }, // (Offset,Value)-Pair #5 { 0x0D, 0xB0 }, // (Offset,Value)-Pair #6 { 0x0E, 0x80 }, // (Offset,Value)-Pair #7 { 0x0F, 0x25 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x16 : setnz dl + // D3DDevice_GetOverlayUpdateStatus+0x16 : setnz dl { 0x16, 0x0F }, // (Offset,Value)-Pair #9 { 0x17, 0x95 }, // (Offset,Value)-Pair #10 { 0x18, 0xC2 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x1C : retn + // D3DDevice_GetOverlayUpdateStatus+0x1C : retn { 0x1C, 0xC3 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_4627, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -1267,359 +1267,359 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4627, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x2554 + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x2554 { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x54 }, // (Offset,Value)-Pair #8 { 0x19, 0x25 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_4627, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x2550], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x2550], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x50 }, // (Offset,Value)-Pair #9 { 0x0D, 0x25 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetViewport +// * D3DDevice_GetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_4627, 10) - // IDirect3DDevice8_GetViewport+0x05 : push esi; push edi + // D3DDevice_GetViewport+0x05 : push esi; push edi { 0x05, 0x56 }, // (Offset,Value)-Pair #1 { 0x06, 0x57 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_GetViewport+0x0B : lea esi, [eax+0x0A90] + // D3DDevice_GetViewport+0x0B : lea esi, [eax+0x0A90] { 0x0B, 0x8D }, // (Offset,Value)-Pair #3 { 0x0C, 0xB0 }, // (Offset,Value)-Pair #4 { 0x0D, 0x90 }, // (Offset,Value)-Pair #5 { 0x0E, 0x0A }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetViewport+0x11 : mov ecx, 6 + // D3DDevice_GetViewport+0x11 : mov ecx, 6 { 0x11, 0xB9 }, // (Offset,Value)-Pair #7 { 0x12, 0x06 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetViewport+0x1A : retn 0x04 + // D3DDevice_GetViewport+0x1A : retn 0x04 { 0x1A, 0xC2 }, // (Offset,Value)-Pair #9 { 0x1B, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_4627, 10) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 + // D3DDevice_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 { 0x14, 0xC1 }, // (Offset,Value)-Pair #1 { 0x15, 0xE0 }, // (Offset,Value)-Pair #2 { 0x16, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x26 : cmp eax, ecx + // D3DDevice_SetTextureState_TexCoordIndex+0x26 : cmp eax, ecx { 0x26, 0x3B }, // (Offset,Value)-Pair #4 { 0x27, 0xC1 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x71 : mov ebp, 0x2400 + // D3DDevice_SetTextureState_TexCoordIndex+0x71 : mov ebp, 0x2400 { 0x71, 0xBD }, // (Offset,Value)-Pair #6 { 0x73, 0x24 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0xAA : shl ebx, 0x04 + // D3DDevice_SetTextureState_TexCoordIndex+0xAA : shl ebx, 0x04 { 0xAA, 0xC1 }, // (Offset,Value)-Pair #8 { 0xAB, 0xE3 }, // (Offset,Value)-Pair #9 { 0xAC, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormalsB +// * D3DDevice_SetRenderState_NormalizeNormalsB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormalsB_1_0_4627, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormalsB_1_0_4627, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormalsB+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_NormalizeNormalsB+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormalsB+0x2E : or [addr], 0x200 + // D3DDevice_SetRenderState_NormalizeNormalsB+0x2E : or [addr], 0x200 { 0x2E, 0x81 }, // (Offset,Value)-Pair #3 { 0x2F, 0x0D }, // (Offset,Value)-Pair #4 { 0x34, 0x00 }, // (Offset,Value)-Pair #5 { 0x35, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormalsB+0x3F : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormalsB+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #7 { 0x40, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_EdgeAntiAliasB +// * D3DDevice_SetRenderState_EdgeAntiAliasB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_EdgeAntiAliasB_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAliasB_1_0_4627, 10) - // IDirect3DDevice8_SetRenderState_EdgeAntiAliasB+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_EdgeAntiAliasB+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_EdgeAntiAliasB+0x0C : jb +0x0E + // D3DDevice_SetRenderState_EdgeAntiAliasB+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #3 { 0x0D, 0x0E }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_EdgeAntiAliasB+0x1C : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_EdgeAntiAliasB+0x1C : mov ecx, [esp+0x08] { 0x1C, 0x8B }, // (Offset,Value)-Pair #5 { 0x1D, 0x4C }, // (Offset,Value)-Pair #6 { 0x1E, 0x24 }, // (Offset,Value)-Pair #7 { 0x1F, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_EdgeAntiAliasB+0x38 : retn 0x04 + // D3DDevice_SetRenderState_EdgeAntiAliasB+0x38 : retn 0x04 { 0x38, 0xC2 }, // (Offset,Value)-Pair #9 { 0x39, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4627, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4627, 9) - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x0D : mov eax, [edi+0x21B4] + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x0D : mov eax, [edi+0x21B4] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x87 }, // (Offset,Value)-Pair #2 { 0x0F, 0xB4 }, // (Offset,Value)-Pair #3 { 0x10, 0x21 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x56 : shl esi, 0x05 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x56 : shl esi, 0x05 { 0x56, 0xC1 }, // (Offset,Value)-Pair #5 { 0x57, 0xE6 }, // (Offset,Value)-Pair #6 { 0x58, 0x05 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0x74 : retn 0x04 + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x74 : retn 0x04 { 0x74, 0xC2 }, // (Offset,Value)-Pair #8 { 0x75, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4627, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_4627, 13) - // IDirect3DDevice8_SetRenderState_ZEnable+0x0C : jb +0x05 + // D3DDevice_SetRenderState_ZEnable+0x0C : jb +0x05 { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x05 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnable+0x1B : mov ecx, [esi+0x21B8h] + // D3DDevice_SetRenderState_ZEnable+0x1B : mov ecx, [esi+0x21B8h] { 0x1B, 0x8B }, // (Offset,Value)-Pair #3 { 0x1C, 0x8E }, // (Offset,Value)-Pair #4 { 0x1D, 0xB8 }, // (Offset,Value)-Pair #5 { 0x1E, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnable+0x2E : mov dword ptr [eax], 0x4030 + // D3DDevice_SetRenderState_ZEnable+0x2E : mov dword ptr [eax], 0x4030 { 0x2E, 0xC7 }, // (Offset,Value)-Pair #7 { 0x2F, 0x00 }, // (Offset,Value)-Pair #8 { 0x30, 0x0C }, // (Offset,Value)-Pair #9 { 0x31, 0x03 }, // (Offset,Value)-Pair #10 { 0x32, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnable+0x8C : retn 0x04 + // D3DDevice_SetRenderState_ZEnable+0x8C : retn 0x04 { 0x8C, 0xC2 }, // (Offset,Value)-Pair #12 { 0x8D, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnableB +// * D3DDevice_SetRenderState_ZEnableB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnableB_1_0_4627, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnableB_1_0_4627, 13) - // IDirect3DDevice8_SetRenderState_ZEnableB+0x0C : jb +0x0E + // D3DDevice_SetRenderState_ZEnableB+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x0E }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_ZEnableB+0x1B : mov ecx, [esi+0x21B8h] + // D3DDevice_SetRenderState_ZEnableB+0x1B : mov ecx, [esi+0x21B8h] { 0x24, 0x8B }, // (Offset,Value)-Pair #3 { 0x25, 0x8E }, // (Offset,Value)-Pair #4 { 0x26, 0xB8 }, // (Offset,Value)-Pair #5 { 0x27, 0x21 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ZEnableB+0x37 : mov dword ptr [eax], 0x4030 + // D3DDevice_SetRenderState_ZEnableB+0x37 : mov dword ptr [eax], 0x4030 { 0x37, 0xC7 }, // (Offset,Value)-Pair #7 { 0x38, 0x00 }, // (Offset,Value)-Pair #8 { 0x39, 0x0C }, // (Offset,Value)-Pair #9 { 0x3A, 0x03 }, // (Offset,Value)-Pair #10 { 0x3B, 0x04 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_ZEnableB+0x99 : retn 0x04 + // D3DDevice_SetRenderState_ZEnableB+0x99 : retn 0x04 { 0x99, 0xC2 }, // (Offset,Value)-Pair #12 { 0x9A, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilEnableB +// * D3DDevice_SetRenderState_StencilEnableB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnableB_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnableB_1_0_4627, 11) - // IDirect3DDevice8_SetRenderState_StencilEnableB+0x0C : jb +0x0E + // D3DDevice_SetRenderState_StencilEnableB+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x0E }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_StencilEnableB+0x35 : jz +0x19 + // D3DDevice_SetRenderState_StencilEnableB+0x35 : jz +0x19 { 0x35, 0x74 }, // (Offset,Value)-Pair #3 { 0x36, 0x19 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_StencilEnableB+0x56 : mov dword ptr [eax], 0x00041D84 + // D3DDevice_SetRenderState_StencilEnableB+0x56 : mov dword ptr [eax], 0x00041D84 { 0x56, 0xC7 }, // (Offset,Value)-Pair #5 { 0x57, 0x00 }, // (Offset,Value)-Pair #6 { 0x58, 0x84 }, // (Offset,Value)-Pair #7 { 0x59, 0x1D }, // (Offset,Value)-Pair #8 { 0x5A, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_StencilEnableB+0x8A : retn 0x04 + // D3DDevice_SetRenderState_StencilEnableB+0x8A : retn 0x04 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #10 { 0x8B, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias +// * D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4627, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x04 : push esi + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x04 : push esi { 0x04, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x13 : call [abs] + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x13 : call [abs] { 0x13, 0xE8 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x27 : shl edi, 0x10 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x27 : shl edi, 0x10 { 0x27, 0xC1 }, // (Offset,Value)-Pair #3 { 0x28, 0xE7 }, // (Offset,Value)-Pair #4 { 0x29, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x2E : jns +0x0C + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x2E : jns +0x0C { 0x2E, 0x79 }, // (Offset,Value)-Pair #6 { 0x2F, 0x0C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x39 : or edi, 0x01 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x39 : or edi, 0x01 { 0x39, 0x83 }, // (Offset,Value)-Pair #8 { 0x3A, 0xCF }, // (Offset,Value)-Pair #9 { 0x3B, 0x01 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias+0x6F : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleAntiAlias+0x6F : retn 0x04 { 0x6F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x70, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB +// * D3DDevice_SetRenderState_MultiSampleAntiAliasB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAliasB_1_0_4627, 12) - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x04 : push esi + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x04 : push esi { 0x04, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x11 : call [abs] + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x11 : call [abs] { 0x11, 0xE8 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x25 : shl edi, 0x10 + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x25 : shl edi, 0x10 { 0x25, 0xC1 }, // (Offset,Value)-Pair #3 { 0x26, 0xE7 }, // (Offset,Value)-Pair #4 { 0x27, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x2C : jns +0x0C + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x2C : jns +0x0C { 0x2C, 0x79 }, // (Offset,Value)-Pair #6 { 0x2D, 0x0C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x37 : or edi, 0x01 + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x37 : or edi, 0x01 { 0x37, 0x83 }, // (Offset,Value)-Pair #8 { 0x38, 0xCF }, // (Offset,Value)-Pair #9 { 0x39, 0x01 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB+0x7B : retn 0x04 + // D3DDevice_SetRenderState_MultiSampleAntiAliasB+0x7B : retn 0x04 { 0x7B, 0xC2 }, // (Offset,Value)-Pair #11 { 0x7C, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_4627, 10) - // IDirect3DDevice8_DrawVerticesUP+0x03 : sub esp, 0x14 + // D3DDevice_DrawVerticesUP+0x03 : sub esp, 0x14 { 0x03, 0x83 }, // (Offset,Value)-Pair #1 { 0x04, 0xEC }, // (Offset,Value)-Pair #2 { 0x05, 0x14 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawVerticesUP+0x2F : mov edx, [edi+0x804] + // D3DDevice_DrawVerticesUP+0x2F : mov edx, [edi+0x804] { 0x2F, 0x8B }, // (Offset,Value)-Pair #4 { 0x30, 0x97 }, // (Offset,Value)-Pair #5 { 0x31, 0x04 }, // (Offset,Value)-Pair #6 { 0x32, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVerticesUP+0xC2 : cmp esi, 0x80 + // D3DDevice_DrawVerticesUP+0xC2 : cmp esi, 0x80 { 0xC2, 0x81 }, // (Offset,Value)-Pair #8 { 0xC3, 0xFE }, // (Offset,Value)-Pair #9 { 0xC4, 0x80 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUPB +// * D3DDevice_DrawVerticesUPB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUPB_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUPB_1_0_4627, 10) - // IDirect3DDevice8_DrawVerticesUPB+0x03 : sub esp, 0x14 + // D3DDevice_DrawVerticesUPB+0x03 : sub esp, 0x14 { 0x03, 0x83 }, // (Offset,Value)-Pair #1 { 0x04, 0xEC }, // (Offset,Value)-Pair #2 { 0x05, 0x14 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawVerticesUPB+0x3C : mov edx, [esi+0x804] + // D3DDevice_DrawVerticesUPB+0x3C : mov edx, [esi+0x804] { 0x3C, 0x8B }, // (Offset,Value)-Pair #4 { 0x3D, 0x96 }, // (Offset,Value)-Pair #5 { 0x3E, 0x04 }, // (Offset,Value)-Pair #6 { 0x3F, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVerticesUPB+0xF9 : cmp edi, 0x80 + // D3DDevice_DrawVerticesUPB+0xF9 : cmp edi, 0x80 { 0xF9, 0x81 }, // (Offset,Value)-Pair #8 { 0xFA, 0xFF }, // (Offset,Value)-Pair #9 { 0xFB, 0x80 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_4627, 11) - // IDirect3DDevice8_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] + // D3DDevice_DrawIndexedVertices+0x0E : mov eax, [esi+0x1C] { 0x0E, 0x8B }, // (Offset,Value)-Pair #1 { 0x0F, 0x46 }, // (Offset,Value)-Pair #2 { 0x10, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawIndexedVertices+0x26 : push 0x0209 + // D3DDevice_DrawIndexedVertices+0x26 : push 0x0209 { 0x26, 0x68 }, // (Offset,Value)-Pair #4 { 0x27, 0x09 }, // (Offset,Value)-Pair #5 { 0x28, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_DrawIndexedVertices+0x66 : dec eax + // D3DDevice_DrawIndexedVertices+0x66 : dec eax { 0x66, 0x48 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawIndexedVertices+0xFB : prefetchnta byte ptr [esi+0x3C] + // D3DDevice_DrawIndexedVertices+0xFB : prefetchnta byte ptr [esi+0x3C] { 0xFB, 0x0F }, // (Offset,Value)-Pair #8 { 0xFC, 0x18 }, // (Offset,Value)-Pair #9 { 0xFD, 0x46 }, // (Offset,Value)-Pair #10 @@ -1627,112 +1627,112 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_4627, 12) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_4627, 12) - // IDirect3DDevice8_SetMaterial+0x0C : add edi, 0x0AB0 + // D3DDevice_SetMaterial+0x0C : add edi, 0x0AB0 { 0x0C, 0x81 }, // (Offset,Value)-Pair #1 { 0x0D, 0xC7 }, // (Offset,Value)-Pair #2 { 0x0E, 0xB0 }, // (Offset,Value)-Pair #3 { 0x0F, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetMaterial+0x12 : mov ecx, 0x11 + // D3DDevice_SetMaterial+0x12 : mov ecx, 0x11 { 0x12, 0xB9 }, // (Offset,Value)-Pair #5 { 0x13, 0x11 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetMaterial+0x1F : or ecx, 0x1000 + // D3DDevice_SetMaterial+0x1F : or ecx, 0x1000 { 0x1F, 0x81 }, // (Offset,Value)-Pair #7 { 0x20, 0xC9 }, // (Offset,Value)-Pair #8 { 0x21, 0x00 }, // (Offset,Value)-Pair #9 { 0x22, 0x10 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetMaterial+0x2D : retn 0x04 + // D3DDevice_SetMaterial+0x2D : retn 0x04 { 0x2D, 0xC2 }, // (Offset,Value)-Pair #11 { 0x2E, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock2 +// * D3DVertexBuffer_Lock2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_4627, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock2_1_0_4627, 11) - // IDirect3DVertexBuffer8_Lock2+0x01 : mov bl, [esp+0x0C] + // D3DVertexBuffer_Lock2+0x01 : mov bl, [esp+0x0C] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x0C }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock2+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock2+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x24 }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock2+0x2F : test bl, 0xA0 + // D3DVertexBuffer_Lock2+0x2F : test bl, 0xA0 { 0x2F, 0xF6 }, // (Offset,Value)-Pair #7 { 0x30, 0xC3 }, // (Offset,Value)-Pair #8 { 0x31, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock2+0x48 : retn 0x08 + // D3DVertexBuffer_Lock2+0x48 : retn 0x08 { 0x48, 0xC2 }, // (Offset,Value)-Pair #10 { 0x49, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock2B +// * D3DVertexBuffer_Lock2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2B_1_0_4627, 11) +OOVPA_NO_XREF(D3DVertexBuffer_Lock2B_1_0_4627, 11) - // IDirect3DVertexBuffer8_Lock2B+0x01 : mov bl, [esp+0x0C] + // D3DVertexBuffer_Lock2B+0x01 : mov bl, [esp+0x0C] { 0x01, 0x8A }, // (Offset,Value)-Pair #1 { 0x02, 0x5C }, // (Offset,Value)-Pair #2 { 0x03, 0x24 }, // (Offset,Value)-Pair #3 { 0x04, 0x0C }, // (Offset,Value)-Pair #4 - // IDirect3DVertexBuffer8_Lock2B+0x09 : jnz +0x24 + // D3DVertexBuffer_Lock2B+0x09 : jnz +0x24 { 0x09, 0x75 }, // (Offset,Value)-Pair #5 { 0x0A, 0x2D }, // (Offset,Value)-Pair #6 - // IDirect3DVertexBuffer8_Lock2B+0x2F : test bl, 0xA0 + // D3DVertexBuffer_Lock2B+0x2F : test bl, 0xA0 { 0x38, 0xF6 }, // (Offset,Value)-Pair #7 { 0x39, 0xC3 }, // (Offset,Value)-Pair #8 { 0x3A, 0xA0 }, // (Offset,Value)-Pair #9 - // IDirect3DVertexBuffer8_Lock2B+0x48 : retn 0x08 + // D3DVertexBuffer_Lock2B+0x48 : retn 0x08 { 0x6B, 0xC2 }, // (Offset,Value)-Pair #10 { 0x6C, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_ReleaseB +// * D3DResource_ReleaseB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_ReleaseB_1_0_4627, 11) +OOVPA_NO_XREF(D3DResource_ReleaseB_1_0_4627, 11) - // IDirect3DResource8_ReleaseB+0x09 : and ecx, 0xFFFF + // D3DResource_ReleaseB+0x09 : and ecx, 0xFFFF { 0x09, 0x81 }, // (Offset,Value)-Pair #1 { 0x0A, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0B, 0xFF }, // (Offset,Value)-Pair #3 { 0x0C, 0xFF }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_ReleaseB+0x14 : and eax, 0x00070000 + // D3DResource_ReleaseB+0x14 : and eax, 0x00070000 { 0x14, 0x25 }, // (Offset,Value)-Pair #5 { 0x17, 0x07 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_ReleaseB+0x19 : cmp eax, 0x00050000 + // D3DResource_ReleaseB+0x19 : cmp eax, 0x00050000 { 0x19, 0x3D }, // (Offset,Value)-Pair #7 { 0x1C, 0x05 }, // (Offset,Value)-Pair #8 - // IDirect3DResource8_ReleaseB+0x3D : pop edi + // D3DResource_ReleaseB+0x3D : pop edi { 0x3D, 0x5F }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_ReleaseB+0x4A : retn 0x04 + // D3DResource_ReleaseB+0x4A : retn 0x04 { 0x4A, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4B, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_GetType +// * D3DResource_GetType // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_GetType_1_0_4627, 7) +OOVPA_NO_XREF(D3DResource_GetType_1_0_4627, 7) { 0x10, 0x77 }, { 0x22, 0x83 }, @@ -1744,56 +1744,56 @@ OOVPA_NO_XREF(IDirect3DResource8_GetType_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DVolumeTexture8_LockBox +// * D3DVolumeTexture_LockBox // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVolumeTexture8_LockBox_1_0_4627, 15) +OOVPA_NO_XREF(D3DVolumeTexture_LockBox_1_0_4627, 15) - // IDirect3DVolumeTexture8_LockBox+0x00 : mov eax, [esp+0x14] + // D3DVolumeTexture_LockBox+0x00 : mov eax, [esp+0x14] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x14 }, // (Offset,Value)-Pair #4 - // IDirect3DVolumeTexture8_LockBox+0x04 : mov ecx, [esp+0x10] + // D3DVolumeTexture_LockBox+0x04 : mov ecx, [esp+0x10] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x0C }, // (Offset,Value)-Pair #8 - // IDirect3DVolumeTexture8_LockBox+0x0C : push eax + // D3DVolumeTexture_LockBox+0x0C : push eax { 0x0C, 0x50 }, // (Offset,Value)-Pair #9 - // IDirect3DVolumeTexture8_LockBox+0x11 : push ecx; push edx; push eax + // D3DVolumeTexture_LockBox+0x11 : push ecx; push edx; push eax { 0x11, 0x51 }, // (Offset,Value)-Pair #10 { 0x12, 0x52 }, // (Offset,Value)-Pair #11 { 0x13, 0x50 }, // (Offset,Value)-Pair #12 - // IDirect3DVolumeTexture8_LockBox+0x18 : call [addr] + // D3DVolumeTexture_LockBox+0x18 : call [addr] { 0x18, 0xE8 }, // (Offset,Value)-Pair #13 - // IDirect3DVolumeTexture8_LockBox+0x1D : retn 0x14 + // D3DVolumeTexture_LockBox+0x1D : retn 0x14 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #14 { 0x1E, 0x14 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DSurface8_LockRectB +// * D3DSurface_LockRectB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DSurface8_LockRectB_1_0_4627, 17) +OOVPA_NO_XREF(D3DSurface_LockRectB_1_0_4627, 17) - // IDirect3DSurface8_LockRectB+0x00 : mov eax, [esp+0x10] + // D3DSurface_LockRectB+0x00 : mov eax, [esp+0x10] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x10 }, // (Offset,Value)-Pair #4 - // IDirect3DSurface8_LockRectB+0x04 : mov ecx, [esp+0x04] + // D3DSurface_LockRectB+0x04 : mov ecx, [esp+0x04] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x4C }, // (Offset,Value)-Pair #6 { 0x06, 0x24 }, // (Offset,Value)-Pair #7 { 0x07, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DSurface8_LockRectB+0x08 : push esi; mov esi, [esp+0x0C]; push eax + // D3DSurface_LockRectB+0x08 : push esi; mov esi, [esp+0x0C]; push eax { 0x08, 0x56 }, // (Offset,Value)-Pair #9 { 0x09, 0x8B }, // (Offset,Value)-Pair #10 { 0x0A, 0x74 }, // (Offset,Value)-Pair #11 @@ -1801,10 +1801,10 @@ OOVPA_NO_XREF(IDirect3DSurface8_LockRectB_1_0_4627, 17) { 0x0C, 0x0C }, // (Offset,Value)-Pair #13 { 0x0D, 0x50 }, // (Offset,Value)-Pair #14 - // IDirect3DSurface8_LockRectB+0x17 : call [addr] + // D3DSurface_LockRectB+0x17 : call [addr] { 0x17, 0xE8 }, // (Offset,Value)-Pair #15 - // IDirect3DSurface8_LockRectB+0x1D : retn 0x10 + // D3DSurface_LockRectB+0x1D : retn 0x10 { 0x1D, 0xC2 }, // (Offset,Value)-Pair #16 { 0x1E, 0x10 }, // (Offset,Value)-Pair #17 OOVPA_END; @@ -1910,69 +1910,69 @@ OOVPA_XREF(Get2DSurfaceDescD_1_0_4627, 10, OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_GetSurfaceLevel2 +// * D3DTexture_GetSurfaceLevel2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_GetSurfaceLevel2_1_0_4627, 14) +OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel2_1_0_4627, 14) - // IDirect3DTexture8_GetSurfaceLevel2+0x00 : sub esp, 0x0C + // D3DTexture_GetSurfaceLevel2+0x00 : sub esp, 0x0C { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x0C }, // (Offset,Value)-Pair #3 - // IDirect3DTexture8_GetSurfaceLevel2+0x04 : mov esi, [esp+0x14] + // D3DTexture_GetSurfaceLevel2+0x04 : mov esi, [esp+0x14] { 0x04, 0x8B }, // (Offset,Value)-Pair #4 { 0x07, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DTexture8_GetSurfaceLevel2+0x08 : lea eax, [esp+0x14] + // D3DTexture_GetSurfaceLevel2+0x08 : lea eax, [esp+0x14] { 0x08, 0x8D }, // (Offset,Value)-Pair #6 { 0x0B, 0x14 }, // (Offset,Value)-Pair #7 - // IDirect3DTexture8_GetSurfaceLevel2+0x17 : mov edx, [esp+0x24] + // D3DTexture_GetSurfaceLevel2+0x17 : mov edx, [esp+0x24] { 0x17, 0x8B }, // (Offset,Value)-Pair #8 { 0x1A, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DTexture8_GetSurfaceLevel2+0x1B : lea eax, [esp+0x18] + // D3DTexture_GetSurfaceLevel2+0x1B : lea eax, [esp+0x18] { 0x1B, 0x8D }, // (Offset,Value)-Pair #10 { 0x1E, 0x18 }, // (Offset,Value)-Pair #11 - // IDirect3DTexture8_GetSurfaceLevel2+0x29 : call [abs] + // D3DTexture_GetSurfaceLevel2+0x29 : call [abs] { 0x29, 0xE8 }, // (Offset,Value)-Pair #12 - // IDirect3DTexture8_GetSurfaceLevel2+0x47 : retn 0x08 + // D3DTexture_GetSurfaceLevel2+0x47 : retn 0x08 { 0x47, 0xC2 }, // (Offset,Value)-Pair #13 { 0x48, 0x08 }, // (Offset,Value)-Pair #14 OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_GetSurfaceLevel2B +// * D3DTexture_GetSurfaceLevel2B // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_GetSurfaceLevel2B_1_0_4627, 14) +OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel2B_1_0_4627, 14) - // IDirect3DTexture8_GetSurfaceLevel2B+0x00 : sub esp, 0x0C + // D3DTexture_GetSurfaceLevel2B+0x00 : sub esp, 0x0C { 0x00, 0x83 }, // (Offset,Value)-Pair #1 { 0x01, 0xEC }, // (Offset,Value)-Pair #2 { 0x02, 0x0C }, // (Offset,Value)-Pair #3 - // IDirect3DTexture8_GetSurfaceLevel2B+0x04 : mov esi, [esp+0x14] + // D3DTexture_GetSurfaceLevel2B+0x04 : mov esi, [esp+0x14] { 0x04, 0x8B }, // (Offset,Value)-Pair #4 { 0x07, 0x14 }, // (Offset,Value)-Pair #5 - // IDirect3DTexture8_GetSurfaceLevel2B+0x08 : lea eax, [esp+0x14] + // D3DTexture_GetSurfaceLevel2B+0x08 : lea eax, [esp+0x14] { 0x08, 0x8D }, // (Offset,Value)-Pair #6 { 0x0B, 0x18 }, // (Offset,Value)-Pair #7 - // IDirect3DTexture8_GetSurfaceLevel2B+0x17 : mov edx, [esp+0x24] + // D3DTexture_GetSurfaceLevel2B+0x17 : mov edx, [esp+0x24] { 0x17, 0x8B }, // (Offset,Value)-Pair #8 { 0x1A, 0x24 }, // (Offset,Value)-Pair #9 - // IDirect3DTexture8_GetSurfaceLevel2B+0x1B : lea eax, [esp+0x18] + // D3DTexture_GetSurfaceLevel2B+0x1B : lea eax, [esp+0x18] { 0x1B, 0x8D }, // (Offset,Value)-Pair #10 { 0x1E, 0x18 }, // (Offset,Value)-Pair #11 - // IDirect3DTexture8_GetSurfaceLevel2B+0x29 : call [abs] + // D3DTexture_GetSurfaceLevel2B+0x29 : call [abs] { 0x29, 0xE8 }, // (Offset,Value)-Pair #12 - // IDirect3DTexture8_GetSurfaceLevel2B+0x47 : retn 0x08 + // D3DTexture_GetSurfaceLevel2B+0x47 : retn 0x08 { 0x45, 0xC2 }, // (Offset,Value)-Pair #13 { 0x46, 0x08 }, // (Offset,Value)-Pair #14 OOVPA_END; @@ -2091,9 +2091,9 @@ OOVPA_NO_XREF(X_D3DDevice_RunVertexStateShader_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EndPush +// * D3DDevice_EndPush // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_EndPush_1_0_4627, 12, +OOVPA_XREF(D3DDevice_EndPush_1_0_4627, 12, XRefNoSaveIndex, XRefOne) @@ -2230,26 +2230,26 @@ OOVPA_NO_XREF(X_D3DDevice_GetStreamSource2_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderB +// * D3DDevice_SetVertexShaderB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderB_1_0_4627, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderB_1_0_4627, 14) - // IDirect3DDevice8_SetVertexShaderB+0x06 : test bl, 1 + // D3DDevice_SetVertexShaderB+0x06 : test bl, 1 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderB+0x11 : mov eax, [esi+0x0380] + // D3DDevice_SetVertexShaderB+0x11 : mov eax, [esi+0x0380] { 0x11, 0x8B }, // (Offset,Value)-Pair #4 { 0x12, 0x86 }, // (Offset,Value)-Pair #5 { 0x13, 0x80 }, // (Offset,Value)-Pair #6 { 0x14, 0x03 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShaderB+0x95 : retn 0x04 + // D3DDevice_SetVertexShaderB+0x95 : retn 0x04 { 0x95, 0xC2 }, // (Offset,Value)-Pair #8 { 0x96, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderB+0xC2 : mov dword ptr [eax], 0x4194C + // D3DDevice_SetVertexShaderB+0xC2 : mov dword ptr [eax], 0x4194C { 0xC2, 0xC7 }, // (Offset,Value)-Pair #10 { 0xC3, 0x00 }, // (Offset,Value)-Pair #11 { 0xC4, 0x4C }, // (Offset,Value)-Pair #12 @@ -2273,31 +2273,31 @@ OOVPA_NO_XREF(X_D3DDevice_Release_1_0_4627, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LineWidth +// * D3DDevice_SetRenderState_LineWidth // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LineWidth_1_0_4627, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_4627, 8) - // IDirect3DDevice8_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0xXXXX] + // D3DDevice_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0xXXXX] { 0x15, 0xD8 }, // (Offset,Value)-Pair #1 { 0x16, 0x8E }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF { 0x32, 0x81 }, // (Offset,Value)-Pair #5 { 0x33, 0xFF }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF { 0x3A, 0xBF }, // (Offset,Value)-Pair #7 { 0x3B, 0xFF }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_LineWidth+0x62 : retn 0x04 + // D3DDevice_SetRenderState_LineWidth+0x62 : retn 0x04 { 0x62, 0xC2 }, // (Offset,Value)-Pair #9 { 0x63, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetBackBufferScale +// * D3DDevice_SetBackBufferScale // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_4627, 6) +OOVPA_NO_XREF(D3DDevice_SetBackBufferScale_1_0_4627, 6) { 0x1E, 0x24 }, { 0x3E, 0x06 }, @@ -2309,9 +2309,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_4627, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Reset +// * D3DDevice_Reset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Reset_1_0_4627, 18) +OOVPA_NO_XREF(D3DDevice_Reset_1_0_4627, 18) { 0x00, 0x8B }, { 0x01, 0x81 }, @@ -2334,9 +2334,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_Reset_1_0_4627, 18) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShaderProgram +// * D3DDevice_SetPixelShaderProgram // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShaderProgram_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShaderProgram_1_0_4627, 10) { 0x00, 0x8B }, { 0x01, 0x54 }, @@ -2351,9 +2351,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShaderProgram_1_0_4627, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayFieldStatus +// * D3DDevice_GetDisplayFieldStatus // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayFieldStatus_1_0_4627, 7) +OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus_1_0_4627, 7) { 0x0B, 0x8B }, { 0x0C, 0x4C }, @@ -2365,9 +2365,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayFieldStatus_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateStateBlock +// * D3DDevice_CreateStateBlock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateStateBlock_1_0_4627, 11) +OOVPA_NO_XREF(D3DDevice_CreateStateBlock_1_0_4627, 11) { 0x0C, 0x57 }, { 0x1C, 0xF3 }, @@ -2383,9 +2383,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateStateBlock_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_InsertCallback +// * D3DDevice_InsertCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_InsertCallback_1_0_4627, 7) +OOVPA_NO_XREF(D3DDevice_InsertCallback_1_0_4627, 7) { 0x0D, 0x0E }, { 0x1C, 0x8B }, @@ -2397,9 +2397,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_InsertCallback_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawRectPatch +// * D3DDevice_DrawRectPatch // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawRectPatch_1_0_4627, 8) +OOVPA_NO_XREF(D3DDevice_DrawRectPatch_1_0_4627, 8) { 0x1E, 0x6C }, { 0x3E, 0x3C }, @@ -2412,9 +2412,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawRectPatch_1_0_4627, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetProjectionViewportMatrix +// * D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetProjectionViewportMatrix_1_0_4627, 7) +OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix_1_0_4627, 7) { 0x02, 0x35 }, { 0x07, 0x57 }, @@ -2426,27 +2426,27 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetProjectionViewportMatrix_1_0_4627, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** /* blueshogun96 8/7/08 for MGS2 :)*/ -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_4721, 10) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_4721, 10) - // IDirect3DDevice8_SetPixelShader+0x26 : or ecx, 0x4800 + // D3DDevice_SetPixelShader+0x26 : or ecx, 0x4800 { 0x26, 0x81 }, // (Offset,Value)-Pair #1 { 0x27, 0xC9 }, // (Offset,Value)-Pair #2 { 0x28, 0x00 }, // (Offset,Value)-Pair #3 { 0x29, 0x48 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetPixelShader+0x3E : or eax, 0x2000 + // D3DDevice_SetPixelShader+0x3E : or eax, 0x2000 { 0x3E, 0x0D }, // (Offset,Value)-Pair #5 { 0x40, 0x20 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetPixelShader+0x7D : retn 0x04 + // D3DDevice_SetPixelShader+0x7D : retn 0x04 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #7 { 0x7E, 0x04 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetPixelShader+0xDE : rep movsd + // D3DDevice_SetPixelShader+0xDE : rep movsd { 0xF4, 0xF3 }, // (Offset,Value)-Pair #9 { 0xF5, 0xA5 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2630,23 +2630,23 @@ OOVPA_NO_XREF(D3D_CDevice_SetStateUP_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVerticesUP +// * D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4627, 10) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP_1_0_4627, 10) - // IDirect3DDevice8_DrawIndexedVerticesUP+0x4A : or edx, 0x800 + // D3DDevice_DrawIndexedVerticesUP+0x4A : or edx, 0x800 { 0x4A, 0x81 }, // (Offset,Value)-Pair #1 { 0x4B, 0xCA }, // (Offset,Value)-Pair #2 { 0x4C, 0x00 }, // (Offset,Value)-Pair #3 { 0x4D, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0x784] + // D3DDevice_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0x784] { 0x5C, 0x8D }, // (Offset,Value)-Pair #5 { 0x5D, 0x97 }, // (Offset,Value)-Pair #6 { 0x5E, 0x84 }, // (Offset,Value)-Pair #7 { 0x5F, 0x07 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 + // D3DDevice_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 { 0x6A, 0xB8 }, // (Offset,Value)-Pair #9 { 0x6B, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -2705,28 +2705,28 @@ OOVPA_NO_XREF(D3DDevice_PersistDisplay_1_0_4928, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetSwapCallback +// * D3DDevice_SetSwapCallback // ****************************************************************** /* See the comment for the 4134 OOVPA signature for previous notes */ -OOVPA_NO_XREF(IDirect3DDevice8_SetSwapCallback_1_0_4928, 12) +OOVPA_NO_XREF(D3DDevice_SetSwapCallback_1_0_4928, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x254C], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x254C], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x4C }, // (Offset,Value)-Pair #9 { 0x0D, 0x25 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -2892,7 +2892,7 @@ OOVPA_NO_XREF(Lock3DSurface_1_0_4627, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateImageSurface +// * D3DDevice_CreateImageSurface // ****************************************************************** OOVPA_NO_XREF(D3DDevice_CreateImageSurface_1_0_4627, 9) @@ -3127,432 +3127,432 @@ OOVPA_END; OOVPATable D3D8_1_0_4627[] = { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_4627, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_4627, D3D_CreateDevice), // IDirect3D8::CreateDeviceX - OOVPA_TABLE_PATCH(IDirect3D8_CreateDeviceX_1_0_4627, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDeviceX_1_0_4627, D3D_CreateDevice), // IDirect3D8::CheckDeviceFormat (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceFormat_1_0_4361, XTL::EmuIDirect3D8_CheckDeviceFormat), + OOVPA_TABLE_PATCH(D3D_CheckDeviceFormat_1_0_4361, D3D_CheckDeviceFormat), // IDirect3DDevice8::BeginVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_4627, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_4627, D3DDevice_BeginVisibilityTest), // 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::EndVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_4627, XTL::EmuIDirect3DDevice8_EndVisibilityTest), + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_4627, D3DDevice_EndVisibilityTest), // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_3925, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_3925, D3DDevice_GetVisibilityTestResult), // IDirect3D8::KickOffAndWaitForIdle - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_4627, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_4627, D3D_KickOffAndWaitForIdle), // IDirect3D8::KickOffAndWaitForIdle2 - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle2_1_0_4627, XTL::EmuIDirect3D8_KickOffAndWaitForIdle2), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle2_1_0_4627, D3D_KickOffAndWaitForIdle2), // IDirect3DDevice8::BeginPush - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginPush_1_0_4627, XTL::EmuIDirect3DDevice8_BeginPush), + OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_4627, D3DDevice_BeginPush), // IDirect3DDevice8::EndPush - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndPush_1_0_4627, XTL::EmuIDirect3DDevice8_EndPush), + OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4627, D3DDevice_EndPush), // IDirect3DDevice8::CopyRects - OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_4627, XTL::EmuIDirect3DDevice8_CopyRects), + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_4627, D3DDevice_CopyRects), // 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), // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_4627, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_4627, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::GetBackBuffer2B - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2B_1_0_4627, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2B_1_0_4627, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_4627, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_4627, D3DDevice_SetViewport), // D3D::CommonSetRenderTarget (XREF) OOVPA_TABLE_XREF(D3D_CommonSetRenderTarget_1_0_4627), // D3D::CommonSetRenderTargetB (XREF) OOVPA_TABLE_XREF(D3D_CommonSetRenderTargetB_1_0_4627), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_4627, D3DDevice_SetRenderTarget), // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_4627, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_4627, D3DDevice_AddRef), // IDirect3DDevice8::SetGammaRamp - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4928, XTL::EmuIDirect3DDevice8_SetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4928, D3DDevice_SetGammaRamp), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_4627, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_4627, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::GetRenderTarget2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget2_1_0_4627, XTL::EmuIDirect3DDevice8_GetRenderTarget2), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget2_1_0_4627, D3DDevice_GetRenderTarget2), // IDirect3DDevice8::GetRenderTarget2B - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget2B_1_0_4627, XTL::EmuIDirect3DDevice8_GetRenderTarget2), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget2B_1_0_4627, D3DDevice_GetRenderTarget2), // IDirect3DDevice8::GetDepthStencilSurface2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2_1_0_4627, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2_1_0_4627, D3DDevice_GetDepthStencilSurface2), // IDirect3DDevice8::GetDepthStencilSurface2B - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2B_1_0_4627, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2B_1_0_4627, D3DDevice_GetDepthStencilSurface2), // IDirect3DDevice8::GetTile - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTile_1_0_4627, XTL::EmuIDirect3DDevice8_GetTile), + OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_4627, D3DDevice_GetTile), // IDirect3DDevice8::SetTileNoWait - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTileNoWait_1_0_4627, XTL::EmuIDirect3DDevice8_SetTileNoWait), + OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_4627, D3DDevice_SetTileNoWait), // IDirect3DDevice8::CreateIndexBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer2_1_0_4627, XTL::EmuIDirect3DDevice8_CreateIndexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_4627, D3DDevice_CreateIndexBuffer2), // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetPixelShaderConstant (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderConstant_1_0_4134, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_4134, D3DDevice_SetPixelShaderConstant), // IDirect3DDevice8::SetVertexShaderConstant1 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_4627, D3DDevice_SetVertexShaderConstant1), // IDirect3DDevice8::SetVertexShaderConstant4 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4), // IDirect3DDevice8::SetVertexShaderConstantNotInline - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstantNotInline_1_0_4627, D3DDevice_SetVertexShaderConstantNotInline), // IDirect3DDevice8::DeletePixelShader (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DeletePixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_4134, D3DDevice_DeletePixelShader), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_4627, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_4627, D3DDevice_SetPixelShader), // IDirect3DDevice8::CreateTexture2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2_1_0_4627, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2_1_0_4627, D3DDevice_CreateTexture2), // IDirect3DDevice8::CreateTexture2B - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2B_1_0_4627, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2B_1_0_4627, D3DDevice_CreateTexture2), // IDirect3DDevice8::CreateTexture2C - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2C_1_0_4627, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2C_1_0_4627, D3DDevice_CreateTexture2), // IDirect3DDevice8::SetIndices (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_4361, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_4361, D3DDevice_SetIndices), // IDirect3DDevice8::SetIndicesB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndicesB_1_0_4627, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndicesB_1_0_4627, D3DDevice_SetIndices), // IDirect3DDevice8::SetTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_4361, D3DDevice_SetTexture), // IDirect3DDevice8::SetTextureB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureB_1_0_4627, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureB_1_0_4627, D3DDevice_SetTexture), // IDirect3DDevice8::SetTextureC - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureC_1_0_4928, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureC_1_0_4928, D3DDevice_SetTexture), // IDirect3DDevice8::GetDisplayMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4627, XTL::EmuIDirect3DDevice8_GetDisplayMode), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4627, D3DDevice_GetDisplayMode), // IDirect3DDevice8::RunPushBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_RunPushBuffer_1_0_4627, XTL::EmuIDirect3DDevice8_RunPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_4627, D3DDevice_RunPushBuffer), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_4627, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_4627, D3DDevice_Begin), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4627, D3DDevice_SetVertexData2f), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4627, D3DDevice_SetVertexData4f), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_4627, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_4627, D3DDevice_End), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_4627, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_4627, D3DDevice_Clear), // IDirect3DDevice8::ClearB - OOVPA_TABLE_PATCH(IDirect3DDevice8_ClearB_1_0_4627, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_ClearB_1_0_4627, D3DDevice_Clear), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_4627, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_4627, D3DDevice_Swap), // 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), // IDirect3DDevice8::CreateVertexBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_4627, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_4627, D3DDevice_CreateVertexBuffer2), // IDirect3DDevice8::UpdateOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_UpdateOverlay_1_0_4627, XTL::EmuIDirect3DDevice8_UpdateOverlay), + OOVPA_TABLE_PATCH(D3DDevice_UpdateOverlay_1_0_4627, D3DDevice_UpdateOverlay), // IDirect3DDevice8::GetOverlayUpdateStatus - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_4627, XTL::EmuIDirect3DDevice8_GetOverlayUpdateStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetOverlayUpdateStatus_1_0_4627, D3DDevice_GetOverlayUpdateStatus), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_4627, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_4627, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_4627, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_4627, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_4627, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_4627, D3DDevice_GetViewport), // IDirect3DDevice8::SetTextureState_TexCoordIndex - 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::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::SetRenderState_VertexBlend (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4361, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_CullModeB (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullModeB_1_0_4134, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_4034, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_4034, D3DDevice_SetRenderState_CullMode), // 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_NormalizeNormalsB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormalsB_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormalsB_1_0_4627, D3DDevice_SetRenderState_NormalizeNormals), // IDirect3DDevice8::SetRenderState_TextureFactor (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_4361, D3DDevice_SetRenderState_TextureFactor), // 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_EdgeAntiAliasB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAliasB_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAliasB_1_0_4627, 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_BackFillMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // 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_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_4627, D3DDevice_SetRenderState_Dxt1NoiseEnable), // 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 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_4627, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_ZEnableB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnableB_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnableB_1_0_4627, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_StencilEnable (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_StencilEnableB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnableB_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnableB_1_0_4627, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_LineWidth - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LineWidth_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4627, D3DDevice_SetRenderState_LineWidth), // 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 - 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_MultiSampleAntiAliasB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAliasB_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAliasB_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::SwitchTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // 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::SetTransform (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4134, D3DDevice_SetTransform), // 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), // D3DDevice_GetStreamSource2 - OOVPA_TABLE_PATCH(X_D3DDevice_GetStreamSource2_1_0_4627, XTL::EmuIDirect3DDevice8_GetStreamSource2), + OOVPA_TABLE_PATCH(X_D3DDevice_GetStreamSource2_1_0_4627, D3DDevice_GetStreamSource2), // 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), // IDirect3DDevice8::SetVertexShader (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_4361, D3DDevice_SetVertexShader), // IDirect3DDevice8::SetVertexShaderB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderB_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderB_1_0_4627, D3DDevice_SetVertexShader), // IDirect3DDevice8::DrawVertices (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_4361, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_4361, D3DDevice_DrawVertices), // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_4627, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_4627, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::DrawVerticesUPB - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUPB_1_0_4627, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUPB_1_0_4627, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::SetLight (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_4361, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_4361, D3DDevice_SetLight), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_4627, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_4627, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4627, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4627, D3DDevice_SetMaterial), // IDirect3DDevice8::LightEnable (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_4361, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_4361, D3DDevice_LightEnable), // IDirect3DVertexBuffer8::Lock2 - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_4627, XTL::EmuIDirect3DVertexBuffer8_Lock2), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_4627, D3DVertexBuffer_Lock2), // IDirect3DVertexBuffer8::Lock2B - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2B_1_0_4627, XTL::EmuIDirect3DVertexBuffer8_Lock2), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2B_1_0_4627, D3DVertexBuffer_Lock2), // 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::ReleaseB - OOVPA_TABLE_PATCH(IDirect3DResource8_ReleaseB_1_0_4627, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_ReleaseB_1_0_4627, D3DResource_Release), // IDirect3DResource8::IsBusy (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_4361, XTL::EmuIDirect3DResource8_IsBusy), /* I forget why I had this in here... + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_4361, D3DResource_IsBusy), /* I forget why I had this in here... // IDirect3DResource8::GetType - OOVPA_TABLE_PATCH(IDirect3DResource8_GetType_1_0_4627, XTL::EmuIDirect3DResource8_GetType),*/ + OOVPA_TABLE_PATCH(D3DResource_GetType_1_0_4627, D3DResource_GetType),*/ // Get2DSurfaceDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4627, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_4627, Get2DSurfaceDesc), // Get2DSurfaceDescB OOVPA_TABLE_XREF(Get2DSurfaceDescB_1_0_4627), // Get2DSurfaceDescC - OOVPA_TABLE_PATCH(Get2DSurfaceDescC_1_0_4627, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDescC_1_0_4627, Get2DSurfaceDesc), // Get2DSurfaceDescD - OOVPA_TABLE_PATCH(Get2DSurfaceDescD_1_0_4627, XTL::EmuGet2DSurfaceDescD), + OOVPA_TABLE_PATCH(Get2DSurfaceDescD_1_0_4627, Get2DSurfaceDescD), // 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), // 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), // IDirect3DSurface8::LockRectB - OOVPA_TABLE_PATCH(IDirect3DSurface8_LockRectB_1_0_4627, XTL::EmuIDirect3DSurface8_LockRect), + OOVPA_TABLE_PATCH(D3DSurface_LockRectB_1_0_4627, 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 - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel2_1_0_4627, XTL::EmuIDirect3DTexture8_GetSurfaceLevel2), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel2_1_0_4627, D3DTexture_GetSurfaceLevel2), // IDirect3DTexture8::GetSurfaceLevel2B - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel2B_1_0_4627, XTL::EmuIDirect3DTexture8_GetSurfaceLevel2), + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel2B_1_0_4627, D3DTexture_GetSurfaceLevel2), // IDirect3DTexture8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_3925, D3DTexture_LockRect), // IDirect3DVolumeTexture8::LockBox - OOVPA_TABLE_PATCH(IDirect3DVolumeTexture8_LockBox_1_0_4627, XTL::EmuIDirect3DVolumeTexture8_LockBox), + OOVPA_TABLE_PATCH(D3DVolumeTexture_LockBox_1_0_4627, D3DVolumeTexture_LockBox), // X_D3DDevice_GetViewportOffsetAndScale - OOVPA_TABLE_PATCH(X_D3DDevice_GetViewportOffsetAndScale_1_0_4627, XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale), + OOVPA_TABLE_PATCH(X_D3DDevice_GetViewportOffsetAndScale_1_0_4627, D3DDevice_GetViewportOffsetAndScale), // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), // D3DDevice_SelectVertexShaderDirect - OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShaderDirect_1_0_4627, XTL::EmuIDirect3DDevice8_SelectVertexShaderDirect), + OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShaderDirect_1_0_4627, D3DDevice_SelectVertexShaderDirect), // D3DDevice_GetShaderConstantMode - OOVPA_TABLE_PATCH(X_D3DDevice_GetShaderConstantMode_1_0_4627, XTL::EmuIDirect3DDevice8_GetShaderConstantMode), + OOVPA_TABLE_PATCH(X_D3DDevice_GetShaderConstantMode_1_0_4627, D3DDevice_GetShaderConstantMode), // D3DDevice_GetVertexShader - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShader_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShader_1_0_4627, D3DDevice_GetVertexShader), // D3DDevice_GetVertexShaderConstant - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderConstant_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShaderConstant), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderConstant_1_0_4627, D3DDevice_GetVertexShaderConstant), // D3DDevice_SetVertexShaderInputDirect - OOVPA_TABLE_PATCH(X_D3DDevice_SetVertexShaderInputDirect_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderInputDirect), + OOVPA_TABLE_PATCH(X_D3DDevice_SetVertexShaderInputDirect_1_0_4627, D3DDevice_SetVertexShaderInputDirect), // D3DDevice_GetVertexShaderInput - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderInput_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShaderInput), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderInput_1_0_4627, D3DDevice_GetVertexShaderInput), // D3DDevice_RunVertexStateShader - OOVPA_TABLE_PATCH(X_D3DDevice_RunVertexStateShader_1_0_4627, XTL::EmuIDirect3DDevice8_RunVertexStateShader), + OOVPA_TABLE_PATCH(X_D3DDevice_RunVertexStateShader_1_0_4627, D3DDevice_RunVertexStateShader), // D3DDevice_LoadVertexShader - OOVPA_TABLE_PATCH(X_D3DDevice_LoadVertexShader_1_0_4627, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_LoadVertexShader_1_0_4627, D3DDevice_LoadVertexShader), // D3DDevice_LoadVertexShaderProgram - OOVPA_TABLE_PATCH(X_D3DDevice_LoadVertexShaderProgram_1_0_4627, XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram), + OOVPA_TABLE_PATCH(X_D3DDevice_LoadVertexShaderProgram_1_0_4627, D3DDevice_LoadVertexShaderProgram), // D3DDevice_SelectVertexShader - OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShader_1_0_4627, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShader_1_0_4627, D3DDevice_SelectVertexShader), // 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::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_GetVertexShaderType - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderType_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShaderType), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderType_1_0_4627, D3DDevice_GetVertexShaderType), // D3DDevice_GetVertexShaderDeclaration - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderDeclaration_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShaderDeclaration), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderDeclaration_1_0_4627, D3DDevice_GetVertexShaderDeclaration), // D3DDevice_GetVertexShaderFunction - OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderFunction_1_0_4627, XTL::EmuIDirect3DDevice8_GetVertexShaderFunction), + OOVPA_TABLE_PATCH(X_D3DDevice_GetVertexShaderFunction_1_0_4627, D3DDevice_GetVertexShaderFunction), // D3DDevice_SetVertexShaderInput - OOVPA_TABLE_PATCH(X_D3DDevice_SetVertexShaderInput_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderInput), + OOVPA_TABLE_PATCH(X_D3DDevice_SetVertexShaderInput_1_0_4627, D3DDevice_SetVertexShaderInput), // D3DDevice_Release - OOVPA_TABLE_PATCH(X_D3DDevice_Release_1_0_4627, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(X_D3DDevice_Release_1_0_4627, D3DDevice_Release), // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_4721, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_4721, D3DDevice_SetPixelShader), // 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), // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_4627, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_4627, D3DDevice_SetScissors), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_4627, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_4627, D3DDevice_SetPalette), // IDirect3DDevice8::SetBackBufferScale - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetBackBufferScale_1_0_4627, XTL::EmuIDirect3DDevice8_SetBackBufferScale), + OOVPA_TABLE_PATCH(D3DDevice_SetBackBufferScale_1_0_4627, D3DDevice_SetBackBufferScale), // IDirect3DDevice8::Reset - OOVPA_TABLE_PATCH(IDirect3DDevice8_Reset_1_0_4627, XTL::EmuIDirect3DDevice8_Reset), - // IDirect3DDevice8_SetPixelShaderProgram - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderProgram_1_0_4627, XTL::EmuIDirect3DDevice8_SetPixelShaderProgram), - // IDirect3DDevice8_GetDisplayFieldStatus - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayFieldStatus_1_0_4627, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus), - // IDirect3DDevice8_SetScreenSpaceOffset (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_4134, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), - // IDirect3DDevice8_CreateStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_CreateStateBlock), - // IDirect3DDevice8_InsertCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_InsertCallback_1_0_4627, XTL::EmuIDirect3DDevice8_InsertCallback), - // IDirect3DDevice8_DrawRectPatch - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawRectPatch_1_0_4627, XTL::EmuIDirect3DDevice8_DrawRectPatch), - // IDirect3DDevice8_GetProjectionViewportMatrix - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetProjectionViewportMatrix_1_0_4627, XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix), - // IDirect3DDevice8_BackFillMode (* unchanged since 4531 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4531, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_4627, D3DDevice_Reset), + // D3DDevice_SetPixelShaderProgram + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_4627, D3DDevice_SetPixelShaderProgram), + // D3DDevice_GetDisplayFieldStatus + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_4627, D3DDevice_GetDisplayFieldStatus), + // D3DDevice_SetScreenSpaceOffset (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_4134, D3DDevice_SetScreenSpaceOffset), + // D3DDevice_CreateStateBlock + OOVPA_TABLE_PATCH(D3DDevice_CreateStateBlock_1_0_4627, D3DDevice_CreateStateBlock), + // D3DDevice_InsertCallback + OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_4627, D3DDevice_InsertCallback), + // D3DDevice_DrawRectPatch + OOVPA_TABLE_PATCH(D3DDevice_DrawRectPatch_1_0_4627, D3DDevice_DrawRectPatch), + // D3DDevice_GetProjectionViewportMatrix + OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_4627, D3DDevice_GetProjectionViewportMatrix), + // D3DDevice_BackFillMode (* unchanged since 4531 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4531, D3DDevice_SetRenderState_BackFillMode), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // D3DDevice_SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_4627, D3DDevice_SetRenderState_MultiSampleMask), // D3DDevice_SetRenderState_LogicOp - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4627, D3DDevice_SetRenderState_LogicOp), // D3D::SetFence (XREF) (* unchanged since 4134 *) OOVPA_TABLE_XREF(D3D_SetFence_1_0_4134), // IDirect3DDevice8::InsertFence - OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_4627, XTL::EmuIDirect3DDevice8_InsertFence), + OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_4627, D3DDevice_InsertFence), // D3D::CDevice::KickOff - OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_4627, XTL::EmuD3DDevice_KickOff), + OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_4627, D3DDevice_KickOff), // IDirect3DDevice8::SetPixelShaderConstant - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShaderConstant_1_0_4928, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_4928, D3DDevice_SetPixelShaderConstant), // IDirect3DDevice8::SetRenderState_TwoSidedLighting (* unchanged since 4134 *) // Beware of the typo... - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, D3DDevice_SetTextureState_TwoSidedLighting), // D3DDevice_GetTexture2 - OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_4627, XTL::EmuIDirect3DDevice8_GetTexture2), + OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_4627, D3DDevice_GetTexture2), // D3D::CDevice::SetStateVB /* - OOVPA_TABLE_PATCH(D3D_CDevice_SetStateVB_1_0_4627, XTL::EmuD3DDevice_SetStateVB), + OOVPA_TABLE_PATCH(D3D_CDevice_SetStateVB_1_0_4627, D3DDevice_SetStateVB), */ // D3D::CDevice::SetStateUP /* - OOVPA_TABLE_PATCH(D3D_CDevice_SetStateUP_1_0_4627, XTL::EmuD3DDevice_SetStateUP), + OOVPA_TABLE_PATCH(D3D_CDevice_SetStateUP_1_0_4627, D3DDevice_SetStateUP), */ // IDirect3DDevice8::DrawIndexedVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_4627, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_4627, D3DDevice_DrawIndexedVerticesUP), // IDirect3DDevice8::SetStipple - OOVPA_TABLE_PATCH(D3DDevice_SetStipple_1_0_4627, XTL::EmuIDirect3DDevice8_SetStipple), + OOVPA_TABLE_PATCH(D3DDevice_SetStipple_1_0_4627, D3DDevice_SetStipple), // 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), // D3DDevice_PersistDisplay - OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_4627, XTL::EmuIDirect3DDevice8_PersistDisplay), + OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_4627, D3DDevice_PersistDisplay), // D3DDevice_PersistDisplay - OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_4928, XTL::EmuIDirect3DDevice8_PersistDisplay), + OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_4928, D3DDevice_PersistDisplay), // IDirect3DDevice8::SetSwapCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSwapCallback_1_0_4928, XTL::EmuIDirect3DDevice8_SetSwapCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_4928, D3DDevice_SetSwapCallback), // 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::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_4627, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_4627, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // 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::BeginStateBlock - OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_BeginStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_4627, D3DDevice_BeginStateBlock), // IDirect3DDevice8::EndStateBlock - OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_EndStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_4627, D3DDevice_EndStateBlock), // IDirect3DDevice8::ApplyStateBlock - 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_4627, XTL::EmuIDirect3DDevice8_CaptureStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_4627, D3DDevice_CaptureStateBlock), // IDirect3DDevice8::DeleteStateBlock - OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_DeleteStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_4627, D3DDevice_DeleteStateBlock), // IDirect3DDevice8::SetVertexData4ub (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4ub), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, D3DDevice_SetVertexData4ub), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, D3DDevice_SetVertexData4f), // D3D_BlockOnTime OOVPA_TABLE_XREF(D3D_BlockOnTime_1_0_4627), // D3DDevice_BlockOnFence - OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4627, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_4627, D3DDevice_BlockOnFence), // Lock3DSurface - OOVPA_TABLE_PATCH(Lock3DSurface_1_0_4627, XTL::EmuLock3DSurface), + OOVPA_TABLE_PATCH(Lock3DSurface_1_0_4627, Lock3DSurface), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), // IDirect3DDevice8::CreateImageSurface - OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_4627, XTL::EmuIDirect3DDevice8_CreateImageSurface), + OOVPA_TABLE_PATCH(D3DDevice_CreateImageSurface_1_0_4627, D3DDevice_CreateImageSurface), // IDirect3DCubeTexture8::GetCubeMapSurface2 - OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2), + OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, D3DCubeTexture_GetCubeMapSurface2), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_4627, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_4627, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_4627, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_4627, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::GetPixelShader - OOVPA_TABLE_PATCH(D3DDevice_GetPixelShader_1_0_4627, XTL::EmuIDirect3DDevice8_GetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_GetPixelShader_1_0_4627, D3DDevice_GetPixelShader), // IDirect3DDevice8::CreatePalette2 - OOVPA_TABLE_PATCH(D3DDevice_CreatePalette2_1_0_4627, XTL::EmuIDirect3DDevice8_CreatePalette2), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette2_1_0_4627, D3DDevice_CreatePalette2), // IDirect3DPalette8::Lock2 - OOVPA_TABLE_PATCH(D3DPalette_Lock2_1_0_4627, XTL::EmuIDirect3DPalette8_Lock2), + OOVPA_TABLE_PATCH(D3DPalette_Lock2_1_0_4627, D3DPalette_Lock2), // IDirect3DDevice8::BeginPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_4627, XTL::EmuIDirect3DDevice8_BeginPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_4627, D3DDevice_BeginPushBuffer), // IDirect3DDevice8::EndPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_4627, XTL::EmuIDirect3DDevice8_EndPushBuffer), + OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_4627, D3DDevice_EndPushBuffer), // D3DDevice_GetPersistedSurface2 - OOVPA_TABLE_PATCH(D3DDevice_GetPersistedSurface2_1_0_4627, XTL::EmuIDirect3DDevice8_GetPersistedSurface2), + OOVPA_TABLE_PATCH(D3DDevice_GetPersistedSurface2_1_0_4627, D3DDevice_GetPersistedSurface2), // D3DDevice_SetModelView - OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_4627, XTL::EmuIDirect3DDevice8_SetModelView), + OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_4627, D3DDevice_SetModelView), // D3D_LazySetPointParams_1_0_4627 - OOVPA_TABLE_PATCH(D3D_LazySetPointParams_1_0_4627, XTL::EmuD3D_LazySetPointParams), + OOVPA_TABLE_PATCH(D3D_LazySetPointParams_1_0_4627, D3D_LazySetPointParams), // D3DDevice_SetDepthClipPlanes - OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_4627, XTL::EmuIDirect3DDevice8_SetDepthClipPlanes), + OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_4627, D3DDevice_SetDepthClipPlanes), // IDirect3DDevice8::GetMaterial - OOVPA_TABLE_PATCH(D3DDevice_GetMaterial_1_0_4627, XTL::EmuIDirect3DDevice8_GetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_GetMaterial_1_0_4627, D3DDevice_GetMaterial), // IDirect3DDevice8::KickPushBuffer - OOVPA_TABLE_PATCH(D3DDevice_KickPushBuffer_1_0_4627, XTL::EmuD3DDevice_KickOff), + OOVPA_TABLE_PATCH(D3DDevice_KickPushBuffer_1_0_4627, D3DDevice_KickOff), // IDirect3DDevice8::GetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_4627, XTL::EmuIDirect3DDevice8_GetBackMaterial), + OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_4627, D3DDevice_GetBackMaterial), // IDirect3DDevice8::SetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_4627, XTL::EmuIDirect3DDevice8_SetBackMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_4627, D3DDevice_SetBackMaterial), // IDirect3DCubeTexture8::LockRect // TODO: This needs to be verified on 4361, not just 4242! /* - OOVPA_TABLE_PATCH(IDirect3DCubeTexture8_LockRect_1_0_3925, XTL::EmuIDirect3DCubeTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DCubeTexture_LockRect_1_0_3925, D3DCubeTexture_LockRect), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h index 99b6ed280..fe809ebf6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index 2576a50fb..26f76ccb2 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -33,31 +33,31 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_5233, 8) +OOVPA_NO_XREF(D3D_CreateDevice_1_0_5233, 8) - // IDirect3D8_CreateDevice+0x0A : jnz +0x0A + // D3D_CreateDevice+0x0A : jnz +0x0A { 0x0A, 0x75 }, // (Offset,Value)-Pair #1 { 0x0B, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x80 : repe stosd + // D3D_CreateDevice+0x80 : repe stosd { 0x80, 0xF3 }, // (Offset,Value)-Pair #3 { 0x81, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x83 : mov eax, esi + // D3D_CreateDevice+0x83 : mov eax, esi { 0x83, 0x8B }, // (Offset,Value)-Pair #5 { 0x84, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0x91 : retn 0x18 + // D3D_CreateDevice+0x91 : retn 0x18 { 0x91, 0xC2 }, // (Offset,Value)-Pair #7 { 0x92, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDisplayFieldStatus +// * D3DDevice_GetDisplayFieldStatus // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayFieldStatus_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus_1_0_5233, 7) { 0x06, 0x90 }, { 0x0E, 0x04 }, @@ -69,30 +69,30 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetDisplayFieldStatus_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_5233, 9) +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_5233, 9) - // IDirect3DDevice8_SetViewport+0x0A : mov eax, [esi+0x15B4] + // D3DDevice_SetViewport+0x0A : mov eax, [esi+0x15B4] { 0x0A, 0x8B }, // (Offset,Value)-Pair #1 { 0x0B, 0x86 }, // (Offset,Value)-Pair #2 { 0x0C, 0xB4 }, // (Offset,Value)-Pair #3 { 0x0D, 0x15 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetViewport+0x63 : shl edi, cl + // D3DDevice_SetViewport+0x63 : shl edi, cl { 0x63, 0xD3 }, // (Offset,Value)-Pair #5 { 0x64, 0xE7 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetViewport+0xDF : and ecx, 0x0F + // D3DDevice_SetViewport+0xDF : and ecx, 0x0F { 0xDF, 0x83 }, // (Offset,Value)-Pair #7 { 0xE0, 0xE1 }, // (Offset,Value)-Pair #8 { 0xE1, 0x0F }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LoadVertexShader +// * D3DDevice_LoadVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LoadVertexShader_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_LoadVertexShader_1_0_5233, 7) { 0x09, 0x45 }, { 0x14, 0x75 }, @@ -104,37 +104,37 @@ OOVPA_NO_XREF(IDirect3DDevice8_LoadVertexShader_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstantNotInline +// * D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstantNotInline_1_0_5233, 12) - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x26 : cmp eax, 0x10 + // D3DDevice_SetVertexShaderConstantNotInline+0x26 : cmp eax, 0x10 { 0x26, 0x83 }, // (Offset,Value)-Pair #1 { 0x27, 0xF8 }, // (Offset,Value)-Pair #2 { 0x28, 0x10 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x29 : jnb +0x1F + // D3DDevice_SetVertexShaderConstantNotInline+0x29 : jnb +0x1F { 0x29, 0x73 }, // (Offset,Value)-Pair #4 { 0x2A, 0x1F }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x33 : or eax, 0x0B80 + // D3DDevice_SetVertexShaderConstantNotInline+0x33 : or eax, 0x0B80 { 0x33, 0x0D }, // (Offset,Value)-Pair #6 { 0x34, 0x80 }, // (Offset,Value)-Pair #7 { 0x35, 0x0B }, // (Offset,Value)-Pair #8 { 0x36, 0x00 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x3B : rep movsd + // D3DDevice_SetVertexShaderConstantNotInline+0x3B : rep movsd { 0x3B, 0xF3 }, // (Offset,Value)-Pair #10 { 0x3C, 0xA5 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetVertexShaderConstantNotInline+0x43 : emms + // D3DDevice_SetVertexShaderConstantNotInline+0x43 : emms { 0x43, 0x0F }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_5233, 8) +OOVPA_NO_XREF_LARGE(D3DDevice_Clear_1_0_5233, 8) { 0x1D, 0x8A }, { 0x3C, 0x8B }, { 0x5B, 0x00 }, @@ -146,9 +146,9 @@ OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_5233, 7) { 0x1E, 0x75 }, { 0x3E, 0x0D }, @@ -160,59 +160,59 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2 +// * D3DDevice_CreateTexture2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_CreateTexture2_1_0_5233, 12) - // IDirect3DDevice8_CreateTexture2+0x04 : lea eax, [esp+0x20] + // D3DDevice_CreateTexture2+0x04 : lea eax, [esp+0x20] { 0x04, 0x8D }, // (Offset,Value)-Pair #1 { 0x07, 0x20 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreateTexture2+0x10 : setz dl + // D3DDevice_CreateTexture2+0x10 : setz dl { 0x10, 0x0F }, // (Offset,Value)-Pair #3 { 0x11, 0x94 }, // (Offset,Value)-Pair #4 { 0x12, 0xC2 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateTexture2+0x2E : push 0x00 + // D3DDevice_CreateTexture2+0x2E : push 0x00 { 0x2E, 0x6A }, // (Offset,Value)-Pair #6 { 0x2F, 0x00 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreateTexture2+0x57 : call [abs] + // D3DDevice_CreateTexture2+0x57 : call [abs] { 0x57, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateTexture2+0x7C : jnz +0x0D + // D3DDevice_CreateTexture2+0x7C : jnz +0x0D { 0x7C, 0x75 }, // (Offset,Value)-Pair #9 { 0x7D, 0x0D }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_CreateTexture2+0xB2 : retn 0x1C + // D3DDevice_CreateTexture2+0xB2 : retn 0x1C { 0xB2, 0xC2 }, // (Offset,Value)-Pair #11 { 0xB3, 0x1C }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_CullMode +// * D3DDevice_SetRenderState_CullMode // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_5233, 13, +OOVPA_XREF(D3DDevice_SetRenderState_CullMode_1_0_5233, 13, XREF_DXSRSCULLMODE, XRefZero) - // IDirect3DDevice8_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308 + // D3DDevice_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308 { 0x19, 0xC7 }, // (Offset,Value)-Pair #1 { 0x1B, 0x08 }, // (Offset,Value)-Pair #2 { 0x1C, 0x03 }, // (Offset,Value)-Pair #3 { 0x1D, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_CullMode+0x24 : add eax, 8 + // D3DDevice_SetRenderState_CullMode+0x24 : add eax, 8 { 0x24, 0x83 }, // (Offset,Value)-Pair #5 { 0x25, 0xC0 }, // (Offset,Value)-Pair #6 { 0x26, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_CullMode+0x30 : retn 4 + // D3DDevice_SetRenderState_CullMode+0x30 : retn 4 { 0x30, 0xC2 }, // (Offset,Value)-Pair #8 { 0x31, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_CullMode+0x53 : add edx, 0x404 + // D3DDevice_SetRenderState_CullMode+0x53 : add edx, 0x404 { 0x53, 0x81 }, // (Offset,Value)-Pair #10 { 0x54, 0xC2 }, // (Offset,Value)-Pair #11 { 0x55, 0x04 }, // (Offset,Value)-Pair #12 @@ -220,9 +220,9 @@ OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_5233, 13, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5233, 7) { 0x0F, 0xB4 }, { 0x10, 0x15 }, @@ -234,56 +234,56 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable +// * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_5344, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5344, 10) - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+0D : mov eax, [edi+XXXXh] + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0D : mov eax, [edi+XXXXh] { 0x0D, 0x8B }, { 0x0E, 0x87 }, - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+1D : and dl, 3Ch + // D3DDevice_SetRenderState_Dxt1NoiseEnable+1D : and dl, 3Ch { 0x1D, 0x80 }, { 0x1E, 0xE2 }, { 0x1F, 0x3C }, - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+20 : xor esi, esi + // D3DDevice_SetRenderState_Dxt1NoiseEnable+20 : xor esi, esi { 0x20, 0x33 }, { 0x21, 0xF6 }, - // IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable+22 : cmp dl, 20h + // D3DDevice_SetRenderState_Dxt1NoiseEnable+22 : cmp dl, 20h { 0x22, 0x80 }, { 0x23, 0xFA }, { 0x24, 0x20 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5233, 9) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_5233, 9) - // IDirect3DDevice8_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x036C] + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x036C] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x86 }, // (Offset,Value)-Pair #2 { 0x09, 0x6C }, // (Offset,Value)-Pair #3 { 0x0A, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x2F : nop + // D3DDevice_SetRenderState_TextureFactor+0x2F : nop { 0x2F, 0x90 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x41 : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x41 : retn 0x04 { 0x41, 0xC2 }, // (Offset,Value)-Pair #6 { 0x42, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_TextureFactor+0x4E : retn 0x04 + // D3DDevice_SetRenderState_TextureFactor+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #8 { 0x4F, 0x04 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_5233, 8) { 0x13, 0x8B }, { 0x22, 0xC9 }, @@ -296,9 +296,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_5233, 7) { 0x0F, 0x10 }, { 0x20, 0xC7 }, @@ -310,9 +310,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTexture +// * D3DDevice_SetTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetTexture_1_0_5233, 8) { 0x1E, 0x44 }, { 0x3E, 0xE8 }, @@ -325,9 +325,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureB +// * D3DDevice_SetTextureB // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureB_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetTextureB_1_0_5233, 8) { 0x1B, 0x89 }, { 0x2B, 0xF8 }, @@ -340,9 +340,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureB_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Begin +// * D3DDevice_Begin // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_Begin_1_0_5233, 7) { 0x07, 0xE8 }, { 0x0C, 0x8B }, @@ -354,9 +354,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_Begin_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_5233, 7) { 0x1B, 0xE8 }, { 0x38, 0xC3 }, @@ -368,9 +368,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_5233, 8) { 0x1E, 0x5E }, { 0x3E, 0x17 }, @@ -383,9 +383,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DPalette8_Lock2 +// * D3DPalette_Lock2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DPalette8_Lock2_1_0_5233, 7) +OOVPA_NO_XREF(D3DPalette_Lock2_1_0_5233, 7) { 0x02, 0x24 }, { 0x06, 0x8B }, @@ -397,9 +397,9 @@ OOVPA_NO_XREF(IDirect3DPalette8_Lock2_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_LockRect +// * D3DTexture_LockRect // ****************************************************************** -OOVPA_NO_XREF(IDirect3DTexture8_LockRect_1_0_5233, 7) +OOVPA_NO_XREF(D3DTexture_LockRect_1_0_5233, 7) { 0x03, 0x14 }, { 0x08, 0x8B }, @@ -455,48 +455,48 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_5344, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer2 +// * D3DDevice_GetBackBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_5233, 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_GetBackBuffer+0x0D : jnz +0x19 + // D3DDevice_GetBackBuffer+0x0D : jnz +0x19 { 0x0D, 0x75 }, // (Offset,Value)-Pair #4 { 0x0E, 0x19 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_GetBackBuffer+0x15 : mov esi, [ecx+eax*4+0x15C0] + // D3DDevice_GetBackBuffer+0x15 : mov esi, [ecx+eax*4+0x15C0] { 0x15, 0x8B }, // (Offset,Value)-Pair #6 { 0x16, 0xB4 }, // (Offset,Value)-Pair #7 { 0x17, 0x81 }, // (Offset,Value)-Pair #8 { 0x18, 0xC0 }, // (Offset,Value)-Pair #9 { 0x19, 0x15 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_GetBackBuffer+0x40 : retn 0x04 + // D3DDevice_GetBackBuffer+0x40 : retn 0x04 { 0x40, 0xC2 }, // (Offset,Value)-Pair #11 { 0x41, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_UpdateOverlay +// * D3DDevice_UpdateOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_5233, 11) +OOVPA_NO_XREF(D3DDevice_UpdateOverlay_1_0_5233, 11) - // IDirect3DDevice8_UpdateOverlay+0x13 : mov [eax+0x17BC], ecx + // D3DDevice_UpdateOverlay+0x13 : mov [eax+0x17BC], ecx { 0x13, 0x89 }, // (Offset,Value)-Pair #1 { 0x14, 0x88 }, // (Offset,Value)-Pair #2 { 0x15, 0xBC }, // (Offset,Value)-Pair #3 { 0x16, 0x17 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_UpdateOverlay+0x92 : and eax, 0xFFFFFFFE + // D3DDevice_UpdateOverlay+0x92 : and eax, 0xFFFFFFFE { 0x92, 0x83 }, // (Offset,Value)-Pair #5 { 0x93, 0xE0 }, // (Offset,Value)-Pair #6 { 0x94, 0xFE }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_UpdateOverlay+0xB0 : mov [esi+0x8930], eax + // D3DDevice_UpdateOverlay+0xB0 : mov [esi+0x8930], eax { 0xB0, 0x89 }, // (Offset,Value)-Pair #8 { 0xB1, 0x86 }, // (Offset,Value)-Pair #9 { 0xB2, 0x30 }, // (Offset,Value)-Pair #10 @@ -504,37 +504,37 @@ OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_5233, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetOverlayUpdateStatus +// * D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus_1_0_5233, 12) - // IDirect3DDevice8_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x1FB0] + // D3DDevice_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x1FB0] { 0x05, 0x8B }, // (Offset,Value)-Pair #1 { 0x06, 0x88 }, // (Offset,Value)-Pair #2 { 0x07, 0xB0 }, // (Offset,Value)-Pair #3 { 0x08, 0x1F }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x1988] + // D3DDevice_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x1988] { 0x0C, 0x8B }, // (Offset,Value)-Pair #5 { 0x0D, 0xB0 }, // (Offset,Value)-Pair #6 { 0x0E, 0x88 }, // (Offset,Value)-Pair #7 { 0x0F, 0x19 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x16 : setnz dl + // D3DDevice_GetOverlayUpdateStatus+0x16 : setnz dl { 0x16, 0x0F }, // (Offset,Value)-Pair #9 { 0x17, 0x95 }, // (Offset,Value)-Pair #10 { 0x18, 0xC2 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x1C : retn + // D3DDevice_GetOverlayUpdateStatus+0x1C : retn { 0x1C, 0xC3 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5233, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_5233, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -542,22 +542,22 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5233, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x195C + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x195C { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x5C }, // (Offset,Value)-Pair #8 { 0x19, 0x19 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetShaderConstantMode +// * D3DDevice_SetShaderConstantMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode_1_0_5233, 8) { 0x1D, 0xFD }, { 0x3C, 0x8B }, @@ -570,9 +570,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetRenderTarget2 +// * D3DDevice_GetRenderTarget2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget2_1_0_5233, 6) +OOVPA_NO_XREF(D3DDevice_GetRenderTarget2_1_0_5233, 6) { 0x05, 0x56 }, { 0x06, 0x8B }, @@ -583,9 +583,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetRenderTarget2_1_0_5233, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetDepthStencilSurface2 +// * D3DDevice_GetDepthStencilSurface2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2_1_0_5233, 7) { 0x05, 0x56 }, { 0x06, 0x8B }, @@ -597,9 +597,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3D8_GetDeviceCaps +// * D3D_GetDeviceCaps // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_GetDeviceCaps_1_0_5233, 7) +OOVPA_NO_XREF(D3D_GetDeviceCaps_1_0_5233, 7) { 0x04, 0x85 }, { 0x0A, 0x08 }, @@ -611,9 +611,9 @@ OOVPA_NO_XREF(IDirect3D8_GetDeviceCaps_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVertices +// * D3DDevice_DrawVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5233, 7) +OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_5233, 7) { 0x12, 0x8B }, { 0x26, 0x8B }, @@ -625,35 +625,35 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_5233, 12) - // IDirect3DDevice8_SetLight+0x11 : mov edi, [ebp+0x390] + // D3DDevice_SetLight+0x11 : mov edi, [ebp+0x390] { 0x11, 0x8B }, // (Offset,Value)-Pair #1 { 0x12, 0xBD }, // (Offset,Value)-Pair #2 { 0x13, 0x90 }, // (Offset,Value)-Pair #3 { 0x14, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetLight+0x30 : shl eax, 0x04 + // D3DDevice_SetLight+0x30 : shl eax, 0x04 { 0x30, 0xC1 }, // (Offset,Value)-Pair #5 { 0x31, 0xE0 }, // (Offset,Value)-Pair #6 { 0x32, 0x04 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetLight+0xBD : rep stosb + // D3DDevice_SetLight+0xBD : rep stosb { 0xBD, 0xF3 }, // (Offset,Value)-Pair #8 { 0xBE, 0xAB }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetLight+0xFD : mov ecx, [ebx+0x68] + // D3DDevice_SetLight+0xFD : mov ecx, [ebx+0x68] { 0xFD, 0x8B }, // (Offset,Value)-Pair #10 { 0xFE, 0x4B }, // (Offset,Value)-Pair #11 { 0xFF, 0x68 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5344, 8) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_5344, 8) { 0x1E, 0x00 }, { 0x3E, 0x89 }, @@ -666,38 +666,38 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5344, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5233, 13) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5233, 13) - // IDirect3DDevice8_LightEnable+0x0F : cmp ebx, [esi+0x0390] + // D3DDevice_LightEnable+0x0F : cmp ebx, [esi+0x0390] { 0x0F, 0x3B }, // (Offset,Value)-Pair #1 { 0x10, 0x9E }, // (Offset,Value)-Pair #2 { 0x11, 0x90 }, // (Offset,Value)-Pair #3 { 0x12, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_LightEnable+0x6B : test eax, eax + // D3DDevice_LightEnable+0x6B : test eax, eax { 0x6B, 0x85 }, // (Offset,Value)-Pair #5 { 0x6C, 0xC0 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_LightEnable+0x9E : mov eax, [eax+0x8C] + // D3DDevice_LightEnable+0x9E : mov eax, [eax+0x8C] { 0x9E, 0x8B }, // (Offset,Value)-Pair #7 { 0x9F, 0x80 }, // (Offset,Value)-Pair #8 { 0xA0, 0x8C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_LightEnable+0xBC : jz +0x12 + // D3DDevice_LightEnable+0xBC : jz +0x12 { 0xBC, 0x74 }, // (Offset,Value)-Pair #10 { 0xBD, 0x12 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_LightEnable+0xE1 : retn 0x08 + // D3DDevice_LightEnable+0xE1 : retn 0x08 { 0xE1, 0xC2 }, // (Offset,Value)-Pair #12 { 0xE2, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5344, 8) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5344, 8) { 0x1E, 0x8D }, { 0x3E, 0xC7 }, @@ -710,9 +710,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5344, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_GetDesc +// * D3DVertexBuffer_GetDesc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_GetDesc_1_0_5233, 7) +OOVPA_NO_XREF(D3DVertexBuffer_GetDesc_1_0_5233, 7) { 0x02, 0x24 }, { 0x06, 0x74 }, @@ -724,26 +724,26 @@ OOVPA_NO_XREF(IDirect3DVertexBuffer8_GetDesc_1_0_5233, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_5233, 14) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_5233, 14) - // IDirect3DDevice8_SetVertexShader+0x06 : test bl, 1 + // D3DDevice_SetVertexShader+0x06 : test bl, 1 { 0x06, 0xF6 }, // (Offset,Value)-Pair #1 { 0x07, 0xC3 }, // (Offset,Value)-Pair #2 { 0x08, 0x01 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShader+0x11 : mov eax, [esi+0x037C] + // D3DDevice_SetVertexShader+0x11 : mov eax, [esi+0x037C] { 0x11, 0x8B }, // (Offset,Value)-Pair #4 { 0x12, 0x86 }, // (Offset,Value)-Pair #5 { 0x13, 0x7C }, // (Offset,Value)-Pair #6 { 0x14, 0x03 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetVertexShader+0x90 : retn 0x04 + // D3DDevice_SetVertexShader+0x90 : retn 0x04 { 0x90, 0xC2 }, // (Offset,Value)-Pair #8 { 0x91, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C + // D3DDevice_SetVertexShader+0xB0 : mov dword ptr [eax], 0x4194C { 0xB0, 0xC7 }, // (Offset,Value)-Pair #10 { 0xB1, 0x00 }, // (Offset,Value)-Pair #11 { 0xB2, 0x4C }, // (Offset,Value)-Pair #12 @@ -752,21 +752,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_5233, 14) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTileNoWait +// * D3DDevice_SetTileNoWait // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTileNoWait_1_0_5233, 11) +OOVPA_NO_XREF(D3DDevice_SetTileNoWait_1_0_5233, 11) - // IDirect3DDevice8_SetTileNoWait+0x06 : sub esp, 0x18 + // D3DDevice_SetTileNoWait+0x06 : sub esp, 0x18 { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0xEC }, // (Offset,Value)-Pair #2 { 0x08, 0x18 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTileNoWait+0x15 : cmp [esi+4], eax + // D3DDevice_SetTileNoWait+0x15 : cmp [esi+4], eax { 0x15, 0x39 }, // (Offset,Value)-Pair #4 { 0x16, 0x46 }, // (Offset,Value)-Pair #5 { 0x17, 0x04 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x1660] + // D3DDevice_SetTileNoWait+0x3D : lea edi, [edx+ecx*8+0x1660] { 0x3D, 0x8D }, // (Offset,Value)-Pair #7 { 0x3E, 0xBC }, // (Offset,Value)-Pair #8 { 0x3F, 0xCA }, // (Offset,Value)-Pair #9 @@ -775,23 +775,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTileNoWait_1_0_5233, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_AddRef +// * D3DDevice_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_5233, 10) +OOVPA_NO_XREF(D3DDevice_AddRef_1_0_5233, 10) - // IDirect3DDevice8_AddRef+0x00 : mov eax, [addr] + // D3DDevice_AddRef+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_AddRef+0x05 : mov ecx, [eax+0x04FC] + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x04FC] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x88 }, // (Offset,Value)-Pair #3 { 0x07, 0xFC }, // (Offset,Value)-Pair #4 { 0x08, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_AddRef+0x0B : inc ecx + // D3DDevice_AddRef+0x0B : inc ecx { 0x0B, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_AddRef+0x0C : mov [eax+0x04FC], ecx + // D3DDevice_AddRef+0x0C : mov [eax+0x04FC], ecx { 0x0C, 0x89 }, // (Offset,Value)-Pair #7 { 0x0D, 0x88 }, // (Offset,Value)-Pair #8 { 0x0E, 0xFC }, // (Offset,Value)-Pair #9 @@ -801,7 +801,7 @@ OOVPA_END; // ****************************************************************** // * IDirectD3DDevice8_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_Release_1_0_5233, 8) { 0x07, 0x8B }, { 0x0C, 0x00 }, @@ -814,36 +814,36 @@ OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3D8_KickOffAndWaitForIdle +// * D3D_KickOffAndWaitForIdle // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_KickOffAndWaitForIdle_1_0_5233, 9) +OOVPA_NO_XREF(D3D_KickOffAndWaitForIdle_1_0_5233, 9) - // IDirect3D8_KickOffAndWaitForIdle+0x00 : mov eax, [addr] + // D3D_KickOffAndWaitForIdle+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3D8_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x2C] + // D3D_KickOffAndWaitForIdle+0x05 : mov ecx, [eax+0x2C] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x48 }, // (Offset,Value)-Pair #3 { 0x07, 0x2C }, // (Offset,Value)-Pair #4 - // IDirect3D8_KickOffAndWaitForIdle+0x08 : push 2 + // D3D_KickOffAndWaitForIdle+0x08 : push 2 { 0x08, 0x6A }, // (Offset,Value)-Pair #5 { 0x09, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3D8_KickOffAndWaitForIdle+0x0A : push ecx + // D3D_KickOffAndWaitForIdle+0x0A : push ecx { 0x0A, 0x51 }, // (Offset,Value)-Pair #7 - // IDirect3D8_KickOffAndWaitForIdle+0x0B : call [addr] + // D3D_KickOffAndWaitForIdle+0x0B : call [addr] { 0x0B, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3D8_KickOffAndWaitForIdle+0x10 : retn + // D3D_KickOffAndWaitForIdle+0x10 : retn { 0x10, 0xC3 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CopyRects +// * D3DDevice_CopyRects // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_CopyRects_1_0_5233, 8) { 0x1E, 0xE1 }, { 0x42, 0x84 }, @@ -856,9 +856,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CopyRects_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScissors +// * D3DDevice_SetScissors // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetScissors_1_0_5233, 8) { 0x07, 0x2C }, { 0x28, 0x44 }, @@ -871,60 +871,60 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScreenSpaceOffset +// * D3DDevice_SetScreenSpaceOffset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5233, 8) +OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset_1_0_5233, 8) - // IDirect3DDevice8_SetScreenSpaceOffset+0x13 : fstp [esi+0x0AA8] + // D3DDevice_SetScreenSpaceOffset+0x13 : fstp [esi+0x0AA8] { 0x13, 0xD9 }, // (Offset,Value)-Pair #1 { 0x14, 0x9E }, // (Offset,Value)-Pair #2 { 0x15, 0xA8 }, // (Offset,Value)-Pair #3 { 0x16, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetScreenSpaceOffset+0x33 : jb +0x05 + // D3DDevice_SetScreenSpaceOffset+0x33 : jb +0x05 { 0x33, 0x72 }, // (Offset,Value)-Pair #5 { 0x34, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetScreenSpaceOffset+0x46 : retn 0x08 + // D3DDevice_SetScreenSpaceOffset+0x46 : retn 0x08 { 0x46, 0xC2 }, // (Offset,Value)-Pair #7 { 0x47, 0x08 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleMode +// * D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_5233, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode_1_0_5233, 13) - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x04 : mov ecx, ds:dword_XXXX + // D3DDevice_SetRenderState_MultiSampleMode+0x04 : mov ecx, ds:dword_XXXX { 0x04, 0x8B }, { 0x05, 0x0D }, - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x0F : mov edx, [ecx+XXXXh] + // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov edx, [ecx+XXXXh] { 0x0F, 0x8B }, { 0x10, 0x91 }, - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x15 : cmp edx, [ecx+XXXXh] + // D3DDevice_SetRenderState_MultiSampleMode+0x15 : cmp edx, [ecx+XXXXh] { 0x15, 0x3B }, { 0x16, 0x91 }, - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x1B : jnz short + // D3DDevice_SetRenderState_MultiSampleMode+0x1B : jnz short { 0x1B, 0x75 }, { 0x1C, 0x07 }, - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x1D : xor edx, edx + // D3DDevice_SetRenderState_MultiSampleMode+0x1D : xor edx, edx { 0x1D, 0x33 }, { 0x1E, 0xD2 }, - // IDirect3DDevice8_SetRenderState_MultiSampleMode+0x24 : retn 4 + // D3DDevice_SetRenderState_MultiSampleMode+0x24 : retn 4 { 0x24, 0xC2 }, { 0x25, 0x04 }, { 0x26, 0x00 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +// * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_5233, 8, +OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5233, 8, XRefNoSaveIndex, XRefOne) @@ -941,9 +941,9 @@ OOVPA_XREF(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_5233, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode +// * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_5344, 8, +OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5344, 8, XRefNoSaveIndex, XRefOne) @@ -995,9 +995,9 @@ OOVPA_XREF(D3D_SetFence_1_0_5233, 7, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_InsertFence +// * D3DDevice_InsertFence // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_InsertFence_1_0_5233, 5, +OOVPA_XREF(D3DDevice_InsertFence_1_0_5233, 5, XRefNoSaveIndex, XRefOne) @@ -1011,9 +1011,9 @@ OOVPA_XREF(IDirect3DDevice8_InsertFence_1_0_5233, 5, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_IsFencePending +// * D3DDevice_IsFencePending // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_IsFencePending_1_0_5233, 6, +OOVPA_XREF(D3DDevice_IsFencePending_1_0_5233, 6, XRefNoSaveIndex, XRefOne) @@ -1044,9 +1044,9 @@ OOVPA_XREF(D3D_BlockOnTime_1_0_5233, 6, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockOnFence +// * D3DDevice_BlockOnFence // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_BlockOnFence_1_0_5233, 6, +OOVPA_XREF(D3DDevice_BlockOnFence_1_0_5233, 6, XRefNoSaveIndex, XRefOne) @@ -1061,41 +1061,41 @@ OOVPA_XREF(IDirect3DDevice8_BlockOnFence_1_0_5233, 6, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_5233, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xBE }, // (Offset,Value)-Pair #3 { 0x10, 0x48 }, // (Offset,Value)-Pair #4 { 0x11, 0x0B }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x51 : add ebp, 0x80000 + // D3DDevice_SetPalette+0x51 : add ebp, 0x80000 { 0x51, 0x81 }, // (Offset,Value)-Pair #6 { 0x52, 0xC5 }, // (Offset,Value)-Pair #7 { 0x53, 0x00 }, // (Offset,Value)-Pair #8 { 0x54, 0x00 }, // (Offset,Value)-Pair #9 { 0x55, 0x08 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x8A : retn 0x08 + // D3DDevice_SetPalette+0x8A : retn 0x08 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x8B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_5233, 12) - // IDirect3DDevice8_SetFlickerFilter+0x1C : mov eax, [eax+0x17C8] + // D3DDevice_SetFlickerFilter+0x1C : mov eax, [eax+0x17C8] { 0x1C, 0x8B }, // (Offset,Value)-Pair #1 { 0x1D, 0x80 }, // (Offset,Value)-Pair #2 { 0x1E, 0xC8 }, // (Offset,Value)-Pair #3 { 0x1F, 0x17 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax + // D3DDevice_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax { 0x22, 0x6A }, // (Offset,Value)-Pair #5 { 0x23, 0x00 }, // (Offset,Value)-Pair #6 { 0x24, 0x56 }, // (Offset,Value)-Pair #7 @@ -1103,23 +1103,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5233, 12) { 0x26, 0x0B }, // (Offset,Value)-Pair #9 { 0x27, 0x50 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x3F : retn 0x04 + // D3DDevice_SetFlickerFilter+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x40, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5344, 12) +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_5344, 12) - // IDirect3DDevice8_SetFlickerFilter+0x1C : mov eax, [eax+0x17C8] + // D3DDevice_SetFlickerFilter+0x1C : mov eax, [eax+0x17C8] { 0x1C, 0x8B }, // (Offset,Value)-Pair #1 { 0x1D, 0x80 }, // (Offset,Value)-Pair #2 { 0x1E, 0xF8 }, // (Offset,Value)-Pair #3 { 0x1F, 0x17 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax + // D3DDevice_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax { 0x22, 0x6A }, // (Offset,Value)-Pair #5 { 0x23, 0x00 }, // (Offset,Value)-Pair #6 { 0x24, 0x56 }, // (Offset,Value)-Pair #7 @@ -1127,23 +1127,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5344, 12) { 0x26, 0x0B }, // (Offset,Value)-Pair #9 { 0x27, 0x50 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x3F : retn 0x04 + // D3DDevice_SetFlickerFilter+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x40, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter_1_0_5233, 12) - // IDirect3DDevice8_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x17C8] + // D3DDevice_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x17C8] { 0x25, 0x8B }, // (Offset,Value)-Pair #1 { 0x26, 0x90 }, // (Offset,Value)-Pair #2 { 0x27, 0xC8 }, // (Offset,Value)-Pair #3 { 0x28, 0x17 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx + // D3DDevice_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx { 0x2B, 0x6A }, // (Offset,Value)-Pair #5 { 0x2C, 0x00 }, // (Offset,Value)-Pair #6 { 0x2D, 0x56 }, // (Offset,Value)-Pair #7 @@ -1151,23 +1151,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5233, 12) { 0x2F, 0x0E }, // (Offset,Value)-Pair #9 { 0x30, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetSoftDisplayFilter+0x4E : retn 0x04 + // D3DDevice_SetSoftDisplayFilter+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x4F, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5344, 12) +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter_1_0_5344, 12) - // IDirect3DDevice8_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x17F8] + // D3DDevice_SetSoftDisplayFilter+0x25 : mov edx, [eax+0x17F8] { 0x25, 0x8B }, // (Offset,Value)-Pair #1 { 0x26, 0x90 }, // (Offset,Value)-Pair #2 { 0x27, 0xF8 }, // (Offset,Value)-Pair #3 { 0x28, 0x17 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx + // D3DDevice_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx { 0x2B, 0x6A }, // (Offset,Value)-Pair #5 { 0x2C, 0x00 }, // (Offset,Value)-Pair #6 { 0x2D, 0x56 }, // (Offset,Value)-Pair #7 @@ -1175,27 +1175,27 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5344, 12) { 0x2F, 0x0E }, // (Offset,Value)-Pair #9 { 0x30, 0x52 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetSoftDisplayFilter+0x4E : retn 0x04 + // D3DDevice_SetSoftDisplayFilter+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x4F, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TwoSidedLighting +// * D3DDevice_SetTextureState_TwoSidedLighting // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_5344, 13) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TwoSidedLighting_1_0_5344, 13) - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x07 : mov eax, [esi] + // D3DDevice_SetTextureState_TwoSidedLighting+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x09 : cmp eax, [esi+4] + // D3DDevice_SetTextureState_TwoSidedLighting+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #3 { 0x0A, 0x46 }, // (Offset,Value)-Pair #4 { 0x0B, 0x04 }, // (Offset,Value)-Pair #5 // *** - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x18 : mov dword ptr [eax], 417C4h + // D3DDevice_SetTextureState_TwoSidedLighting+0x18 : mov dword ptr [eax], 417C4h { 0x18, 0xC7 }, // (Offset,Value)-Pair #6 { 0x19, 0x00 }, // (Offset,Value)-Pair #7 { 0x1A, 0xC4 }, // (Offset,Value)-Pair #8 @@ -1203,27 +1203,27 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_5344, 13) { 0x1C, 0x04 }, // (Offset,Value)-Pair #10 { 0x1D, 0x00 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetTextureState_TwoSidedLighting+0x7D : retn 0x04 + // D3DDevice_SetTextureState_TwoSidedLighting+0x7D : retn 0x04 { 0x7D, 0xC2 }, // (Offset,Value)-Pair #12 { 0x7E, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Unknown1 +// * D3DDevice_Unknown1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Unknown1_1_0_5233, 9) +OOVPA_NO_XREF(D3DDevice_Unknown1_1_0_5233, 9) - // IDirect3DDevice8_Unknown1+0x00 : xor eax, eax + // D3DDevice_Unknown1+0x00 : xor eax, eax { 0x00, 0x33 }, { 0x01, 0xC0 }, - // IDirect3DDevice8_Unknown1+0x13 : call ds:AvSendTVEncoderOption + // D3DDevice_Unknown1+0x13 : call ds:AvSendTVEncoderOption { 0x13, 0xFF }, { 0x14, 0x15 }, { 0x15, 0x08 }, { 0x16, 0x94 }, { 0x17, 0x19 }, { 0x18, 0x00 }, - // IDirect3DDevice8_Unknown1+0x1E : retn + // D3DDevice_Unknown1+0x1E : retn { 0x1E, 0xC3 }, OOVPA_END; @@ -1256,27 +1256,27 @@ OOVPA_NO_XREF(D3DDevice_EndPush_1_0_5344, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_5233, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x1958], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x1958], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x58 }, // (Offset,Value)-Pair #9 { 0x0D, 0x19 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -1355,11 +1355,11 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_5233, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_End +// * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5233, 12) +OOVPA_NO_XREF(D3DDevice_End_1_0_5233, 12) - // IDirect3DDevice8_End+0x13 : mov dword ptr [eax], 0x417FC + // D3DDevice_End+0x13 : mov dword ptr [eax], 0x417FC { 0x13, 0xC7 }, // (Offset,Value)-Pair #1 { 0x14, 0x00 }, // (Offset,Value)-Pair #2 { 0x15, 0xFC }, // (Offset,Value)-Pair #3 @@ -1367,16 +1367,16 @@ OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5233, 12) { 0x17, 0x04 }, // (Offset,Value)-Pair #5 { 0x18, 0x00 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_End+0x28 : test ah, 0x10 + // D3DDevice_End+0x28 : test ah, 0x10 { 0x28, 0xF6 }, // (Offset,Value)-Pair #7 { 0x29, 0xC4 }, // (Offset,Value)-Pair #8 { 0x2A, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_End+0x2B : jz +0x07 + // D3DDevice_End+0x2B : jz +0x07 { 0x2B, 0x74 }, // (Offset,Value)-Pair #10 { 0x2C, 0x07 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_End+0x3C : retn + // D3DDevice_End+0x3C : retn { 0x3C, 0xC3 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -1533,330 +1533,330 @@ OOVPA_END; OOVPATable D3D8_1_0_5233[] = { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_5233, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_5233, D3D_CreateDevice), // IDirect3DDevice8::GetDisplayFieldStatus - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayFieldStatus_1_0_5233, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5233, D3DDevice_GetDisplayFieldStatus), // IDirect3D8::CheckDeviceFormat (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceFormat_1_0_4361, XTL::EmuIDirect3D8_CheckDeviceFormat), + OOVPA_TABLE_PATCH(D3D_CheckDeviceFormat_1_0_4361, D3D_CheckDeviceFormat), // IDirect3D8::KickOffAndWaitForIdle - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_5233, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_5233, D3D_KickOffAndWaitForIdle), // IDirect3DDevice8::CopyRects - OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_5233, XTL::EmuIDirect3DDevice8_CopyRects), + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_5233, D3DDevice_CopyRects), // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScissors_1_0_5233, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5233, D3DDevice_SetScissors), // 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), // IDirect3DDevice8::SetGammaRamp (* unchanged since 4928 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4928, XTL::EmuIDirect3DDevice8_SetGammaRamp), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4928, D3DDevice_SetGammaRamp), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_5233, D3DDevice_SetShaderConstantMode), // IDirect3DDevice8::GetRenderTarget2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget2_1_0_5233, XTL::EmuIDirect3DDevice8_GetRenderTarget2), + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget2_1_0_5233, D3DDevice_GetRenderTarget2), // IDirect3DDevice8::GetDepthStencilSurface2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5233, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2_1_0_5233, D3DDevice_GetDepthStencilSurface2), // D3D::CommonSetRenderTarget (XREF) OOVPA_TABLE_XREF(D3D_CommonSetRenderTarget_1_0_5233), // IDirect3DDevice8::SetRenderTarget (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_4627, D3DDevice_SetRenderTarget), // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_5233, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5233, D3DDevice_AddRef), // 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), // IDirect3DDevice8::SetTileNoWait - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTileNoWait_1_0_5233, XTL::EmuIDirect3DDevice8_SetTileNoWait), + OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_5233, D3DDevice_SetTileNoWait), // IDirect3DDevice8::CreateIndexBuffer2 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer2_1_0_4627, XTL::EmuIDirect3DDevice8_CreateIndexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_4627, D3DDevice_CreateIndexBuffer2), // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_3925, D3DDevice_CreateVertexShader), // 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_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), // 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::SetVertexShaderConstant1 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_4627, D3DDevice_SetVertexShaderConstant1), // IDirect3DDevice8::SetVertexShaderConstant4 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4), // IDirect3DDevice8::SetVertexShaderConstantNotInline - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_5233, XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstantNotInline_1_0_5233, D3DDevice_SetVertexShaderConstantNotInline), // IDirect3DDevice8::DeletePixelShader (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DeletePixelShader_1_0_4134, XTL::EmuIDirect3DDevice8_DeletePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_DeletePixelShader_1_0_4134, D3DDevice_DeletePixelShader), // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_3925, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_3925, D3DDevice_CreatePixelShader), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_5233, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_5233, D3DDevice_SetPixelShader), // IDirect3DDevice8::CreateTexture2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2_1_0_5233, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2_1_0_5233, D3DDevice_CreateTexture2), // IDirect3DDevice8::CreateTexture2C (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2C_1_0_4627, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2C_1_0_4627, D3DDevice_CreateTexture2), // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_5233, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5233, D3DDevice_SetIndices), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_5233, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_5233, D3DDevice_SetTexture), // IDirect3DDevice8::SetTextureB - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureB_1_0_5233, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureB_1_0_5233, D3DDevice_SetTexture), // IDirect3DDevice8::SetTextureC (* unchanged since 4928 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureC_1_0_4928, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureC_1_0_4928, D3DDevice_SetTexture), // 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 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4627, D3DDevice_SetVertexData2f), // IDirect3DDevice8::Begin - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_5233, XTL::EmuIDirect3DDevice8_Begin), + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_5233, D3DDevice_Begin), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5233, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5233, D3DDevice_SetVertexData2f), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_5233, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_5233, D3DDevice_End), // IDirect3DDevice8::Clear - 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(IDirect3DDevice8_Swap_1_0_5233, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5233, D3DDevice_Swap), // 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), // IDirect3DDevice8::CreateVertexBuffer2 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_4627, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_4627, D3DDevice_CreateVertexBuffer2), // 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::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::SetRenderState_VertexBlend (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4361, D3DDevice_SetRenderState_VertexBlend), // IDirect3DDevice8::SetRenderState_CullMode - 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_CullModeB (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullModeB_1_0_4134, D3DDevice_SetRenderState_CullMode), // 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_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5233, D3DDevice_SetRenderState_TextureFactor), // 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_BackFillMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // 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_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5233, D3DDevice_SetRenderState_Dxt1NoiseEnable), // ******* // Duplicated functions generally dangerous, but until such time as XDK 5344 // has it's own OOVP's, fine here // ******* // IDirect3DDevice8::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable_1_0_5344, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5344, D3DDevice_SetRenderState_Dxt1NoiseEnable), // 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 - 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 (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), // IDirect3DDevice8::SetRenderState_LineWidth (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LineWidth_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_4627, D3DDevice_SetRenderState_LineWidth), // 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_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 (* 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::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_MultiSampleMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5233, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5233, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // ******* // Duplicated functions generally dangerous, but until such time as XDK 5344 // has it's own OOVP's, fine here // ******* // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode_1_0_5344, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5344, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // 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::SwitchTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // 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::SetTransform (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_4134, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_4134, D3DDevice_SetTransform), // 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), // IDirect3D8::GetDeviceCaps - OOVPA_TABLE_PATCH(IDirect3D8_GetDeviceCaps_1_0_5233, XTL::EmuIDirect3D8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3D_GetDeviceCaps_1_0_5233, D3D_GetDeviceCaps), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5233, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5233, D3DDevice_SetLight), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5344, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5344, D3DDevice_SetLight), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5233, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5233, D3DDevice_LightEnable), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5344, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5344, D3DDevice_LightEnable), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_5233, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_5233, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::SetMaterial (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_4627, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_4627, D3DDevice_SetMaterial), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5344, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5344, D3DDevice_SetMaterial), // IDirect3DVertexBuffer8::GetDesc - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_GetDesc_1_0_5233, XTL::EmuIDirect3DVertexBuffer8_GetDesc), + OOVPA_TABLE_PATCH(D3DVertexBuffer_GetDesc_1_0_5233, D3DVertexBuffer_GetDesc), // IDirect3DVertexBuffer8::Lock2 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_4627, XTL::EmuIDirect3DVertexBuffer8_Lock2), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_4627, D3DVertexBuffer_Lock2), // 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), // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_5233, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5233, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::UpdateOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_UpdateOverlay_1_0_5233, XTL::EmuIDirect3DDevice8_UpdateOverlay), + OOVPA_TABLE_PATCH(D3DDevice_UpdateOverlay_1_0_5233, D3DDevice_UpdateOverlay), // IDirect3DDevice8::GetOverlayUpdateStatus - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_5233, XTL::EmuIDirect3DDevice8_GetOverlayUpdateStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetOverlayUpdateStatus_1_0_5233, D3DDevice_GetOverlayUpdateStatus), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5233, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5233, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::GetViewport (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_4627, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_4627, D3DDevice_GetViewport), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_5233, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5233, D3DDevice_SetViewport), // 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), // IDirect3DPalette8::Lock2 - 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_5233, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_5233, D3DTexture_LockRect), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), // Get2DSurfaceDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5233, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5233, Get2DSurfaceDesc), // Get2DSurfaceDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5344, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5344, Get2DSurfaceDesc), // 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), // 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::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_5233, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_5233, D3DDevice_SetVertexShader), // IDirect3DDevice8::DrawVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_5233, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_5233, D3DDevice_DrawVertices), // IDirect3DDevice8::GetViewportOffsetAndScale (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(X_D3DDevice_GetViewportOffsetAndScale_1_0_4627, XTL::EmuIDirect3DDevice8_GetViewportOffsetAndScale), + OOVPA_TABLE_PATCH(X_D3DDevice_GetViewportOffsetAndScale_1_0_4627, D3DDevice_GetViewportOffsetAndScale), // IDirect3DDevice8::DeleteVertexShader (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader), + OOVPA_TABLE_PATCH(X_D3DDevice_DeleteVertexShader_1_0_3925, D3DDevice_DeleteVertexShader), // IDirect3DDevice8::SelectVertexShaderDirect (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShaderDirect_1_0_4627, XTL::EmuIDirect3DDevice8_SelectVertexShaderDirect), + OOVPA_TABLE_PATCH(X_D3DDevice_SelectVertexShaderDirect_1_0_4627, D3DDevice_SelectVertexShaderDirect), // IDirect3DDevice8::LoadVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_5233, XTL::EmuIDirect3DDevice8_LoadVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_5233, D3DDevice_LoadVertexShader), // IDirect3DDevice::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_5233, XTL::EmuIDirect3DDevice8_Release), + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_5233, D3DDevice_Release), // IDirect3DDevice8::SetScreenSpaceOffset - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5233, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_5233, D3DDevice_SetScreenSpaceOffset), // D3D::SetFence (XREF) OOVPA_TABLE_XREF(D3D_SetFence_1_0_5233), // IDirect3DDevice8::InsertFence - OOVPA_TABLE_PATCH(IDirect3DDevice8_InsertFence_1_0_5233, XTL::EmuIDirect3DDevice8_InsertFence), + OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_5233, D3DDevice_InsertFence), // IDirect3DDevice8::IsFencePending - OOVPA_TABLE_PATCH(IDirect3DDevice8_IsFencePending_1_0_5233, XTL::EmuIDirect3DDevice8_IsFencePending), + OOVPA_TABLE_PATCH(D3DDevice_IsFencePending_1_0_5233, D3DDevice_IsFencePending), // D3D::BlockOnTime (XREF) OOVPA_TABLE_XREF(D3D_BlockOnTime_1_0_5233), // IDirect3DDevice8::BlockOnFence - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockOnFence_1_0_5233, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_5233, D3DDevice_BlockOnFence), // 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::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_5233, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5233, D3DDevice_SetPalette), // 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::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_5233, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5233, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_5344, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5344, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5233, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5233, D3DDevice_SetSoftDisplayFilter), // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5344, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), - // IDirect3DDevice8_Unknown1 + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5344, D3DDevice_SetSoftDisplayFilter), + // D3DDevice_Unknown1 /* - OOVPA_TABLE_PATCH(IDirect3DDevice8_Unknown1_1_0_5233, XTL::EmuIDirect3DDevice8_Unknown1, + OOVPA_TABLE_PATCH(D3DDevice_Unknown1_1_0_5233, D3DDevice_Unknown1, */ // IDirect3DDevice8::SetRenderState_TwoSidedLighting (* unchanged since 4134 *) // Beware of the typo... - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_4134, D3DDevice_SetTextureState_TwoSidedLighting), // ****** // Duplicate references are normally bad, but this XDK is aliased to XDK 5344 // until such time as a separate XDK file is generated for 5344, this will have to do // ****** // IDirect3DDevice8::SetRenderState_TwoSidedLighting (* targeting 5344 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TwoSidedLighting_1_0_5344, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TwoSidedLighting_1_0_5344, D3DDevice_SetTextureState_TwoSidedLighting), // 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), // D3DDevice_SetRenderState_LogicOp (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_LogicOp), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_4627, D3DDevice_SetRenderState_LogicOp), // IDirect3DDevice8::BeginPush - OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_5344, XTL::EmuIDirect3DDevice8_BeginPush), + OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_5344, D3DDevice_BeginPush), // 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::EndPush - OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_5344, XTL::EmuIDirect3DDevice8_EndPush), + OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_5344, D3DDevice_EndPush), // 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), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5233, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5233, D3DDevice_SetVerticalBlankCallback), // D3DDevice_SetRenderState_SampleAlpha - 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), // D3DDevice_SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5233, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetVertexData4ub (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4ub), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4ub_1_0_4361, D3DDevice_SetVertexData4ub), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_4361, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5344, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5344, D3DDevice_SetViewport), /** * Having two versions of D3Device::SetTransform in this file creates problems, * in order to support Futurama, this second verison (added for Whacked support) * has been disabled. // IDirect3DDevice8::SetTransform - OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_5344, XTL::EmuIDirect3DDevice8_SetTransform),**/ + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_5344, D3DDevice_SetTransform),**/ // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5344, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5344, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5344, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5344, D3DDevice_SetVerticalBlankCallback), // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5344, XTL::EmuIDirect3DDevice8_SetSwapCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5344, D3DDevice_SetSwapCallback), // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5344, XTL::EmuIDirect3DDevice8_GetViewport), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5344, D3DDevice_GetViewport), // IDirect3DDevice8::SetRenderTargetFast - OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, XTL::EmuIDirect3DDevice8_SetRenderTargetFast), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, D3DDevice_SetRenderTargetFast), // IDirect3DDevice8::SetScreenSpaceOffset - OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_5344, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_5344, D3DDevice_SetScreenSpaceOffset), // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5344, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5344, D3DDevice_SetScissors), // 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::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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index bd9edc6f1..9184fd7aa 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -58,9 +58,9 @@ OOVPA_XREF(D3D_CDevice_LazySetStateVB_1_0_5558, 12, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginPush +// * D3DDevice_BeginPush // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_BeginPush_1_0_5558, 10, +OOVPA_XREF(D3DDevice_BeginPush_1_0_5558, 10, XRefNoSaveIndex, XRefOne) @@ -82,9 +82,9 @@ OOVPA_XREF(IDirect3DDevice8_BeginPush_1_0_5558, 10, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SelectVertexShader +// * D3DDevice_SelectVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SelectVertexShader_1_0_5558, 7) +OOVPA_NO_XREF(D3DDevice_SelectVertexShader_1_0_5558, 7) { 0x12, 0x07 }, { 0x26, 0x00 }, @@ -96,62 +96,62 @@ OOVPA_NO_XREF(IDirect3DDevice8_SelectVertexShader_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexShader +// * D3DDevice_CreateVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5558, 12) +OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_5558, 12) - // IDirect3DDevice8_CreateVertexShader+0x00 : push ecx; push ebx; push ebp + // D3DDevice_CreateVertexShader+0x00 : push ecx; push ebx; push ebp { 0x00, 0x51 }, // (Offset,Value)-Pair #1 { 0x01, 0x53 }, // (Offset,Value)-Pair #2 { 0x02, 0x55 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_CreateVertexShader+0x0A : jz +0x10 + // D3DDevice_CreateVertexShader+0x0A : jz +0x10 { 0x0A, 0x74 }, // (Offset,Value)-Pair #4 { 0x0B, 0x10 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_CreateVertexShader+0x43 : shl eax, 0x02 + // D3DDevice_CreateVertexShader+0x43 : shl eax, 0x02 { 0x43, 0xC1 }, // (Offset,Value)-Pair #6 { 0x44, 0xE0 }, // (Offset,Value)-Pair #7 { 0x45, 0x02 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_CreateVertexShader+0x73 : mov eax, 0x8007000E + // D3DDevice_CreateVertexShader+0x73 : mov eax, 0x8007000E { 0x65, 0x07 }, // (Offset,Value)-Pair #11 { 0x66, 0x80 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_CreateVertexShader+0x69 : retn 0x10 + // D3DDevice_CreateVertexShader+0x69 : retn 0x10 { 0x69, 0xC2 }, // (Offset,Value)-Pair #9 { 0x6A, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant1 +// * D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5558, 11) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1_1_0_5558, 11) - // IDirect3DDevice8_SetVertexShaderConstant1+0x05 : add eax, 0x1C + // D3DDevice_SetVertexShaderConstant1+0x05 : add eax, 0x1C /* { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant1+0x0E : jnb +0x2E + // D3DDevice_SetVertexShaderConstant1+0x0E : jnb +0x2E { 0x0E, 0x73 }, // (Offset,Value)-Pair #4 { 0x0F, 0x2E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstant1+0x28 : mov [eax-0x10], ecx + // D3DDevice_SetVertexShaderConstant1+0x28 : mov [eax-0x10], ecx { 0x28, 0x89 }, // (Offset,Value)-Pair #6 { 0x29, 0x48 }, // (Offset,Value)-Pair #7 { 0x2A, 0xF0 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant1+0x3D : retn + // D3DDevice_SetVertexShaderConstant1+0x3D : retn { 0x3D, 0xC3 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstant1+0x47 : jmp +0xB7 + // D3DDevice_SetVertexShaderConstant1+0x47 : jmp +0xB7 { 0x47, 0xEB }, // (Offset,Value)-Pair #10 { 0x48, 0xB7 }, // (Offset,Value)-Pair #11 */ - // IDirect3DDevice8_SetVertexShaderConstant1+0x06 : add eax, 0x1C + // D3DDevice_SetVertexShaderConstant1+0x06 : add eax, 0x1C { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0xC0 }, // (Offset,Value)-Pair #2 { 0x08, 0x1C }, // (Offset,Value)-Pair #3 @@ -164,41 +164,41 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5558, 11) { 0x1B, 0x04 }, { 0x1C, 0x00 }, - // IDirect3DDevice8_SetVertexShaderConstant1+0x53 : retn + // D3DDevice_SetVertexShaderConstant1+0x53 : retn { 0x53, 0xC3 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant1Fast +// * D3DDevice_SetVertexShaderConstant1Fast // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1Fast_1_0_5558, 11) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1Fast_1_0_5558, 11) - // IDirect3DDevice8_SetVertexShaderConstant1Fast+0x05 : add eax, 0x1C + // D3DDevice_SetVertexShaderConstant1Fast+0x05 : add eax, 0x1C { 0x05, 0x83 }, // (Offset,Value)-Pair #1 { 0x06, 0xC0 }, // (Offset,Value)-Pair #2 { 0x07, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant1Fast+0x0E : jnb +0x2E + // D3DDevice_SetVertexShaderConstant1Fast+0x0E : jnb +0x2E { 0x0E, 0x73 }, // (Offset,Value)-Pair #4 { 0x0F, 0x2E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstant1Fast+0x28 : mov [eax-0x10], ecx + // D3DDevice_SetVertexShaderConstant1Fast+0x28 : mov [eax-0x10], ecx { 0x28, 0x89 }, // (Offset,Value)-Pair #6 { 0x29, 0x48 }, // (Offset,Value)-Pair #7 { 0x2A, 0xF0 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant1Fast+0x3D : retn + // D3DDevice_SetVertexShaderConstant1Fast+0x3D : retn { 0x3D, 0xC3 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstant1Fast+0x47 : jmp +0xB7 + // D3DDevice_SetVertexShaderConstant1Fast+0x47 : jmp +0xB7 { 0x47, 0xEB }, // (Offset,Value)-Pair #10 { 0x48, 0xB7 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_5558, 8) { 0x1E, 0x86 }, { 0x3E, 0x1B }, @@ -211,9 +211,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexBuffer2 +// * D3DDevice_CreateVertexBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5558, 7) +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2_1_0_5558, 7) { 0x08, 0xE8 }, { 0x12, 0x1E }, @@ -225,22 +225,22 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_UpdateOverlay +// * D3DDevice_UpdateOverlay // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_5558, 11) +OOVPA_NO_XREF(D3DDevice_UpdateOverlay_1_0_5558, 11) - // IDirect3DDevice8_UpdateOverlay+0x13 : mov [eax+0x1C0C], ecx + // D3DDevice_UpdateOverlay+0x13 : mov [eax+0x1C0C], ecx { 0x13, 0x89 }, // (Offset,Value)-Pair #1 { 0x14, 0x88 }, // (Offset,Value)-Pair #2 { 0x15, 0x0C }, // (Offset,Value)-Pair #3 { 0x16, 0x1C }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_UpdateOverlay+0x85 : and eax, 0x0FFFFFFF + // D3DDevice_UpdateOverlay+0x85 : and eax, 0x0FFFFFFF { 0x85, 0x25 }, // (Offset,Value)-Pair #5 { 0x86, 0xFF }, // (Offset,Value)-Pair #6 { 0x89, 0x0F }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_UpdateOverlay+0x9D : mov [esi+0x8920], ecx + // D3DDevice_UpdateOverlay+0x9D : mov [esi+0x8920], ecx { 0x9D, 0x89 }, // (Offset,Value)-Pair #8 { 0x9E, 0x8E }, // (Offset,Value)-Pair #9 { 0x9F, 0x20 }, // (Offset,Value)-Pair #10 @@ -248,35 +248,35 @@ OOVPA_NO_XREF(IDirect3DDevice8_UpdateOverlay_1_0_5558, 11) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetOverlayUpdateStatus +// * D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_5558, 10) +OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus_1_0_5558, 10) - // IDirect3DDevice8_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x24xx] + // D3DDevice_GetOverlayUpdateStatus+0x05 : mov ecx, [eax+0x24xx] { 0x05, 0x8B }, // (Offset,Value)-Pair #1 { 0x06, 0x88 }, // (Offset,Value)-Pair #2 // { 0x07, 0x00 }, // The offset from EAX has been seen as 2400 (5558) and 2410 (5659) { 0x08, 0x24 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x1Dxx] + // D3DDevice_GetOverlayUpdateStatus+0x0C : mov esi, [eax+0x1Dxx] { 0x0C, 0x8B }, // (Offset,Value)-Pair #4 { 0x0D, 0xB0 }, // (Offset,Value)-Pair #5 // { 0x0E, 0xD8 }, // // The offset from EAX has been seen as 0x1DD8 (5558) and 0x1DE8 (5659) { 0x0F, 0x1D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x16 : setnz dl + // D3DDevice_GetOverlayUpdateStatus+0x16 : setnz dl { 0x16, 0x0F }, // (Offset,Value)-Pair #7 { 0x17, 0x95 }, // (Offset,Value)-Pair #8 { 0x18, 0xC2 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_GetOverlayUpdateStatus+0x1C : retn + // D3DDevice_GetOverlayUpdateStatus+0x1C : retn { 0x1C, 0xC3 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreatePalette2 +// * D3DDevice_CreatePalette2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreatePalette2_1_0_5558, 7) +OOVPA_NO_XREF(D3DDevice_CreatePalette2_1_0_5558, 7) { 0x0D, 0x8B }, { 0x16, 0x00 }, @@ -288,9 +288,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreatePalette2_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2 +// * D3DDevice_CreateTexture2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_CreateTexture2_1_0_5558, 8) { 0x14, 0x4C }, { 0x2A, 0x8B }, @@ -303,9 +303,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateTexture2_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_End +// * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5558, 7) +OOVPA_NO_XREF(D3DDevice_End_1_0_5558, 7) { 0x07, 0x8B }, { 0x13, 0xC7 }, @@ -317,9 +317,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_5558, 8) { 0x1E, 0x00 }, { 0x3E, 0x89 }, @@ -332,9 +332,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5558, 9) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_5558, 9) { 0x04, 0x08 }, { 0x0C, 0x81 }, @@ -348,9 +348,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5558, 9) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5558, 8) { 0x1E, 0x8D }, { 0x3E, 0xC7 }, @@ -363,9 +363,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_5558, 8) { 0x1E, 0x89 }, { 0x3E, 0x5F }, @@ -378,33 +378,33 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPalette +// * D3DDevice_SetPalette // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPalette_1_0_5558, 12) +OOVPA_NO_XREF(D3DDevice_SetPalette_1_0_5558, 12) - // IDirect3DDevice8_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0A88] { 0x0D, 0x8B }, // (Offset,Value)-Pair #1 { 0x0E, 0x84 }, // (Offset,Value)-Pair #2 { 0x0F, 0xBE }, // (Offset,Value)-Pair #3 { 0x10, 0x88 }, // (Offset,Value)-Pair #4 { 0x11, 0x0F }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetPalette+0x76 : add esi, 0x41B20 + // D3DDevice_SetPalette+0x76 : add esi, 0x41B20 { 0x76, 0x81 }, // (Offset,Value)-Pair #6 { 0x77, 0xC7 }, // (Offset,Value)-Pair #7 { 0x78, 0x20 }, // (Offset,Value)-Pair #8 { 0x79, 0x1B }, // (Offset,Value)-Pair #9 { 0x7A, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetPalette+0x8A : retn 0x08 + // D3DDevice_SetPalette+0x8A : retn 0x08 { 0x8A, 0xC2 }, // (Offset,Value)-Pair #11 { 0x8B, 0x08 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5558, 7) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_5558, 7) { 0x05, 0x6A }, { 0x08, 0x00 }, @@ -416,32 +416,32 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVerticesUP +// * D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5558, 10) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP_1_0_5558, 10) - // IDirect3DDevice8_DrawIndexedVerticesUP+0x4A : or edx, 0x800 + // D3DDevice_DrawIndexedVerticesUP+0x4A : or edx, 0x800 { 0x4A, 0x81 }, // (Offset,Value)-Pair #1 { 0x4B, 0xCA }, // (Offset,Value)-Pair #2 { 0x4C, 0x00 }, // (Offset,Value)-Pair #3 { 0x4D, 0x08 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0xBxx] + // D3DDevice_DrawIndexedVerticesUP+0x5C : lea edx, [edi+0xBxx] { 0x5C, 0x8D }, // (Offset,Value)-Pair #5 { 0x5D, 0x96 }, // (Offset,Value)-Pair #6 // { 0x5E, 0xC4 }, // The offset from EDI has been seen as BC4 (5558) and BD4 (5659) { 0x5F, 0x0B }, // (Offset,Value)-Pair #7 { 0x60, 0x00 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 + // D3DDevice_DrawIndexedVerticesUP+0x6A : mov eax, 0x10 { 0x6A, 0xB8 }, // (Offset,Value)-Pair #9 { 0x6B, 0x10 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTransform +// * D3DDevice_SetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetTransform_1_0_5558, 8) { 0x1D, 0xB9 }, { 0x3E, 0x0F }, @@ -454,88 +454,88 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer2 +// * D3DDevice_GetBackBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_5558, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_5558, 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+0x15 : mov esi, [ecx+eax*4+0x1A04] + // D3DDevice_GetBackBuffer2+0x15 : mov esi, [ecx+eax*4+0x1A04] { 0x15, 0x8B }, // (Offset,Value)-Pair #6 { 0x16, 0xB4 }, // (Offset,Value)-Pair #7 { 0x17, 0x81 }, // (Offset,Value)-Pair #8 { 0x18, 0x04 }, // (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_GetBackBuffer2B +// * D3DDevice_GetBackBuffer2B // ****************************************************************** // NOTE: XIII has a different version than the others... -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2B_1_0_5558, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2B_1_0_5558, 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+0x15 : mov esi, [ecx+eax*4+0x1A14] + // D3DDevice_GetBackBuffer2+0x15 : mov esi, [ecx+eax*4+0x1A14] { 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_GetBackBuffer2 +// * D3DDevice_GetBackBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_5455, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_5455, 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+0x15 : mov esi, [ecx+eax*4+0x15F4] + // D3DDevice_GetBackBuffer2+0x15 : mov esi, [ecx+eax*4+0x15F4] { 0x15, 0x8B }, // (Offset,Value)-Pair #6 { 0x16, 0xB4 }, // (Offset,Value)-Pair #7 { 0x17, 0x81 }, // (Offset,Value)-Pair #8 { 0x18, 0xF4 }, // (Offset,Value)-Pair #9 { 0x19, 0x15 }, // (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; // ****************************************************************** -// * IDirect3D8_CheckDeviceMultiSampleType +// * D3D_CheckDeviceMultiSampleType // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CheckDeviceMultiSampleType_1_0_5558, 7) +OOVPA_NO_XREF(D3D_CheckDeviceMultiSampleType_1_0_5558, 7) { 0x0E, 0x00 }, { 0x1E, 0x54 }, @@ -547,9 +547,9 @@ OOVPA_NO_XREF(IDirect3D8_CheckDeviceMultiSampleType_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3D8_SetPushBufferSize +// * D3D_SetPushBufferSize // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_SetPushBufferSize_1_0_5558, 7) +OOVPA_NO_XREF(D3D_SetPushBufferSize_1_0_5558, 7) { 0x01, 0x44 }, { 0x04, 0x8B }, @@ -628,9 +628,9 @@ OOVPA_XREF(D3D_BlockOnResource_1_0_5558, 16, OOVPA_END; // ****************************************************************** -// * IDirect3DResource8_BlockUntilNotBusy +// * D3DResource_BlockUntilNotBusy // ****************************************************************** -OOVPA_XREF(IDirect3DResource8_BlockUntilNotBusy_1_0_5558, 2, +OOVPA_XREF(D3DResource_BlockUntilNotBusy_1_0_5558, 2, XRefNoSaveIndex, XRefOne) @@ -641,9 +641,9 @@ OOVPA_XREF(IDirect3DResource8_BlockUntilNotBusy_1_0_5558, 2, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScissors +// * D3DDevice_SetScissors // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetScissors_1_0_5558, 8) { 0x1D, 0x44 }, { 0x3C, 0x8B }, @@ -656,9 +656,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5558, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScissors +// * D3DDevice_SetScissors // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5455, 8) +OOVPA_NO_XREF(D3DDevice_SetScissors_1_0_5455, 8) { 0x1D, 0x44 }, { 0x3C, 0x8B }, @@ -671,23 +671,23 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetScissors_1_0_5455, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_AddRef +// * D3DDevice_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_5558, 10) +OOVPA_NO_XREF(D3DDevice_AddRef_1_0_5558, 10) - // IDirect3DDevice8_AddRef+0x00 : mov eax, [addr] + // D3DDevice_AddRef+0x00 : mov eax, [addr] { 0x00, 0xA1 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_AddRef+0x05 : mov ecx, [eax+0x04FC] + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x04FC] { 0x05, 0x8B }, // (Offset,Value)-Pair #2 { 0x06, 0x88 }, // (Offset,Value)-Pair #3 { 0x07, 0x34 }, // (Offset,Value)-Pair #4 { 0x08, 0x09 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_AddRef+0x0B : inc ecx + // D3DDevice_AddRef+0x0B : inc ecx { 0x0B, 0x41 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_AddRef+0x0C : mov [eax+0x04FC], ecx + // D3DDevice_AddRef+0x0C : mov [eax+0x04FC], ecx { 0x0C, 0x89 }, // (Offset,Value)-Pair #7 { 0x0D, 0x88 }, // (Offset,Value)-Pair #8 { 0x0E, 0x34 }, // (Offset,Value)-Pair #9 @@ -695,56 +695,56 @@ OOVPA_NO_XREF(IDirect3DDevice8_AddRef_1_0_5558, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreatePixelShader +// * D3DDevice_CreatePixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_5558, 11) +OOVPA_NO_XREF(D3DDevice_CreatePixelShader_1_0_5558, 11) - // IDirect3DDevice8_CreatePixelShader+0x05 : push 0xFC + // D3DDevice_CreatePixelShader+0x05 : push 0xFC { 0x05, 0x68 }, // (Offset,Value)-Pair #1 { 0x06, 0xFC }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_CreatePixelShader+0x10 : mov eax, 0x8007000E + // D3DDevice_CreatePixelShader+0x10 : mov eax, 0x8007000E { 0x13, 0xB8 }, // (Offset,Value)-Pair #3 { 0x14, 0x0E }, // (Offset,Value)-Pair #4 { 0x15, 0x00 }, // (Offset,Value)-Pair #5 { 0x16, 0x07 }, // (Offset,Value)-Pair #6 { 0x17, 0x80 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_CreatePixelShader+0x31 : mov ecx, 0x3C + // D3DDevice_CreatePixelShader+0x31 : mov ecx, 0x3C { 0x34, 0xB9 }, // (Offset,Value)-Pair #8 { 0x35, 0x3C }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_CreatePixelShader+0x42 : retn 0x08 + // D3DDevice_CreatePixelShader+0x42 : retn 0x08 { 0x45, 0xC2 }, // (Offset,Value)-Pair #10 { 0x46, 0x08 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5558, 10) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_5558, 10) - // IDirect3DDevice8_DrawVerticesUP+0x03 : sub esp, 0x14 + // D3DDevice_DrawVerticesUP+0x03 : sub esp, 0x14 { 0x03, 0x83 }, // (Offset,Value)-Pair #1 { 0x04, 0xEC }, // (Offset,Value)-Pair #2 { 0x05, 0x14 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_DrawVerticesUP+0x37 : mov edx, [edi+0xC44] + // D3DDevice_DrawVerticesUP+0x37 : mov edx, [edi+0xC44] { 0x37, 0x8B }, // (Offset,Value)-Pair #4 { 0x38, 0x97 }, // (Offset,Value)-Pair #5 { 0x39, 0x44 }, // (Offset,Value)-Pair #6 { 0x3A, 0x0C }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_DrawVerticesUP+0xC4 : cmp esi, 0x80 + // D3DDevice_DrawVerticesUP+0xC4 : cmp esi, 0x80 { 0xC4, 0x81 }, // (Offset,Value)-Pair #8 { 0xC5, 0xFE }, // (Offset,Value)-Pair #9 { 0xC6, 0x80 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateIndexBuffer +// * D3DDevice_CreateIndexBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateIndexBuffer_1_0_5558, 10) +OOVPA_NO_XREF(D3DDevice_CreateIndexBuffer_1_0_5558, 10) { 0x00, 0x50 }, { 0x06, 0x8B }, @@ -787,27 +787,27 @@ OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5455, 12) +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback_1_0_5455, 12) - // IDirect3DDevice8_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetVerticalBlankCallback+0x04 : mov ecx, [addr] + // D3DDevice_SetVerticalBlankCallback+0x04 : mov ecx, [addr] { 0x04, 0x8B }, // (Offset,Value)-Pair #5 { 0x05, 0x0D }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetVerticalBlankCallback+0x0A : mov [ecx+0x1998], eax + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x1998], eax { 0x0A, 0x89 }, // (Offset,Value)-Pair #7 { 0x0B, 0x81 }, // (Offset,Value)-Pair #8 { 0x0C, 0x98 }, // (Offset,Value)-Pair #9 { 0x0D, 0x19 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetVerticalBlankCallback+0x10 : retn 0x04 + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 { 0x10, 0xC2 }, // (Offset,Value)-Pair #11 { 0x11, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; @@ -884,9 +884,9 @@ OOVPA_NO_XREF(D3DDevice_SetGammaRamp_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetProjectionViewportMatrix +// * D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetProjectionViewportMatrix_1_0_5455, 7) +OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix_1_0_5455, 7) { 0x02, 0x35 }, { 0x07, 0x57 }, @@ -1072,17 +1072,17 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShaderConstant_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetFlickerFilter +// * D3DDevice_SetFlickerFilter // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5455, 12) +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter_1_0_5455, 12) - // IDirect3DDevice8_SetFlickerFilter+0x1C : mov eax, [eax+0x1808] + // D3DDevice_SetFlickerFilter+0x1C : mov eax, [eax+0x1808] { 0x1C, 0x8B }, // (Offset,Value)-Pair #1 { 0x1D, 0x80 }, // (Offset,Value)-Pair #2 { 0x1E, 0x08 }, // (Offset,Value)-Pair #3 { 0x1F, 0x18 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax + // D3DDevice_SetFlickerFilter+0x22 : push 0; push esi; push 0x0B; push eax { 0x22, 0x6A }, // (Offset,Value)-Pair #5 { 0x23, 0x00 }, // (Offset,Value)-Pair #6 { 0x24, 0x56 }, // (Offset,Value)-Pair #7 @@ -1090,17 +1090,17 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetFlickerFilter_1_0_5455, 12) { 0x26, 0x0B }, // (Offset,Value)-Pair #9 { 0x27, 0x50 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetFlickerFilter+0x3F : retn 0x04 + // D3DDevice_SetFlickerFilter+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #11 { 0x40, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BlockUntilVerticalBlank +// * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5455, 11) +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank_1_0_5455, 11) - // IDirect3DDevice8_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0; push 0; push 1 { 0x05, 0x6A }, // (Offset,Value)-Pair #1 { 0x06, 0x00 }, // (Offset,Value)-Pair #2 { 0x07, 0x6A }, // (Offset,Value)-Pair #3 @@ -1108,54 +1108,54 @@ OOVPA_NO_XREF(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5455, 11) { 0x09, 0x6A }, // (Offset,Value)-Pair #5 { 0x0A, 0x01 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x17 : add eax, 0x199C + // D3DDevice_BlockUntilVerticalBlank+0x17 : add eax, 0x199C { 0x17, 0x05 }, // (Offset,Value)-Pair #7 { 0x18, 0x9C }, // (Offset,Value)-Pair #8 { 0x19, 0x19 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x1D : call [KrnlImport] + // D3DDevice_BlockUntilVerticalBlank+0x1D : call [KrnlImport] { 0x1D, 0xFF }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_BlockUntilVerticalBlank+0x23 : retn + // D3DDevice_BlockUntilVerticalBlank+0x23 : retn { 0x23, 0xC3 }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScreenSpaceOffset +// * D3DDevice_SetScreenSpaceOffset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5455, 8) +OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset_1_0_5455, 8) - // IDirect3DDevice8_SetScreenSpaceOffset+0x13 : fstp [esi+0x0AD8] + // D3DDevice_SetScreenSpaceOffset+0x13 : fstp [esi+0x0AD8] { 0x13, 0xD9 }, // (Offset,Value)-Pair #1 { 0x14, 0x9E }, // (Offset,Value)-Pair #2 { 0x15, 0xD8 }, // (Offset,Value)-Pair #3 { 0x16, 0x0A }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetScreenSpaceOffset+0x33 : jb +0x05 + // D3DDevice_SetScreenSpaceOffset+0x33 : jb +0x05 { 0x33, 0x72 }, // (Offset,Value)-Pair #5 { 0x34, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetScreenSpaceOffset+0x46 : retn 0x08 + // D3DDevice_SetScreenSpaceOffset+0x46 : retn 0x08 { 0x46, 0xC2 }, // (Offset,Value)-Pair #7 { 0x47, 0x08 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetScreenSpaceOffset +// * D3DDevice_SetScreenSpaceOffset // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5558, 8) +OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset_1_0_5558, 8) - // IDirect3DDevice8_SetScreenSpaceOffset+0x13 : fstp [esi+0x0EE8] + // D3DDevice_SetScreenSpaceOffset+0x13 : fstp [esi+0x0EE8] { 0x13, 0xD9 }, // (Offset,Value)-Pair #1 { 0x14, 0x9E }, // (Offset,Value)-Pair #2 { 0x15, 0xE8 }, // (Offset,Value)-Pair #3 { 0x16, 0x0E }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetScreenSpaceOffset+0x33 : jb +0x05 + // D3DDevice_SetScreenSpaceOffset+0x33 : jb +0x05 { 0x33, 0x72 }, // (Offset,Value)-Pair #5 { 0x34, 0x05 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetScreenSpaceOffset+0x46 : retn 0x08 + // D3DDevice_SetScreenSpaceOffset+0x46 : retn 0x08 { 0x46, 0xC2 }, // (Offset,Value)-Pair #7 { 0x47, 0x08 }, // (Offset,Value)-Pair #8 OOVPA_END; @@ -1175,25 +1175,25 @@ OOVPA_NO_XREF(D3DDevice_InsertCallback_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_LineWidth +// * D3DDevice_SetRenderState_LineWidth // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_LineWidth_1_0_5455, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_5455, 10) - // IDirect3DDevice8_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x54C] + // D3DDevice_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x54C] { 0x15, 0xD8 }, // (Offset,Value)-Pair #1 { 0x16, 0x8E }, // (Offset,Value)-Pair #2 { 0x17, 0x4C }, // (Offset,Value)-Pair #3 { 0x18, 0x05 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF { 0x32, 0x81 }, // (Offset,Value)-Pair #5 { 0x33, 0xFF }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF + // D3DDevice_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF { 0x3A, 0xBF }, // (Offset,Value)-Pair #7 { 0x3B, 0xFF }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_LineWidth+0x62 : retn 0x04 + // D3DDevice_SetRenderState_LineWidth+0x62 : retn 0x04 { 0x62, 0xC2 }, // (Offset,Value)-Pair #9 { 0x63, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -1230,30 +1230,30 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp_1_0_5558, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5455, 13) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5455, 13) - // IDirect3DDevice8_LightEnable+0x0F : cmp ebx, [esi+0x0390] + // D3DDevice_LightEnable+0x0F : cmp ebx, [esi+0x0390] { 0x0F, 0x3B }, // (Offset,Value)-Pair #1 { 0x10, 0x9E }, // (Offset,Value)-Pair #2 { 0x11, 0x90 }, // (Offset,Value)-Pair #3 { 0x12, 0x03 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_LightEnable+0x6B : test eax, eax + // D3DDevice_LightEnable+0x6B : test eax, eax { 0x6B, 0x85 }, // (Offset,Value)-Pair #5 { 0x6C, 0xC0 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_LightEnable+0x9A : cmp ecx, 0xFFFFFFFF + // D3DDevice_LightEnable+0x9A : cmp ecx, 0xFFFFFFFF { 0x9A, 0x83 }, // (Offset,Value)-Pair #7 { 0x9B, 0xF9 }, // (Offset,Value)-Pair #8 { 0x9C, 0xFF }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_LightEnable+0xB9 : jnz +0xF7 + // D3DDevice_LightEnable+0xB9 : jnz +0xF7 { 0xB9, 0x75 }, // (Offset,Value)-Pair #10 { 0xBA, 0xF7 }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_LightEnable+0xFB : retn 0x08 + // D3DDevice_LightEnable+0xFB : retn 0x08 { 0xFB, 0xC2 }, // (Offset,Value)-Pair #12 { 0xFC, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; @@ -1512,323 +1512,323 @@ OOVPA_END; OOVPATable D3D8_1_0_5558[] = { // 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::GetDisplayFieldStatus (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayFieldStatus_1_0_5233, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5233, D3DDevice_GetDisplayFieldStatus), // D3D::CDevice::LazySetStateVB (XREF) OOVPA_TABLE_XREF(D3D_CDevice_LazySetStateVB_1_0_5558), // IDirect3DDevice8::BeginPush - 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), // 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), // 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::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), // 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 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SelectVertexShader_1_0_5558, D3DDevice_SelectVertexShader), // IDirect3DDevice8::CreateVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_5558, D3DDevice_CreateVertexShader), // IDirect3DDevice8::SetVertexShaderConstant1 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_5558, D3DDevice_SetVertexShaderConstant1), // IDirect3DDevice8::SetVertexShaderConstant1Fast - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1Fast_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1Fast_1_0_5558, D3DDevice_SetVertexShaderConstant1), // 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), // IDirect3DDevice8::CreateVertexBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_5558, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_5558, D3DDevice_CreateVertexBuffer2), // IDirect3DDevice8::UpdateOverlay - OOVPA_TABLE_PATCH(IDirect3DDevice8_UpdateOverlay_1_0_5558, XTL::EmuIDirect3DDevice8_UpdateOverlay), + OOVPA_TABLE_PATCH(D3DDevice_UpdateOverlay_1_0_5558, D3DDevice_UpdateOverlay), // IDirect3DDevice8::GetOverlayUpdateStatus - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetOverlayUpdateStatus_1_0_5558, XTL::EmuIDirect3DDevice8_GetOverlayUpdateStatus), + OOVPA_TABLE_PATCH(D3DDevice_GetOverlayUpdateStatus_1_0_5558, D3DDevice_GetOverlayUpdateStatus), // 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::CreatePalette2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette2_1_0_5558, XTL::EmuIDirect3DDevice8_CreatePalette2), + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette2_1_0_5558, D3DDevice_CreatePalette2), // IDirect3DDevice8::SetPalette - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPalette_1_0_5558, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5558, D3DDevice_SetPalette), // IDirect3DDevice8::Swap (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_5233, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5233, D3DDevice_Swap), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5558, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5558, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::DrawIndexedVertices (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_5233, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_5233, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::DrawIndexedVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5558, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_5558, D3DDevice_DrawIndexedVerticesUP), // 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::CreateTexture2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2_1_0_5558, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2_1_0_5558, D3DDevice_CreateTexture2), // 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::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_5558, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_5558, D3DDevice_End), // 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_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 (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5558, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5558, D3DDevice_SetLight), // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_5558, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5558, D3DDevice_SetMaterial), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5558, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5558, D3DDevice_LightEnable), // IDirect3DVertexBuffer8::Lock2 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_4627, XTL::EmuIDirect3DVertexBuffer8_Lock2), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_4627, D3DVertexBuffer_Lock2), // 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 - 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(D3DDevice_SetIndices_1_0_5558, XTL::EmuIDirect3DDevice8_SetIndices), + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5558, D3DDevice_SetIndices), //// IDirect3DDevice8::SetIndices - // TODO : Move to OOVPATable D3D8_1_0_5455 : OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5455, XTL::EmuIDirect3DDevice8_SetIndices), + // TODO : Move to OOVPATable D3D8_1_0_5455 : OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5455, 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), // IDirect3DDevice8::SwitchTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // 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), // 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), // 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::SetTransform - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_5558, XTL::EmuIDirect3DDevice8_SetTransform), + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_5558, D3DDevice_SetTransform), // 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), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_5558, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5558, D3DDevice_SetViewport), // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_5558, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5558, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::GetBackBuffer2B - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2B_1_0_5558, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2B_1_0_5558, D3DDevice_GetBackBuffer2), // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_5455, XTL::EmuIDirect3DDevice8_GetBackBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5455, D3DDevice_GetBackBuffer2), // 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), // 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), // 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), // 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(D3DTexture_LockRect_1_0_5558, XTL::EmuIDirect3DTexture8_LockRect), + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_5558, 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::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), // IDirect3D8::CheckDeviceMultiSampleType - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceMultiSampleType_1_0_5558, XTL::EmuIDirect3D8_CheckDeviceMultiSampleType), + OOVPA_TABLE_PATCH(D3D_CheckDeviceMultiSampleType_1_0_5558, D3D_CheckDeviceMultiSampleType), // IDirect3D8::GetDeviceCaps (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3D8_GetDeviceCaps_1_0_5233, XTL::EmuIDirect3D8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3D_GetDeviceCaps_1_0_5233, D3D_GetDeviceCaps), // IDirect3D8::SetPushBufferSize - OOVPA_TABLE_PATCH(IDirect3D8_SetPushBufferSize_1_0_5558, XTL::EmuIDirect3D8_SetPushBufferSize), + OOVPA_TABLE_PATCH(D3D_SetPushBufferSize_1_0_5558, D3D_SetPushBufferSize), // IDirect3DDevice8::DrawVertices (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_5233, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_5233, D3DDevice_DrawVertices), // D3D::SetFence (XREF) OOVPA_TABLE_XREF(D3D_SetFence_1_0_5558), // IDirect3DDevice8::InsertFence (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_InsertFence_1_0_5233, XTL::EmuIDirect3DDevice8_InsertFence), + OOVPA_TABLE_PATCH(D3DDevice_InsertFence_1_0_5233, D3DDevice_InsertFence), // D3D::BlockOnTime (XREF) OOVPA_TABLE_XREF(D3D_BlockOnTime_1_0_5558), // IDirect3DDevice8::BlockOnFence (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockOnFence_1_0_5233, XTL::EmuIDirect3DDevice8_BlockOnFence), + OOVPA_TABLE_PATCH(D3DDevice_BlockOnFence_1_0_5233, D3DDevice_BlockOnFence), // D3D::BlockOnResource (XREF) OOVPA_TABLE_XREF(D3D_BlockOnResource_1_0_5558), // IDirect3DResource8::BlockUntilNotBusy - OOVPA_TABLE_PATCH(IDirect3DResource8_BlockUntilNotBusy_1_0_5558, XTL::EmuIDirect3DResource8_BlockUntilNotBusy), + OOVPA_TABLE_PATCH(D3DResource_BlockUntilNotBusy_1_0_5558, D3DResource_BlockUntilNotBusy), // IDirect3DVertexBuffer8::GetDesc (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_GetDesc_1_0_5233, XTL::EmuIDirect3DVertexBuffer8_GetDesc), + OOVPA_TABLE_PATCH(D3DVertexBuffer_GetDesc_1_0_5233, D3DVertexBuffer_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), // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScissors_1_0_5558, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5558, D3DDevice_SetScissors), // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScissors_1_0_5455, XTL::EmuIDirect3DDevice8_SetScissors), + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5455, D3DDevice_SetScissors), // IDirect3DDevice8::GetDepthStencilSurface2 (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5233, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2), + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2_1_0_5233, D3DDevice_GetDepthStencilSurface2), // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(IDirect3DDevice8_AddRef_1_0_5558, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5558, D3DDevice_AddRef), // IDirect3DDevice8::CreatePixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_5558, XTL::EmuIDirect3DDevice8_CreatePixelShader), + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_5558, D3DDevice_CreatePixelShader), // IDirect3DDevice8::SetVertexShaderConstant4 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4), // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_5558, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_5558, D3DDevice_DrawVerticesUP), // 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::CreateIndexBuffer2 - OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_5558, XTL::EmuIDirect3DDevice8_CreateIndexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_5558, D3DDevice_CreateIndexBuffer2), // IDirect3DDevice8::CreateIndexBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateIndexBuffer_1_0_5558, XTL::EmuIDirect3DDevice8_CreateIndexBuffer), + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer_1_0_5558, D3DDevice_CreateIndexBuffer), // D3DDevice_SetVerticalBlankCallback - OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5558, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5558, D3DDevice_SetVerticalBlankCallback), // D3DDevice_SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5455, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5455, D3DDevice_SetVerticalBlankCallback), // D3DDevice_SetSwapCallback - OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5558, XTL::EmuIDirect3DDevice8_SetSwapCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5558, D3DDevice_SetSwapCallback), // 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), // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5558, D3DDevice_SetRenderState_TextureFactor), // IDirect3DDevice8::SetRenderState_VertexBlend (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_4361, D3DDevice_SetRenderState_VertexBlend), // 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), // 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), // 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::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::GetViewport - OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5558, XTL::EmuIDirect3DDevice8_GetViewport), - // IDirect3DDevice8_GetProjectionViewportMatrix - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetProjectionViewportMatrix_1_0_5455, XTL::EmuIDirect3DDevice8_GetProjectionViewportMatrix), + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5558, D3DDevice_GetViewport), + // D3DDevice_GetProjectionViewportMatrix + OOVPA_TABLE_PATCH(D3DDevice_GetProjectionViewportMatrix_1_0_5455, D3DDevice_GetProjectionViewportMatrix), // IDirect3DDevice8::GetModelView - OOVPA_TABLE_PATCH(D3DDevice_GetModelView_1_0_5558, XTL::EmuIDirect3DDevice8_GetModelView), + OOVPA_TABLE_PATCH(D3DDevice_GetModelView_1_0_5558, D3DDevice_GetModelView), // IDirect3DDevice8::SetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5558, XTL::EmuIDirect3DDevice8_SetBackMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5558, D3DDevice_SetBackMaterial), // IDirect3DDevice8::SetRenderState_TwoSidedLighting - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5558, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5558, D3DDevice_SetTextureState_TwoSidedLighting), // IDirect3DDevice8::BeginStateBlock - OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_5558, XTL::EmuIDirect3DDevice8_BeginStateBlock), + OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_5558, D3DDevice_BeginStateBlock), // IDirect3DDevice8::EndStateBlock - OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_5558, XTL::EmuIDirect3DDevice8_EndStateBlock), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), + OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_5558, D3DDevice_EndStateBlock), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), // 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), // Get2DSurfaceDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5558, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5558, Get2DSurfaceDesc), // D3D::MakeRequestedSpace - OOVPA_TABLE_PATCH(D3D_MakeRequestedSpace_1_0_5558, XTL::EmuD3D_MakeRequestedSpace), + OOVPA_TABLE_PATCH(D3D_MakeRequestedSpace_1_0_5558, D3D_MakeRequestedSpace), // D3DDevice_MakeSpace - OOVPA_TABLE_PATCH(D3DDevice_MakeSpace_1_0_5558, XTL::EmuD3DDevice_MakeSpace), + OOVPA_TABLE_PATCH(D3DDevice_MakeSpace_1_0_5558, D3DDevice_MakeSpace), // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderTarget), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_5558, D3DDevice_SetRenderTarget), // IDirect3DDevice8::SetPixelShaderConstant - OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5558, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5558, D3DDevice_SetPixelShaderConstant), // Lock2DSurface (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetFlickerFilter_1_0_5455, XTL::EmuIDirect3DDevice8_SetFlickerFilter), + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5455, D3DDevice_SetFlickerFilter), // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(IDirect3DDevice8_BlockUntilVerticalBlank_1_0_5455, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5455, D3DDevice_BlockUntilVerticalBlank), // IDirect3DDevice8::SetScreenSpaceOffset - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5455, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_5455, D3DDevice_SetScreenSpaceOffset), // IDirect3DDevice8::SetScreenSpaceOffset - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetScreenSpaceOffset_1_0_5558, XTL::EmuIDirect3DDevice8_SetScreenSpaceOffset), - // IDirect3DDevice8_InsertCallback - OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_5558, XTL::EmuIDirect3DDevice8_InsertCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetScreenSpaceOffset_1_0_5558, D3DDevice_SetScreenSpaceOffset), + // D3DDevice_InsertCallback + OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_5558, D3DDevice_InsertCallback), // IDirect3DDevice8::SetRenderState_LineWidth - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_LineWidth_1_0_5455, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_5455, D3DDevice_SetRenderState_LineWidth), // D3DDevice_FlushVertexCache - OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5558, XTL::EmuIDirect3DDevice8_FlushVertexCache), + OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5558, D3DDevice_FlushVertexCache), // 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 - 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), // IDirect3DDevice8::LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5455, XTL::EmuIDirect3DDevice8_LightEnable), + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5455, D3DDevice_LightEnable), // D3DDevice_SetModelView - OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_5558, XTL::EmuIDirect3DDevice8_SetModelView), + OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_5558, D3DDevice_SetModelView), // D3DDevice_GetBackBuffer - OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_5558, XTL::EmuIDirect3DDevice8_GetBackBuffer), + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer_1_0_5558, D3DDevice_GetBackBuffer), // D3DDevice_PersistDisplay - OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_5558, XTL::EmuIDirect3DDevice8_PersistDisplay), + OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_5558, D3DDevice_PersistDisplay), // D3DCubeTexture_GetCubeMapSurface - OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface_1_0_5558, XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface), + OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface_1_0_5558, D3DCubeTexture_GetCubeMapSurface), // 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::SetVertexDataColor - OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexDataColor), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_5558, D3DDevice_SetVertexDataColor), // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexData4f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_5558, D3DDevice_SetVertexData4f), // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5558, D3DDevice_SetVertexData2f), // 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::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), // 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::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), // D3DDevice_LoadVertexShaderProgram - OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5558, XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5558, D3DDevice_LoadVertexShaderProgram), // D3DDevice_SetPixelShaderProgram - OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_5558, XTL::EmuIDirect3DDevice8_SetPixelShaderProgram), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderProgram_1_0_5558, D3DDevice_SetPixelShaderProgram), // IDirect3DDevice8::SetRenderState_BackFillMode (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_4134, D3DDevice_SetRenderState_BackFillMode), // IDirect3DDevice8::SetRenderState_TextureFactor (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5233, D3DDevice_SetRenderState_TextureFactor), // D3DDevice_SetRenderState_MultiSampleMask (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5233, D3DDevice_SetRenderState_MultiSampleMask), // IDirect3DDevice8::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5558, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5455, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5455, D3DDevice_SetRenderState_MultiSampleMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5558, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5455, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5455, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), // IDirect3DDevice8::SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5558, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5558, D3DDevice_SetRenderState_Dxt1NoiseEnable), // 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::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::IsFencePending - OOVPA_TABLE_PATCH(D3DDevice_IsFencePending_1_0_5558, XTL::EmuIDirect3DDevice8_IsFencePending), + OOVPA_TABLE_PATCH(D3DDevice_IsFencePending_1_0_5558, D3DDevice_IsFencePending), // 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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index 5ecef2e3d..26636549b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -33,9 +33,9 @@ // ****************************************************************** // ****************************************************************** -// * IDirect3DDevice8_EndVisibilityTest +// * D3DDevice_EndVisibilityTest // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_EndVisibilityTest_1_0_5788, 7) { 0x10, 0x09 }, { 0x12, 0x0E }, @@ -47,9 +47,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_EndVisibilityTest_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetVisibilityTestResult +// * D3DDevice_GetVisibilityTestResult // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult_1_0_5788, 7) { 0x0E, 0x08 }, { 0x10, 0xFF }, @@ -61,9 +61,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetVisibilityTestResult_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetViewport +// * D3DDevice_GetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_GetViewport_1_0_5788, 8) { 0x09, 0x05 }, { 0x14, 0x04 }, @@ -76,9 +76,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_GetViewport_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetBackBufferScale +// * D3DDevice_SetBackBufferScale // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_SetBackBufferScale_1_0_5788, 7) { 0x1E, 0x24 }, { 0x3E, 0x06 }, @@ -90,63 +90,63 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetBackBufferScale_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_GetBackBuffer2 +// * D3DDevice_GetBackBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_GetBackBuffer2_1_0_5788, 12) +OOVPA_NO_XREF(D3DDevice_GetBackBuffer2_1_0_5788, 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_5788, 10) +OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2_1_0_5788, 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_5788, 8) +OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_5788, 8) { 0x1E, 0x85 }, { 0x3E, 0xE8 }, @@ -159,9 +159,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreatePixelShader +// * D3DDevice_CreatePixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_CreatePixelShader_1_0_5788, 8) { 0x07, 0x00 }, { 0x10, 0xC0 }, @@ -174,9 +174,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreatePixelShader_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexData4f +// * D3DDevice_SetVertexData4f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_SetVertexData4f_1_0_5788, 7) { 0x0A, 0x46 }, { 0x16, 0x08 }, @@ -188,9 +188,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData4f_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexDataColor +// * D3DDevice_SetVertexDataColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_SetVertexDataColor_1_0_5788, 7) { 0x08, 0x06 }, { 0x14, 0x8B }, @@ -202,9 +202,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexDataColor_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_5788, 7) { 0x09, 0x84 }, { 0x14, 0x46 }, @@ -216,9 +216,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetIndices +// * D3DDevice_SetIndices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_SetIndices_1_0_5788, 7) { 0x0F, 0x10 }, { 0x20, 0xC7 }, @@ -230,9 +230,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetIndices_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_5788, 8) { 0x1E, 0x5E }, { 0x3E, 0x17 }, @@ -245,9 +245,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVerticesUP +// * D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP_1_0_5788, 8) { 0x1F, 0x05 }, { 0x3A, 0x89 }, @@ -260,9 +260,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5788, 9) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_5788, 9) { 0x04, 0x08 }, { 0x0C, 0x81 }, @@ -276,9 +276,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5788, 9) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginStateBig +// * D3DDevice_BeginStateBig // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BeginStateBig_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_BeginStateBig_1_0_5788, 7) { 0x07, 0x01 }, { 0x10, 0x8D }, @@ -290,9 +290,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_BeginStateBig_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexBuffer2 +// * D3DDevice_CreateVertexBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2_1_0_5788, 7) { 0x08, 0xE8 }, { 0x12, 0x1E }, @@ -304,9 +304,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DVertexBuffer8_Lock +// * D3DVertexBuffer8_Lock // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock_1_0_5788, 8) +OOVPA_NO_XREF(D3DVertexBuffer_Lock_1_0_5788, 8) { 0x01, 0x51 }, { 0x07, 0x8B }, @@ -321,7 +321,7 @@ OOVPA_END; // ****************************************************************** // * D3DVertexBuffer_Lock2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_5788, 7) +OOVPA_NO_XREF(D3DVertexBuffer_Lock2_1_0_5788, 7) { 0x08, 0x56 }, { 0x12, 0x06 }, @@ -333,9 +333,9 @@ OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_LightEnable +// * D3DDevice_LightEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_LightEnable_1_0_5788, 8) { 0x1E, 0x8D }, { 0x3E, 0xC7 }, @@ -348,9 +348,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_LightEnable_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVertices +// * D3DDevice_DrawVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5788, 7) +OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_5788, 7) { 0x12, 0x8B }, { 0x26, 0x8B }, @@ -362,9 +362,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderTarget +// * D3DDevice_SetRenderTarget // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderTarget_1_0_5788, 8) { 0x1E, 0x44 }, { 0x3E, 0x2C }, @@ -377,9 +377,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderTarget_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3D8_AllocContiguousMemory +// * D3D_AllocContiguousMemory // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_AllocContiguousMemory_1_0_5788, 7) +OOVPA_NO_XREF(D3D_AllocContiguousMemory_1_0_5788, 7) { 0x05, 0x10 }, { 0x0C, 0x00 }, @@ -391,7 +391,7 @@ OOVPA_NO_XREF(IDirect3D8_AllocContiguousMemory_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DTexture8_GetLevelDesc +// * D3DTexture8_GetLevelDesc // ****************************************************************** // * NOTE: We are actually intercepting Get2DSurfaceDesc, because // * GetLevelDesc Simply redirects to that function @@ -416,9 +416,9 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_5788, 10) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateTexture2 +// * D3DDevice_CreateTexture2 // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_CreateTexture2_1_0_5788, 8, +OOVPA_XREF(D3DDevice_CreateTexture2_1_0_5788, 8, XRefNoSaveIndex, // ?? XREF_D3DDevice_CreateTexture2, XRefZero) @@ -434,36 +434,36 @@ OOVPA_XREF(IDirect3DDevice8_CreateTexture2_1_0_5788, 8, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant1 +// * D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5788, 11) +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1_1_0_5788, 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_5788, 8) +OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_5788, 8) { 0x0D, 0x05 }, { 0x17, 0x8D }, @@ -476,9 +476,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_5788, 8) { 0x1E, 0x72 }, { 0x3E, 0xC0 }, @@ -491,9 +491,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5788, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_BeginPushBuffer +// * D3DDevice_BeginPushBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_BeginPushBuffer_1_0_5788, 6) +OOVPA_NO_XREF(D3DDevice_BeginPushBuffer_1_0_5788, 6) { 0x09, 0x00 }, { 0x11, 0x8B }, @@ -504,9 +504,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_BeginPushBuffer_1_0_5788, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_EndPushBuffer +// * D3DDevice_EndPushBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_EndPushBuffer_1_0_5788, 6) +OOVPA_NO_XREF(D3DDevice_EndPushBuffer_1_0_5788, 6) { 0x09, 0x00 }, { 0x15, 0x50 }, @@ -517,9 +517,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_EndPushBuffer_1_0_5788, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_RunPushBuffer +// * D3DDevice_RunPushBuffer // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_RunPushBuffer_1_0_5788, 6) +OOVPA_NO_XREF(D3DDevice_RunPushBuffer_1_0_5788, 6) { 0x0E, 0xED }, { 0x42, 0x18 }, @@ -530,9 +530,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_RunPushBuffer_1_0_5788, 6) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVerticalBlankCallback +// * D3DDevice_SetVerticalBlankCallback // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5788, 7, +OOVPA_XREF(D3DDevice_SetVerticalBlankCallback_1_0_5788, 7, XRefNoSaveIndex, XRefOne) @@ -610,7 +610,7 @@ OOVPA_END; // ****************************************************************** // * IDirectD3DDevice8_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Release_1_0_5788, 8) +OOVPA_NO_XREF(D3DDevice_Release_1_0_5788, 8) { 0x07, 0x8B }, { 0x0C, 0x00 }, @@ -705,25 +705,25 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth_1_0_5788, 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 @@ -874,17 +874,17 @@ OOVPA_XREF(D3D_ClearStateBlockFlags_1_0_5788, 9, XREF_CLEARSTATEBLOCKFLAGS, XRefZero) - // IDirect3D_ClearStateBlockFlags+0x0A : mov ecx, 0x87 + // D3D_ClearStateBlockFlags+0x0A : mov ecx, 0x87 { 0x0A, 0xB9 }, // (Offset,Value)-Pair #1 { 0x0B, 0x87 }, // (Offset,Value)-Pair #2 - // IDirect3D_ClearStateBlockFlags+0x16 : mov ecx, [edx+0x07A4] + // D3D_ClearStateBlockFlags+0x16 : mov ecx, [edx+0x07A4] { 0x16, 0x8B }, // (Offset,Value)-Pair #3 { 0x17, 0x8A }, // (Offset,Value)-Pair #4 { 0x18, 0xA4 }, // (Offset,Value)-Pair #5 { 0x19, 0x07 }, // (Offset,Value)-Pair #6 - // IDirect3D_ClearStateBlockFlags+0x2F : add ecx, 0x90 + // D3D_ClearStateBlockFlags+0x2F : add ecx, 0x90 { 0x2F, 0x81 }, // (Offset,Value)-Pair #7 { 0x30, 0xC1 }, // (Offset,Value)-Pair #8 { 0x31, 0x90 }, // (Offset,Value)-Pair #9 @@ -898,17 +898,17 @@ OOVPA_XREF(D3D_RecordStateBlock_1_0_5788, 10, XREF_RECORDSTATEBLOCK, XRefZero) - // IDirect3D_RecordStateBlock+0x0F : mov eax, [edi+0x07A4] + // D3D_RecordStateBlock+0x0F : mov eax, [edi+0x07A4] { 0x0F, 0x8B }, // (Offset,Value)-Pair #1 { 0x10, 0x87 }, // (Offset,Value)-Pair #2 { 0x11, 0xA4 }, // (Offset,Value)-Pair #3 { 0x12, 0x07 }, // (Offset,Value)-Pair #4 - // IDirect3D_RecordStateBlock+0x95 : add ebx, ecx + // D3D_RecordStateBlock+0x95 : add ebx, ecx { 0x95, 0x03 }, // (Offset,Value)-Pair #5 { 0x96, 0xD9 }, // (Offset,Value)-Pair #6 - // IDirect3D_RecordStateBlock+0xD5 : mov dword ptr [esi+0x0C], 1 + // D3D_RecordStateBlock+0xD5 : mov dword ptr [esi+0x0C], 1 { 0xD5, 0xC7 }, // (Offset,Value)-Pair #7 { 0xD6, 0x46 }, // (Offset,Value)-Pair #8 { 0xD7, 0x0C }, // (Offset,Value)-Pair #9 @@ -973,26 +973,26 @@ OOVPA_NO_XREF(D3DDevice_Swap_1_0_5788, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap (2) +// * D3DDevice_Swap (2) // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap2_1_0_5788, 11) +OOVPA_NO_XREF(D3DDevice_Swap2_1_0_5788, 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; @@ -1282,340 +1282,340 @@ OOVPA_END; // ****************************************************************** OOVPATable D3D8_1_0_5788[] = { - // IDirect3D8::CreateDevice (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_4627, XTL::EmuIDirect3D8_CreateDevice), - // IDirect3DDevice8::BeginVisibilityTest (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginVisibilityTest_1_0_4627, XTL::EmuIDirect3DDevice8_BeginVisibilityTest), - // IDirect3DDevice8::EndVisibilityTest - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndVisibilityTest_1_0_5788, XTL::EmuIDirect3DDevice8_EndVisibilityTest), - // IDirect3DDevice8::GetVisibilityTestResult - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetVisibilityTestResult_1_0_5788, XTL::EmuIDirect3DDevice8_GetVisibilityTestResult), - // IDirect3DDevice8::GetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetViewport_1_0_5788, XTL::EmuIDirect3DDevice8_GetViewport), - // IDirect3DDevice8::SetBackBufferScale - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetBackBufferScale_1_0_5788, XTL::EmuIDirect3DDevice8_SetBackBufferScale), - // IDirect3DDevice8::GetCreationParameters (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetCreationParameters_1_0_4034, XTL::EmuIDirect3DDevice8_GetCreationParameters), - // IDirect3DDevice8::Clear (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_5233, XTL::EmuIDirect3DDevice8_Clear), - // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5788, XTL::EmuIDirect3DDevice8_Swap), - // IDirect3DDevice8::Swap (2) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap2_1_0_5788, XTL::EmuIDirect3DDevice8_Swap), - // IDirect3DDevice8::GetBackBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetBackBuffer2_1_0_5788, XTL::EmuIDirect3DDevice8_GetBackBuffer2), - // IDirect3DDevice8::GetDepthStencilSurface2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDepthStencilSurface2_1_0_5788, XTL::EmuIDirect3DDevice8_GetDepthStencilSurface2), - // IDirect3DDevice8::CreateVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_5788, XTL::EmuIDirect3DDevice8_CreateVertexShader), - // IDirect3DDevice8::CreatePixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePixelShader_1_0_5788, XTL::EmuIDirect3DDevice8_CreatePixelShader), - // IDirect3DDevice8::SetPixelShader (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_5233, XTL::EmuIDirect3DDevice8_SetPixelShader), - // IDirect3DDevice8::GetDisplayMode (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDisplayMode_1_0_4627, XTL::EmuIDirect3DDevice8_GetDisplayMode), - // IDirect3DDevice8::SetVertexData2f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_5788, XTL::EmuIDirect3DDevice8_SetVertexData2f), - // IDirect3DDevice8::SetVertexData4f - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData4f_1_0_5788, XTL::EmuIDirect3DDevice8_SetVertexData4f), - // IDirect3DDevice8::SetVertexDataColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexDataColor_1_0_5788, XTL::EmuIDirect3DDevice8_SetVertexDataColor), - // IDirect3DDevice8::End (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_5558, XTL::EmuIDirect3DDevice8_End), - // IDirect3DDevice8::SetVerticalBlankCallback - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVerticalBlankCallback_1_0_5788, XTL::EmuIDirect3DDevice8_SetVerticalBlankCallback), - // IDirect3DDevice8::SetTextureState_TexCoordIndex (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), - // IDirect3DDevice8::SetTextureState_BumpEnv (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv), - // IDirect3DDevice8::SetTextureState_BorderColor (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_4361, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), - // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), - // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), - // IDirect3DDevice8::SetRenderState_NormalizeNormals (* unchanged since 4432 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4432, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), - // IDirect3DDevice8::SetRenderState_ZBias (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZBias_1_0_3925, XTL::EmuIDirect3DDevice8_SetRenderState_ZBias), - // IDirect3DDevice8::SetRenderState_EdgeAntiAlias (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), - // IDirect3DDevice8::SetRenderState_FillMode (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), - // IDirect3DDevice8::SetRenderState_FogColor (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), - // IDirect3DDevice8::SetRenderState_Simple (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_Simple_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_Simple), - // IDirect3DDevice8::SetRenderState_ZEnable (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), - // IDirect3DDevice8::SetRenderState_StencilEnable (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_4361, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), - // IDirect3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilFail_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), - // IDirect3DDevice8::SetRenderState_OcclusionCullEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable), - // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4627, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), - // IDirect3DDevice8::SetRenderState_ShadowFunc (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc), - // IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable), - // IDirect3DDevice8::SetVertexShader (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShader), - // IDirect3DDevice8::SetIndices - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetIndices_1_0_5788, XTL::EmuIDirect3DDevice8_SetIndices), - // IDirect3DDevice8::SetTexture (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_5233, XTL::EmuIDirect3DDevice8_SetTexture), - // IDirect3DDevice8::SwitchTexture (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SwitchTexture_1_0_4361, XTL::EmuIDirect3DDevice8_SwitchTexture), + // D3D8::CreateDevice (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_4627, D3D_CreateDevice), + // D3DDevice8::BeginVisibilityTest (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_BeginVisibilityTest_1_0_4627, D3DDevice_BeginVisibilityTest), + // D3DDevice8::EndVisibilityTest + OOVPA_TABLE_PATCH(D3DDevice_EndVisibilityTest_1_0_5788, D3DDevice_EndVisibilityTest), + // D3DDevice8::GetVisibilityTestResult + OOVPA_TABLE_PATCH(D3DDevice_GetVisibilityTestResult_1_0_5788, D3DDevice_GetVisibilityTestResult), + // D3DDevice8::GetViewport + OOVPA_TABLE_PATCH(D3DDevice_GetViewport_1_0_5788, D3DDevice_GetViewport), + // D3DDevice8::SetBackBufferScale + OOVPA_TABLE_PATCH(D3DDevice_SetBackBufferScale_1_0_5788, D3DDevice_SetBackBufferScale), + // D3DDevice8::GetCreationParameters (* unchanged since 4034 *) + OOVPA_TABLE_PATCH(D3DDevice_GetCreationParameters_1_0_4034, D3DDevice_GetCreationParameters), + // D3DDevice8::Clear (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_5233, D3DDevice_Clear), + // D3DDevice8::Swap + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5788, D3DDevice_Swap), + // D3DDevice8::Swap (2) + OOVPA_TABLE_PATCH(D3DDevice_Swap2_1_0_5788, D3DDevice_Swap), + // D3DDevice8::GetBackBuffer2 + OOVPA_TABLE_PATCH(D3DDevice_GetBackBuffer2_1_0_5788, D3DDevice_GetBackBuffer2), + // D3DDevice8::GetDepthStencilSurface2 + OOVPA_TABLE_PATCH(D3DDevice_GetDepthStencilSurface2_1_0_5788, D3DDevice_GetDepthStencilSurface2), + // D3DDevice8::CreateVertexShader + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_5788, D3DDevice_CreateVertexShader), + // D3DDevice8::CreatePixelShader + OOVPA_TABLE_PATCH(D3DDevice_CreatePixelShader_1_0_5788, D3DDevice_CreatePixelShader), + // D3DDevice8::SetPixelShader (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_5233, D3DDevice_SetPixelShader), + // D3DDevice8::GetDisplayMode (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayMode_1_0_4627, D3DDevice_GetDisplayMode), + // D3DDevice8::SetVertexData2f + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_5788, D3DDevice_SetVertexData2f), + // D3DDevice8::SetVertexData4f + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData4f_1_0_5788, D3DDevice_SetVertexData4f), + // D3DDevice8::SetVertexDataColor + OOVPA_TABLE_PATCH(D3DDevice_SetVertexDataColor_1_0_5788, D3DDevice_SetVertexDataColor), + // D3DDevice8::End (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_5558, D3DDevice_End), + // D3DDevice8::SetVerticalBlankCallback + OOVPA_TABLE_PATCH(D3DDevice_SetVerticalBlankCallback_1_0_5788, D3DDevice_SetVerticalBlankCallback), + // D3DDevice8::SetTextureState_TexCoordIndex (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_4627, D3DDevice_SetTextureState_TexCoordIndex), + // D3DDevice8::SetTextureState_BumpEnv (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_4361, D3DDevice_SetTextureState_BumpEnv), + // D3DDevice8::SetTextureState_BorderColor (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_4361, D3DDevice_SetTextureState_BorderColor), + // D3DDevice8::SetRenderState_CullMode (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_5233, D3DDevice_SetRenderState_CullMode), + // D3DDevice8::SetRenderState_TextureFactor + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5788, D3DDevice_SetRenderState_TextureFactor), + // D3DDevice8::SetRenderState_NormalizeNormals (* unchanged since 4432 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_4432, D3DDevice_SetRenderState_NormalizeNormals), + // D3DDevice8::SetRenderState_ZBias (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZBias_1_0_3925, D3DDevice_SetRenderState_ZBias), + // D3DDevice8::SetRenderState_EdgeAntiAlias (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_4361, D3DDevice_SetRenderState_EdgeAntiAlias), + // D3DDevice8::SetRenderState_FillMode (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_4361, D3DDevice_SetRenderState_FillMode), + // D3DDevice8::SetRenderState_FogColor (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_4134, D3DDevice_SetRenderState_FogColor), + // D3DDevice8::SetRenderState_Simple (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Simple_1_0_4361, D3DDevice_SetRenderState_Simple), + // D3DDevice8::SetRenderState_ZEnable (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_5233, D3DDevice_SetRenderState_ZEnable), + // D3DDevice8::SetRenderState_StencilEnable (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_4361, D3DDevice_SetRenderState_StencilEnable), + // D3DDevice8::SetRenderState_StencilFail (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_4134, D3DDevice_SetRenderState_StencilFail), + // D3DDevice8::SetRenderState_OcclusionCullEnable (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_4134, D3DDevice_SetRenderState_OcclusionCullEnable), + // D3DDevice8::SetRenderState_MultiSampleAntiAlias (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_4627, D3DDevice_SetRenderState_MultiSampleAntiAlias), + // D3DDevice8::SetRenderState_ShadowFunc (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_4134, D3DDevice_SetRenderState_ShadowFunc), + // D3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_4134, D3DDevice_SetRenderState_YuvEnable), + // D3DDevice8::SetVertexShader (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_5558, D3DDevice_SetVertexShader), + // D3DDevice8::SetIndices + OOVPA_TABLE_PATCH(D3DDevice_SetIndices_1_0_5788, D3DDevice_SetIndices), + // D3DDevice8::SetTexture (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_5233, D3DDevice_SetTexture), + // D3DDevice8::SwitchTexture (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SwitchTexture_1_0_4361, D3DDevice_SwitchTexture), // 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), - // IDirect3DDevice8::EndPush (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndPush_1_0_4627, XTL::EmuIDirect3DDevice8_EndPush), + // D3DDevice8::BeginPush (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_BeginPush_1_0_5558, D3DDevice_BeginPush), + // D3DDevice8::EndPush (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_EndPush_1_0_4627, D3DDevice_EndPush), // /* Not implemented yet. - // IDirect3DDevice8::BeginPushBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginPushBuffer_1_0_5788, XTL::EmuIDirect3DDevice8_BeginPushBuffer), - // IDirect3DDevice8::EndPushBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndPushBuffer_1_0_5788, XTL::EmuIDirect3DDevice8_EndPushBuffer), + // D3DDevice8::BeginPushBuffer + OOVPA_TABLE_PATCH(D3DDevice_BeginPushBuffer_1_0_5788, D3DDevice_BeginPushBuffer), + // D3DDevice8::EndPushBuffer + OOVPA_TABLE_PATCH(D3DDevice_EndPushBuffer_1_0_5788, D3DDevice_EndPushBuffer), // */ - // IDirect3DDevice8::RunPushBuffer - OOVPA_TABLE_PATCH(IDirect3DDevice8_RunPushBuffer_1_0_5788, XTL::EmuIDirect3DDevice8_RunPushBuffer), - // IDirect3DDevice8::Begin (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Begin_1_0_5233, XTL::EmuIDirect3DDevice8_Begin), - // IDirect3DDevice8::BeginStateBig - OOVPA_TABLE_XREF(IDirect3DDevice8_BeginStateBig_1_0_5788), - // IDirect3DDevice8::GetTransform (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetTransform_1_0_4361, XTL::EmuIDirect3DDevice8_GetTransform), - // IDirect3DDevice8::SetTransform (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTransform_1_0_5558, XTL::EmuIDirect3DDevice8_SetTransform), - // IDirect3DDevice8::CreateIndexBuffer2 - OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_5558, XTL::EmuIDirect3DDevice8_CreateIndexBuffer2), - // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_5788, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), - // IDirect3DDevice8::DrawIndexedVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVerticesUP_1_0_5788, XTL::EmuIDirect3DDevice8_DrawIndexedVerticesUP), - // IDirect3DDevice8::SetMaterial - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_5788, XTL::EmuIDirect3DDevice8_SetMaterial), - // IDirect3DDevice8::SetStreamSource (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_4361, XTL::EmuIDirect3DDevice8_SetStreamSource), - // IDirect3DResource8::Register (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_Register_1_0_3925, XTL::EmuIDirect3DResource8_Register), - // IDirect3DResource8::AddRef (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef), - // IDirect3DResource8::Release (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_3925, XTL::EmuIDirect3DResource8_Release), - // IDirect3DResource8::IsBusy (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_IsBusy_1_0_4361, XTL::EmuIDirect3DResource8_IsBusy), + // D3DDevice8::RunPushBuffer + OOVPA_TABLE_PATCH(D3DDevice_RunPushBuffer_1_0_5788, D3DDevice_RunPushBuffer), + // D3DDevice8::Begin (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_Begin_1_0_5233, D3DDevice_Begin), + // D3DDevice8::BeginStateBig + OOVPA_TABLE_XREF(D3DDevice_BeginStateBig_1_0_5788), + // D3DDevice8::GetTransform (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_GetTransform_1_0_4361, D3DDevice_GetTransform), + // D3DDevice8::SetTransform (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTransform_1_0_5558, D3DDevice_SetTransform), + // D3DDevice8::CreateIndexBuffer2 + OOVPA_TABLE_PATCH(D3DDevice_CreateIndexBuffer2_1_0_5558, D3DDevice_CreateIndexBuffer2), + // D3DDevice8::DrawIndexedVertices + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_5788, D3DDevice_DrawIndexedVertices), + // D3DDevice8::DrawIndexedVerticesUP + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVerticesUP_1_0_5788, D3DDevice_DrawIndexedVerticesUP), + // D3DDevice8::SetMaterial + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5788, D3DDevice_SetMaterial), + // D3DDevice8::SetStreamSource (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_4361, D3DDevice_SetStreamSource), + // D3DResource8::Register (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DResource_Register_1_0_3925, D3DResource_Register), + // D3DResource8::AddRef (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef), + // D3DResource8::Release (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_3925, D3DResource_Release), + // D3DResource8::IsBusy (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DResource_IsBusy_1_0_4361, D3DResource_IsBusy), // D3D::BlockOnResource (XREF) (* unchanged since 5558 *) OOVPA_TABLE_XREF(D3D_BlockOnResource_1_0_5558), - // IDirect3DResource8::BlockUntilNotBusy (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DResource8_BlockUntilNotBusy_1_0_5558, XTL::EmuIDirect3DResource8_BlockUntilNotBusy), - // IDirect3DVertexBuffer8::GetDesc (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_GetDesc_1_0_5233, XTL::EmuIDirect3DVertexBuffer8_GetDesc), - // IDirect3DSurface8::GetDesc (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DSurface8_GetDesc_1_0_4361, XTL::EmuIDirect3DSurface8_GetDesc), - // IDirect3DDevice8::CopyRects (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CopyRects_1_0_5233, XTL::EmuIDirect3DDevice8_CopyRects), - // IDirect3DPalette8::Lock2 (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DPalette8_Lock2_1_0_5233, XTL::EmuIDirect3DPalette8_Lock2), - // IDirect3DTexture8::LockRect - OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_5558, XTL::EmuIDirect3DTexture8_LockRect), - // IDirect3DSurface8::LockRect (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DSurface8_LockRect_1_0_3925, XTL::EmuIDirect3DSurface8_LockRect), - // IDirect3DBaseTexture8::GetLevelCount (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DBaseTexture8_GetLevelCount_1_0_4361, XTL::EmuIDirect3DBaseTexture8_GetLevelCount), - // IDirect3DTexture8::GetSurfaceLevel2 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DTexture8_GetSurfaceLevel2_1_0_4627, XTL::EmuIDirect3DTexture8_GetSurfaceLevel2), - // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5558, XTL::EmuIDirect3DDevice8_SetLight), - // IDirect3DDevice8::CreateVertexBuffer2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_5788, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2), - // IDirect3DVertexBuffer8_Lock - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock_1_0_5788, XTL::EmuIDirect3DVertexBuffer8_Lock), - // IDirect3DVertexBuffer8::Lock2 - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_5788, XTL::EmuIDirect3DVertexBuffer8_Lock2), - // IDirect3DDevice8_LightEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_LightEnable_1_0_5788, XTL::EmuIDirect3DDevice8_LightEnable), + // D3DResource8::BlockUntilNotBusy (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DResource_BlockUntilNotBusy_1_0_5558, D3DResource_BlockUntilNotBusy), + // D3DVertexBuffer8::GetDesc (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DVertexBuffer_GetDesc_1_0_5233, D3DVertexBuffer_GetDesc), + // D3DSurface8::GetDesc (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DSurface_GetDesc_1_0_4361, D3DSurface_GetDesc), + // D3DDevice8::CopyRects (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_CopyRects_1_0_5233, D3DDevice_CopyRects), + // D3DPalette8::Lock2 (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DPalette_Lock2_1_0_5233, D3DPalette_Lock2), + // D3DTexture8::LockRect + OOVPA_TABLE_PATCH(D3DTexture_LockRect_1_0_5558, D3DTexture_LockRect), + // D3DSurface8::LockRect (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DSurface_LockRect_1_0_3925, D3DSurface_LockRect), + // D3DBaseTexture8::GetLevelCount (* unchanged since 4361 *) + OOVPA_TABLE_PATCH(D3DBaseTexture_GetLevelCount_1_0_4361, D3DBaseTexture_GetLevelCount), + // D3DTexture8::GetSurfaceLevel2 (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DTexture_GetSurfaceLevel2_1_0_4627, D3DTexture_GetSurfaceLevel2), + // D3DDevice8::SetLight + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5558, D3DDevice_SetLight), + // D3DDevice8::CreateVertexBuffer2 + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_5788, D3DDevice_CreateVertexBuffer2), + // D3DVertexBuffer8_Lock + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock_1_0_5788, D3DVertexBuffer_Lock), + // D3DVertexBuffer8::Lock2 + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_5788, D3DVertexBuffer_Lock2), + // D3DDevice_LightEnable + OOVPA_TABLE_PATCH(D3DDevice_LightEnable_1_0_5788, D3DDevice_LightEnable), // D3DDevice_SetModelView (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_5558, XTL::EmuIDirect3DDevice8_SetModelView), + OOVPA_TABLE_PATCH(D3DDevice_SetModelView_1_0_5558, D3DDevice_SetModelView), // D3DDevice_PersistDisplay (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_5558, XTL::EmuIDirect3DDevice8_PersistDisplay), - // IDirect3D8::SetPushBufferSize (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3D8_SetPushBufferSize_1_0_5558, XTL::EmuIDirect3D8_SetPushBufferSize), - // IDirect3D8::CheckDeviceMultiSampleType (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3D8_CheckDeviceMultiSampleType_1_0_5558, XTL::EmuIDirect3D8_CheckDeviceMultiSampleType), - // IDirect3D8::GetDeviceCaps (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3D8_GetDeviceCaps_1_0_5233, XTL::EmuIDirect3D8_GetDeviceCaps), - // IDirect3DDevice8_DrawVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_5788, XTL::EmuIDirect3DDevice8_DrawVertices), - // IDirect3D8_AllocContiguousMemory - OOVPA_TABLE_PATCH(IDirect3D8_AllocContiguousMemory_1_0_5788, XTL::EmuIDirect3D8_AllocContiguousMemory), - // IDirect3DTexture8_GetLevelDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5788, XTL::EmuGet2DSurfaceDesc), - // IDirect3DDevice8::CreateTexture2 - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateTexture2_1_0_5788, XTL::EmuIDirect3DDevice8_CreateTexture2), + OOVPA_TABLE_PATCH(D3DDevice_PersistDisplay_1_0_5558, D3DDevice_PersistDisplay), + // D3D8::SetPushBufferSize (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3D_SetPushBufferSize_1_0_5558, D3D_SetPushBufferSize), + // D3D8::CheckDeviceMultiSampleType (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3D_CheckDeviceMultiSampleType_1_0_5558, D3D_CheckDeviceMultiSampleType), + // D3D8::GetDeviceCaps (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3D_GetDeviceCaps_1_0_5233, D3D_GetDeviceCaps), + // D3DDevice_DrawVertices + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_5788, D3DDevice_DrawVertices), + // D3D8_AllocContiguousMemory + OOVPA_TABLE_PATCH(D3D_AllocContiguousMemory_1_0_5788, D3D_AllocContiguousMemory), + // D3DTexture8_GetLevelDesc + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5788, Get2DSurfaceDesc), + // D3DDevice8::CreateTexture2 + OOVPA_TABLE_PATCH(D3DDevice_CreateTexture2_1_0_5788, D3DDevice_CreateTexture2), // Lock2DSurface - OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, XTL::EmuLock2DSurface), - // IDirect3DDevice8::SetVertexShaderConstant4 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4), - // IDirect3DDevice8::SetVertexShaderConstant1 - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5788, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), - // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_5788, XTL::EmuIDirect3DDevice8_DrawVerticesUP), - // IDirect3DDevice8::SetRenderTarget - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderTarget_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderTarget), - // IDirect3DDevice8::SetShaderConstantMode (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_5233, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), - // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5788, XTL::EmuIDirect3DDevice8_SetViewport), - // IDirect3DDevice8::BlockUntilVerticalBlank - OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5788, XTL::EmuIDirect3DDevice8_BlockUntilVerticalBlank), - // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetDeviceCaps_1_0_3925, XTL::EmuIDirect3DDevice8_GetDeviceCaps), - // IDirect3DDevice8::SetRenderState_FrontFace (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FrontFace_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_FrontFace), - // IDirect3DDevice8::GetModelView (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(D3DDevice_GetModelView_1_0_5558, XTL::EmuIDirect3DDevice8_GetModelView), - // IDirect3DDevice8::SetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5788, XTL::EmuIDirect3DDevice8_SetBackMaterial), - // IDirect3DDevice8::SetRenderState_TwoSidedLighting - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5788, XTL::EmuIDirect3DDevice8_SetTextureState_TwoSidedLighting), - // IDirect3D8::KickOffAndWaitForIdle (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3D8_KickOffAndWaitForIdle_1_0_5233, XTL::EmuIDirect3D8_KickOffAndWaitForIdle), + OOVPA_TABLE_PATCH(Lock2DSurface_1_0_3925, Lock2DSurface), + // D3DDevice8::SetVertexShaderConstant4 + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4), + // D3DDevice8::SetVertexShaderConstant1 + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_5788, D3DDevice_SetVertexShaderConstant1), + // D3DDevice8::DrawVerticesUP + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_5788, D3DDevice_DrawVerticesUP), + // D3DDevice8::SetRenderTarget + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTarget_1_0_5788, D3DDevice_SetRenderTarget), + // D3DDevice8::SetShaderConstantMode (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_5233, D3DDevice_SetShaderConstantMode), + // D3DDevice8::SetViewport + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5788, D3DDevice_SetViewport), + // D3DDevice8::BlockUntilVerticalBlank + OOVPA_TABLE_PATCH(D3DDevice_BlockUntilVerticalBlank_1_0_5788, D3DDevice_BlockUntilVerticalBlank), + // D3DDevice_GetDeviceCaps (* unchanged since 3925 *) + OOVPA_TABLE_PATCH(D3DDevice_GetDeviceCaps_1_0_3925, D3DDevice_GetDeviceCaps), + // D3DDevice8::SetRenderState_FrontFace (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FrontFace_1_0_4134, D3DDevice_SetRenderState_FrontFace), + // D3DDevice8::GetModelView (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_GetModelView_1_0_5558, D3DDevice_GetModelView), + // D3DDevice8::SetBackMaterial + OOVPA_TABLE_PATCH(D3DDevice_SetBackMaterial_1_0_5788, D3DDevice_SetBackMaterial), + // D3DDevice8::SetRenderState_TwoSidedLighting + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TwoSidedLighting_1_0_5788, D3DDevice_SetTextureState_TwoSidedLighting), + // D3D8::KickOffAndWaitForIdle (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3D_KickOffAndWaitForIdle_1_0_5233, D3D_KickOffAndWaitForIdle), // D3D::SetTileNoWait - OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_5788, XTL::EmuIDirect3DDevice8_SetTileNoWait), - // IDirect3DDevice8::SetGammaRamp (* unchanged since 4928 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetGammaRamp_1_0_4928, XTL::EmuIDirect3DDevice8_SetGammaRamp), - // IDirect3DDevice8::GetGammaRamp (* unchanged since 4034 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetGammaRamp_1_0_4034, XTL::EmuIDirect3DDevice8_GetGammaRamp), + OOVPA_TABLE_PATCH(D3DDevice_SetTileNoWait_1_0_5788, D3DDevice_SetTileNoWait), + // D3DDevice8::SetGammaRamp (* unchanged since 4928 *) + OOVPA_TABLE_PATCH(D3DDevice_SetGammaRamp_1_0_4928, D3DDevice_SetGammaRamp), + // D3DDevice8::GetGammaRamp (* unchanged since 4034 *) + OOVPA_TABLE_PATCH(D3DDevice_GetGammaRamp_1_0_4034, D3DDevice_GetGammaRamp), // D3DDevice_SetSwapCallback - OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5788, XTL::EmuIDirect3DDevice8_SetSwapCallback), - // IDirect3DDevice8::GetRenderTarget2 (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_GetRenderTarget2_1_0_5233, XTL::EmuIDirect3DDevice8_GetRenderTarget2), + OOVPA_TABLE_PATCH(D3DDevice_SetSwapCallback_1_0_5788, D3DDevice_SetSwapCallback), + // D3DDevice8::GetRenderTarget2 (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_GetRenderTarget2_1_0_5233, D3DDevice_GetRenderTarget2), // D3DDevice_SetRenderState_StencilFail - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilFail_1_0_5788, D3DDevice_SetRenderState_StencilFail), // D3DDevice_SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5788, D3DDevice_SetRenderState_VertexBlend), // D3DDevice_SetRenderState_VertexBlend - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend), - // IDirect3DDevice8::Reset (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_Reset_1_0_4134, XTL::EmuIDirect3DDevice8_Reset), - // IDirect3DDevice::Release - OOVPA_TABLE_PATCH(IDirect3DDevice8_Release_1_0_5788, XTL::EmuIDirect3DDevice8_Release), - // IDirect3DDevice8_InsertCallback (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(D3DDevice_InsertCallback_1_0_5558, XTL::EmuIDirect3DDevice8_InsertCallback), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_VertexBlend_1_0_5788, D3DDevice_SetRenderState_VertexBlend), + // D3DDevice8::Reset (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_Reset_1_0_4134, D3DDevice_Reset), + // D3DDevice::Release + OOVPA_TABLE_PATCH(D3DDevice_Release_1_0_5788, 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_5788, XTL::EmuIDirect3DDevice8_SetRenderState_LineWidth), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LineWidth_1_0_5788, D3DDevice_SetRenderState_LineWidth), // D3DDevice_SetRenderState_SampleAlpha (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_SampleAlpha_1_0_5233, XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha), - // IDirect3DDevice8::SetTextureState_ColorKeyColor (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_4134, XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor), - // IDirect3DDevice8::IsFencePending (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(D3DDevice_IsFencePending_1_0_5558, XTL::EmuIDirect3DDevice8_IsFencePending), - // IDirect3DDevice8::EnableOverlay (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_EnableOverlay_1_0_4361, XTL::EmuIDirect3DDevice8_EnableOverlay), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_SampleAlpha_1_0_5233, D3DDevice_SetRenderState_SampleAlpha), + // D3DDevice8::SetTextureState_ColorKeyColor (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_4134, D3DDevice_SetTextureState_ColorKeyColor), + // D3DDevice8::IsFencePending (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_IsFencePending_1_0_5558, D3DDevice_IsFencePending), + // D3DDevice8::EnableOverlay (* unchanged since 4361 *) + 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), - // IDirect3DDevice8::CreatePalette2 (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreatePalette2_1_0_5558, XTL::EmuIDirect3DDevice8_CreatePalette2), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_LogicOp_1_0_5558, D3DDevice_SetRenderState_LogicOp), + // D3DDevice8::CreatePalette2 (* unchanged since 5558 *) + OOVPA_TABLE_PATCH(D3DDevice_CreatePalette2_1_0_5558, D3DDevice_CreatePalette2), // D3DDevice_SetPalette - OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5788, XTL::EmuIDirect3DDevice8_SetPalette), + OOVPA_TABLE_PATCH(D3DDevice_SetPalette_1_0_5788, D3DDevice_SetPalette), // D3DDevice_LoadVertexShaderProgram - OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5788, XTL::EmuIDirect3DDevice8_LoadVertexShaderProgram), + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShaderProgram_1_0_5788, D3DDevice_LoadVertexShaderProgram), // D3DDevice_GetPushBufferOffset - OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_5788, XTL::EmuIDirect3DDevice8_GetPushBufferOffset), + OOVPA_TABLE_PATCH(D3DDevice_GetPushBufferOffset_1_0_5788, D3DDevice_GetPushBufferOffset), // D3D::MakeRequestedSpace OOVPA_TABLE_XREF(D3D_MakeRequestedSpace_1_0_5788), // D3D::Unknown OOVPA_TABLE_XREF(D3D_Unknown_1_0_5788), - // IDirect3DDevice8::SetVertexShaderConstantNotInline (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstantNotInline_1_0_5233, XTL::EmuIDirect3DDevice8_SetVertexShaderConstantNotInline), + // D3DDevice8::SetVertexShaderConstantNotInline (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstantNotInline_1_0_5233, D3DDevice_SetVertexShaderConstantNotInline), // D3DDevice_FlushVertexCache - OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5788, XTL::EmuIDirect3DDevice8_FlushVertexCache), + OOVPA_TABLE_PATCH(D3DDevice_FlushVertexCache_1_0_5788, D3DDevice_FlushVertexCache), // D3DDevice_GetVertexShaderSize - OOVPA_TABLE_PATCH(D3DDevice_GetVertexShaderSize_1_0_5788, XTL::EmuIDirect3DDevice8_GetVertexShaderSize), - // IDirect3DDevice8::LoadVertexShader (* unchanged since 5233 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_LoadVertexShader_1_0_5233, XTL::EmuIDirect3DDevice8_LoadVertexShader), - // IDirect3DDevice8::SelectVertexShader (* unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SelectVertexShader_1_0_5558, XTL::EmuIDirect3DDevice8_SelectVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_GetVertexShaderSize_1_0_5788, D3DDevice_GetVertexShaderSize), + // D3DDevice8::LoadVertexShader (* unchanged since 5233 *) + OOVPA_TABLE_PATCH(D3DDevice_LoadVertexShader_1_0_5233, D3DDevice_LoadVertexShader), + // D3DDevice8::SelectVertexShader (* unchanged since 5558 *) + 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), - // IDirect3DDevice8::AddRef - OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5788, XTL::EmuIDirect3DDevice8_AddRef), + OOVPA_TABLE_PATCH(X_D3DDevice_RunVertexStateShader_1_0_4627, D3DDevice_RunVertexStateShader), + // D3DDevice8::AddRef + OOVPA_TABLE_PATCH(D3DDevice_AddRef_1_0_5788, D3DDevice_AddRef), // D3D::ClearStateBlockFlags OOVPA_TABLE_XREF(D3D_ClearStateBlockFlags_1_0_5788), // D3D::RecordStateBlock OOVPA_TABLE_XREF(D3D_RecordStateBlock_1_0_5788), - // IDirect3DDevice8::BeginStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_BeginStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_BeginStateBlock), - // IDirect3DDevice8::EndStateBlock - OOVPA_TABLE_PATCH(IDirect3DDevice8_EndStateBlock_1_0_4361, XTL::EmuIDirect3DDevice8_EndStateBlock), + // D3DDevice8::BeginStateBlock + OOVPA_TABLE_PATCH(D3DDevice_BeginStateBlock_1_0_4361, D3DDevice_BeginStateBlock), + // D3DDevice8::EndStateBlock + OOVPA_TABLE_PATCH(D3DDevice_EndStateBlock_1_0_4361, D3DDevice_EndStateBlock), // D3DDevice_SetRenderState_BackFillMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_BackFillMode_1_0_5788, D3DDevice_SetRenderState_BackFillMode), // D3DDevice_SetRenderState_Dxt1NoiseEnable - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_Dxt1NoiseEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable_1_0_5788, D3DDevice_SetRenderState_Dxt1NoiseEnable), // D3DDevice_GetTile - OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_5788, XTL::EmuIDirect3DDevice8_GetTile), + OOVPA_TABLE_PATCH(D3DDevice_GetTile_1_0_5788, D3DDevice_GetTile), // D3D::CDevice::KickOff - OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_5788, XTL::EmuD3DDevice_KickOff), - // IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead), - // IDirect3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZRead_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_RopZRead), - // IDirect3DDevice8::SetRenderState_DoNotCullUncompressed (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_DoNotCullUncompressed_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_DoNotCullUncompressed), - // IDirect3DDevice8::SetSoftDisplayFilter - OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5788, XTL::EmuIDirect3DDevice8_SetSoftDisplayFilter), - // IDirect3DDevice8::SetFlickerFilter - OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5788, XTL::EmuIDirect3DDevice8_SetFlickerFilter), - // IDirect3DDevice8::SetRenderState_MultiSampleMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMode), - // IDirect3DDevice8::SetRenderState_MultiSampleRenderTargetMode - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleRenderTargetMode), - // IDirect3DDevice8::SetRenderState_MultiSampleAntiAlias - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias), - // IDirect3DDevice8::SetRenderState_MultiSampleMask - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_MultiSampleMask), - // IDirect3DDevice8::SetPixelShaderConstant - OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5788, XTL::EmuIDirect3DDevice8_SetPixelShaderConstant), + OOVPA_TABLE_PATCH(D3D_CDevice_KickOff_1_0_5788, D3DDevice_KickOff), + // D3DDevice8::SetRenderState_RopZCmpAlwaysRead (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_4134, D3DDevice_SetRenderState_RopZCmpAlwaysRead), + // D3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZRead_1_0_4134, D3DDevice_SetRenderState_RopZRead), + // D3DDevice8::SetRenderState_DoNotCullUncompressed (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_4134, D3DDevice_SetRenderState_DoNotCullUncompressed), + // D3DDevice8::SetSoftDisplayFilter + OOVPA_TABLE_PATCH(D3DDevice_SetSoftDisplayFilter_1_0_5788, D3DDevice_SetSoftDisplayFilter), + // D3DDevice8::SetFlickerFilter + OOVPA_TABLE_PATCH(D3DDevice_SetFlickerFilter_1_0_5788, D3DDevice_SetFlickerFilter), + // D3DDevice8::SetRenderState_MultiSampleMode + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMode_1_0_5788, D3DDevice_SetRenderState_MultiSampleMode), + // D3DDevice8::SetRenderState_MultiSampleRenderTargetMode + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode_1_0_5788, D3DDevice_SetRenderState_MultiSampleRenderTargetMode), + // D3DDevice8::SetRenderState_MultiSampleAntiAlias + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias_1_0_5788, D3DDevice_SetRenderState_MultiSampleAntiAlias), + // D3DDevice8::SetRenderState_MultiSampleMask + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_MultiSampleMask_1_0_5788, D3DDevice_SetRenderState_MultiSampleMask), + // D3DDevice8::SetPixelShaderConstant + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShaderConstant_1_0_5788, D3DDevice_SetPixelShaderConstant), // D3DDevice_GetDisplayFieldStatus - OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5788, XTL::EmuIDirect3DDevice8_GetDisplayFieldStatus), - // IDirect3DCubeTexture8::GetCubeMapSurface2 (* Unchanged since 4627 *) - OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2), - // IDirect3DDevice8::SetVertexShaderConstant1Fast (* Unchanged since 5558 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1Fast_1_0_5558, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_GetDisplayFieldStatus_1_0_5788, D3DDevice_GetDisplayFieldStatus), + // D3DCubeTexture8::GetCubeMapSurface2 (* Unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DCubeTexture_GetCubeMapSurface2_1_0_4627, D3DCubeTexture_GetCubeMapSurface2), + // D3DDevice8::SetVertexShaderConstant1Fast (* Unchanged since 5558 *) + 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), - // IDirect3DDevice8::SetScissors - OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5788, XTL::EmuIDirect3DDevice8_SetScissors), - // IDirect3DDevice8::GetScissors - OOVPA_TABLE_PATCH(D3DDevice_GetScissors_1_0_5788, XTL::EmuIDirect3DDevice8_GetScissors), - // IDirect3DDevice8::GetBackMaterial - OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_5788, XTL::EmuIDirect3DDevice8_GetBackMaterial), - // IDirect3DDevice8::ApplyStateBlock (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_4627, XTL::EmuIDirect3DDevice8_ApplyStateBlock), - // IDirect3DDevice8::CaptureStateBlock - OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_5788, XTL::EmuIDirect3DDevice8_CaptureStateBlock), - // IDirect3DDevice8::DeleteStateBlock - OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_5788, XTL::EmuIDirect3DDevice8_DeleteStateBlock), - // IDirect3DDevice8::SetRenderState_StencilCullEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilCullEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_StencilCullEnable), - // IDirect3DDevice8::SetRenderState_OcclusionCullEnable (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_4134, XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable), - // IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead - OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_5788, XTL::EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead), - // IDirect3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_RopZRead_1_0_4134, XTL::EmuIDirect3DDevice8_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_SetPixelShaderProgram_1_0_5558, D3DDevice_SetPixelShaderProgram), + // D3DDevice8::SetScissors + OOVPA_TABLE_PATCH(D3DDevice_SetScissors_1_0_5788, D3DDevice_SetScissors), + // D3DDevice8::GetScissors + OOVPA_TABLE_PATCH(D3DDevice_GetScissors_1_0_5788, D3DDevice_GetScissors), + // D3DDevice8::GetBackMaterial + OOVPA_TABLE_PATCH(D3DDevice_GetBackMaterial_1_0_5788, D3DDevice_GetBackMaterial), + // D3DDevice8::ApplyStateBlock (* unchanged since 4627 *) + OOVPA_TABLE_PATCH(D3DDevice_ApplyStateBlock_1_0_4627, D3DDevice_ApplyStateBlock), + // D3DDevice8::CaptureStateBlock + OOVPA_TABLE_PATCH(D3DDevice_CaptureStateBlock_1_0_5788, D3DDevice_CaptureStateBlock), + // D3DDevice8::DeleteStateBlock + OOVPA_TABLE_PATCH(D3DDevice_DeleteStateBlock_1_0_5788, D3DDevice_DeleteStateBlock), + // D3DDevice8::SetRenderState_StencilCullEnable (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilCullEnable_1_0_4134, D3DDevice_SetRenderState_StencilCullEnable), + // D3DDevice8::SetRenderState_OcclusionCullEnable (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_4134, D3DDevice_SetRenderState_OcclusionCullEnable), + // D3DDevice8::SetRenderState_RopZCmpAlwaysRead + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead_1_0_5788, D3DDevice_SetRenderState_RopZCmpAlwaysRead), + // D3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_RopZRead_1_0_4134, D3DDevice_SetRenderState_RopZRead), + // D3DDevice8::SetRenderState_DoNotCullUncompressed (* unchanged since 4134 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_DoNotCullUncompressed_1_0_4134, D3DDevice_SetRenderState_DoNotCullUncompressed), // D3DDevice_GetTexture2 - OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_5788, XTL::EmuIDirect3DDevice8_GetTexture2), - // IDirect3DDevice8::SetRenderTargetFast (* unchanged since 5344 *) - OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, XTL::EmuIDirect3DDevice8_SetRenderTargetFast), + OOVPA_TABLE_PATCH(D3DDevice_GetTexture2_1_0_5788, D3DDevice_GetTexture2), + // D3DDevice8::SetRenderTargetFast (* unchanged since 5344 *) + OOVPA_TABLE_PATCH(D3DDevice_SetRenderTargetFast_1_0_5344, D3DDevice_SetRenderTargetFast), // D3DDevice_SetDepthClipPlanes - OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_5788, XTL::EmuIDirect3DDevice8_SetDepthClipPlanes), + OOVPA_TABLE_PATCH(D3DDevice_SetDepthClipPlanes_1_0_5788, D3DDevice_SetDepthClipPlanes), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index 99db466b0..381148a1a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.h b/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.h index 21ba788bb..6b7440bba 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.h +++ b/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.h @@ -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; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl index a63ca2964..eb755e55a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl @@ -36,56 +36,56 @@ // For Burnout 3 Takedown // ****************************************************************** -// * IDirect3D8_CreateDevice +// * D3D_CreateDevice // ****************************************************************** -OOVPA_NO_XREF(IDirect3D8_CreateDevice_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3D_CreateDevice_1_0_5849_LTCG, 8) - // IDirect3D8_CreateDevice+0x07 : jnz +0x0A + // D3D_CreateDevice+0x07 : jnz +0x0A { 0x07, 0x75 }, // (Offset,Value)-Pair #1 { 0x08, 0x0A }, // (Offset,Value)-Pair #2 - // IDirect3D8_CreateDevice+0x7F : rep stos + // D3D_CreateDevice+0x7F : rep stos { 0x7F, 0xF3 }, // (Offset,Value)-Pair #3 { 0x80, 0xAB }, // (Offset,Value)-Pair #4 - // IDirect3D8_CreateDevice+0x82 : mov eax, esi + // D3D_CreateDevice+0x82 : mov eax, esi { 0x82, 0x8B }, // (Offset,Value)-Pair #5 { 0x83, 0xC6 }, // (Offset,Value)-Pair #6 - // IDirect3D8_CreateDevice+0x8F : retn 0x18 + // D3D_CreateDevice+0x8F : retn 0x18 { 0x8F, 0xC2 }, // (Offset,Value)-Pair #7 { 0x90, 0x18 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetPixelShader +// * D3DDevice_SetPixelShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetPixelShader_1_0_5849_LTCG, 9) +OOVPA_NO_XREF(D3DDevice_SetPixelShader_1_0_5849_LTCG, 9) - // IDirect3D8_SetPixelShader+0x1E : jnz +0x67 + // D3D_SetPixelShader+0x1E : jnz +0x67 { 0x1E, 0x75 }, // (Offset,Value)-Pair #1 { 0x1F, 0x67 }, // (Offset,Value)-Pair #2 - // IDirect3D8_SetPixelShader+0x3E : or eax, 0x2000 + // D3D_SetPixelShader+0x3E : or eax, 0x2000 { 0x3E, 0x0D }, // (Offset,Value)-Pair #3 { 0x3F, 0x00 }, // (Offset,Value)-Pair #4 - // IDirect3D8_SetPixelShader+0x60 : push eax + // D3D_SetPixelShader+0x60 : push eax { 0x60, 0x50 }, // (Offset,Value)-Pair #5 - // IDirect3D8_SetPixelShader+0x61 : shr eax, 1 + // D3D_SetPixelShader+0x61 : shr eax, 1 { 0x61, 0xD1 }, // (Offset,Value)-Pair #6 { 0x62, 0xE8 }, // (Offset,Value)-Pair #7 - // IDirect3D8_SetPixelShader+0xE1 : jb +0x0E + // D3D_SetPixelShader+0xE1 : jb +0x0E { 0xE1, 0x72 }, // (Offset,Value)-Pair #8 { 0xE2, 0x0E }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_CreateVertexShader +// * D3DDevice_CreateVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_CreateVertexShader_1_0_5849_LTCG, 8) { 0x1E, 0x85 }, { 0x3E, 0xE8 }, @@ -98,9 +98,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexShader_1_0_5849_LTCG, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawIndexedVertices +// * D3DDevice_DrawIndexedVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawIndexedVertices_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices_1_0_5849_LTCG, 8) { 0x13, 0x89 }, { 0x3E, 0x3B }, @@ -115,9 +115,9 @@ OOVPA_END; // Verteks 10/03/2009 // ****************************************************************** -// * IDirect3DDevice8_SetTexture +// * D3DDevice_SetTexture // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetTexture_1_0_5849_LTCG, 8) { 0x1E, 0x7C }, { 0x3C, 0xE8 }, @@ -130,9 +130,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTexture_1_0_5849_LTCG, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetViewport +// * D3DDevice_SetViewport // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetViewport_1_0_5849_LTCG, 8) { 0x1E, 0xAE }, { 0x3E, 0x53 }, @@ -145,9 +145,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetViewport_1_0_5849_LTCG, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetLight +// * D3DDevice_SetLight // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetLight_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetLight_1_0_5849_LTCG, 8) { 0x1E, 0x00 }, { 0x3E, 0x89 }, @@ -161,9 +161,9 @@ OOVPA_END; /* Same as 5558 // ****************************************************************** -// * IDirect3DDevice8_SetTransform +// * D3DDevice_SetTransform // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTransform_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetTransform_1_0_5849_LTCG, 8) { 0x1D, 0xB9 }, { 0x3E, 0x0F }, @@ -178,9 +178,9 @@ OOVPA_END; /* Same as 5849 // ****************************************************************** -// * IDirect3DDevice8_SetMaterial +// * D3DDevice_SetMaterial // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetMaterial_1_0_5849_LTCG, 9) +OOVPA_NO_XREF(D3DDevice_SetMaterial_1_0_5849_LTCG, 9) { 0x04, 0x08 }, { 0x0C, 0x81 }, @@ -195,57 +195,57 @@ OOVPA_END; */ // ****************************************************************** -// * IDirect3DDevice8_SetStreamSource +// * D3DDevice_SetStreamSource // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetStreamSource_1_0_5849_LTCG, 14) - // IDirect3DDevice8_SetStreamSource+0x07 : mov ebx, [esp+0x0C] +OOVPA_NO_XREF(D3DDevice_SetStreamSource_1_0_5849_LTCG, 14) + // D3DDevice_SetStreamSource+0x07 : mov ebx, [esp+0x0C] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x5C }, // (Offset,Value)-Pair #2 { 0x09, 0x24 }, // (Offset,Value)-Pair #3 { 0x0A, 0x0C }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetStreamSource+0x28 : jz +0x26 + // D3DDevice_SetStreamSource+0x28 : jz +0x26 { 0x28, 0x74 }, // (Offset,Value)-Pair #5 { 0x29, 0x26 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetStreamSource+0x70 : or ecx, 0x40 + // D3DDevice_SetStreamSource+0x70 : or ecx, 0x40 { 0x70, 0x83 }, // (Offset,Value)-Pair #7 { 0x71, 0xC9 }, // (Offset,Value)-Pair #8 { 0x72, 0x40 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetStreamSource+0x7E : or ecx, 0x70 + // D3DDevice_SetStreamSource+0x7E : or ecx, 0x70 { 0x7E, 0x83 }, // (Offset,Value)-Pair #10 { 0x7F, 0xC9 }, // (Offset,Value)-Pair #11 { 0x80, 0x70 }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetStreamSource+0x89 : retn 0x0C + // D3DDevice_SetStreamSource+0x89 : retn 0x0C { 0x89, 0xC2 }, // (Offset,Value)-Pair #13 { 0x8A, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; /* Same as 5849 // ****************************************************************** -// * IDirect3DDevice8_SetVertexShaderConstant1 +// * D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5849_LTCG, 11) - // IDirect3DDevice8_SetVertexShaderConstant1+0x06 : add eax, 0x1C +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant1_1_0_5849_LTCG, 11) + // D3DDevice_SetVertexShaderConstant1+0x06 : add eax, 0x1C { 0x06, 0x83 }, // (Offset,Value)-Pair #1 { 0x07, 0xC0 }, // (Offset,Value)-Pair #2 { 0x08, 0x1C }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexShaderConstant1+0x0F : jnb +0x43 + // D3DDevice_SetVertexShaderConstant1+0x0F : jnb +0x43 { 0x0F, 0x73 }, // (Offset,Value)-Pair #4 { 0x10, 0x43 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetVertexShaderConstant1+0x1D : mov [eax-0x18], ecx + // D3DDevice_SetVertexShaderConstant1+0x1D : mov [eax-0x18], ecx { 0x1D, 0x89 }, // (Offset,Value)-Pair #6 { 0x1E, 0x48 }, // (Offset,Value)-Pair #7 { 0x1F, 0xE8 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetVertexShaderConstant1+0x53 : retn + // D3DDevice_SetVertexShaderConstant1+0x53 : retn { 0x53, 0xC3 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexShaderConstant1+0x5D : jmp +0xA2 + // D3DDevice_SetVertexShaderConstant1+0x5D : jmp +0xA2 { 0x5D, 0xEB }, // (Offset,Value)-Pair #10 { 0x5E, 0xA2 }, // (Offset,Value)-Pair #11 OOVPA_END; @@ -253,9 +253,9 @@ OOVPA_END; /* Same as 5849 // ****************************************************************** -// * IDirect3DDevice8_CreateVertexBuffer2 +// * D3DDevice_CreateVertexBuffer2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_CreateVertexBuffer2_1_0_5849_LTCG, 7) +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2_1_0_5849_LTCG, 7) { 0x08, 0xE8 }, { 0x12, 0x1E }, { 0x1C, 0x50 }, @@ -267,68 +267,68 @@ OOVPA_END; */ // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_TexCoordIndex +// * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_5849_LTCG, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_TexCoordIndex_1_0_5849_LTCG, 10) - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 + // D3DDevice_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 { 0x14, 0xC1 }, // (Offset,Value)-Pair #1 { 0x15, 0xE0 }, // (Offset,Value)-Pair #2 { 0x16, 0x07 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x26 : cmp eax, ecx + // D3DDevice_SetTextureState_TexCoordIndex+0x26 : cmp eax, ecx { 0x26, 0x3B }, // (Offset,Value)-Pair #4 { 0x27, 0xC1 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0x7A : mov ebp, 0x2400 + // D3DDevice_SetTextureState_TexCoordIndex+0x7A : mov ebp, 0x2400 { 0x7A, 0xBD }, // (Offset,Value)-Pair #6 { 0x7C, 0x24 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetTextureState_TexCoordIndex+0xB3 : shl ebx, 0x04 + // D3DDevice_SetTextureState_TexCoordIndex+0xB3 : shl ebx, 0x04 { 0xB3, 0xC1 }, // (Offset,Value)-Pair #8 { 0xB4, 0xE3 }, // (Offset,Value)-Pair #9 { 0xB5, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BumpEnv +// * D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_5849_LTCG, 12) - // IDirect3DDevice8_SetTextureState_BumpEnv+0x18 : jnz +0x03 +OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv_1_0_5849_LTCG, 12) + // D3DDevice_SetTextureState_BumpEnv+0x18 : jnz +0x03 { 0x18, 0x75 }, // (Offset,Value)-Pair #1 { 0x19, 0x03 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x1D : test bl, 3 + // D3DDevice_SetTextureState_BumpEnv+0x1D : test bl, 3 { 0x1D, 0xF6 }, // (Offset,Value)-Pair #3 { 0x1E, 0xC3 }, // (Offset,Value)-Pair #4 { 0x1F, 0x03 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x3B : mov ecx, [esp+0x18] + // D3DDevice_SetTextureState_BumpEnv+0x3B : mov ecx, [esp+0x18] { 0x3B, 0x8B }, // (Offset,Value)-Pair #6 { 0x3C, 0x4C }, // (Offset,Value)-Pair #7 { 0x3D, 0x24 }, // (Offset,Value)-Pair #8 { 0x3E, 0x18 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetTextureState_BumpEnv+0x59 : shl esi, 5 + // D3DDevice_SetTextureState_BumpEnv+0x59 : shl esi, 5 { 0x59, 0xC1 }, // (Offset,Value)-Pair #10 { 0x5A, 0xE6 }, // (Offset,Value)-Pair #11 { 0x5B, 0x05 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_BorderColor +// * D3DDevice_SetTextureState_BorderColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BorderColor_1_0_5849_LTCG, 15) - // IDirect3DDevice8_SetTextureState_BorderColor+0x0C : jb +0x0E +OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor_1_0_5849_LTCG, 15) + // D3DDevice_SetTextureState_BorderColor+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #1 { 0x0D, 0x0E }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetTextureState_BorderColor+0x22 : shl edx, 6 + // D3DDevice_SetTextureState_BorderColor+0x22 : shl edx, 6 { 0x22, 0xC1 }, // (Offset,Value)-Pair #3 { 0x23, 0xE2 }, // (Offset,Value)-Pair #4 { 0x24, 0x06 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetTextureState_BorderColor+0x34 : add eax, 8; mov [esi], eax; shl ecx, 7 + // D3DDevice_SetTextureState_BorderColor+0x34 : add eax, 8; mov [esi], eax; shl ecx, 7 { 0x34, 0x83 }, // (Offset,Value)-Pair #6 { 0x35, 0xC0 }, // (Offset,Value)-Pair #7 { 0x36, 0x08 }, // (Offset,Value)-Pair #8 @@ -338,35 +338,35 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_BorderColor_1_0_5849_LTCG, 15) { 0x3A, 0xE1 }, // (Offset,Value)-Pair #12 { 0x3B, 0x07 }, // (Offset,Value)-Pair #13 - // IDirect3DDevice8_SetTextureState_BorderColor+0x43 : retn 0x08 + // D3DDevice_SetTextureState_BorderColor+0x43 : retn 0x08 { 0x43, 0xC2 }, // (Offset,Value)-Pair #14 { 0x44, 0x08 }, // (Offset,Value)-Pair #15 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_CullMode +// * D3DDevice_SetRenderState_CullMode // ****************************************************************** -OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_5849_LTCG, 13, +OOVPA_XREF(D3DDevice_SetRenderState_CullMode_1_0_5849_LTCG, 13, XREF_DXSRSCULLMODE, XRefZero) - // IDirect3DDevice8_SetRenderState_CullMode+0x23 : mov dword ptr [eax], 0x40308 + // D3DDevice_SetRenderState_CullMode+0x23 : mov dword ptr [eax], 0x40308 { 0x23, 0xC7 }, // (Offset,Value)-Pair #1 { 0x25, 0x08 }, // (Offset,Value)-Pair #2 { 0x26, 0x03 }, // (Offset,Value)-Pair #3 { 0x27, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_CullMode+0x2E : add eax, 8 + // D3DDevice_SetRenderState_CullMode+0x2E : add eax, 8 { 0x2E, 0x83 }, // (Offset,Value)-Pair #5 { 0x2F, 0xC0 }, // (Offset,Value)-Pair #6 { 0x30, 0x08 }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_SetRenderState_CullMode+0x3A : retn 4 + // D3DDevice_SetRenderState_CullMode+0x3A : retn 4 { 0x3A, 0xC2 }, // (Offset,Value)-Pair #8 { 0x3B, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_CullMode+0x5C : add edx, 0x404 + // D3DDevice_SetRenderState_CullMode+0x5C : add edx, 0x404 { 0x5D, 0x81 }, // (Offset,Value)-Pair #10 { 0x5E, 0xC2 }, // (Offset,Value)-Pair #11 { 0x5F, 0x04 }, // (Offset,Value)-Pair #12 @@ -374,9 +374,9 @@ OOVPA_XREF(IDirect3DDevice8_SetRenderState_CullMode_1_0_5849_LTCG, 13, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_TextureFactor +// * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849_LTCG, 7) +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor_1_0_5849_LTCG, 7) { 0x09, 0x84 }, { 0x14, 0x46 }, { 0x28, 0x24 }, @@ -387,28 +387,28 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849_LTCG, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_NormalizeNormals +// * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_5849_LTCG, 8) - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals_1_0_5849_LTCG, 8) + // D3DDevice_SetRenderState_NormalizeNormals+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x2E : or [addr], 0x200 + // D3DDevice_SetRenderState_NormalizeNormals+0x2E : or [addr], 0x200 { 0x2E, 0x81 }, // (Offset,Value)-Pair #3 { 0x2F, 0x0D }, // (Offset,Value)-Pair #4 { 0x34, 0x00 }, // (Offset,Value)-Pair #5 { 0x35, 0x02 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_NormalizeNormals+0x3F : retn 0x04 + // D3DDevice_SetRenderState_NormalizeNormals+0x3F : retn 0x04 { 0x3F, 0xC2 }, // (Offset,Value)-Pair #7 { 0x40, 0x04 }, // (Offset,Value)-Pair #8 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ZEnable +// * D3DDevice_SetRenderState_ZEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable_1_0_5849_LTCG, 8) { 0x0C, 0x72 }, { 0x2B, 0xC9 }, { 0x3D, 0x89 }, @@ -420,9 +420,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5849_LTCG, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_StencilEnable +// * D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable_1_0_5849_LTCG, 8) { 0x12, 0x8B }, { 0x2D, 0x33 }, { 0x40, 0x74 }, @@ -434,9 +434,9 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849_LTCG, 8) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -//OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_5849_LTCG, 7) +//OOVPA_NO_XREF(D3DDevice_Swap_1_0_5849_LTCG, 7) // { 0x1B, 0xE8 }, // { 0x38, 0xC3 }, // { 0x55, 0xC0 }, @@ -448,15 +448,15 @@ OOVPA_END; /* Same as 4627 // ****************************************************************** -// * IDirect3DDevice8_SetVertexData2f +// * D3DDevice_SetVertexData2f // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_5849_LTCG, 14) - // IDirect3DDevice8_SetVertexData2f+0x20 : lea edx, ds:abs[ecx*8] +OOVPA_NO_XREF(D3DDevice_SetVertexData2f_1_0_5849_LTCG, 14) + // D3DDevice_SetVertexData2f+0x20 : lea edx, ds:abs[ecx*8] { 0x20, 0x8D }, // (Offset,Value)-Pair #1 { 0x21, 0x14 }, // (Offset,Value)-Pair #2 { 0x22, 0xCD }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_SetVertexData2f+0x2B : mov [eax], edx; mov edx, [esp+0x10] + // D3DDevice_SetVertexData2f+0x2B : mov [eax], edx; mov edx, [esp+0x10] { 0x2B, 0x89 }, // (Offset,Value)-Pair #4 { 0x2C, 0x10 }, // (Offset,Value)-Pair #5 { 0x2D, 0x8B }, // (Offset,Value)-Pair #6 @@ -464,21 +464,21 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetVertexData2f_1_0_5849_LTCG, 14) { 0x2F, 0x24 }, // (Offset,Value)-Pair #8 { 0x30, 0x10 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetVertexData2f+0x37 : add eax, 0x0C + // D3DDevice_SetVertexData2f+0x37 : add eax, 0x0C { 0x37, 0x83 }, // (Offset,Value)-Pair #10 { 0x38, 0xC0 }, // (Offset,Value)-Pair #11 { 0x39, 0x0C }, // (Offset,Value)-Pair #12 - // IDirect3DDevice8_SetVertexData2f+0x3D : retn 0x0C + // D3DDevice_SetVertexData2f+0x3D : retn 0x0C { 0x3D, 0xC2 }, // (Offset,Value)-Pair #13 { 0x3E, 0x0C }, // (Offset,Value)-Pair #14 OOVPA_END; */ // ****************************************************************** -// * IDirect3DDevice8_End +// * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5849_LTCG, 7) +OOVPA_NO_XREF(D3DDevice_End_1_0_5849_LTCG, 7) { 0x07, 0x8B }, { 0x13, 0x50 }, { 0x1C, 0xC7 }, @@ -489,56 +489,56 @@ OOVPA_NO_XREF(IDirect3DDevice8_End_1_0_5849_LTCG, 7) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FillMode +// * D3DDevice_SetRenderState_FillMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FillMode_1_0_5849_LTCG, 11) - // IDirect3DDevice8_SetRenderState_FillMode+0x07 : mov eax, [esi] +OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode_1_0_5849_LTCG, 11) + // D3DDevice_SetRenderState_FillMode+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FillMode+0x2A : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_FillMode+0x2A : mov ecx, [esp+0x08] { 0x2A, 0x8B }, // (Offset,Value)-Pair #3 { 0x2B, 0x4C }, // (Offset,Value)-Pair #4 { 0x2C, 0x24 }, // (Offset,Value)-Pair #5 { 0x2D, 0x08 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_FillMode+0x2E : jnz +0x02 + // D3DDevice_SetRenderState_FillMode+0x2E : jnz +0x02 { 0x2E, 0x75 }, // (Offset,Value)-Pair #7 { 0x2F, 0x02 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FillMode+0x3E : add eax, 0x0C + // D3DDevice_SetRenderState_FillMode+0x3E : add eax, 0x0C { 0x3E, 0x83 }, // (Offset,Value)-Pair #9 { 0x3F, 0xC0 }, // (Offset,Value)-Pair #10 { 0x40, 0x0C }, // (Offset,Value)-Pair #11 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_FogColor +// * D3DDevice_SetRenderState_FogColor // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_FogColor_1_0_5849_LTCG, 10) - // IDirect3DDevice8_SetRenderState_FogColor+0x07 : mov eax, [esi] +OOVPA_NO_XREF(D3DDevice_SetRenderState_FogColor_1_0_5849_LTCG, 10) + // D3DDevice_SetRenderState_FogColor+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_FogColor+0x09 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_FogColor+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #3 { 0x0A, 0x46 }, // (Offset,Value)-Pair #4 { 0x0B, 0x04 }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_FogColor+0x2E : shl edi, 0x10 + // D3DDevice_SetRenderState_FogColor+0x2E : shl edi, 0x10 { 0x2E, 0xC1 }, // (Offset,Value)-Pair #6 { 0x2F, 0xE7 }, // (Offset,Value)-Pair #7 { 0x30, 0x10 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_FogColor+0x49 : mov [esi], eax + // D3DDevice_SetRenderState_FogColor+0x49 : mov [esi], eax { 0x49, 0x89 }, // (Offset,Value)-Pair #9 { 0x4A, 0x06 }, // (Offset,Value)-Pair #10 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVerticesUP +// * D3DDevice_DrawVerticesUP // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVerticesUP_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP_1_0_5849_LTCG, 8) { 0x1E, 0xA1 }, { 0x3E, 0x8B }, { 0x5E, 0x08 }, @@ -555,7 +555,7 @@ OOVPA_END; // ****************************************************************** // * D3DVertexBuffer_Lock2 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DVertexBuffer8_Lock2_1_0_5849_LTCG, 10) +OOVPA_NO_XREF(D3DVertexBuffer_Lock2_1_0_5849_LTCG, 10) // D3DVertexBuffer_Lock2+0x05 : test bl, 0x10 { 0x05, 0xF6 }, { 0x06, 0xC3 }, @@ -573,115 +573,115 @@ OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_YuvEnable +// * D3DDevice_SetRenderState_YuvEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_5849_LTCG, 13) - // IDirect3DDevice8_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] +OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable_1_0_5849_LTCG, 13) + // D3DDevice_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, // (Offset,Value)-Pair #1 { 0x01, 0x44 }, // (Offset,Value)-Pair #2 { 0x02, 0x24 }, // (Offset,Value)-Pair #3 { 0x03, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x10 : mov eax, [esi] + // D3DDevice_SetRenderState_YuvEnable+0x10 : mov eax, [esi] { 0x10, 0x8B }, // (Offset,Value)-Pair #5 { 0x11, 0x06 }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x12 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_YuvEnable+0x12 : cmp eax, [esi+4] { 0x12, 0x3B }, // (Offset,Value)-Pair #7 { 0x13, 0x46 }, // (Offset,Value)-Pair #8 { 0x14, 0x04 }, // (Offset,Value)-Pair #9 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x15 : jb +0x0E + // D3DDevice_SetRenderState_YuvEnable+0x15 : jb +0x0E { 0x15, 0x72 }, // (Offset,Value)-Pair #10 { 0x16, 0x0E }, // (Offset,Value)-Pair #11 - // IDirect3DDevice8_SetRenderState_YuvEnable+0x30 : retn 0x04 + // D3DDevice_SetRenderState_YuvEnable+0x30 : retn 0x04 { 0x30, 0xC2 }, // (Offset,Value)-Pair #12 { 0x31, 0x04 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_ShadowFunc +// * D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_5849_LTCG, 13) +OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc_1_0_5849_LTCG, 13) - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x00 : push esi + // D3DDevice_SetRenderState_ShadowFunc+0x00 : push esi { 0x00, 0x56 }, // (Offset,Value)-Pair #1 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x09 : cmp eax, [esi+4] + // D3DDevice_SetRenderState_ShadowFunc+0x09 : cmp eax, [esi+4] { 0x09, 0x3B }, // (Offset,Value)-Pair #2 { 0x0A, 0x46 }, // (Offset,Value)-Pair #3 { 0x0B, 0x04 }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x0C : jb +0x0E + // D3DDevice_SetRenderState_ShadowFunc+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #5 { 0x0D, 0x0E }, // (Offset,Value)-Pair #6 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x26 : lea edx, [ecx-0x0200] + // D3DDevice_SetRenderState_ShadowFunc+0x26 : lea edx, [ecx-0x0200] { 0x26, 0x8D }, // (Offset,Value)-Pair #7 { 0x27, 0x91 }, // (Offset,Value)-Pair #8 { 0x28, 0x00 }, // (Offset,Value)-Pair #9 { 0x29, 0xFE }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_ShadowFunc+0x2F : add eax, 0x08 + // D3DDevice_SetRenderState_ShadowFunc+0x2F : add eax, 0x08 { 0x2F, 0x83 }, // (Offset,Value)-Pair #11 { 0x30, 0xC0 }, // (Offset,Value)-Pair #12 { 0x31, 0x08 }, // (Offset,Value)-Pair #13 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_OcclusionCullEnable +// * D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_5849_LTCG, 12) +OOVPA_NO_XREF(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_5849_LTCG, 12) - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x15 : jb +0x0E + // D3DDevice_SetRenderState_OcclusionCullEnable+0x15 : jb +0x0E { 0x15, 0x72 }, // (Offset,Value)-Pair #1 { 0x16, 0x0E }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x4A : cmp [abs], 0x1E00 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x4A : cmp [abs], 0x1E00 { 0x4A, 0x81 }, // (Offset,Value)-Pair #3 { 0x50, 0x00 }, // (Offset,Value)-Pair #4 { 0x51, 0x1E }, // (Offset,Value)-Pair #5 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x59 : mov dword ptr [eax], 0x41D84 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x59 : mov dword ptr [eax], 0x41D84 { 0x59, 0xC7 }, // (Offset,Value)-Pair #6 { 0x5A, 0x00 }, // (Offset,Value)-Pair #7 { 0x5B, 0x84 }, // (Offset,Value)-Pair #8 { 0x5C, 0x1D }, // (Offset,Value)-Pair #9 { 0x5D, 0x04 }, // (Offset,Value)-Pair #10 - // IDirect3DDevice8_SetRenderState_OcclusionCullEnable+0x68 : retn 0x04 + // D3DDevice_SetRenderState_OcclusionCullEnable+0x68 : retn 0x04 { 0x68, 0xC2 }, // (Offset,Value)-Pair #11 { 0x69, 0x04 }, // (Offset,Value)-Pair #12 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetRenderState_EdgeAntiAlias +// * D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_5849_LTCG, 10) +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_5849_LTCG, 10) - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x07 : mov eax, [esi] { 0x07, 0x8B }, // (Offset,Value)-Pair #1 { 0x08, 0x06 }, // (Offset,Value)-Pair #2 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x0C : jb +0x0E + // D3DDevice_SetRenderState_EdgeAntiAlias+0x0C : jb +0x0E { 0x0C, 0x72 }, // (Offset,Value)-Pair #3 { 0x0D, 0x0E }, // (Offset,Value)-Pair #4 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x1C : mov ecx, [esp+0x08] + // D3DDevice_SetRenderState_EdgeAntiAlias+0x1C : mov ecx, [esp+0x08] { 0x1C, 0x8B }, // (Offset,Value)-Pair #5 { 0x1D, 0x4C }, // (Offset,Value)-Pair #6 { 0x1E, 0x24 }, // (Offset,Value)-Pair #7 { 0x1F, 0x08 }, // (Offset,Value)-Pair #8 - // IDirect3DDevice8_SetRenderState_EdgeAntiAlias+0x38 : retn 0x04 + // D3DDevice_SetRenderState_EdgeAntiAlias+0x38 : retn 0x04 { 0x38, 0xC2 }, // (Offset,Value)-Pair #9 { 0x39, 0x04 }, // (Offset,Value)-Pair #10 OOVPA_END; // I am not sure about this // ****************************************************************** -// * IDirect3DTexture8_GetLevelDesc +// * D3DTexture_GetLevelDesc // ****************************************************************** // * NOTE: We are actually intercepting Get2DSurfaceDesc, because // * GetLevelDesc Simply redirects to that function @@ -705,9 +705,9 @@ OOVPA_NO_XREF(Get2DSurfaceDesc_1_0_5849_LTCG, 9) OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetShaderConstantMode +// * D3DDevice_SetShaderConstantMode // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetShaderConstantMode_1_0_5849_LTCG, 8) +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode_1_0_5849_LTCG, 8) { 0x19, 0xFD }, { 0x38, 0x8B }, @@ -725,9 +725,9 @@ I don't know which one of these is the right one : 0x0034E200 2 args 0x0034F150 3 args // ****************************************************************** -// * 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 }, @@ -757,31 +757,31 @@ OOVPA_END; 0034D757 |. 85C0 test eax, eax 0034D759 |. 74 06 je short default.0034D761 0034D75B |. 50 push eax -0034D75C |. E8 9FF4FFFF call default.0034CC00 <- IDirect3DResource8_AddRef +0034D75C |. E8 9FF4FFFF call default.0034CC00 <- D3DResource_AddRef 0034D761 |> FF01 inc dword ptr ds:[ecx] 0034D763 |> 8BC1 mov eax, ecx 0034D765 \. C3 retn // ****************************************************************** -// * IDirect3DResource8_AddRef +// * D3DResource_AddRef // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_AddRef_1_0_5849_LTCG, 10) - // IDirect3DResource8_AddRef+0x11 : test eax, 0xFFFF +OOVPA_NO_XREF(D3DResource_AddRef_1_0_5849_LTCG, 10) + // D3DResource_AddRef+0x11 : test eax, 0xFFFF { 0x11, 0xA9 }, // (Offset,Value)-Pair #1 { 0x12, 0xFF }, // (Offset,Value)-Pair #2 { 0x13, 0xFF }, // (Offset,Value)-Pair #3 - // IDirect3DResource8_AddRef+0x18 : and eax, 0x00070000 + // D3DResource_AddRef+0x18 : and eax, 0x00070000 { 0x18, 0x25 }, // (Offset,Value)-Pair #4 { 0x1B, 0x07 }, // (Offset,Value)-Pair #5 - // IDirect3DResource8_AddRef+0x1D : cmp eax, 0x00050000 + // D3DResource_AddRef+0x1D : cmp eax, 0x00050000 { 0x1D, 0x3D }, // (Offset,Value)-Pair #6 { 0x20, 0x05 }, // (Offset,Value)-Pair #7 - // IDirect3DResource8_AddRef+0x2B : push eax + // D3DResource_AddRef+0x2B : push eax { 0x2B, 0x50 }, // (Offset,Value)-Pair #8 - // IDirect3DResource8_AddRef+0x34 : mov eax, ecx + // D3DResource_AddRef+0x34 : mov eax, ecx { 0x33, 0x8B }, // (Offset,Value)-Pair #9 { 0x34, 0xC1 }, // (Offset,Value)-Pair #10 OOVPA_END; @@ -789,68 +789,68 @@ OOVPA_END; // 0x0034CC40 // ****************************************************************** -// * IDirect3DResource8_Release +// * D3DResource_Release // ****************************************************************** -OOVPA_NO_XREF(IDirect3DResource8_Release_1_0_5849_LTCG, 11) +OOVPA_NO_XREF(D3DResource_Release_1_0_5849_LTCG, 11) - // IDirect3DResource8_Release+0x09 : and ecx, 0xFFFF + // D3DResource_Release+0x09 : and ecx, 0xFFFF { 0x09, 0x81 }, // (Offset,Value)-Pair #1 { 0x0A, 0xE1 }, // (Offset,Value)-Pair #2 { 0x0B, 0xFF }, // (Offset,Value)-Pair #3 { 0x0C, 0xFF }, // (Offset,Value)-Pair #4 - // IDirect3DResource8_Release+0x14 : and eax, 0x00070000 + // D3DResource_Release+0x14 : and eax, 0x00070000 { 0x14, 0x25 }, // (Offset,Value)-Pair #5 { 0x17, 0x07 }, // (Offset,Value)-Pair #6 - // IDirect3DResource8_Release+0x19 : cmp eax, 0x00050000 + // D3DResource_Release+0x19 : cmp eax, 0x00050000 { 0x19, 0x3D }, // (Offset,Value)-Pair #7 { 0x1C, 0x05 }, // (Offset,Value)-Pair #8 - // IDirect3DResource8_Release+0x3D : pop edi + // D3DResource_Release+0x3D : pop edi { 0x3D, 0x5F }, // (Offset,Value)-Pair #9 - // IDirect3DResource8_Release+0x4A : retn 0x04 + // D3DResource_Release+0x4A : retn 0x04 { 0x4A, 0xC2 }, // (Offset,Value)-Pair #10 { 0x4B, 0x04 }, // (Offset,Value)-Pair #11 OOVPA_END; // Verteks 05/04/2009 // ****************************************************************** -// * IDirect3DDevice8_SetTextureState_ColorKeyColor (Not sure) +// * D3DDevice_SetTextureState_ColorKeyColor (Not sure) // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_5849_LTCG, 10) +OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_1_0_5849_LTCG, 10) - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x05 : cmp esi, 0x5C + // D3DDevice_SetTextureState_ColorKeyColor+0x05 : cmp esi, 0x5C { 0x05, 0x83 }, { 0x06, 0xFE }, { 0x07, 0x5C }, - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x29 : cmp esi, 0x88 + // D3DDevice_SetTextureState_ColorKeyColor+0x29 : cmp esi, 0x88 { 0x29, 0x81 }, { 0x2A, 0xFE }, { 0x2B, 0x88 }, - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x4A : retn 0x08 + // D3DDevice_SetTextureState_ColorKeyColor+0x4A : retn 0x08 { 0x4A, 0xC2 }, { 0x4B, 0x08 }, - // IDirect3DDevice8_SetTextureState_ColorKeyColor+0x5A : retn 0x08 + // D3DDevice_SetTextureState_ColorKeyColor+0x5A : retn 0x08 { 0x5A, 0xC2 }, { 0x5B, 0x08 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Unknown1_3 +// * D3DDevice_Unknown1_3 // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Unknown1_3_1_0_5849_LTCG, 13) +OOVPA_NO_XREF(D3DDevice_Unknown1_3_1_0_5849_LTCG, 13) - // IDirect3DDevice8_Unknown1_3+0x04 : cmp eax, 0x0C + // D3DDevice_Unknown1_3+0x04 : cmp eax, 0x0C { 0x04, 0x83 }, { 0x05, 0xF8 }, { 0x06, 0x0C }, - // IDirect3DDevice8_Unknown1_3+0x48 : and ecx, 0xFFFFBFF1 + // D3DDevice_Unknown1_3+0x48 : and ecx, 0xFFFFBFF1 { 0x48, 0x81 }, { 0x49, 0xE1 }, { 0x4A, 0xF1 }, @@ -858,91 +858,91 @@ OOVPA_NO_XREF(IDirect3DDevice8_Unknown1_3_1_0_5849_LTCG, 13) { 0x4C, 0xFF }, { 0x4D, 0xFF }, - // IDirect3DDevice8_Unknown1_3+0x69 : retn 0x0C + // D3DDevice_Unknown1_3+0x69 : retn 0x0C { 0x69, 0xC2 }, { 0x6A, 0x0C }, - // IDirect3DDevice8_Unknown1_3+0xD7 : retn 0x0C + // D3DDevice_Unknown1_3+0xD7 : retn 0x0C { 0xD7, 0xC2 }, { 0xD8, 0x0C }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Clear +// * D3DDevice_Clear // ****************************************************************** -OOVPA_NO_XREF_LARGE(IDirect3DDevice8_Clear_1_0_5849_LTCG, 9) - // IDirect3DDevice8_Clear+0x0000 : sub esp, 38h +OOVPA_NO_XREF_LARGE(D3DDevice_Clear_1_0_5849_LTCG, 9) + // D3DDevice_Clear+0x0000 : sub esp, 38h { 0x0000, 0x83 }, // (Offset,Value)-Pair #1 { 0x0001, 0xEC }, // (Offset,Value)-Pair #2 { 0x0002, 0x38 }, // (Offset,Value)-Pair #3 - // IDirect3DDevice8_Clear+0x000B : mov ebx, [ebp+0x1A04] + // D3DDevice_Clear+0x000B : mov ebx, [ebp+0x1A04] { 0x000B, 0x8B }, // (Offset,Value)-Pair #4 { 0x000C, 0x9D }, // (Offset,Value)-Pair #5 { 0x000D, 0x04 }, // (Offset,Value)-Pair #6 { 0x000E, 0x1A }, // (Offset,Value)-Pair #7 - // IDirect3DDevice8_Clear+0x03D1 : retn 0x18 + // D3DDevice_Clear+0x03D1 : retn 0x18 { 0x03D1, 0xC2 }, // (Offset,Value)-Pair #8 { 0x03D2, 0x18 }, // (Offset,Value)-Pair #9 OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_Swap +// * D3DDevice_Swap // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_Swap_1_0_5849_LTCG, 6) +OOVPA_NO_XREF(D3DDevice_Swap_1_0_5849_LTCG, 6) - // IDirect3DDevice8_Swap+0x00 : push esi + // D3DDevice_Swap+0x00 : push esi { 0x00, 0x56 }, - // IDirect3DDevice8_Swap+0x32 : test ah, 0x40 + // D3DDevice_Swap+0x32 : test ah, 0x40 { 0x32, 0xF6 }, { 0x33, 0xC4 }, { 0x34, 0x40 }, - // IDirect3DDevice8_Swap+0xEA : retn 4 + // D3DDevice_Swap+0xEA : retn 4 { 0xEA, 0xC2 }, { 0xEB, 0x04 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_SetVertexShader +// * D3DDevice_SetVertexShader // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_SetVertexShader_1_0_5849_LTCG, 10) +OOVPA_NO_XREF(D3DDevice_SetVertexShader_1_0_5849_LTCG, 10) - // IDirect3DDevice8_SetVertexShader+0x27 : test al, 0x10 + // D3DDevice_SetVertexShader+0x27 : test al, 0x10 { 0x27, 0xA8 }, { 0x28, 0x10 }, - // IDirect3DDevice8_SetVertexShader+0x70 : or eax, 0x400 + // D3DDevice_SetVertexShader+0x70 : or eax, 0x400 { 0x70, 0x0D }, { 0x71, 0x00 }, { 0x72, 0x04 }, { 0x73, 0x00 }, { 0x74, 0x00 }, - // IDirect3DDevice8_SetVertexShader+0xCD : add eax, 8 + // D3DDevice_SetVertexShader+0xCD : add eax, 8 { 0xCD, 0x83 }, { 0xCE, 0xC0 }, { 0xCF, 0x08 }, OOVPA_END; // ****************************************************************** -// * IDirect3DDevice8_DrawVertices +// * D3DDevice_DrawVertices // ****************************************************************** -OOVPA_NO_XREF(IDirect3DDevice8_DrawVertices_1_0_5849_LTCG, 14) +OOVPA_NO_XREF(D3DDevice_DrawVertices_1_0_5849_LTCG, 14) - // IDirect3DDevice8_DrawVertices+0x2B : and ecx, 0x200 + // D3DDevice_DrawVertices+0x2B : and ecx, 0x200 { 0x2B, 0x81 }, { 0x2C, 0xC1 }, { 0x2D, 0x00 }, { 0x2E, 0x02 }, { 0x2F, 0x00 }, { 0x30, 0x00 }, - // IDirect3DDevice8_DrawVertices+0x6F : cmp edi, 0x100 + // D3DDevice_DrawVertices+0x6F : cmp edi, 0x100 { 0x6F, 0x81 }, { 0x70, 0xFF }, { 0x71, 0x00 }, { 0x72, 0x01 }, { 0x73, 0x00 }, { 0x74, 0x00 }, - // IDirect3DDevice8_DrawVertices+0xCC : retn 0xC + // D3DDevice_DrawVertices+0xCC : retn 0xC { 0xCC, 0xC2 }, { 0xCD, 0x0C }, OOVPA_END; @@ -953,86 +953,86 @@ OOVPA_END; OOVPATable D3D8LTCG_1_0_5849[] = { // IDirect3D8::CreateDevice - OOVPA_TABLE_PATCH(IDirect3D8_CreateDevice_1_0_5849_LTCG, XTL::EmuIDirect3D8_CreateDevice), + OOVPA_TABLE_PATCH(D3D_CreateDevice_1_0_5849_LTCG, D3D_CreateDevice), // IDirect3DDevice8::SetPixelShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetPixelShader_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetPixelShader), + OOVPA_TABLE_PATCH(D3DDevice_SetPixelShader_1_0_5849_LTCG, D3DDevice_SetPixelShader), // IDirect3DDevice8::CreateVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexShader_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_CreateVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexShader_1_0_5849_LTCG, D3DDevice_CreateVertexShader), // IDirect3DDevice8::DrawIndexedVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawIndexedVertices_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_DrawIndexedVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawIndexedVertices_1_0_5849_LTCG, D3DDevice_DrawIndexedVertices), // IDirect3DDevice8::SetVertexShader - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShader_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetVertexShader), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShader_1_0_5849_LTCG, D3DDevice_SetVertexShader), // IDirect3DDevice8::SetTexture - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTexture_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetTexture), + OOVPA_TABLE_PATCH(D3DDevice_SetTexture_1_0_5849_LTCG, D3DDevice_SetTexture), // IDirect3DDevice8::SetViewport - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetViewport_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetViewport), + OOVPA_TABLE_PATCH(D3DDevice_SetViewport_1_0_5849_LTCG, D3DDevice_SetViewport), // IDirect3DDevice8::SetLight - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetLight_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetLight), + OOVPA_TABLE_PATCH(D3DDevice_SetLight_1_0_5849_LTCG, D3DDevice_SetLight), // 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::SetMaterial (* unchanged since 5849 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetMaterial_1_0_5849, XTL::EmuIDirect3DDevice8_SetMaterial), + OOVPA_TABLE_PATCH(D3DDevice_SetMaterial_1_0_5849, D3DDevice_SetMaterial), // IDirect3DDevice8::SetStreamSource - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetStreamSource_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetStreamSource), + OOVPA_TABLE_PATCH(D3DDevice_SetStreamSource_1_0_5849_LTCG, D3DDevice_SetStreamSource), // IDirect3DDevice8::SetVertexShaderConstant1 (* unchanged since 5849 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant1_1_0_5849, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant1), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant1_1_0_5849, D3DDevice_SetVertexShaderConstant1), // IDirect3DDevice8::CreateVertexBuffer2 (* unchanged since 5849 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_CreateVertexBuffer2_1_0_5849, XTL::EmuIDirect3DDevice8_CreateVertexBuffer2), + OOVPA_TABLE_PATCH(D3DDevice_CreateVertexBuffer2_1_0_5849, D3DDevice_CreateVertexBuffer2), // IDirect3DDevice8::SetTextureState_TexCoordIndex - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_TexCoordIndex_1_0_5849_LTCG, D3DDevice_SetTextureState_TexCoordIndex), // IDirect3DDevice8::SetTextureState_BumpEnv - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BumpEnv_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BumpEnv_1_0_5849_LTCG, D3DDevice_SetTextureState_BumpEnv), // IDirect3DDevice8::SetTextureState_BorderColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_BorderColor_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_BorderColor_1_0_5849_LTCG, D3DDevice_SetTextureState_BorderColor), // IDirect3DDevice8::SetRenderState_CullMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_CullMode_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_CullMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_CullMode_1_0_5849_LTCG, D3DDevice_SetRenderState_CullMode), // IDirect3DDevice8::SetRenderState_TextureFactor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_TextureFactor_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_TextureFactor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_TextureFactor_1_0_5849_LTCG, D3DDevice_SetRenderState_TextureFactor), // IDirect3DDevice8::SetRenderState_NormalizeNormals - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_NormalizeNormals_1_0_5849_LTCG, D3DDevice_SetRenderState_NormalizeNormals), // IDirect3DDevice8::SetRenderState_ZEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ZEnable_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_ZEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ZEnable_1_0_5849_LTCG, D3DDevice_SetRenderState_ZEnable), // IDirect3DDevice8::SetRenderState_StencilEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_StencilEnable_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_StencilEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_StencilEnable_1_0_5849_LTCG, D3DDevice_SetRenderState_StencilEnable), // IDirect3DDevice8::Swap - OOVPA_TABLE_PATCH(IDirect3DDevice8_Swap_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_Swap), + OOVPA_TABLE_PATCH(D3DDevice_Swap_1_0_5849_LTCG, D3DDevice_Swap), // IDirect3DDevice8::SetVertexData2f (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexData2f_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexData2f), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexData2f_1_0_4627, D3DDevice_SetVertexData2f), // IDirect3DDevice8::End - OOVPA_TABLE_PATCH(IDirect3DDevice8_End_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_End), + OOVPA_TABLE_PATCH(D3DDevice_End_1_0_5849_LTCG, D3DDevice_End), // IDirect3DDevice8::SetRenderState_FillMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FillMode_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_FillMode), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FillMode_1_0_5849_LTCG, D3DDevice_SetRenderState_FillMode), // IDirect3DDevice8::SetRenderState_FogColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_FogColor_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_FogColor), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_FogColor_1_0_5849_LTCG, D3DDevice_SetRenderState_FogColor), // IDirect3DDevice8::DrawVertices - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVertices_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_DrawVertices), + OOVPA_TABLE_PATCH(D3DDevice_DrawVertices_1_0_5849_LTCG, D3DDevice_DrawVertices), // IDirect3DDevice8::DrawVerticesUP - OOVPA_TABLE_PATCH(IDirect3DDevice8_DrawVerticesUP_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_DrawVerticesUP), + OOVPA_TABLE_PATCH(D3DDevice_DrawVerticesUP_1_0_5849_LTCG, D3DDevice_DrawVerticesUP), // IDirect3DDevice8::SetVertexShaderConstant4 (* unchanged since 4627 *) - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetVertexShaderConstant4_1_0_4627, XTL::EmuIDirect3DDevice8_SetVertexShaderConstant4), + OOVPA_TABLE_PATCH(D3DDevice_SetVertexShaderConstant4_1_0_4627, D3DDevice_SetVertexShaderConstant4), // IDirect3DVertexBuffer8::Lock2 - OOVPA_TABLE_PATCH(IDirect3DVertexBuffer8_Lock2_1_0_5849_LTCG, XTL::EmuIDirect3DVertexBuffer8_Lock2), + OOVPA_TABLE_PATCH(D3DVertexBuffer_Lock2_1_0_5849_LTCG, D3DVertexBuffer_Lock2), // IDirect3DDevice8::SetRenderState_YuvEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_YuvEnable_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_YuvEnable_1_0_5849_LTCG, D3DDevice_SetRenderState_YuvEnable), // IDirect3DDevice8::SetRenderState_ShadowFunc - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_ShadowFunc_1_0_5849_LTCG, D3DDevice_SetRenderState_ShadowFunc), // IDirect3DDevice8::SetRenderState_OcclusionCullEnable - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_OcclusionCullEnable_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_OcclusionCullEnable), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_OcclusionCullEnable_1_0_5849_LTCG, D3DDevice_SetRenderState_OcclusionCullEnable), // IDirect3DDevice8::SetRenderState_EdgeAntiAlias - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetRenderState_EdgeAntiAlias), + OOVPA_TABLE_PATCH(D3DDevice_SetRenderState_EdgeAntiAlias_1_0_5849_LTCG, D3DDevice_SetRenderState_EdgeAntiAlias), // IDirect3DTexture8::GetLevelDesc - OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5849_LTCG, XTL::EmuGet2DSurfaceDesc), + OOVPA_TABLE_PATCH(Get2DSurfaceDesc_1_0_5849_LTCG, Get2DSurfaceDesc), // IDirect3DDevice8::SetShaderConstantMode - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetShaderConstantMode_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetShaderConstantMode), + OOVPA_TABLE_PATCH(D3DDevice_SetShaderConstantMode_1_0_5849_LTCG, D3DDevice_SetShaderConstantMode), // IDirect3DResource8::AddRef - OOVPA_TABLE_PATCH(IDirect3DResource8_AddRef_1_0_3925, XTL::EmuIDirect3DResource8_AddRef), + OOVPA_TABLE_PATCH(D3DResource_AddRef_1_0_3925, D3DResource_AddRef), // IDirect3DResource8::Release - OOVPA_TABLE_PATCH(IDirect3DResource8_Release_1_0_5849_LTCG, XTL::EmuIDirect3DResource8_Release), + OOVPA_TABLE_PATCH(D3DResource_Release_1_0_5849_LTCG, D3DResource_Release), // IDirect3DDevice8::SetTextureState_ColorKeyColor - OOVPA_TABLE_PATCH(IDirect3DDevice8_SetTextureState_ColorKeyColor_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_SetTextureState_ColorKeyColor), + OOVPA_TABLE_PATCH(D3DDevice_SetTextureState_ColorKeyColor_1_0_5849_LTCG, D3DDevice_SetTextureState_ColorKeyColor), // IDirect3DDevice8::Clear - OOVPA_TABLE_PATCH(IDirect3DDevice8_Clear_1_0_5849_LTCG, XTL::EmuIDirect3DDevice8_Clear), + OOVPA_TABLE_PATCH(D3DDevice_Clear_1_0_5849_LTCG, D3DDevice_Clear), }; uint32 D3D8LTCG_1_0_5849_SIZE = sizeof(D3D8LTCG_1_0_5849); \ No newline at end of file diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 54783a985..d46926986 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index a543190cb..98052813e 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 4d00ccec5..28b264184 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl index 0270ab82e..f483d7f31 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index bdd4d5e4d..09c540cbf 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -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 diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index ec7597601..b474de61c 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -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 }; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index be53c0fc5..c39cf0bba 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index 690484513..845615f61 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl index 35eadf7d3..89666f9e4 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl index b068baf9a..65e190eae 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.3911.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl index be79f0c9c..459f01a18 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4034.inl @@ -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),*/ }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl index 7e1501e89..36ea76438 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4361.inl @@ -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 diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl index ec24c7b1f..137eeae21 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4432.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl index 36a71a26c..2761cfb3b 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.4627.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl index e4e36acd2..08bcadc17 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl index a5e3ca6f9..d576f1ecc 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl index 0e0860cdf..0c9200944 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5788.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl index 69965114f..814b62e38 100644 --- a/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XG.1.0.5849.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl index 7d9296637..8c476f54b 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl index e4094b2a8..14c5243a5 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl @@ -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::Emusocket)), + OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4627, socket), // connect - OOVPA_TABLE_PATCH(connect_1_0_4627, MFPtoFP(&XTL::EmuThis::Emuconnect)), + OOVPA_TABLE_PATCH_EmuThis(connect_1_0_4627, connect), // send - OOVPA_TABLE_PATCH(send_1_0_4627, MFPtoFP(&XTL::EmuThis::Emusend)), + OOVPA_TABLE_PATCH_EmuThis(send_1_0_4627, send), // recv - OOVPA_TABLE_PATCH(recv_1_0_4627, MFPtoFP(&XTL::EmuThis::Emurecv)), + OOVPA_TABLE_PATCH_EmuThis(recv_1_0_4627, recv), // ioctlsocket - OOVPA_TABLE_PATCH(ioctlsocket_1_0_4627, MFPtoFP(&XTL::EmuThis::Emuioctlsocket)), + OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4627, ioctlsocket), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl index ea81b4dba..974c18de4 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl @@ -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::Emusocket)), + OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket), // bind - OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP(&XTL::EmuThis::Emubind)), + OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind), // listen - OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP(&XTL::EmuThis::Emulisten)), + OOVPA_TABLE_PATCH_EmuThis(listen_1_0_4361, listen), // ioctlsocket - OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP(&XTL::EmuThis::Emuioctlsocket)), + OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl index 194feb353..a3842f183 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl @@ -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::Emusocket)), + OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket), // bind (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP(&XTL::EmuThis::Emubind)), + OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind), // listen - OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP(&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::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), }; diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl index 5a7a716ce..958e89bc6 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl @@ -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::Emusocket)), + OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket), */ // bind (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP(&XTL::EmuThis::Emubind)), + OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind), // listen /* - OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP(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::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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl index fd5100b27..5be9b7b3d 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl @@ -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::Emusocket)), + OOVPA_TABLE_PATCH_EmuThis(socket_1_0_4361, socket), */ // bind (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(bind_1_0_4361, MFPtoFP(&XTL::EmuThis::Emubind)), + OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind), // listen /* - OOVPA_TABLE_PATCH(listen_1_0_4361, MFPtoFP(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::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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl index 9b33c85ed..88b691dd9 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl @@ -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::Emubind)), + OOVPA_TABLE_PATCH_EmuThis(bind_1_0_4361, bind), // ioctlsocket (* unchanged since 4361 *) - OOVPA_TABLE_PATCH(ioctlsocket_1_0_4361, MFPtoFP(&XTL::EmuThis::Emuioctlsocket)), + OOVPA_TABLE_PATCH_EmuThis(ioctlsocket_1_0_4361, ioctlsocket), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl index 5987c6058..9facd6caa 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl index c18c72005..8024d869a 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl index 3ce34b796..60be31028 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl index 5e0d1a8fd..f7fa17267 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index 70b9033ce..a625420c7 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl index c4029c5ff..ca658803e 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl index ab51e9b5c..82e968c72 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl index 779878a11..ceea3b6f4 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl @@ -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), */ }; diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl index 280da04c3..d1e498876 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4721.inl @@ -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),*/ }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl index 96a726c88..ba0c8cdca 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5233.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl index 4346aee64..2c53e750f 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5558.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl index befb4e7fc..16b66eeb9 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5788.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl index 5fc1e4433..19eaae09b 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.5849.inl @@ -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), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index a4dd1c3e9..db968f169 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -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) diff --git a/src/CxbxKrnl/OOVPA.h b/src/CxbxKrnl/OOVPA.h index 9dd8f5ce8..ea0dfd20b 100644 --- a/src/CxbxKrnl/OOVPA.h +++ b/src/CxbxKrnl/OOVPA.h @@ -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:: EMUPATCH(Patch)), #Patch) #define OOVPA_TABLE_XREF(Oovpa) \ - {&Oovpa.Header, 0} -#endif + OOVPA_TABLE_ENTRY(&Oovpa.Header, nullptr, #Oovpa" (XRef)") #pragma pack()