diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp
index 05f0e92a7..f6bcbbee1 100644
--- a/src/CxbxKrnl/EmuD3D8.cpp
+++ b/src/CxbxKrnl/EmuD3D8.cpp
@@ -187,6 +187,7 @@ bool IsValidXboxDisplayMode(XTL::D3DDISPLAYMODE PCDisplayMode, int PCModeNr)
 	for (int i = 0; i < XboxResolutions.size(); i++) {
 		if (XboxResolutions[i].W == PCDisplayMode.Width && XboxResolutions[i].H == PCDisplayMode.Height) {
 			XboxResolutions[i].PCMode = PCModeNr;
+				
 			return true;
 		}
 	}
@@ -5919,24 +5920,10 @@ HRESULT WINAPI XTL::EmuIDirect3DTexture8_LockRect
         if(!(Flags & 0x80) && !(Flags & 0x40) && !(Flags & 0x20) && !(Flags & 0x10) && Flags != 0)
             CxbxKrnlCleanup("EmuIDirect3DTexture8_LockRect: Unknown Flags! (0x%.08X)", Flags);
 
-        // Remove old lock(s)
-		if(Level == 6 || Level == 7 || Level == 8 || Level == 9)
-		{
-			// HACK: Unreal Championship crashes when the texture level reaches 9...
-			EmuWarning("Unreal Championship texture hack applied!");
-			hRet = D3DERR_INVALIDCALL;
-		}
-		else
-		{
-			pTexture8->UnlockRect(Level);
-
-			hRet = pTexture8->LockRect(Level, pLockedRect, pRect, NewFlags);
-
-			pThis->Common |= X_D3DCOMMON_ISLOCKED;
-		}
-    }
-
-    
+		pTexture8->UnlockRect(Level);
+		hRet = pTexture8->LockRect(Level, pLockedRect, pRect, NewFlags);
+		pThis->Common |= X_D3DCOMMON_ISLOCKED;
+	}
 
     return hRet;
 }
diff --git a/src/CxbxKrnl/EmuFile.cpp b/src/CxbxKrnl/EmuFile.cpp
index 57c657247..c55e08473 100644
--- a/src/CxbxKrnl/EmuFile.cpp
+++ b/src/CxbxKrnl/EmuFile.cpp
@@ -137,7 +137,7 @@ EmuNtObject* EmuNtObject::NtDuplicateObject(DWORD Options)
 
 bool IsEmuHandle(HANDLE Handle)
 {
-	return ((uint32)Handle > 0x80000000) && ((int32)Handle < 0xFFFFFFFE);
+	return ((uint32)Handle > 0x80000000) && ((uint32)Handle < 0xFFFFFFFE);
 }
 
 EmuHandle* HandleToEmuHandle(HANDLE Handle)
{
	return (EmuHandle*)((uint32_t)Handle & 0x7FFFFFFF);
}

HANDLE EmuHandleToHandle(EmuHandle* emuHandle)
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
index 187d93037..7b6bbea16 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
@@ -1531,6 +1531,26 @@ OOVPATable D3D8_1_0_4034[] =
         "EmuIDirect3DDevice8_Clear"
         #endif
     },
+    // IDirect3DResource8::Register
+    {
+        (OOVPA*)&IDirect3DResource8_Register_1_0_3925,
+
+        XTL::EmuIDirect3DResource8_Register,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DResource8_Register"
+        #endif
+    },    
+    // IDirect3DDevice8::CreatePalette
+    {
+        (OOVPA*)&IDirect3DDevice8_CreatePalette_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_CreatePalette,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_CreatePalette"
+        #endif
+    },
 
     // ********************** BEG WARNING UNTESTED!!! *******************
 
@@ -1755,16 +1775,6 @@ OOVPATable D3D8_1_0_4034[] =
         "EmuIDirect3DDevice8_Clear"
         #endif
     },
