From 4a88ae0b27f83a809a4ef9fbe801a7d6160e99af Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Wed, 4 Feb 2004 00:20:53 +0000
Subject: [PATCH] lots o' work

---
 Cxbx.opt                                      | Bin 65536 -> 68096 bytes
 CxbxKrnl.dsp                                  | 151 +---------
 Doc/Todo.txt                                  |   7 +
 Include/Win32/CxbxKrnl/EmuD3D8.h              |   8 +
 Include/Win32/CxbxKrnl/EmuD3D8Conv.h          |   3 +
 Include/Win32/CxbxKrnl/HLEDataBase.h          |   1 +
 .../CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h      |  42 +++
 Source/Win32/CxbxKrnl/Emu.cpp                 |   2 +-
 Source/Win32/CxbxKrnl/EmuD3D8.cpp             |  30 +-
 Source/Win32/CxbxKrnl/HLEDataBase.cpp         |   8 +
 .../CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl    | 230 ++++++++++++++
 .../CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl    | 193 +-----------
 .../CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl    | 281 ++++++++++++++++++
 .../CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl    | 194 +-----------
 14 files changed, 632 insertions(+), 518 deletions(-)
 create mode 100644 Include/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h
 create mode 100644 Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl

diff --git a/Cxbx.opt b/Cxbx.opt
index 052913b064d8d9a8d5de81e1b699859f45fd1bd8..76c92f5b5e450e503497e1ebbcec1f70c7e5fae3 100644
GIT binary patch
literal 68096
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
R$^iTS+5gY}|F!G?|39IxI9&h$

literal 65536
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
I_v*j@2mJf2djJ3c

diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp
index 37f4f414c..fddf1e3cc 100644
--- a/CxbxKrnl.dsp
+++ b/CxbxKrnl.dsp
@@ -189,6 +189,10 @@ SOURCE=.\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h
 # End Source File
 # Begin Source File
@@ -330,236 +334,97 @@ SOURCE=.\Resource\CxbxDll.rc
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4034.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4134.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.3936.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4361.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\DSound.1.0.4627.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.3911.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4034.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4134.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-!ENDIF 
-
+SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4361.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\XG.1.0.4627.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\XNet.1.0.3911.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\Source\Win32\CxbxKrnl\HLEDataBase\XOnline.1.0.4361.inl
-
-!IF  "$(CFG)" == "CxbxKrnl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "CxbxKrnl - Win32 Debug"
-
 # PROP Exclude_From_Build 1
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Source File
diff --git a/Doc/Todo.txt b/Doc/Todo.txt
index 1a27fcb47..1a99d2c35 100644
--- a/Doc/Todo.txt
+++ b/Doc/Todo.txt
@@ -1,5 +1,12 @@
 Cxbx Todo (* denotes high priority, + denotes medium priority)
 
+HLE :
+
+  * Direct3D_SetPushBufferSize for Antz Extreme Racing (4361). Do this
+    when Xiggen is stabilized! For now, safe to ignore it.
+
+ETC :
+
   * Use SetAllParameters to reverse engineer 3911 DSound functions
 
   * Stella has a memory leak in the game's list screen..
diff --git a/Include/Win32/CxbxKrnl/EmuD3D8.h b/Include/Win32/CxbxKrnl/EmuD3D8.h
index 64bb310a4..80e3c37c1 100644
--- a/Include/Win32/CxbxKrnl/EmuD3D8.h
+++ b/Include/Win32/CxbxKrnl/EmuD3D8.h
@@ -1039,6 +1039,14 @@ VOID WINAPI EmuIDirect3DDevice8_SetTextureState_TexCoordIndex
     DWORD Value
 );
 
+// ******************************************************************
+// * func: EmuIDirect3DDevice8_SetTextureState_BackFillMode
+// ******************************************************************
+VOID WINAPI EmuIDirect3DDevice8_SetTextureState_BackFillMode
+(
+    DWORD Value
+);
+
 // ******************************************************************
 // * func: EmuIDirect3DDevice8_SetTextureState_BorderColor
 // ******************************************************************
diff --git a/Include/Win32/CxbxKrnl/EmuD3D8Conv.h b/Include/Win32/CxbxKrnl/EmuD3D8Conv.h
index b1370db2c..99e2b31e1 100644
--- a/Include/Win32/CxbxKrnl/EmuD3D8Conv.h
+++ b/Include/Win32/CxbxKrnl/EmuD3D8Conv.h
@@ -118,6 +118,9 @@ inline D3DFORMAT EmuXB2PC_D3DFormat(X_D3DFORMAT Format)
         case 0x2A: // Swizzled   (X_D3DFMT_D24S8)
             return D3DFMT_D24S8;
 
+        case 0x2B: // Swizzled   (X_D3DFMT_F24S8)
+            return D3DFMT_D24S8;    // NOTE: Hack!! PC does not have D3DFMT_F24S8 (Float vs Int)
+
         case 0x30: // Linear     (X_D3DFMT_LIN_D16)
         case 0x2C: // Swizzled   (X_D3DFMT_D16)
             return D3DFMT_D16;
diff --git a/Include/Win32/CxbxKrnl/HLEDataBase.h b/Include/Win32/CxbxKrnl/HLEDataBase.h
index 43b90ee22..26b50dcaa 100644
--- a/Include/Win32/CxbxKrnl/HLEDataBase.h
+++ b/Include/Win32/CxbxKrnl/HLEDataBase.h
@@ -38,6 +38,7 @@
 #include "Xapi.1.0.4034.h"
 #include "Xapi.1.0.4134.h"
 #include "Xapi.1.0.4361.h"
+#include "Xapi.1.0.4432.h"
 #include "Xapi.1.0.4627.h"
 #include "D3D8.1.0.3925.h"
 #include "D3D8.1.0.4034.h"
