From c5c6f2ef114f7889c2febfe5c358590874ffbcbd Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Sat, 1 Nov 2003 04:42:42 +0000 Subject: [PATCH] doogie howser --- Cxbx.opt | Bin 64512 -> 67072 bytes Source/Win32/CxbxKrnl/EmuKrnl.cpp | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cxbx.opt b/Cxbx.opt index ee4367d715bfc18baebe8e28f192c405343db7e5..17d7bf450bb86a0c0de7e31f64562bf34206fe47 100644 GIT binary patch literal 67072 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 Do8N>& diff --git a/Source/Win32/CxbxKrnl/EmuKrnl.cpp b/Source/Win32/CxbxKrnl/EmuKrnl.cpp index 37a64a1c9..7390ac6da 100644 --- a/Source/Win32/CxbxKrnl/EmuKrnl.cpp +++ b/Source/Win32/CxbxKrnl/EmuKrnl.cpp @@ -971,6 +971,7 @@ XBSYSAPI EXPORTNUM(182) VOID NTAPI xboxkrnl::MmSetAddressProtect } #endif + /* // Halo Hack if(BaseAddress == (PVOID)0x80366000) { @@ -987,9 +988,9 @@ XBSYSAPI EXPORTNUM(182) VOID NTAPI xboxkrnl::MmSetAddressProtect EmuWarning("VirtualProtect Failed!"); #ifdef _DEBUG_TRACE - printf("EmuKrnl (0x%X): VirtualProtect was 0x%.08X -> 0x%.08X\n", dwOldProtect, NewProtect & (~PAGE_WRITECOMBINE)); + printf("EmuKrnl (0x%X): VirtualProtect was 0x%.08X -> 0x%.08X\n", GetCurrentThreadId(), dwOldProtect, NewProtect & (~PAGE_WRITECOMBINE)); #endif - + //*/ EmuSwapFS(); // Xbox FS return;