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

Minor logging fixes

This commit is contained in:
StrikerX3 2016-12-13 20:52:25 -02:00
parent 1f5f4f3ad0
commit 7b8e062825
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/Logging.h
View File

@ -82,6 +82,10 @@ extern thread_local std::string _logPrefix;
#define LOG_FUNC_ARG(arg) \
msg << "\n " << std::setw(26) << std::left << std::setfill(' ') << #arg" : " << arg;
// LOG_FUNC_ARG_STR writes a pointer-based string argument, rendering nulls as <nullptr>
#define LOG_FUNC_ARG_STR(arg) \
msg << "\n " << std::setw(26) << std::left << std::setfill(' ') << #arg" : " << (arg == NULL ? "<nullptr>" : arg);
// LOG_FUNC_ARG_OUT prevents expansion of types, by only rendering as a pointer
#define LOG_FUNC_ARG_OUT(arg) \
msg << "\n " << std::setw(26) << std::left << std::setfill(' ') << #arg << " : 0x" << (void*)arg;
@ -99,6 +103,7 @@ extern thread_local std::string _logPrefix;
#else
#define LOG_FUNC_BEGIN
#define LOG_FUNC_ARG(arg)
#define LOG_FUNC_ARG_STR(arg)
#define LOG_FUNC_ARG_OUT(arg)
#define LOG_FUNC_END
#define LOG_FUNC_RESULT(r)

2
src/CxbxKrnl/EmuFile.cpp
View File

@ -267,7 +267,7 @@ NTSTATUS CxbxObjectAttributesToNT(xboxkrnl::POBJECT_ATTRIBUTES ObjectAttributes,
DbgPrintf(" Org:\"%s\"\n", OriginalPath.c_str());
if (_strnicmp(NativePath.c_str(), CxbxBasePath.c_str(), CxbxBasePath.length()) == 0)
{
DbgPrintf(" New:\"$CxbxPath\\EmuDisk\\%s%s\"\n", (NativePath.substr(CxbxBasePath.length(), std::string::npos)).c_str(), RelativePath.c_str());
DbgPrintf(" New:\"$CxbxPath\\EmuDisk\\%s\\%s\"\n", (NativePath.substr(CxbxBasePath.length(), std::string::npos)).c_str(), RelativePath.c_str());
}
else
DbgPrintf(" New:\"$XbePath\\%s\"\n", RelativePath.c_str());

2
src/CxbxKrnl/EmuXapi.cpp
View File

@ -815,7 +815,7 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(lpTitlePath)
LOG_FUNC_ARG_STR(lpTitlePath)
LOG_FUNC_ARG(pLaunchData)
LOG_FUNC_END;