ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix hidden bug when binaries are mixed

This commit is contained in:
RadWolfie 2022-03-29 19:54:29 -05:00
parent f0a1301b64
commit 82427abcb8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -113,7 +113,7 @@ std::atomic_bool g_bEnableAllInterrupts = true;
// Set by the VMManager during initialization. Exported because it's needed in other parts of the emu // Set by the VMManager during initialization. Exported because it's needed in other parts of the emu
size_t g_SystemMaxMemory = 0; size_t g_SystemMaxMemory = 0;
HANDLE g_CurrentProcessHandle = 0; // Set in CxbxKrnlMain HANDLE g_CurrentProcessHandle = 0; // Set in CxbxKrnlEmulate
bool g_CxbxPrintUEM = false; bool g_CxbxPrintUEM = false;
ULONG g_CxbxFatalErrorCode = FATAL_ERROR_NONE; ULONG g_CxbxFatalErrorCode = FATAL_ERROR_NONE;
@ -1016,6 +1016,9 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
// and capture any crash from this point and beyond. Useful for capture live crash and generate crash report. // and capture any crash from this point and beyond. Useful for capture live crash and generate crash report.
g_ExceptionManager = new ExceptionManager(); g_ExceptionManager = new ExceptionManager();
// Set current process handle in order for CxbxKrnlShutDown to work properly.
g_CurrentProcessHandle = GetCurrentProcess(); // OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId());
// First of all, check if the EmuShared version matches the emu version and abort otherwise // First of all, check if the EmuShared version matches the emu version and abort otherwise
char GitVersionEmuShared[GitVersionMaxLength]; char GitVersionEmuShared[GitVersionMaxLength];
g_EmuShared->GetGitVersion(GitVersionEmuShared); g_EmuShared->GetGitVersion(GitVersionEmuShared);
@ -1069,8 +1072,6 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
int BootFlags; int BootFlags;
g_EmuShared->GetBootFlags(&BootFlags); g_EmuShared->GetBootFlags(&BootFlags);
g_CurrentProcessHandle = GetCurrentProcess(); // OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId());
// Set up the logging variables for the kernel process during initialization. // Set up the logging variables for the kernel process during initialization.
log_sync_config(); log_sync_config();