diff --git a/Include/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h b/Include/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h
new file mode 100644
index 000000000..4cce01074
--- /dev/null
+++ b/Include/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.h
@@ -0,0 +1,42 @@
+// ******************************************************************
+// *
+// *    .,-:::::    .,::      .::::::::.    .,::      .:
+// *  ,;;;'````'    `;;;,  .,;;  ;;;'';;'   `;;;,  .,;; 
+// *  [[[             '[[,,[['   [[[__[[\.    '[[,,[['  
+// *  $$$              Y$$$P     $$""""Y$$     Y$$$P    
+// *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
+// *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
+// *
+// *   Cxbx->Win32->CxbxKrnl->Xapi.1.0.4432.h
+// *
+// *  This file is part of the Cxbx project.
+// *
+// *  Cxbx and Cxbe are free software; you can redistribute them
+// *  and/or modify them under the terms of the GNU General Public
+// *  License as published by the Free Software Foundation; either
+// *  version 2 of the license, or (at your option) any later version.
+// *
+// *  This program is distributed in the hope that it will be useful,
+// *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// *  GNU General Public License for more details.
+// *
+// *  You should have recieved a copy of the GNU General Public License
+// *  along with this program; see the file COPYING.
+// *  If not, write to the Free Software Foundation, Inc.,
+// *  59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.
+// *
+// *  (c) 2002-2003 Aaron Robinson <caustik@caustik.com>
+// *
+// *  All rights reserved
+// *
+// ******************************************************************
+#ifndef XAPI_1_0_4432_H
+#define XAPI_1_0_4432_H
+
+#include "OOVPA.h"
+
+extern OOVPATable XAPI_1_0_4432[];
+extern uint32     XAPI_1_0_4432_SIZE;
+
+#endif
diff --git a/Source/Win32/CxbxKrnl/Emu.cpp b/Source/Win32/CxbxKrnl/Emu.cpp
index 980ef7aa6..22e4b2db5 100644
--- a/Source/Win32/CxbxKrnl/Emu.cpp
+++ b/Source/Win32/CxbxKrnl/Emu.cpp
@@ -536,7 +536,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit
         // _USE_XGMATH Disabled in mesh :[
         // halo : dword_0_2E2D18
         // halo : 1744F0 (bink)
-        //_asm int 3
+        _asm int 3
 
         Entry();
 
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index 5b3c4ca32..3d6e1a161 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -1732,7 +1732,7 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_GetDepthStencilSurface
     *ppZStencilSurface = g_pCachedZStencilSurface;
 
     #ifdef _DEBUG_TRACE
-    printf("EmuD3D8 (0x%X): DepthStencilSurface := 0x%.08X\n", pSurface8);
+    printf("EmuD3D8 (0x%X): DepthStencilSurface := 0x%.08X\n", GetCurrentThreadId(), pSurface8);
     #endif
 
     EmuSwapFS();   // Xbox FS
@@ -4868,6 +4868,34 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_TexCoordIndex
     return;
 }
 
+// ******************************************************************
+// * func: EmuIDirect3DDevice8_SetTextureState_BackFillMode
+// ******************************************************************
+VOID WINAPI XTL::EmuIDirect3DDevice8_SetTextureState_BackFillMode
+(
+    DWORD Value
+)
+{
+    EmuSwapFS();   // Win2k/XP FS
+
+    // debug trace
+    #ifdef _DEBUG_TRACE
+    {
+        printf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_SetTextureState_BackFillMode\n"
+               "(\n"
+               "   Value               : 0x%.08X\n"
+               ");\n",
+               GetCurrentThreadId(), Value);
+    }
+    #endif
+
+    EmuWarning("BackFillMode is not supported!");
+
+    EmuSwapFS();   // XBox FS
+
+    return;
+}
+
 // ******************************************************************
 // * func: EmuIDirect3DDevice8_SetTextureState_BorderColor
 // ******************************************************************
diff --git a/Source/Win32/CxbxKrnl/HLEDataBase.cpp b/Source/Win32/CxbxKrnl/HLEDataBase.cpp
index 24240ed64..72494caf7 100644
--- a/Source/Win32/CxbxKrnl/HLEDataBase.cpp
+++ b/Source/Win32/CxbxKrnl/HLEDataBase.cpp
@@ -53,6 +53,7 @@ namespace XTL
 #include "HLEDataBase/Xapi.1.0.4034.inl"
 #include "HLEDataBase/Xapi.1.0.4134.inl"
 #include "HLEDataBase/Xapi.1.0.4361.inl"
+#include "HLEDataBase/Xapi.1.0.4432.inl"
 #include "HLEDataBase/Xapi.1.0.4627.inl"
 #include "HLEDataBase/D3D8.1.0.3925.inl"
 #include "HLEDataBase/D3D8.1.0.4034.inl"
@@ -101,6 +102,13 @@ HLEData HLEDataBase[] =
         XAPI_1_0_4361,
         XAPI_1_0_4361_SIZE
     },