-    // IDirect3DDevice8::CreatePalette
-    {
-        (OOVPA*)&IDirect3DDevice8_CreatePalette_1_0_3925,
-
-        XTL::EmuIDirect3DDevice8_CreatePalette,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3DDevice8_CreatePalette"
-        #endif
-    },
     // IDirect3DDevice8::SetPalette
     {
         (OOVPA*)&IDirect3DDevice8_SetPalette_1_0_3925,
@@ -1965,16 +1975,6 @@ OOVPATable D3D8_1_0_4034[] =
         "EmuIDirect3DVertexBuffer8_Lock"
         #endif
     },
-    // IDirect3DResource8::Register
-    {
-        (OOVPA*)&IDirect3DResource8_Register_1_0_3925,
-
-        XTL::EmuIDirect3DResource8_Register,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3DResource8_Register"
-        #endif
-    },
     // IDirect3DResource8::IsBusy
     {
         (OOVPA*)&IDirect3DResource8_IsBusy_1_0_3925,
@@ -2360,6 +2360,16 @@ OOVPATable D3D8_1_0_4034[] =
         "EmuIDirect3DDevice8_LoadVertexShader"
         #endif
     },
+    // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetVisibilityTestResult_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_GetVisibilityTestResult,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetVisibilityTestResult"
+        #endif
+    },    
 	// D3DDevice_DeleteVertexShader (* unchanged since 3925 *)
     {
         (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925,
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
index 434112567..0b55a4289 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
@@ -2498,6 +2498,16 @@ OOVPATable D3D8_1_0_4134[] =
         "EmuIDirect3DDevice8_LoadVertexShader"
         #endif
     },
+    // IDirect3DDevice8::LoadVertexShader (* unchanged since 4034 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_LoadVertexShader_1_0_4034,
+
+        XTL::EmuIDirect3DDevice8_LoadVertexShader,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_LoadVertexShader"
+        #endif
+    },    
     // IDirect3DDevice8::SelectVertexShader
     {
         (OOVPA*)&IDirect3DDevice8_SelectVertexShader_1_0_3925,
@@ -3062,6 +3072,16 @@ OOVPATable D3D8_1_0_4134[] =
         "EmuIDirect3DSurface8_LockRect"
         #endif
     },
+    // D3DDevice_DeleteVertexShader (* unchanged since 3925 *)
+    {
+        (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_DeleteVertexShader,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_DeleteVertexShader"
+        #endif
+    },    
 	// Lock2DSurface (* unchanged since 3925 *)
     {
         (OOVPA*)&Lock2DSurface_1_0_3925,
@@ -3809,6 +3829,26 @@ OOVPATable D3D8_1_0_4134[] =
         "EmuIDirect3DDevice8_SetShaderConstantMode"
         #endif
     },
+    // IDirect3DDevice8::GetCreationParameters (* unchanged since 4034 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetCreationParameters_1_0_4034,
+
+        XTL::EmuIDirect3DDevice8_GetCreationParameters,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetCreationParameters"
+        #endif
+    },    
+    // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetVisibilityTestResult_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_GetVisibilityTestResult,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetVisibilityTestResult"
+        #endif
+    },    
 };
 
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
index 027469b02..fff27d915 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
@@ -3166,6 +3166,16 @@ OOVPATable D3D8_1_0_4361[] =
         "EmuIDirect3DResource8_AddRef"
         #endif
     },
+    // IDirect3DResource8::Release
+    {
+        (OOVPA*)&IDirect3DResource8_Release_1_0_3925,
+
+        XTL::EmuIDirect3DResource8_Release,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DResource8_Release"
+        #endif
+    },    
 	// IDirect3DPalette8::Lock (* unchanged since 3925 *)
     {
         (OOVPA*)&IDirect3DPalette8_Lock_1_0_3925,
@@ -3525,6 +3535,16 @@ OOVPATable D3D8_1_0_4361[] =
         "EmuIDirect3DDevice8_GetCreationParameters"
         #endif
     },
