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

Merge pull request #345 from PatrickvL/master 

Disabled more patches
This commit is contained in:
Luke Usher 2017-04-10 10:55:30 +01:00 committed by GitHub
parent c8ef5bfc41 698012973c
commit 17fedee8fd
20 changed files with 127 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -1479,6 +1479,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetCreationParameters)(D3DDEVICE_CREATION_PA
return;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_CheckDeviceFormat
// ******************************************************************
@ -1521,6 +1522,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_CheckDeviceFormat)
return hRet;
}
#endif
// ******************************************************************
// * patch: D3DDevice_GetDisplayFieldStatus
@ -1680,6 +1682,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetVisibilityTestResult)
return D3D_OK;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_GetDeviceCaps
// ******************************************************************
@ -1704,6 +1707,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetDeviceCaps)
return;
}
#endif
// ******************************************************************
// * patch: D3DDevice_LoadVertexShader
@ -5228,6 +5232,7 @@ BOOL WINAPI XTL::EMUPATCH(D3DResource_IsBusy)
return FALSE;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: IDirect3DResource8_GetType
// ******************************************************************
@ -5267,6 +5272,7 @@ XTL::X_D3DRESOURCETYPE WINAPI XTL::EMUPATCH(D3DResource_GetType)
return (X_D3DRESOURCETYPE)rType;
}
#endif
// ******************************************************************
// * patch: Lock2DSurface
@ -5896,6 +5902,7 @@ ULONG WINAPI XTL::EMUPATCH(D3DDevice_Release)()
return RefCount;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_CreateVertexBuffer
// ******************************************************************
@ -5912,7 +5919,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateVertexBuffer)
return D3D_OK;
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_CreateVertexBuffer2
// ******************************************************************
@ -5951,6 +5960,7 @@ XTL::X_D3DVertexBuffer* WINAPI XTL::EMUPATCH(D3DDevice_CreateVertexBuffer2)
return pD3DVertexBuffer;
}
#endif
// ******************************************************************
// * patch: D3DDevice_EnableOverlay
@ -9021,10 +9031,11 @@ HRESULT WINAPI XTL::EMUPATCH(D3DTexture_GetLevelDesc)
return D3D_OK;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_CheckDeviceMultiSampleType
// * patch: Direct3D_CheckDeviceMultiSampleType
// ******************************************************************
HRESULT WINAPI XTL::EMUPATCH(D3D_CheckDeviceMultiSampleType)
HRESULT WINAPI XTL::EMUPATCH(Direct3D_CheckDeviceMultiSampleType)
(
UINT Adapter,
D3DDEVTYPE DeviceType,
@ -9094,7 +9105,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_CheckDeviceMultiSampleType)
return hRet;
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_GetDeviceCaps
// ******************************************************************
@ -9123,7 +9136,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_GetDeviceCaps)
return hRet;
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_SetPushBufferSize
// ******************************************************************
@ -9150,6 +9165,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_SetPushBufferSize)
return hRet;
}
#endif
// ******************************************************************
// * patch: D3DDevice_InsertFence
@ -10014,6 +10030,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetBackMaterial)(D3DMATERIAL8* pMaterial)
return S_OK;
}
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_GetAdapterIdentifier
// ******************************************************************
@ -10048,6 +10065,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_GetAdapterIdentifier)
return hRet;
}
#endif
// ******************************************************************
// * patch: D3D_MakeRequestedSpace

34
src/CxbxKrnl/EmuD3D8.h
View File