+    // Xapilib Version 1.0.4432
+    {
+        "XAPILIB",
+        1, 0, 4432,
+        XAPI_1_0_4432,
+        XAPI_1_0_4432_SIZE
+    },
     // Xapilib Version 1.0.4627
     {
         "XAPILIB",
diff --git a/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
index dfc75e10c..e97bbd804 100644
--- a/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
+++ b/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
@@ -32,6 +32,141 @@
 // *
 // ******************************************************************
 
+// ******************************************************************
+// * IDirect3D8_CreateDevice
+// ******************************************************************
+SOOVPA<8> IDirect3D8_CreateDevice_1_0_4432 =
+{
+    0,  // Large == 0
+    8,  // Count == 8
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // IDirect3D8_CreateDevice+0x07 : jnz +0x0A
+        { 0x07, 0x75 }, // (Offset,Value)-Pair #1
+        { 0x08, 0x0A }, // (Offset,Value)-Pair #2
+
+        // IDirect3D8_CreateDevice+0x86 : repe stosd
+        { 0x86, 0xF3 }, // (Offset,Value)-Pair #3
+        { 0x87, 0xAB }, // (Offset,Value)-Pair #4
+
+        // IDirect3D8_CreateDevice+0x89 : mov eax, esi
+        { 0x89, 0x8B }, // (Offset,Value)-Pair #5
+        { 0x8A, 0xC6 }, // (Offset,Value)-Pair #6
+
+        // IDirect3D8_CreateDevice+0xA0 : retn 0x18
+        { 0xA0, 0xC2 }, // (Offset,Value)-Pair #7
+        { 0xA1, 0x18 }, // (Offset,Value)-Pair #8
+    }
+};
+
+// ******************************************************************
+// * IDirect3DDevice8_GetRenderTarget
+// ******************************************************************
+SOOVPA<11> IDirect3DDevice8_GetRenderTarget_1_0_4432 =
+{
+    0,  // Large == 0
+    11, // Count == 11
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // IDirect3DDevice8_GetRenderTarget+0x00 : mov eax, [addr]
+        { 0x00, 0xA1 }, // (Offset,Value)-Pair #1
+
+        // IDirect3DDevice8_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
+        { 0x15, 0x50 }, // (Offset,Value)-Pair #6
+
+        // IDirect3DDevice8_GetRenderTarget+0x13 : jz + 0x06
+        { 0x13, 0x74 }, // (Offset,Value)-Pair #7
+        { 0x14, 0x06 }, // (Offset,Value)-Pair #8
+
+        // IDirect3DDevice8_GetRenderTarget+0x16 : call [addr]
+        { 0x16, 0xE8 }, // (Offset,Value)-Pair #9
+
+        // IDirect3DDevice8_GetRenderTarget+0x1D : retn 0x04
+        { 0x1D, 0xC2 }, // (Offset,Value)-Pair #10
+        { 0x1E, 0x04 }, // (Offset,Value)-Pair #11
+    }
+};
+
+// ******************************************************************
+// * IDirect3DDevice8_GetDepthStencilSurface
+// ******************************************************************
+SOOVPA<11> IDirect3DDevice8_GetDepthStencilSurface_1_0_4432 =
+{
+    0,  // Large == 0
+    11, // Count == 11
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // IDirect3DDevice8_GetDepthStencilSurface+0x00 : mov eax, [addr]
+        { 0x00, 0xA1 }, // (Offset,Value)-Pair #1
+
+        // IDirect3DDevice8_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
+        { 0x15, 0x50 }, // (Offset,Value)-Pair #6
+
+        // IDirect3DDevice8_GetDepthStencilSurface+0x13 : jnz +0x0B
+        { 0x13, 0x74 }, // (Offset,Value)-Pair #7
+        { 0x14, 0x0B }, // (Offset,Value)-Pair #8
+
+        // IDirect3DDevice8_GetDepthStencilSurface+0x16 : call [addr]
+        { 0x16, 0xE8 }, // (Offset,Value)-Pair #9
+
+        // IDirect3DDevice8_GetDepthStencilSurface+0x25 : retn 0x04
+        { 0x25, 0xC2 }, // (Offset,Value)-Pair #10
+        { 0x26, 0x04 }, // (Offset,Value)-Pair #11
+    }
+};
+
+// ******************************************************************
+// * IDirect3DDevice8_SetPixelShader
+// ******************************************************************
+SOOVPA<10> IDirect3DDevice8_SetPixelShader_1_0_4432 =
+{
+    0,  // Large == 0
+    10, // Count == 10
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // IDirect3DDevice8_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
+        { 0x3A, 0x0D }, // (Offset,Value)-Pair #5
+        { 0x3C, 0x20 }, // (Offset,Value)-Pair #6
+
+        // IDirect3DDevice8_SetPixelShader+0x78 : retn 0x04
+        { 0x78, 0xC2 }, // (Offset,Value)-Pair #7
+        { 0x79, 0x04 }, // (Offset,Value)-Pair #8
+
+        // IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd
+        { 0xE3, 0xF3 }, // (Offset,Value)-Pair #9
+        { 0xE4, 0xA5 }, // (Offset,Value)-Pair #10
+    }
+};
 
 // ******************************************************************
 // * IDirect3DDevice8_SetTextureState_BumpEnv
@@ -67,6 +202,41 @@ SOOVPA<12> IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4432 =
     }
 };
 
+// ******************************************************************
+// * IDirect3DDevice8_SetTextureState_BackFillMode
+// ******************************************************************
+SOOVPA<13> IDirect3DDevice8_SetTextureState_BackFillMode_1_0_4432 =
+{
+    0,  // Large == 0
+    13, // Count == 13
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // IDirect3DDevice8_SetTextureState_BackFillMode+0x1C : jb +0x05
+        { 0x1C, 0x72 }, // (Offset,Value)-Pair #1
+        { 0x1D, 0x05 }, // (Offset,Value)-Pair #2
+
+        // IDirect3DDevice8_SetTextureState_BackFillMode+0x35 : mov dword ptr [eax], abs
+        { 0x35, 0xC7 }, // (Offset,Value)-Pair #3
+        { 0x36, 0x00 }, // (Offset,Value)-Pair #4
+
+        // IDirect3DDevice8_SetTextureState_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
+        { 0x44, 0x89 }, // (Offset,Value)-Pair #8
+        { 0x45, 0x06 }, // (Offset,Value)-Pair #9
+        { 0x46, 0x89 }, // (Offset,Value)-Pair #10
+        { 0x47, 0x3D }, // (Offset,Value)-Pair #11
+
+        // IDirect3DDevice8_SetTextureState_BackFillMode+0x4E : retn 0x04
+        { 0x4E, 0xC2 }, // (Offset,Value)-Pair #12
+        { 0x4F, 0x04 }, // (Offset,Value)-Pair #13
+    }
+};
+
 // ******************************************************************
 // * IDirect3DDevice8_SetTextureState_BorderColor
 // ******************************************************************