+    // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetVisibilityTestResult_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_GetVisibilityTestResult,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetVisibilityTestResult"
+        #endif
+    },    
 	// IDirect3DDevice8::SetShaderConstantMode
     {
         (OOVPA*)&IDirect3DDevice8_SetShaderConstantMode_1_0_4361,
@@ -3718,7 +3738,7 @@ OOVPATable D3D8_1_0_4361[] =
         XTL::EmuIDirect3DDevice8_GetPushBufferOffset,
 
         #ifdef _DEBUG_TRACE
-        "EmuIDirect3DDevice8_GetPushBufferOffset"
+        "EmuIDirect3DDevice8_GetPushBufferOffset"3
         #endif
     },
 	// IDirect3DDevice8::CreateCubeTexture
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
index 67a95f3b7..3c960fd58 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
@@ -942,6 +942,16 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3D8_GetAdapterModeCount"
         #endif
     },
+    // IDirect3D8::CheckDeviceFormat (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3D8_CheckDeviceFormat_1_0_4361,
+
+        XTL::EmuIDirect3D8_CheckDeviceFormat,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3D8_CheckDeviceFormat"
+        #endif
+    },    
     // IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
     {
         (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
@@ -1202,6 +1212,36 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DDevice8_SetRenderState_ZBias"
         #endif
     },
+    // IDirect3DDevice8::GetCreationParameters (* unchanged since 4034 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetCreationParameters_1_0_4034,
+
+        XTL::EmuIDirect3DDevice8_GetCreationParameters,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetCreationParameters"
+        #endif
+    },    
+    // IDirect3DDevice8::GetVisibilityTestResult (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetVisibilityTestResult_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_GetVisibilityTestResult,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetVisibilityTestResult"
+        #endif
+    },    
+    // IDirect3DDevice8::SetTextureState_BumpEnv (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SetTextureState_BumpEnv_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SetTextureState_BumpEnv,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetTextureState_BumpEnv"
+        #endif
+    },    
     // IDirect3DDevice8::SetRenderState_EdgeAntiAlias (* unchanged since 4361 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_EdgeAntiAlias_1_0_4361,
@@ -1391,7 +1431,17 @@ OOVPATable D3D8_1_0_4432[] =
         #ifdef _DEBUG_TRACE
         "EmuIDirect3DDevice8_SetRenderState_ShadowFunc"
         #endif
-    },
+    },   
+    // IDirect3DDevice8::SwitchTexture (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SwitchTexture_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SwitchTexture,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SwitchTexture"
+        #endif
+    },    
     // IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134,
@@ -1582,6 +1632,16 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DResource8_Register"
         #endif
     },
+    // IDirect3DResource8::AddRef (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DResource8_AddRef_1_0_3925,
+
+        XTL::EmuIDirect3DResource8_AddRef,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DResource8_AddRef"
+        #endif
+    },    
     // IDirect3DResource8::Release (* unchanged since 3925 *)
     {
         (OOVPA*)&IDirect3DResource8_Release_1_0_3925,
@@ -1631,16 +1691,6 @@ OOVPATable D3D8_1_0_4432[] =
         #ifdef _DEBUG_TRACE
         "EmuIDirect3DSurface8_LockRect"
         #endif
-    },
-    // IDirect3DTexture8::LockRect (* unchanged since 3925 *)
-    {
-        (OOVPA*)&IDirect3DTexture8_LockRect_1_0_3925,
-
-        XTL::EmuIDirect3DTexture8_LockRect,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3DTexture8_LockRect"
-        #endif
     },
 	// IDirect3DDevice8_Release
 	{
@@ -1940,7 +1990,7 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3DDevice8_SetVertexData4f"
         #endif
     },
