From 3f42f70d334b76505d41cc40286543456b488acb Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Fri, 6 Feb 2004 06:41:18 +0000 Subject: [PATCH] 4432+RtlReAllocateHeap! --- Cxbx.opt | Bin 67072 -> 67072 bytes Include/Win32/CxbxKrnl/EmuD3D8.h | 9 +++++++++ Include/Win32/CxbxKrnl/EmuNtDll.h | 12 ++++++++++++ Include/Win32/CxbxKrnl/EmuXapi.h | 11 +++++++++++ .../CxbxKrnl/HLEDataBase/D3D8.1.0.4432.h | 2 -- 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Cxbx.opt b/Cxbx.opt index 34d611907ba5400324b22f7a76ec9f3bc1ed6ee3..2f3cf85e22a62866e22da154a1f787424e2ad87c 100644 GIT binary patch literal 67072 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 Iji~?s7poWjUH||9 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;