@@ -211,6 +381,16 @@ SOOVPA<13> IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4432 =
 // ******************************************************************
 OOVPATable D3D8_1_0_4432[] =
 {
+    // IDirect3D8::CreateDevice
+    {
+        (OOVPA*)&IDirect3D8_CreateDevice_1_0_4432,
+
+        XTL::EmuIDirect3D8_CreateDevice,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3D8_CreateDevice" 
+        #endif
+    },
     // IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
     {
         (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
@@ -231,6 +411,26 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3D8_EnumAdapterModes" 
         #endif
     },
+    // IDirect3DDevice8::GetRenderTarget
+    {
+        (OOVPA*)&IDirect3DDevice8_GetRenderTarget_1_0_4432,
+
+        XTL::EmuIDirect3DDevice8_GetRenderTarget,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetRenderTarget"
+        #endif
+    },
+    // IDirect3DDevice8::GetDepthStencilSurface
+    {
+        (OOVPA*)&IDirect3DDevice8_GetDepthStencilSurface_1_0_4432,
+
+        XTL::EmuIDirect3DDevice8_GetDepthStencilSurface,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetDepthStencilSurface"
+        #endif
+    },
     // IDirect3DDevice8::CreateVertexShader (* unchanged since 3925 *)
     {
         (OOVPA*)&IDirect3DDevice8_CreateVertexShader_1_0_3925,
@@ -241,6 +441,16 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DDevice8_CreateVertexShader"
         #endif
     },
+    // IDirect3DDevice8::SetPixelShader
+    {
+        (OOVPA*)&IDirect3DDevice8_SetPixelShader_1_0_4432,
+
+        XTL::EmuIDirect3DDevice8_SetPixelShader,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetPixelShader"
+        #endif
+    },
     // IDirect3DDevice8::SetTexture (* unchanged since 4361 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetTexture_1_0_4361,
@@ -271,6 +481,16 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DDevice8_SetTextureState_BumpEnv" 
         #endif
     },
+    // IDirect3DDevice8::SetTextureState_BackFillMode
+    {
+        (OOVPA*)&IDirect3DDevice8_SetTextureState_BackFillMode_1_0_4432,
+
+        XTL::EmuIDirect3DDevice8_SetTextureState_BackFillMode,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetTextureState_BackFillMode" 
+        #endif
+    },
     // IDirect3DDevice8::SetTextureState_BorderColor
     {
         (OOVPA*)&IDirect3DDevice8_SetTextureState_BorderColor_1_0_4432,
@@ -281,6 +501,16 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DDevice8_SetTextureState_BorderColor" 
         #endif
     },
+    // IDirect3DDevice8::SetRenderState_VertexBlend (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SetRenderState_VertexBlend_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SetRenderState_VertexBlend,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetRenderState_VertexBlend" 
+        #endif
+    },
     // IDirect3DDevice8::SetRenderState_CullMode (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_CullMode_1_0_4134,
diff --git a/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
index 893a2418f..a8dfd288c 100644
--- a/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
+++ b/Source/Win32/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
@@ -1165,105 +1165,6 @@ SOOVPA<10> IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4627 =
     }
 };
 
-// ******************************************************************
-// * IDirect3DDevice8_SetTextureState_BumpEnv
-// ******************************************************************
-SOOVPA<12> IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4627 =
-{
-    0,  // Large == 0
-    12, // Count == 12
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // IDirect3DDevice8_SetTextureState_BumpEnv+0x18 : jnz +0x03
-        { 0x18, 0x75 }, // (Offset,Value)-Pair #1
-        { 0x19, 0x03 }, // (Offset,Value)-Pair #2
-
-        // IDirect3DDevice8_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]
-        { 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
-        { 0x50, 0xC1 }, // (Offset,Value)-Pair #10
-        { 0x51, 0xE6 }, // (Offset,Value)-Pair #11
-        { 0x52, 0x05 }, // (Offset,Value)-Pair #12
-    }
-};
-
-// ******************************************************************
-// * IDirect3DDevice8_SetTextureState_BorderColor
-// ******************************************************************
-SOOVPA<15> IDirect3DDevice8_SetTextureState_BorderColor_1_0_4627 =
-{
-    0,  // Large == 0
-    15, // Count == 15
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // IDirect3DDevice8_SetTextureState_BorderColor+0x0C : jb +0x05
-        { 0x0C, 0x72 }, // (Offset,Value)-Pair #1
-        { 0x0D, 0x05 }, // (Offset,Value)-Pair #2
-
-        // IDirect3DDevice8_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
-        { 0x2B, 0x83 }, // (Offset,Value)-Pair #6
-        { 0x2C, 0xC0 }, // (Offset,Value)-Pair #7
-        { 0x2D, 0x08 }, // (Offset,Value)-Pair #8
-        { 0x2E, 0x89 }, // (Offset,Value)-Pair #9
-        { 0x2F, 0x06 }, // (Offset,Value)-Pair #10
-        { 0x30, 0xC1 }, // (Offset,Value)-Pair #11
-        { 0x31, 0xE1 }, // (Offset,Value)-Pair #12
-        { 0x32, 0x07 }, // (Offset,Value)-Pair #13
-
-        // IDirect3DDevice8_SetTextureState_BorderColor+0x3A : retn 0x08
-        { 0x3A, 0xC2 }, // (Offset,Value)-Pair #14
-        { 0x3B, 0x08 }, // (Offset,Value)-Pair #15
-    }
-};
-
-// ******************************************************************
-// * IDirect3DDevice8_SetRenderState_NormalizeNormals
-// ******************************************************************
-SOOVPA<8> IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4627 =
-{
-    0,  // Large == 0
-    8,  // Count == 8
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // IDirect3DDevice8_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
-        { 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
-        { 0x36, 0xC2 }, // (Offset,Value)-Pair #7
-        { 0x37, 0x04 }, // (Offset,Value)-Pair #8
-    }
-};
-
 // ******************************************************************
 // * IDirect3DDevice8_SetRenderState_Dxt1NoiseEnable
 // ******************************************************************