-	// IDirect3DDevice8::SetVertexData4ub (* unchanged since 4361 *)
+	// IDirect3DDevice8::SetVertexData4ub (* un`anged since 4361 *)
     {
         (OOVPA*)&D3DDevice_SetVertexData4ub_1_0_4361,
 
@@ -1970,6 +2020,26 @@ OOVPATable D3D8_1_0_4432[] =
         "D3DDevice_GetVertexShaderSize"
         #endif
     },
+    // IDirect3DDevice8::BeginStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_BeginStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginStateBlock"
+        #endif
+    },   
+    // IDirect3DDevice8::EndStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_EndStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_EndStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_EndStateBlock"
+        #endif
+    },    
 	// Lock2DSurface (* unchanged since 3925 *)
     {
         (OOVPA*)&Lock2DSurface_1_0_3925,
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
index 54379ef36..7fe723857 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
@@ -4299,7 +4299,7 @@ OOVPATable D3D8_1_0_4627[] =
         #ifdef _DEBUG_TRACE
         "EmuIDirect3D8_CheckDeviceFormat"
         #endif
-    },
+    }, 
     // IDirect3DDevice8::BeginVisibilityTest
     {
         (OOVPA*)&IDirect3DDevice8_BeginVisibilityTest_1_0_4627,
@@ -4310,6 +4310,16 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_BeginVisibilityTest"
         #endif
     },
+    // IDirect3DDevice8::GetCreationParameters (* unchanged since 4034 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetCreationParameters_1_0_4034,
+
+        XTL::EmuIDirect3DDevice8_GetCreationParameters,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetCreationParameters"
+        #endif
+    },    
     // IDirect3DDevice8::EndVisibilityTest
     {
         (OOVPA*)&IDirect3DDevice8_EndVisibilityTest_1_0_4627,
@@ -5036,6 +5046,16 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetRenderState_FillMode"
         #endif
     },
+    // IDirect3DDevice8::SetRenderState_BackFillMode (* unchanged since 4134 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SetRenderState_BackFillMode_1_0_4134,
+
+        XTL::EmuIDirect3DDevice8_SetRenderState_BackFillMode,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetRenderState_BackFillMode"
+        #endif
+    },    
     // IDirect3DDevice8::SetRenderState_FogColor (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_FogColor_1_0_4134,
@@ -5156,6 +5176,16 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetRenderState_ShadowFunc"
         #endif
     },
+    // IDirect3DDevice8::SwitchTexture (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SwitchTexture_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SwitchTexture,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SwitchTexture"
+        #endif
+    },    
     // IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134,
@@ -5626,6 +5656,26 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_GetVertexShaderSize"
         #endif
     },
+    // IDirect3DDevice8::BeginStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_BeginStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginStateBlock"
+        #endif
+    },
+    // IDirect3DDevice8::EndStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_EndStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_EndStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_EndStateBlock"
+        #endif
+    },        
     // D3DDevice_GetVertexShaderType
     {
         (OOVPA*)&X_D3DDevice_GetVertexShaderType_1_0_4627,
@@ -6122,6 +6172,16 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_SetVertexData4ub"
         #endif
     },
+    // IDirect3DDevice8::SetVertexData4f
+    {
+        (OOVPA*)&D3DDevice_SetVertexData4f_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SetVertexData4f,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetVertexData4f"
+        #endif
+    },    
 	// D3D_BlockOnTime
 	{
         (OOVPA*)&D3D_BlockOnTime_1_0_4627, 0,
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
index 388952da7..9871f7a6e 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
@@ -2226,6 +2226,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_SetGammaRamp"
         #endif
     },
+    // IDirect3DDevice8_GetDeviceCaps (* unchanged since 3925 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_GetDeviceCaps_1_0_3925, 
+            
+        XTL::EmuIDirect3DDevice8_GetDeviceCaps,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_GetDeviceCaps"
+        #endif
+    },    
     // IDirect3DDevice8::SetShaderConstantMode
     {
         (OOVPA*)&IDirect3DDevice8_SetShaderConstantMode_1_0_5233,
@@ -2324,6 +2334,46 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_CreateVertexShader"
         #endif
     },
