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

fixed carriage returns..

This commit is contained in:
Aaron Robinson 2003-04-25 23:49:58 +00:00
parent a40fbad03f
commit 10d149316f
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Win32/CxbxKrnl/Emu.cpp
View File

@ -452,28 +452,28 @@ void EmuInstallWrappers(OOVPATable *OovpaTable, uint32 OovpaTableSize, void (*En
// ******************************************************************
// * func: EmuException
// ******************************************************************
// ******************************************************************
int EmuException(LPEXCEPTION_POINTERS e)
{
// ******************************************************************
// * Debugging Information
// ******************************************************************
{
printf("\n");
printf("Recieved Exception : 0x%.08X\n", e->ExceptionRecord->ExceptionCode);
printf("\n");
}
// ******************************************************************
// * Notify User
// ******************************************************************
{
char buffer[256];
sprintf(buffer, "Recieved Exception [0x%.08X]\n\nPress 'OK' to terminate emulation.\nPress 'Cancel' to debug.", e->ExceptionRecord->ExceptionCode);
if(MessageBox(NULL, buffer, "Cxbx", MB_ICONSTOP | MB_OKCANCEL) == IDOK)
ExitProcess(1);
// ******************************************************************
// * Debugging Information
// ******************************************************************
{
printf("\n");
printf("Recieved Exception : 0x%.08X\n", e->ExceptionRecord->ExceptionCode);
printf("\n");
}
// ******************************************************************
// * Notify User
// ******************************************************************
{
char buffer[256];
sprintf(buffer, "Recieved Exception [0x%.08X]\n\nPress 'OK' to terminate emulation.\nPress 'Cancel' to debug.", e->ExceptionRecord->ExceptionCode);
if(MessageBox(NULL, buffer, "Cxbx", MB_ICONSTOP | MB_OKCANCEL) == IDOK)
ExitProcess(1);
}
return EXCEPTION_CONTINUE_SEARCH;

22
Source/Win32/CxbxKrnl/EmuFS.cpp
View File

@ -64,8 +64,8 @@ void EmuGenerateFS(int TlsAdjust)
NT_TIB *OrgNtTib;
xboxkrnl::KPCR *NewPcr;
uint16 NewFS = -1, OrgFS = -1;
uint16 NewFS = -1, OrgFS = -1;
void *TLSPtr = 0;
// ******************************************************************
@ -96,10 +96,10 @@ void EmuGenerateFS(int TlsAdjust)
// Save "NewFS" inside OrgFS.ArbitraryUserPointer.SwapFS
mov ax, NewFS
mov fs:[0x14], ax
// Save "True" inside OrgFS.ArbitraryUserPointer.isOrgFS
mov ah, 1
mov fs:[0x14], ax
// Save "True" inside OrgFS.ArbitraryUserPointer.isOrgFS
mov ah, 1
mov fs:[0x16], ah
}
@ -149,9 +149,9 @@ void EmuGenerateFS(int TlsAdjust)
{
mov ax, OrgFS
mov fs:[0x14], ax // NewFS.ArbitraryUserPointer
mov ah, 0
mov fs:[0x16], ah // NewFS.ArbitraryUserPointer.isOrgFS
mov ah, 0
mov fs:[0x16], ah // NewFS.ArbitraryUserPointer.isOrgFS
}
// ******************************************************************
@ -180,7 +180,7 @@ bool EmuIsXboxFS()
{
mov ah, fs:[0x16]
mov chk, ah
}
}
return chk;
}

2
Source/Win32/CxbxKrnl/EmuKrnl.cpp
View File

@ -124,7 +124,7 @@ static DWORD WINAPI PCSTProxy
__try
{
__asm
{
{
mov esi, StartRoutine
push StartContext2
push StartContext1

8
Source/Win32/Mutex.cpp
View File

@ -52,8 +52,8 @@ void Mutex::Lock()
while(true)
{
// Grab the lock, letting us look at the variables
while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0))
// while(InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0))
// while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0))
while(InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0))
Sleep(1);
// Are we the the new owner?
@ -99,8 +99,8 @@ void Mutex::Lock()
void Mutex::Unlock()
{
// Grab the lock, letting us look at the variables
while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0))
// while (InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0))
// while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0))
while (InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0))
Sleep(1);
// Decrement the lock count