From 44e9bca20e6cfa31bb64887c2c645bb8d3577dbb Mon Sep 17 00:00:00 2001
From: Echelon9 <rhyskidd@gmail.com>
Date: Fri, 30 Nov 2012 23:40:54 +1100
Subject: [PATCH] Changes required to allow Debug mode to run on an unmodified
 Windows XP install, without XInput_9_01.dll

---
 src/CxbxKrnl/Emu.cpp       | 9 ++++-----
 src/CxbxKrnl/EmuXInput.cpp | 4 ++--
 src/CxbxKrnl/EmuXInput.h   | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/CxbxKrnl/Emu.cpp b/src/CxbxKrnl/Emu.cpp
index 38d16a922..f0cfcb9ee 100644
--- a/src/CxbxKrnl/Emu.cpp
+++ b/src/CxbxKrnl/Emu.cpp
@@ -279,9 +279,10 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
         }
     }
 
-	// Smashing drive *NTSC* 
+	
 	if(e->ExceptionRecord->ExceptionCode == 0xC0000005)
 	{
+		// Smashing drive *NTSC* 
 		if(e->ContextRecord->Eip == 0xA41F5)
 		{
 			// Skip call to D3D::SwapStart(class D3D::CDevice *)
@@ -292,11 +293,8 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
 
 			return EXCEPTION_CONTINUE_EXECUTION;
 		}
-	}
 
-	// House of the Dead 3 *NTSC*
-	if(e->ExceptionRecord->ExceptionCode == 0xC0000005)
-	{
+		// House of the Dead 3 *NTSC*
 		if(e->ContextRecord->Eip == 0xB961E)
 		{
 			e->ContextRecord->Eip += 2;
@@ -308,6 +306,7 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
 			return EXCEPTION_CONTINUE_EXECUTION;
 		}
 
+		// House of the Dead 3 *NTSC*
 		if(e->ContextRecord->Eip == 0x1197F4)
 		{
 			e->ContextRecord->Eip += 2;
diff --git a/src/CxbxKrnl/EmuXInput.cpp b/src/CxbxKrnl/EmuXInput.cpp
index 6d9b22dbe..5b11b6097 100644
--- a/src/CxbxKrnl/EmuXInput.cpp
+++ b/src/CxbxKrnl/EmuXInput.cpp
@@ -71,7 +71,7 @@ static BOOL				g_bXInputInitialized = FALSE;
 // ******************************************************************
 // * func: EmuXInputPCPoll
 // ******************************************************************
-void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
+/*void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
 {
 	//
 	// Get the PC's XInput values
@@ -99,4 +99,4 @@ void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
 	Controller->Gamepad.bAnalogButtons[5] = (g_Controller.Gamepad.wButtons & 0x0200) ? 1 : 0;
 	Controller->Gamepad.bAnalogButtons[6] = g_Controller.Gamepad.bLeftTrigger;
 	Controller->Gamepad.bAnalogButtons[7] = g_Controller.Gamepad.bRightTrigger;
-}
\ No newline at end of file
+}*/
diff --git a/src/CxbxKrnl/EmuXInput.h b/src/CxbxKrnl/EmuXInput.h
index e7489f41a..699938504 100644
--- a/src/CxbxKrnl/EmuXInput.h
+++ b/src/CxbxKrnl/EmuXInput.h
@@ -37,6 +37,6 @@
 // ******************************************************************
 // * func: EmuXInputPCPoll
 // ******************************************************************
-void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );
+// void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );
 
 #endif
\ No newline at end of file