+    // IDirect3DDevice8::BeginStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_BeginStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginStateBlock"
+        #endif
+    },
+    // IDirect3DDevice8::EndStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_EndStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_EndStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_EndStateBlock"
+        #endif
+    },        
+    // D3DDevice_RunVertexStateShader (* unchanged since 4627 *)
+    {
+       (OOVPA*)&X_D3DDevice_RunVertexStateShader_1_0_4627,
+
+       XTL::EmuIDirect3DDevice8_RunVertexStateShader,
+
+       #ifdef _DEBUG_TRACE
+       "D3DDevice_RunVertexStateShader"
+       #endif
+    },    
+    // D3DDevice_GetVertexShaderSize (* unchanged since 3925 *)
+    {
+        (OOVPA*)&X_D3DDevice_GetVertexShaderSize_1_0_3925,
+
+        XTL::EmuIDirect3DDevice8_GetVertexShaderSize,
+
+        #ifdef _DEBUG_TRACE
+        "D3DDevice_GetVertexShaderSize"
+        #endif
+    },    
     // IDirect3DDevice8::SetVertexShaderConstant1 (* unchanged since 4627 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetVertexShaderConstant1_1_0_4627,
@@ -2454,6 +2504,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_GetDisplayMode"
         #endif
     },
+    // IDirect3DDevice8::SetVertexData2f (* unchanged since 4627 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SetVertexData2f_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_SetVertexData2f,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetVertexData2f"
+        #endif
+    },    
     // IDirect3DDevice8::Begin
     {
         (OOVPA*)&IDirect3DDevice8_Begin_1_0_5233,
@@ -2842,6 +2902,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_SetRenderState_ShadowFunc"
         #endif
     },
+    // IDirect3DDevice8::SwitchTexture (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_SwitchTexture_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_SwitchTexture,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SwitchTexture"
+        #endif
+    },    
     // IDirect3DDevice8::SetRenderState_YuvEnable (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_YuvEnable_1_0_4134,
@@ -3422,6 +3492,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_BeginPush"
         #endif
     },
+    // IDirect3DDevice8::BeginVisibilityTest (* unchanged since 4627 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginVisibilityTest_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_BeginVisibilityTest,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginVisibilityTest"
+        #endif
+    },    
     // IDirect3DDevice8::EndPush
     {
         (OOVPA*)&D3DDevice_EndPush_1_0_5344,
@@ -3432,6 +3512,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DDevice8_EndPush"
         #endif
     },
+    // IDirect3DDevice8::EndPush (* unchanged since 4627 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_EndPush_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_EndPush,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_EndPush"
+        #endif
+    },    
 	// IDirect3DDevice8::SetVerticalBlankCallback
     {
         (OOVPA*)&IDirect3DDevice8_SetVerticalBlankCallback_1_0_5233,
@@ -3482,6 +3572,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3D8_EnumAdapterModes"
         #endif
     },
+    // IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
+
+        XTL::EmuIDirect3D8_EnumAdapterModes,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3D8_EnumAdapterModes"
+        #endif
+    },    
 	// IDirect3DDevice8::SetVertexData4ub (* unchanged since 4361 *)
     {
         (OOVPA*)&D3DDevice_SetVertexData4ub_1_0_4361,
@@ -3606,6 +3706,16 @@ OOVPATable D3D8_1_0_5233[] =
         "EmuIDirect3DCubeTexture8_GetCubeMapSurface2"
         #endif
     }, 