@@ -1366,80 +1267,6 @@ SOOVPA<12> IDirect3DDevice8_SetRenderState_MultiSampleAntiAlias_1_0_4627 =
     }
 };
 
-// ******************************************************************
-// * IDirect3DDevice8_SetRenderState_ShadowFunc
-// ******************************************************************
-SOOVPA<13> IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4627 =
-{
-    0,  // Large == 0
-    13, // Count == 13
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // IDirect3DDevice8_SetRenderState_ShadowFunc+0x00 : push esi
-        { 0x00, 0x56 }, // (Offset,Value)-Pair #1
-
-        // IDirect3DDevice8_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
-        { 0x0C, 0x72 }, // (Offset,Value)-Pair #5
-        { 0x0D, 0x05 }, // (Offset,Value)-Pair #6
-
-        // IDirect3DDevice8_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
-        { 0x26, 0x83 }, // (Offset,Value)-Pair #11
-        { 0x27, 0xC0 }, // (Offset,Value)-Pair #12
-        { 0x28, 0x08 }, // (Offset,Value)-Pair #13
-    }
-};
-
-// ******************************************************************
-// * IDirect3DDevice8_SetRenderState_YuvEnable
-// ******************************************************************
-SOOVPA<13> IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4627 =
-{
-    0,  // Large == 0
-    13, // Count == 13
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // IDirect3DDevice8_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]
-        { 0x10, 0x8B }, // (Offset,Value)-Pair #5
-        { 0x11, 0x06 }, // (Offset,Value)-Pair #6
-
-        // IDirect3DDevice8_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
-        { 0x15, 0x72 }, // (Offset,Value)-Pair #10
-        { 0x16, 0x05 }, // (Offset,Value)-Pair #11
-
-        // IDirect3DDevice8_SetRenderState_YuvEnable+0x28 : retn 0x04
-        { 0x28, 0xC2 }, // (Offset,Value)-Pair #12
-        { 0x29, 0x04 }, // (Offset,Value)-Pair #13
-    }
-};
-
 // ******************************************************************
 // * IDirect3DDevice8_DrawVerticesUP
 // ******************************************************************
@@ -2148,9 +1975,9 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetTextureState_TexCoordIndex" 
         #endif
     },
-    // IDirect3DDevice8::SetTextureState_BumpEnv
+    // IDirect3DDevice8::SetTextureState_BumpEnv (* unchanged since 4432 *)
     {
-        (OOVPA*)&IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4627,
+        (OOVPA*)&IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4432,
 
         XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv,
 
@@ -2158,9 +1985,9 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetTextureState_BumpEnv" 
         #endif
     },
-    // IDirect3DDevice8::SetTextureState_BorderColor
+    // IDirect3DDevice8::SetTextureState_BorderColor (* unchanged since 4432 *)
     {
-        (OOVPA*)&IDirect3DDevice8_SetTextureState_BorderColor_1_0_4627,
+        (OOVPA*)&IDirect3DDevice8_SetTextureState_BorderColor_1_0_4432,
 
         XTL::EmuIDirect3DDevice8_SetTextureState_BorderColor,
 
@@ -2178,9 +2005,9 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetRenderState_CullMode" 
         #endif
     },
-    // IDirect3DDevice8::SetRenderState_NormalizeNormals
+    // IDirect3DDevice8::SetRenderState_NormalizeNormals (* unchanged since 4432 *)
     {
-        (OOVPA*)&IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4627,
+        (OOVPA*)&IDirect3DDevice8_SetRenderState_NormalizeNormals_1_0_4432,
 
         XTL::EmuIDirect3DDevice8_SetRenderState_NormalizeNormals,
 
@@ -2288,9 +2115,9 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetRenderState_MultiSampleAntiAlias" 
         #endif
     },
-    // IDirect3DDevice8::SetRenderState_ShadowFunc
+    // IDirect3DDevice8::SetRenderState_ShadowFunc (* unchanged since 4432 *)
     {
-        (OOVPA*)&IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4627,
+        (OOVPA*)&IDirect3DDevice8_SetRenderState_ShadowFunc_1_0_4432,
 
         XTL::EmuIDirect3DDevice8_SetRenderState_ShadowFunc,
 
@@ -2298,9 +2125,9 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetRenderState_ShadowFunc" 
         #endif
     },