@ -88,10 +88,14 @@ HRESULT WINAPI EMUPATCH(Direct3D_CreateDevice)
BOOL WINAPI EMUPATCH(D3DDevice_IsBusy)();
// ******************************************************************
// * patch: D3D_CheckDeviceFormat
// * patch: D3DDevice_GetCreationParameters
// ******************************************************************
VOID WINAPI EMUPATCH(D3DDevice_GetCreationParameters)(D3DDEVICE_CREATION_PARAMETERS *pParameters);
VOID WINAPI EMUPATCH(D3DDevice_GetCreationParameters)
(
D3DDEVICE_CREATION_PARAMETERS *pParameters
);
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_CheckDeviceFormat
// ******************************************************************
@ -104,7 +108,9 @@ HRESULT WINAPI EMUPATCH(D3D_CheckDeviceFormat)
X_D3DRESOURCETYPE RType,
X_D3DFORMAT CheckFormat
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_GetDeviceCaps
// ******************************************************************
@ -112,11 +118,15 @@ VOID WINAPI EMUPATCH(D3DDevice_GetDeviceCaps)
(
D3DCAPS8 *pCaps
);
#endif
// ******************************************************************
// * patch: D3DDevice_GetDisplayFieldStatus
// ******************************************************************
VOID WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pFieldStatus);
VOID WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus)
(
X_D3DFIELD_STATUS *pFieldStatus
);
// ******************************************************************
// * patch: D3DDevice_BeginPush
@ -681,6 +691,7 @@ ULONG WINAPI EMUPATCH(D3DResource_Release)
X_D3DResource *pThis
);
#if 0 // patch disabled
// ******************************************************************
// * patch: IDirect3DResource8_GetType
// ******************************************************************
@ -688,6 +699,7 @@ X_D3DRESOURCETYPE WINAPI EMUPATCH(D3DResource_GetType)
(
X_D3DResource *pThis
);
#endif
// ******************************************************************
// * patch: IDirect3DResource8_AddRef
@ -833,6 +845,7 @@ HRESULT WINAPI EMUPATCH(D3DCubeTexture_LockRect)
DWORD Flags
);
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_CreateVertexBuffer
// ******************************************************************
@ -844,7 +857,9 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer)
D3DPOOL Pool,
X_D3DVertexBuffer **ppVertexBuffer
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3DDevice_CreateVertexBuffer2
// ******************************************************************
@ -852,6 +867,7 @@ X_D3DVertexBuffer* WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer2)
(
UINT Length
);
#endif
// ******************************************************************
// * patch: D3DDevice_EnableOverlay
@ -1547,10 +1563,11 @@ HRESULT WINAPI EMUPATCH(D3DTexture_GetLevelDesc)
X_D3DSURFACE_DESC* pDesc
);
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_CheckDeviceMultiSampleType
// * patch: Direct3D_CheckDeviceMultiSampleType
// ******************************************************************
HRESULT WINAPI EMUPATCH(D3D_CheckDeviceMultiSampleType)
HRESULT WINAPI EMUPATCH(Direct3D_CheckDeviceMultiSampleType)
(
UINT Adapter,
D3DDEVTYPE DeviceType,
@ -1558,7 +1575,9 @@ HRESULT WINAPI EMUPATCH(D3D_CheckDeviceMultiSampleType)
BOOL Windowed,
D3DMULTISAMPLE_TYPE MultiSampleType
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_GetDeviceCaps
// ******************************************************************
@ -1568,7 +1587,9 @@ HRESULT WINAPI EMUPATCH(D3D_GetDeviceCaps)
D3DDEVTYPE DeviceType,
D3DCAPS8 *pCaps
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_SetPushBufferSize
// ******************************************************************
@ -1577,6 +1598,7 @@ HRESULT WINAPI EMUPATCH(D3D_SetPushBufferSize)
DWORD PushBufferSize,
DWORD KickOffSize
);
#endif
// ******************************************************************
// * patch: D3DDevice_InsertFence
@ -1855,6 +1877,7 @@ HRESULT WINAPI EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView);
// ******************************************************************
HRESULT WINAPI EMUPATCH(D3DDevice_SetBackMaterial)(D3DMATERIAL8* pMaterial);
#if 0 // patch disabled
// ******************************************************************
// * patch: D3D_GetAdapterIdentifier
// ******************************************************************
@ -1864,6 +1887,7 @@ HRESULT WINAPI EMUPATCH(D3D_GetAdapterIdentifier)
DWORD Flags,
D3DADAPTER_IDENTIFIER8* pIdentifier
);
#endif
// ******************************************************************
// * patch: D3D::MakeRequestedSpace