+    // IDirect3DDevice8::ApplyStateBlock (* unchanged since 4627 *)
+    {
+        (OOVPA*)&D3DDevice_ApplyStateBlock_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_ApplyStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_ApplyStateBlock"
+        #endif
+    },    
 };
 
 // ******************************************************************
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
index 456d1e901..b215ccbca 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
@@ -2216,6 +2216,26 @@ OOVPATable D3D8_1_0_5558[] =
         "D3DDevice_GetVertexShaderSize"
         #endif
     },
+    // IDirect3DDevice8::BeginStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_BeginStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginStateBlock"
+        #endif
+    },
+    // IDirect3DDevice8::EndStateBlock
+    {
+        (OOVPA*)&IDirect3DDevice8_EndStateBlock_1_0_4361,
+
+        XTL::EmuIDirect3DDevice8_EndStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_EndStateBlock"
+        #endif
+    },        
     // IDirect3DDevice8::LoadVertexShader (* unchanged since 5233 *)
     {
         (OOVPA*)&IDirect3DDevice8_LoadVertexShader_1_0_5233,
@@ -2696,6 +2716,26 @@ OOVPATable D3D8_1_0_5558[] =
         "EmuIDirect3DDevice8_Begin"
         #endif
     },
+    // IDirect3DResource8::IsBusy (* unchanged since 4361 *)
+    {
+        (OOVPA*)&IDirect3DResource8_IsBusy_1_0_4361,
+
+        XTL::EmuIDirect3DResource8_IsBusy,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DResource8_IsBusy"
+        #endif
+    },    
+    // IDirect3DDevice8::BeginVisibilityTest (* unchanged since 4627 *)
+    {
+        (OOVPA*)&IDirect3DDevice8_BeginVisibilityTest_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_BeginVisibilityTest,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_BeginVisibilityTest"
+        #endif
+    },    
     // IDirect3DDevice8::SetTransform
     {
         (OOVPA*)&IDirect3DDevice8_SetTransform_1_0_5558,
@@ -3176,6 +3216,16 @@ OOVPATable D3D8_1_0_5558[] =
         "EmuIDirect3DDevice8_Reset"
         #endif
     },
+    // D3DDevice_SetRenderState_SampleAlpha (* unchanged since 5233 *)
+    {
+        (OOVPA*)&D3DDevice_SetRenderState_SampleAlpha_1_0_5233,
+
+        XTL::EmuIDirect3DDevice8_SetRenderState_SampleAlpha,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_SetRenderState_SampleAlpha"
+        #endif
+    },    
 	// IDirect3DDevice8::SetGammaRamp (* unchanged since 4928 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetGammaRamp_1_0_4928,
@@ -3510,6 +3560,16 @@ OOVPATable D3D8_1_0_5558[] =
         "EmuIDirect3DDevice8_SetVertexData2f"
         #endif
     },
+    // IDirect3DDevice8::ApplyStateBlock (* unchanged since 4627 *)
+    {
+        (OOVPA*)&D3DDevice_ApplyStateBlock_1_0_4627,
+
+        XTL::EmuIDirect3DDevice8_ApplyStateBlock,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DDevice8_ApplyStateBlock"
+        #endif
+    },    
 	// IDirect3DDevice8::SetRenderState_RopZCmpAlwaysRead (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead_1_0_4134,
@@ -3520,6 +3580,16 @@ OOVPATable D3D8_1_0_5558[] =
         "EmuIDirect3DDevice8_SetRenderState_RopZCmpAlwaysRead"
         #endif
     },
+    // IDirect3DCubeTexture8::GetCubeMapSurface2 (* Unchanged since 4627 *)
+    {
+        (OOVPA*)&D3DCubeTexture_GetCubeMapSurface2_1_0_4627,
+
+        XTL::EmuIDirect3DCubeTexture8_GetCubeMapSurface2,
+
+        #ifdef _DEBUG_TRACE
+        "EmuIDirect3DCubeTexture8_GetCubeMapSurface2"
+        #endif
+    },     
 	// IDirect3DDevice8::SetRenderState_RopZRead (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderState_RopZRead_1_0_4134,