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

Fixes to printf() and DbgPrintf() messages

This commit is contained in:
Echelon9 2012-10-08 01:06:57 +11:00
parent 8f41bc0795
commit 929a108885
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Exe.cpp
View File

@ -140,7 +140,7 @@ Exe::Exe(const char *x_szFilename)
goto cleanup;
}
printf("OK\n", v);
printf("OK\n");
}
}
@ -184,7 +184,7 @@ Exe::Exe(const char *x_szFilename)
}
}
printf("Exe::Exe: Exe was successfully opened.\n", x_szFilename);
printf("Exe::Exe: %s was successfully opened.\n", x_szFilename);
cleanup:

2
src/Common/Win32/XBController.cpp
View File

@ -371,7 +371,7 @@ bool XBController::ConfigPoll(char *szStatus)
Map(CurConfigObject, DeviceInstance.tszInstanceName, dwHow, dwFlags);
printf("Cxbx: Detected %s%s on %s\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType);
printf("Cxbx: Detected %s%s on %s%s\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType);
sprintf(szStatus, "Success: %s Mapped to '%s%s' on '%s'!", m_DeviceNameLookup[CurConfigObject], szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName);

12
src/CxbxKrnl/EmuDSound.cpp
View File

@ -2016,7 +2016,10 @@ HRESULT WINAPI XTL::EmuCDirectSoundStream_Flush(X_CDirectSoundStream *pThis)
{
EmuSwapFS(); // Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_Flush();\n",
DbgPrintf("EmuDSound (0x%X): EmuCDirectSoundStream_Flush\n"
"(\n"
" pThis : 0x%.08X\n"
");\n",
GetCurrentThreadId(), pThis);
// TODO: Actually Flush
@ -2033,8 +2036,11 @@ HRESULT WINAPI XTL::EmuCDirectSound_SynchPlayback(PVOID pUnknown)
{
EmuSwapFS(); // Win2k/XP FS
DbgPrintf("EmuDSound (0x%X): EmuCDirectSound_SynchPlayback(0x%.08X);\n",
GetCurrentThreadId());
DbgPrintf("EmuDSound (0x%X): EmuCDirectSound_SynchPlayback\n"
"(\n"
" pUnknown : 0x%.08X\n"
");\n",
GetCurrentThreadId(), pUnknown);
EmuSwapFS(); // XBox FS

2
src/CxbxKrnl/EmuKrnl.cpp
View File

@ -3025,7 +3025,7 @@ XBSYSAPI EXPORTNUM(264) VOID NTAPI xboxkrnl::RtlAssert
" LineNumber : 0x%.08X\n"
" Message : 0x%.08X (\"%s\")\n"
");\n",
GetCurrentThreadId(), FailedAssertion, FileName, Message, Message);
GetCurrentThreadId(), FailedAssertion, FileName, LineNumber, Message, Message);
//TODO: Actually implement this.
//NTSTATUS ret = NtDll::RtlAssert((NtDll::UNICODE_STRING*)DestinationString, (NtDll::STRING*)SourceString, AllocateDestinationString);

2
src/CxbxKrnl/EmuXactEng.cpp
View File

@ -218,7 +218,7 @@ HRESULT WINAPI XTL::EmuIXACTEngine_DownloadEffectsImage
" pEffectLoc : 0x%.08X\n"
" ppImageDesc : 0x%.08X\n"
");\n",
GetCurrentThreadId(), pThis, dwSize, pEffectLoc, ppImageDesc);
GetCurrentThreadId(), pThis, pvData, dwSize, pEffectLoc, ppImageDesc);
// TODO: Implement

10
src/CxbxKrnl/EmuXapi.cpp
View File

@ -1278,7 +1278,7 @@ LPVOID WINAPI XTL::EmuCreateFiber
if( !pFiber )
EmuWarning( "CreateFiber failed!" );
else
DbgPrintf("CreateFiber returned 0x%X\n" );
DbgPrintf("CreateFiber returned 0x%X\n", pFiber);
// Add to list of queued fiber routines
g_Fibers[g_FiberCount].pfnRoutine = lpStartRoutine;
@ -1415,7 +1415,7 @@ LPVOID WINAPI XTL::EmuXLoadSectionA
DbgPrintf("EmuXapi (0x%X): EmuXLoadSectionA\n"
"(\n"
" pSectionName : \"%s\"\n"
" pSectionName : 0x%.08X (\"%s\")\n"
");\n",
GetCurrentThreadId(), pSectionName, pSectionName );
@ -1458,7 +1458,7 @@ BOOL WINAPI XTL::EmuXFreeSectionA
DbgPrintf("EmuXapi (0x%X): EmuXFreeSectionA\n"
"(\n"
" pSectionName : \"%s\"\n"
" pSectionName : 0x%.08X (\"%s\")\n"
");\n",
GetCurrentThreadId(), pSectionName, pSectionName );
@ -1482,7 +1482,7 @@ HANDLE WINAPI XTL::EmuXGetSectionHandleA
DbgPrintf("EmuXapi (0x%X): EmuXGetSectionHandleA\n"
"(\n"
" pSectionName : \"%s\"\n"
" pSectionName : 0x%.08X (\"%s\")\n"
");\n",
GetCurrentThreadId(), pSectionName, pSectionName );
@ -2018,7 +2018,7 @@ HANDLE WINAPI XTL::EmuCreateSemaphore
" lMaximumCount : 0x%.08X\n"
" lpName : 0x%.08X (%s)\n"
");\n",
GetCurrentThreadId(), lpSemaphoreAttributes, lInitialCount, lMaximumCount, lpName);
GetCurrentThreadId(), lpSemaphoreAttributes, lInitialCount, lMaximumCount, lpName, lpName);
if(lpSemaphoreAttributes)
EmuWarning( "lpSemaphoreAttributes != NULL" );