2
src/CxbxKrnl/EmuXG.cpp
View File

@ -53,6 +53,7 @@ namespace NtDll
#include "EmuXTL.h"
#if 0 // patch disabled
// ******************************************************************
// * patch: XGIsSwizzledFormat
// ******************************************************************
@ -65,6 +66,7 @@ PVOID WINAPI XTL::EMUPATCH(XGIsSwizzledFormat)
RETURN(FALSE);
}
#endif
/* Leave unpatched
// ******************************************************************

2
src/CxbxKrnl/EmuXG.h
View File

@ -42,6 +42,7 @@ typedef struct _XGPOINT3D
}
XGPOINT3D;
#if 0 // patch disabled
// ******************************************************************
// * patch: XGIsSwizzledFormat
// ******************************************************************
@ -49,6 +50,7 @@ PVOID WINAPI EMUPATCH(XGIsSwizzledFormat)
(
X_D3DFORMAT Format
);
#endif
/* Leave unpatched
// ******************************************************************

14
src/CxbxKrnl/EmuXapi.cpp
View File

@ -174,6 +174,7 @@ DWORD WINAPI XTL::EMUPATCH(XGetDevices)
RETURN(ret);
}
#if 0 // patch disabled
// ******************************************************************
// * patch: XGetDeviceChanges
// ******************************************************************
@ -217,6 +218,7 @@ BOOL WINAPI XTL::EMUPATCH(XGetDeviceChanges)
RETURN(TRUE); // TODO : RETURN(bRet);
}
#endif
// ******************************************************************
// * patch: XInputOpen
@ -705,6 +707,7 @@ VOID WINAPI XTL::EMUPATCH(XRegisterThreadNotifyRoutine)
}
}
#if 0 // patch disabled
// ******************************************************************
// * patch: CreateFiber
// ******************************************************************
@ -737,7 +740,9 @@ LPVOID WINAPI XTL::EMUPATCH(CreateFiber)
return pFiber;
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: DeleteFiber
// ******************************************************************
@ -756,7 +761,9 @@ VOID WINAPI XTL::EMUPATCH(DeleteFiber)
DeleteFiber( lpFiber );
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: SwitchToFiber
// ******************************************************************
@ -787,7 +794,9 @@ VOID WINAPI XTL::EMUPATCH(SwitchToFiber)
DbgPrintf( "Finished executing fibers!\n" );
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: ConvertThreadToFiber
// ******************************************************************
@ -809,7 +818,9 @@ LPVOID WINAPI XTL::EMUPATCH(ConvertThreadToFiber)
return pRet;
}
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: XapiFiberStartup
// ******************************************************************
@ -839,6 +850,7 @@ VOID WINAPI XTL::EMUPATCH(XapiFiberStartup)(DWORD dwDummy)
}
}
#endif
// ******************************************************************
// * patch: QueueUserAPC
@ -977,6 +989,7 @@ DWORD WINAPI XTL::EMUPATCH(XLaunchNewImage)
DWORD g_XGetLaunchInfo_Status = -1;
#if 0 // patch disabled
// ******************************************************************
// * patch: XGetLaunchInfo
// ******************************************************************
@ -1024,6 +1037,7 @@ DWORD WINAPI XTL::EMUPATCH(XGetLaunchInfo)
RETURN(ret);
}
#endif
// ******************************************************************
// * patch: XSetProcessQuantumLength

14
src/CxbxKrnl/EmuXapi.h
View File

@ -380,6 +380,7 @@ DWORD WINAPI EMUPATCH(XGetDevices)
XPP_DEVICE_TYPE *DeviceType
);
#if 0 // patch disabled
// ******************************************************************
// * patch: XGetDeviceChanges
// ******************************************************************
@ -389,6 +390,7 @@ BOOL WINAPI EMUPATCH(XGetDeviceChanges)
PDWORD pdwInsertions,
PDWORD pdwRemovals
);
#endif
// ******************************************************************
// * patch: XInputOpen
@ -523,6 +525,7 @@ VOID WINAPI EMUPATCH(XRegisterThreadNotifyRoutine)
BOOL fRegister
);
#if 0 // patch disabled
// ******************************************************************
// * patch: CreateFiber
// ******************************************************************
@ -532,7 +535,9 @@ LPVOID WINAPI EMUPATCH(CreateFiber)
LPFIBER_START_ROUTINE lpStartRoutine,
LPVOID lpParameter
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: DeleteFiber
// ******************************************************************
@ -540,7 +545,9 @@ VOID WINAPI EMUPATCH(DeleteFiber)
(
LPVOID lpFiber
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: SwitchToFiber
// ******************************************************************
@ -548,7 +555,9 @@ VOID WINAPI EMUPATCH(SwitchToFiber)
(
LPVOID lpFiber
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: ConvertThreadToFiber
// ******************************************************************
@ -556,11 +565,14 @@ LPVOID WINAPI EMUPATCH(ConvertThreadToFiber)
(
LPVOID lpParameter
);
#endif
#if 0 // patch disabled
// ******************************************************************
// * patch: XapiFiberStartup
// ******************************************************************
VOID WINAPI EMUPATCH(XapiFiberStartup)(DWORD dwDummy);
#endif
// ******************************************************************
// * patch: QueueUserAPC
@ -592,6 +604,7 @@ DWORD WINAPI EMUPATCH(XLaunchNewImage)
PLAUNCH_DATA pLaunchData
);
#if 0 // patch disabled
// ******************************************************************
// * patch: XGetLaunchInfo
// ******************************************************************
@ -600,6 +613,7 @@ DWORD WINAPI EMUPATCH(XGetLaunchInfo)
PDWORD pdwLaunchDataType,
PLAUNCH_DATA pLaunchData
);
#endif
// ******************************************************************
// * patch: XSetProcessQuantumLength

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

@ -996,7 +996,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3D_SetPushBufferSize, 4034, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4361, PATCH),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5028, PATCH),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5028, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH),

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

@ -1092,8 +1092,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_BeginPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 5233, PATCH),

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

@ -828,8 +828,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3D_CheckDeviceFormat, 4361, DISABLED),
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4928, PATCH),
REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
@ -853,13 +852,11 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetPixelShader, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetIndices, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTexture, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTexture, 5233, PATCH), // Was 4928
REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_Begin, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_End, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_Clear, 5233, PATCH),
@ -879,8 +876,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4361, PATCH),
@ -893,42 +889,34 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTransform, 4134, DISABLED),
REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134
REGISTER_OOVPA(D3DDevice_SetStreamSource, 4361, PATCH),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH), // 5233
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetViewport, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3DPalette_Lock2, 5233, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5233, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5233, DISABLED),
REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DSurface_GetDesc, 4361, PATCH),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
@ -940,8 +928,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Release, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3D_SetFence, 5233, XREF),
REGISTER_OOVPA(D3DDevice_InsertFence, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_IsFencePending, 5233, PATCH),
@ -950,21 +937,16 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetPalette, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5344, PATCH), // 5233
// REGISTER_OOVPA(D3DDevice_Unknown1, 5233, PATCH)
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, DISABLED), // Beware of the typo...
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), // 4134
REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_BeginPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4361, PATCH),

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

@ -498,9 +498,9 @@ OOVPA_NO_XREF(D3DDevice_GetBackBuffer2, 5455, 12)
OOVPA_END;
// ******************************************************************
// * D3D_CheckDeviceMultiSampleType
// * Direct3D_CheckDeviceMultiSampleType
// ******************************************************************
OOVPA_NO_XREF(D3D_CheckDeviceMultiSampleType, 5558, 7)
OOVPA_NO_XREF(Direct3D_CheckDeviceMultiSampleType, 5558, 7)
{ 0x0E, 0x00 },
{ 0x1E, 0x54 },
@ -1547,9 +1547,9 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5233, PATCH),
REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH),
REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 5558, DISABLED),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED),
REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, PATCH),
REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, DISABLED),
REGISTER_OOVPA(D3DDevice_DrawVertices, 5233, PATCH),
REGISTER_OOVPA(D3D_SetFence, 5558, XREF),
REGISTER_OOVPA(D3DDevice_InsertFence, 5233, PATCH),

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

@ -1309,8 +1309,8 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DDevice_LightEnable, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_SetModelView, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH),
REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, PATCH),
REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH),
REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, DISABLED),
REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 5558, DISABLED),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_DrawVertices, 5788, PATCH),
REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH

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

@ -875,8 +875,8 @@ OOVPATable DSound_5344[] = {
REGISTER_OOVPA(IDirectSoundBuffer_Pause, 4928, PATCH),
REGISTER_OOVPA(CMcpxStream_Pause, 5233, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_Pause, 4361, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4134, DISABLED),
REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4134, DISABLED),
// REGISTER_OOVPA(DirectSound_CDirectSound_SetI3DL2Listener, 4134, DISABLED), // 5344 XREF is already in here
// REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 4134, DISABLED), // 5344 XREF is already in here
REGISTER_OOVPA(DirectSound_CDirectSound_SetVelocity, 5344, XREF),
REGISTER_OOVPA(IDirectSound_SetVelocity, 3936, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoiceSettings_SetMixBins, 5344, XREF),
@ -930,8 +930,7 @@ OOVPATable DSound_5344[] = {
REGISTER_OOVPA(IDirectSoundBuffer_SetDopplerFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5344, XREF),
REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 5344, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4134, DISABLED),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, DISABLED),
// REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 4134, DISABLED), // 5344 XREF is already in here
REGISTER_OOVPA(DirectSound_CDirectSound_CommitDeferredSettings, 5344, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetMaxDistance, 5344, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetMaxDistance, 5344, XREF),
@ -968,7 +967,7 @@ OOVPATable DSound_5344[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetRolloffFactor, 4134, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5344, XREF),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 5344, PATCH),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 5344, PATCH), // Was 4134
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_SetLoopRegion, 4134, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 4134, PATCH),
REGISTER_OOVPA(CMcpxBuffer_SetCurrentPosition, 4134, XREF),

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

@ -1991,7 +1991,7 @@ OOVPATable DSound_5558[] = {
REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF),
REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5558, XREF),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344?
REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5558, XREF),
REGISTER_OOVPA(DirectSound_CDirectSoundStream_FlushEx, 5233, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5233, PATCH),

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

@ -1698,7 +1698,7 @@ OOVPATable DSound_5788[] = {
REGISTER_OOVPA(DirectSound_CDirectSound_SetDistanceFactorA, 5558, XREF),
REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5788, XREF),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344?
REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5788, XREF),
REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5788, XREF),

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

@ -1770,7 +1770,7 @@ OOVPATable DSound_5849[] = {
REGISTER_OOVPA(DirectSound_CDirectSoundBuffer_StopEx, 5849, XREF),
REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 5849, ALIAS, DirectSound_CDirectSoundBuffer_StopEx),
REGISTER_OOVPA(DirectSound_CDirectSound_SetRolloffFactor, 5849, XREF),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH),
REGISTER_OOVPA(IDirectSound_SetRolloffFactor, 4134, PATCH), // TODO : Use 5344?
REGISTER_OOVPA(DirectSound_CDirectSound_SetDopplerFactor, 5849, XREF),
REGISTER_OOVPA(IDirectSound_SetDopplerFactor, 4134, PATCH),
REGISTER_OOVPA(DirectSound_CDirectSoundVoice_SetPitch, 5849, XREF),

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

@ -126,7 +126,7 @@ OOVPA_END;
// ******************************************************************
OOVPATable XG_3911[] = {
REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH),
REGISTER_OOVPA(XGIsSwizzledFormat, 3911, DISABLED),
// REGISTER_OOVPA(XGSwizzleRect, 3911, PATCH), // Leave unpatched
// REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH), // Leave unpatched
REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH),

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

@ -114,11 +114,11 @@ OOVPA_END;
// ******************************************************************
OOVPATable XG_4034[] = {
REGISTER_OOVPA(XGIsSwizzledFormat, 3911, PATCH),
REGISTER_OOVPA(XGIsSwizzledFormat, 3911, DISABLED),
// REGISTER_OOVPA(XGSwizzleRect, 3911, PATCH), // Leave unpatched
// REGISTER_OOVPA(XGUnswizzleRect, 3911, PATCH),
REGISTER_OOVPA(XGSwizzleBox, 3911, PATCH),
// REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, PATCH),
REGISTER_OOVPA(XGSwizzleBox, 3911, DISABLED),
// REGISTER_OOVPA(XGWriteSurfaceOrTextureToXPR, 3911, DISABLED),
};
// ******************************************************************

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

@ -76,7 +76,7 @@ OOVPA_END;
// ******************************************************************
OOVPATable XG_5788[1] = {
REGISTER_OOVPA(XGIsSwizzledFormat, 4361, PATCH),
REGISTER_OOVPA(XGIsSwizzledFormat, 4361, DISABLED),
// REGISTER_OOVPA(XGSwizzleRect, 5558, PATCH),
// REGISTER_OOVPA(XGUnswizzleRect, 5558, PATCH),
// REGISTER_OOVPA(XFONT_OpenBitmapFontFromMemory, 5788, PATCH),

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

@ -212,7 +212,7 @@ OOVPATable XAPI_5558[] = {
REGISTER_OOVPA(DeleteFiber, 3911, DISABLED),
REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED),
REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED),
// REGISTER_OOVPA(XapiFiberStartup, 5558, PATCH),
REGISTER_OOVPA(XapiFiberStartup, 5558, DISABLED),
REGISTER_OOVPA(XID_fCloseDevice, 5558, XREF),
REGISTER_OOVPA(XInputClose, 5558, PATCH),
REGISTER_OOVPA(OutputDebugStringA, 3911, PATCH),

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

@ -154,9 +154,9 @@ OOVPATable XAPI_5788[] = {
REGISTER_OOVPA(XInputOpen, 4361, PATCH),
REGISTER_OOVPA(XInputGetCapabilities, 5558, PATCH),
REGISTER_OOVPA(XInputGetState, 5558, PATCH),
REGISTER_OOVPA(XGetDeviceChanges, 5788, PATCH),
REGISTER_OOVPA(XGetDeviceChanges, 5788, DISABLED), // Was PATCH
// REGISTER_OOVPA(XapiThreadStartup, 4361, PATCH), // obsolete?
REGISTER_OOVPA(XGetLaunchInfo, 5558, PATCH),
REGISTER_OOVPA(XGetLaunchInfo, 5558, DISABLED),
REGISTER_OOVPA(QueueUserAPC, 3911, PATCH),
REGISTER_OOVPA(XRegisterThreadNotifyRoutine, 3911, PATCH),
REGISTER_OOVPA(GetThreadPriority, 5788, PATCH),
@ -170,10 +170,10 @@ OOVPATable XAPI_5788[] = {
REGISTER_OOVPA(XGetDeviceEnumerationStatus, 5788, PATCH),
// REGISTER_OOVPA(SwitchToThread, 5788, PATCH),
REGISTER_OOVPA(XFormatUtilityDrive, 4627, PATCH),
REGISTER_OOVPA(CreateFiber, 3911, PATCH),
REGISTER_OOVPA(DeleteFiber, 3911, PATCH),
REGISTER_OOVPA(SwitchToFiber, 3911, PATCH),
REGISTER_OOVPA(ConvertThreadToFiber, 3911, PATCH),
REGISTER_OOVPA(CreateFiber, 3911, DISABLED),
REGISTER_OOVPA(DeleteFiber, 3911, DISABLED),
REGISTER_OOVPA(SwitchToFiber, 3911, DISABLED),
REGISTER_OOVPA(ConvertThreadToFiber, 3911, DISABLED),
REGISTER_OOVPA(XID_fCloseDevice, 5558, XREF),
REGISTER_OOVPA(XInputClose, 5558, PATCH),
};