-    // IDirect3DDevice8::SetRenderState_YuvEnable
+    // IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4432 *)
     {
-        (OOVPA*)&IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4627,
+        (OOVPA*)&IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4432,
 
         XTL::EmuIDirect3DDevice8_SetRenderState_YuvEnable,
 
diff --git a/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl b/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl
new file mode 100644
index 000000000..2b80e9d7f
--- /dev/null
+++ b/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4432.inl
@@ -0,0 +1,281 @@
+// ******************************************************************
+// *
+// *    .,-:::::    .,::      .::::::::.    .,::      .:
+// *  ,;;;'````'    `;;;,  .,;;  ;;;'';;'   `;;;,  .,;; 
+// *  [[[             '[[,,[['   [[[__[[\.    '[[,,[['  
+// *  $$$              Y$$$P     $$""""Y$$     Y$$$P    
+// *  `88bo,__,o,    oP"``"Yo,  _88o,,od8P   oP"``"Yo,  
+// *    "YUMMMMMP",m"       "Mm,""YUMMMP" ,m"       "Mm,
+// *
+// *   Cxbx->Win32->CxbxKrnl->Xapi.1.0.4432.cpp
+// *
+// *  This file is part of the Cxbx project.
+// *
+// *  Cxbx and Cxbe are free software; you can redistribute them
+// *  and/or modify them under the terms of the GNU General Public
+// *  License as published by the Free Software Foundation; either
+// *  version 2 of the license, or (at your option) any later version.
+// *
+// *  This program is distributed in the hope that it will be useful,
+// *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// *  GNU General Public License for more details.
+// *
+// *  You should have recieved a copy of the GNU General Public License
+// *  along with this program; see the file COPYING.
+// *  If not, write to the Free Software Foundation, Inc.,
+// *  59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.
+// *
+// *  (c) 2002-2003 Aaron Robinson <caustik@caustik.com>
+// *
+// *  All rights reserved
+// *
+// ******************************************************************
+
+// ******************************************************************
+// * RtlFreeHeap
+// ******************************************************************
+SOOVPA<9> RtlFreeHeap_1_0_4432 =
+{
+    0,  // Large == 0
+    9,  // Count == 9
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // RtlFreeHeap+0x1F : test ecx, ecx
+        { 0x1F, 0x85 }, // (Offset,Value)-Pair #1
+        { 0x20, 0xC9 }, // (Offset,Value)-Pair #2
+
+        // RtlFreeHeap+0x23 : mov al, 1
+        { 0x23, 0xB0 }, // (Offset,Value)-Pair #3
+        { 0x24, 0x01 }, // (Offset,Value)-Pair #4
+
+        // RtlFreeHeap+0x4B : test byte ptr [edi+5], 8
+        { 0x4B, 0xF6 }, // (Offset,Value)-Pair #5
+        { 0x4C, 0x47 }, // (Offset,Value)-Pair #6
+        { 0x4D, 0x05 }, // (Offset,Value)-Pair #7
+
+        // RtlFreeHeap+0x6E : cmp ecx, 0x80
+        { 0x6E, 0x81 }, // (Offset,Value)-Pair #8
+        { 0x6F, 0xF9 }, // (Offset,Value)-Pair #9
+    }
+};
+
+// ******************************************************************
+// * RtlSizeHeap
+// ******************************************************************
+SOOVPA<11> RtlSizeHeap_1_0_4432 =
+{
+    0,  // Large == 0
+    11, // Count == 11
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // RtlSizeHeap+0x04 : mov al, [ecx-0x0B]
+        { 0x04, 0x8A }, // (Offset,Value)-Pair #1
+        { 0x05, 0x41 }, // (Offset,Value)-Pair #2
+        { 0x06, 0xF5 }, // (Offset,Value)-Pair #3
+
+        // RtlSizeHeap+0x07 : test al, 1
+        { 0x07, 0xA8 }, // (Offset,Value)-Pair #4
+        { 0x08, 0x01 }, // (Offset,Value)-Pair #5
+
+        // RtlSizeHeap+0x14 : movzx edx, word ptr [ecx-0x10]
+        { 0x14, 0x0F }, // (Offset,Value)-Pair #6
+        { 0x15, 0xB7 }, // (Offset,Value)-Pair #7
+        { 0x16, 0x51 }, // (Offset,Value)-Pair #8
+        { 0x17, 0xF0 }, // (Offset,Value)-Pair #9
+
+        // RtlSizeHeap+0x2A : sub eax, ecx
+        { 0x2A, 0x2B }, // (Offset,Value)-Pair #10
+        { 0x2B, 0xC1 }, // (Offset,Value)-Pair #11
+    }
+};
+
+// ******************************************************************
+// * XMountUtilityDrive
+// ******************************************************************
+SOOVPA<8> XMountUtilityDrive_1_0_4432 =
+{
+    0,  // Large == 0
+    8,  // Count == 8
+
+    -1, // XRef Not Saved
+    0,  // XRef Not Used
+
+    {
+        // XapiUnknownBad1+0x51 : push 0x0104
+        { 0x51, 0x68 }, // (Offset,Value)-Pair #1
+        { 0x52, 0x04 }, // (Offset,Value)-Pair #2
+        { 0x53, 0x01 }, // (Offset,Value)-Pair #3
+
+        // XapiUnknownBad1+0xB3 : jnz +0x1A
+        { 0xB3, 0x75 }, // (Offset,Value)-Pair #4
+        { 0xB4, 0x1A }, // (Offset,Value)-Pair #5
+
+        // XapiUnknownBad1+0xE8 : setnl al
+        { 0xE8, 0x0F }, // (Offset,Value)-Pair #6
+        { 0xE9, 0x9D }, // (Offset,Value)-Pair #7
+        { 0xEA, 0xC0 }, // (Offset,Value)-Pair #8
+
+        // TODO: Finish signature, toss out function call basically
+    }
+};
+
+// ******************************************************************
+// * XAPI_1_0_4432
+// ******************************************************************
+OOVPATable XAPI_1_0_4432[] =
+{
+    // RtlCreateHeap (* unchanged since 1.0.4361 *) (* OR FARTHER *)
+    {
+        (OOVPA*)&RtlCreateHeap_1_0_3911,
+
+        XTL::EmuRtlCreateHeap,
+
+        #ifdef _DEBUG_TRACE
+        "EmuRtlCreateHeap"
+        #endif
+    },
+    // RtlAllocateHeap (* unchanged since 1.0.4361 *) (* OR FARTHER *)
+    {
+        (OOVPA*)&RtlAllocateHeap_1_0_3911,
+
+        XTL::EmuRtlAllocateHeap,
+
+        #ifdef _DEBUG_TRACE
+        "EmuRtlAllocateHeap"
+        #endif
+    },
+    // RtlFreeHeap
+    {
+        (OOVPA*)&RtlFreeHeap_1_0_4432,
+
+        XTL::EmuRtlFreeHeap,
+
+        #ifdef _DEBUG_TRACE
+        "EmuRtlFreeHeap"
+        #endif
+    },
+    // RtlSizeHeap
+    {
+        (OOVPA*)&RtlSizeHeap_1_0_4432,
+
+        XTL::EmuRtlSizeHeap,
+
+        #ifdef _DEBUG_TRACE
+        "EmuRtlSizeHeap"
+        #endif
+    },
+    // XMountUtilityDrive
+    {
+        (OOVPA*)&XMountUtilityDrive_1_0_4432,
+
+        XTL::EmuXMountUtilityDrive,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXMountUtilityDrive"
+        #endif
+    },
+    // XInitDevices (* unchanged since 1.0.3911 *)
+    {
+        (OOVPA*)&XInitDevices_1_0_3911,
+
+        XTL::EmuXInitDevices,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXInitDevices"
+        #endif
+    },
+    // XGetDevices (* unchanged since 1.0.4134 *)
+    {
+        (OOVPA*)&XGetDevices_1_0_4134,
+
+        XTL::EmuXGetDevices,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXGetDevices" 
+        #endif
+    },
+    // XInputOpen (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XInputOpen_1_0_4361,
+
+        XTL::EmuXInputOpen,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXInputOpen"
+        #endif
+    },
+    // XInputGetCapabilities (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XInputGetCapabilities_1_0_4361,
+
+        XTL::EmuXInputGetCapabilities,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXInputGetCapabilities"
+        #endif
+    },
+    // XInputGetState (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XInputGetState_1_0_4361,
+
+        XTL::EmuXInputGetState,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXInputGetState"
+        #endif
+    },
+    // XInputSetState (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XInputSetState_1_0_4361,
+
+        XTL::EmuXInputSetState,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXInputSetState"
+        #endif
+    },
+    // XapiThreadStartup (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XapiThreadStartup_1_0_4361,
+
+        XTL::EmuXapiThreadStartup,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXapiThreadStartup"
+        #endif
+    },
+    //* Too High Level
+    // XapiInitProcess (* unchanged since 1.0.4361 *)
+    {
+        (OOVPA*)&XapiInitProcess_1_0_4361,
+
+        XTL::EmuXapiInitProcess,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXapiInitProcess" 
+        #endif
+    },
+    //*/
+    // XapiBootToDash (* unchanged since 1.0.3911 *)
+    {
+        (OOVPA*)&XapiBootDash_1_0_3911,
+
+        XTL::EmuXapiBootDash,
+
+        #ifdef _DEBUG_TRACE
+        "EmuXapiBootDash"
+        #endif
+    },
+};
+
+// ******************************************************************
+// * XAPI_1_0_4432_SIZE
+// ******************************************************************
+uint32 XAPI_1_0_4432_SIZE = sizeof(XAPI_1_0_4432);
diff --git a/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl b/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl
index 163c7ce6f..ff571e9f7 100644
--- a/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl
+++ b/Source/Win32/CxbxKrnl/HLEDataBase/Xapi.1.0.4627.inl
@@ -63,192 +63,6 @@ SOOVPA<9> RtlFreeHeap_1_0_4627 =
     }
 };
 
