Merge pull request #2496 from RadWolfie/fix-chihiro-again

Fix Chihiro console type again

Author: LukeUsher

projects/cxbxr-emu/CMakeLists.txt

@@ -48,9 +48,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 
   # Use inline XXHash version
   XXH_INLINE_ALL
-
-  # Enable Chihiro work
-  CHIHIRO_WORK
  )
  add_compile_options(
   /EHs

src/core/kernel/init/CxbxKrnl.cpp

@@ -43,9 +43,7 @@
 #include "EmuShared.h"
 #include "core\hle\D3D8\Direct3D9\Direct3D9.h" // For CxbxInitWindow, EmuD3DInit
 #include "core\hle\DSOUND\DirectSound\DirectSound.hpp" // For CxbxInitAudio
-#ifdef CHIHIRO_WORK
 #include "core\hle\JVS\JVS.h" // For JVS_Init
-#endif
 #include "core\hle\Intercept.hpp"
 #include "core\kernel\memory-manager\VMManager.h"
 #include "CxbxDebugger.h"
@@ -589,9 +587,11 @@ static bool CxbxrKrnlXbeSystemSelector(int BootFlags,
 	// Clear emulation system from reserved systems so all unneeded memory ranges can be freed.
 	reserved_systems &= ~emulate_system;
 
-#ifdef CHIHIRO_WORK
 	// If the Xbe is Chihiro, and we were not launched by SEGABOOT, we need to load SEGABOOT from the Chihiro Media Board rom instead!
-	if (BootFlags == BOOT_NONE && emulate_system == SYSTEM_CHIHIRO) {
+	// All checks are absolutely necessary in order to support both "auto select" and forced chihiro mode.
+	if (BootFlags == BOOT_NONE &&
+		emulate_system == SYSTEM_CHIHIRO &&
+		std::filesystem::exists(xbeDirectory / "boot.id")) {
 
 		std::string chihiroMediaBoardRom = g_DataFilePath + "/EmuDisk/" + MediaBoardRomFile;
 		if (!std::filesystem::exists(chihiroMediaBoardRom)) {
@@ -653,7 +653,6 @@ static bool CxbxrKrnlXbeSystemSelector(int BootFlags,
 		CxbxLaunchNewXbe(chihiroSegaBootNew);
 		CxbxrShutDown(true);
 	}
-#endif // Chihiro wip block
 
 	// Once we have determine which system type to run as, enforce it in future reboots.
 	if ((BootFlags & BOOT_QUICK_REBOOT) == 0) {
@@ -677,17 +676,11 @@ static bool CxbxrKrnlXbeSystemSelector(int BootFlags,
 		hardwareModel = HardwareModel::Revision1_6;
 	}
 
-#ifdef CHIHIRO_WORK
 	// If this is a Chihiro title, we need to patch the init flags to disable HDD setup
 	// The Chihiro kernel does this, so we should too!
 	if (g_bIsChihiro) {
 		CxbxKrnl_Xbe->m_Header.dwInitFlags.bDontSetupHarddisk = true;
 	}
-#else
-	if (g_bIsChihiro) {
-		CxbxrAbort("Emulating Chihiro mode does not work yet. Please use different title to emulate.");
-	}
-#endif
 
 	CxbxrKrnlSetupMemorySystem(BootFlags, emulate_system, reserved_systems, blocks_reserved);
 	return true;
@@ -1412,12 +1405,10 @@ static void CxbxrKrnlInitHacks()
 
 	EmuInitFS();
 
-#ifdef CHIHIRO_WORK
 	// If this title is Chihiro, Setup JVS
 	if (g_bIsChihiro) {
 		JVS_Init();
 	}
-#endif
 
 	EmuX86_Init();
 	// Start the event thread

src/gui/WndMain.cpp

@@ -2419,6 +2419,10 @@ DWORD WndMain::CrashMonitorWrapper(LPVOID lpParam)
 		static_cast<WndMain*>(pCMD->pWndMain)->m_iIsEmulating--; // Multi-xbe boots usage check
 	}
 
+	if (!static_cast<WndMain*>(pCMD->pWndMain)->m_iIsEmulating) {
+		static_cast<WndMain*>(pCMD->pWndMain)->StopEmulation();
+	}
+
 	free(lpParam);
 
 	return 0;
@@ -2427,7 +2431,6 @@ DWORD WndMain::CrashMonitorWrapper(LPVOID lpParam)
 // monitor for crashes
 void WndMain::CrashMonitor(DWORD dwChildProcID)
 {
-	int iBootFlags;
 	DWORD dwExitCode = 0;
 
 	// If we do receive valid process ID, let's do the next step.
@@ -2442,23 +2445,8 @@ void WndMain::CrashMonitor(DWORD dwChildProcID)
 
 			GetExitCodeProcess(hProcess, &dwExitCode);
 			CloseHandle(hProcess);
-
-			g_EmuShared->GetBootFlags(&iBootFlags);
-
-			// Check if reboot did occur.
-			if (iBootFlags) {
-				// Destroy this thread and start a new one
-				// since emulation is still running.
-				return;
-			}
-			// Otherwise emulation did stopped or crashed
-			// But need to tell GUI that emulation did end.
 		}
 	}
-
-	// Crash clean up.
-
-	StopEmulation();
 }
 
 // monitor for Debugger to close then set as "available" (For limit to 1 debugger per Cxbx GUI.)