diff --git a/Cxbx.opt b/Cxbx.opt index 34d611907..2f3cf85e2 100644 Binary files a/Cxbx.opt and b/Cxbx.opt differ diff --git a/Include/Win32/CxbxKrnl/EmuD3D8.h b/Include/Win32/CxbxKrnl/EmuD3D8.h index 610f39859..71f82446c 100644 --- a/Include/Win32/CxbxKrnl/EmuD3D8.h +++ b/Include/Win32/CxbxKrnl/EmuD3D8.h @@ -774,6 +774,15 @@ VOID WINAPI EmuIDirect3DDevice8_SetTextureState_BorderColor DWORD Value ); +// ****************************************************************** +// * func: EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +// ****************************************************************** +VOID WINAPI EmuIDirect3DDevice8_SetTextureState_ColorKeyColor +( + DWORD Stage, + DWORD Value +); + // ****************************************************************** // * func: EmuIDirect3DDevice8_SetTextureState_BumpEnv // ****************************************************************** diff --git a/Include/Win32/CxbxKrnl/EmuNtDll.h b/Include/Win32/CxbxKrnl/EmuNtDll.h index c26efcac5..82e5ef898 100644 --- a/Include/Win32/CxbxKrnl/EmuNtDll.h +++ b/Include/Win32/CxbxKrnl/EmuNtDll.h @@ -533,6 +533,17 @@ typedef BOOL (NTAPI *FPTR_RtlFreeHeap) IN PVOID lpMem ); +// ****************************************************************** +// * RtlReAllocateHeap +// ****************************************************************** +typedef PVOID (NTAPI *FPTR_RtlReAllocateHeap) +( + IN HANDLE hHeap, + IN DWORD dwFlags, + IN PVOID lpMem, + IN DWORD dwBytes +); + // ****************************************************************** // * RtlSizeHeap // ****************************************************************** @@ -955,6 +966,7 @@ extern FPTR_NtWaitForMultipleObjects NtWaitForMultipleObjects; extern FPTR_RtlCreateHeap RtlCreateHeap; extern FPTR_RtlAllocateHeap RtlAllocateHeap; extern FPTR_RtlFreeHeap RtlFreeHeap; +extern FPTR_RtlReAllocateHeap RtlReAllocateHeap; extern FPTR_RtlSizeHeap RtlSizeHeap; extern FPTR_NtAllocateVirtualMemory NtAllocateVirtualMemory; extern FPTR_NtFreeVirtualMemory NtFreeVirtualMemory; diff --git a/Include/Win32/CxbxKrnl/EmuXapi.h b/Include/Win32/CxbxKrnl/EmuXapi.h index 96f3a9ff4..457321f08 100644 --- a/Include/Win32/CxbxKrnl/EmuXapi.h +++ b/Include/Win32/CxbxKrnl/EmuXapi.h @@ -313,6 +313,17 @@ BOOL WINAPI EmuRtlFreeHeap IN PVOID lpMem ); +// ****************************************************************** +// * func: EmuRtlReAllocateHeap +// ****************************************************************** +PVOID WINAPI EmuRtlReAllocateHeap +( + IN HANDLE hHeap, + IN DWORD dwFlags, + IN PVOID lpMem, + IN SIZE_T dwBytes +); + // ****************************************************************** // * func: EmuRtlSizeHeap // ****************************************************************** diff --git a/Include/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h b/Include/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h index e0ab42756..231cb4f58 100644 --- a/Include/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h +++ b/Include/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h @@ -36,8 +36,6 @@ #include "OOVPA.h" -extern SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4432; - extern OOVPATable D3D8_1_0_4432[]; extern uint32 D3D8_1_0_4432_SIZE;