-// ******************************************************************
-// * RtlSizeHeap
-// ******************************************************************
-SOOVPA<11> RtlSizeHeap_1_0_4627 =
-{
-    0,  // Large == 0
-    11, // Count == 11
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // RtlSizeHeap+0x04 : mov al, [ecx-0x0B]
-        { 0x04, 0x8A }, // (Offset,Value)-Pair #1
-        { 0x05, 0x41 }, // (Offset,Value)-Pair #2
-        { 0x06, 0xF5 }, // (Offset,Value)-Pair #3
-
-        // RtlSizeHeap+0x07 : test al, 1
-        { 0x07, 0xA8 }, // (Offset,Value)-Pair #4
-        { 0x08, 0x01 }, // (Offset,Value)-Pair #5
-
-        // RtlSizeHeap+0x14 : movzx edx, word ptr [ecx-0x10]
-        { 0x14, 0x0F }, // (Offset,Value)-Pair #6
-        { 0x15, 0xB7 }, // (Offset,Value)-Pair #7
-        { 0x16, 0x51 }, // (Offset,Value)-Pair #8
-        { 0x17, 0xF0 }, // (Offset,Value)-Pair #9
-
-        // RtlSizeHeap+0x2A : sub eax, ecx
-        { 0x2A, 0x2B }, // (Offset,Value)-Pair #10
-        { 0x2B, 0xC1 }, // (Offset,Value)-Pair #11
-    }
-};
-
-// ******************************************************************
-// * XMountUtilityDrive
-// ******************************************************************
-SOOVPA<8> XMountUtilityDrive_1_0_4627 =
-{
-    0,  // Large == 0
-    8,  // Count == 8
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // XapiUnknownBad1+0x51 : push 0x0104
-        { 0x51, 0x68 }, // (Offset,Value)-Pair #1
-        { 0x52, 0x04 }, // (Offset,Value)-Pair #2
-        { 0x53, 0x01 }, // (Offset,Value)-Pair #3
-
-        // XapiUnknownBad1+0xB3 : jnz +0x1A
-        { 0xB3, 0x75 }, // (Offset,Value)-Pair #4
-        { 0xB4, 0x1A }, // (Offset,Value)-Pair #5
-
-        // XapiUnknownBad1+0xE8 : setnl al
-        { 0xE8, 0x0F }, // (Offset,Value)-Pair #6
-        { 0xE9, 0x9D }, // (Offset,Value)-Pair #7
-        { 0xEA, 0xC0 }, // (Offset,Value)-Pair #8
-
-        // TODO: Finish signature, toss out function call basically
-    }
-};
-
-// s+
-/* not necessary?
-// ******************************************************************
-// * XCalculateSignatureBeginEx
-// ******************************************************************
-SOOVPA<8> XCalculateSignatureBeginEx_1_0_4627 =
-{
-    0,  // Large == 0
-    8,  // Count == 8
-
-    XREF_XAPIXCALCULATESIGNATUREBEGINEX, // XRef Is Saved
-    0,                                   // XRef Not Used
-
-    {
-        // XCalculateSignatureBeginEx+0x09 : push 7Ch
-        { 0x09, 0x6A },
-        { 0x0A, 0x7C },
-
-        // XCalculateSignatureBeginEx+0x2D : lea eax, [esi+5Ch]
-        { 0x2D, 0x8D },
-        { 0x2E, 0x46 },
-        { 0x2F, 0x5C },
-
-        // XCalculateSignatureBeginEx+0xE8 : cmp edx, 40h ; '@'
-        { 0x43, 0x83 },
-        { 0x44, 0xFA },
-        { 0x45, 0x40 },
-    }
-};
-
-// ******************************************************************
-// * XCalculateSignatureBegin
-// ******************************************************************
-SOOVPA<12> XCalculateSignatureBegin_1_0_4627 =
-{
-    0,  // Large == 0
-    12, // Count == 12
-
-    -1, // XRef Not Saved
-    1,  // XRef Is Used
-
-    {
-        // XCalculateSignatureBegin+0x0C : call [XCalculateSignatureBeginEx]
-        { 0x0D, XREF_XAPIXCALCULATESIGNATUREBEGINEX },
-
-        // XCalculateSignatureBegin+0x00 : mov eax, ds:10118h
-        { 0x00, 0xA1 },
-        { 0x01, 0x18 },
-        { 0x02, 0x01 },
-        { 0x03, 0x01 },
-        { 0x04, 0x00 },
-
-        // XCalculateSignatureBegin+0x08 : push [esp+4+arg_0]
-        { 0x08, 0xFF },
-        { 0x09, 0x74 },
-        { 0x0A, 0x24 },
-        { 0x0B, 0x08 },
-
-        // XCalculateSignatureBegin+0x11 : retn 4
-        { 0x12, 0x04 },
-        { 0x13, 0x00 },
-    }
-};
-
-// ******************************************************************
-// * XCalculateSignatureUpdate
-// ******************************************************************
-SOOVPA<9> XCalculateSignatureUpdate_1_0_4627 =
-{
-    0,  // Large == 0
-    9,  // Count == 9
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // XCalculateSignatureUpdate+0x04 : mov eax, [esp+4+arg_0]
-        { 0x04, 0x8B },
-        { 0x05, 0x44 },
-        { 0x06, 0x24 },
-        { 0x07, 0x08 },
-
-        // XCalculateSignatureUpdate+0x0C : add eax, 8
-        { 0x0C, 0x83 },
-        { 0x0D, 0xC0 },
-        { 0x0E, 0x08 },
-
-        // XCalculateSignatureUpdate+0x11 : xor eax, eax
-        { 0x15, 0x33 },
-        { 0x16, 0xC0 },
-    }
-};
-
-// ******************************************************************
-// * XCalculateSignatureEnd
-// ******************************************************************
-SOOVPA<8> XCalculateSignatureEnd_1_0_4627 =
-{
-    0,  // Large == 0
-    8,  // Count == 8
-
-    -1, // XRef Not Saved
-    0,  // XRef Not Used
-
-    {
-        // XCalculateSignatureEnd+0x03 : sub esp, 14h
-        { 0x03, 0x83 },
-        { 0x04, 0xEC },
-        { 0x05, 0x14 },
-
-        // XCalculateSignatureEnd+0x22 : push 10h
-        { 0x22, 0x6A },
-        { 0x23, 0x10 },
-
-        // XCalculateSignatureEnd+0x37 : lea eax, [ebp+var_14]
-        { 0x37, 0x8D },
-        { 0x38, 0x45 },
-        { 0x39, 0xEC },
-    }
-};
-//*/
-// +s
-
 // ******************************************************************
 // * XAPI_1_0_4627
 // ******************************************************************
@@ -284,9 +98,9 @@ OOVPATable XAPI_1_0_4627[] =
         "EmuRtlFreeHeap"
         #endif
     },
-    // RtlSizeHeap
+    // RtlSizeHeap (* unchanged since 4432 *)
     {
-        (OOVPA*)&RtlSizeHeap_1_0_4627,
+        (OOVPA*)&RtlSizeHeap_1_0_4432,
 
         XTL::EmuRtlSizeHeap,
 
@@ -294,9 +108,9 @@ OOVPATable XAPI_1_0_4627[] =
         "EmuRtlSizeHeap"
         #endif
     },
-    // XMountUtilityDrive
+    // XMountUtilityDrive (* unchanged since 4432 *)
     {
-        (OOVPA*)&XMountUtilityDrive_1_0_4627,
+        (OOVPA*)&XMountUtilityDrive_1_0_4432,
 
         XTL::EmuXMountUtilityDrive,