livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception

meow-7.2.2
Graham Madarasz 2013-06-03 18:11:08 -07:00
parent d7e76ed642
commit 62d3a010d4
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llerror.cpp
View File

@ -201,10 +201,12 @@ namespace {
virtual void recordMessage(LLError::ELevel level,
const std::string& message)
{
#if BUG_2707_HUNT
llutf16string utf16str =
wstring_to_utf16str(utf8str_to_wstring(message));
utf16str += '\n';
OutputDebugString(utf16str.c_str());
#endif
}
};
#endif

8
indra/llui/llxuiparser.cpp
View File

@ -1308,7 +1308,7 @@ bool LLXUIParser::writeSDValue(Parser& parser, const void* val_ptr, name_stack_t
void LLXUIParser::parserWarning(const std::string& message)
{
#ifdef LL_WINDOWS
#ifdef LL_WINDOWS && BUG_2707_HUNT
// use Visual Studo friendly formatting of output message for easy access to originating xml
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
utf16str += '\n';
@ -1320,7 +1320,7 @@ void LLXUIParser::parserWarning(const std::string& message)
void LLXUIParser::parserError(const std::string& message)
{
#ifdef LL_WINDOWS
#ifdef LL_WINDOWS && BUG_2707_HUNT
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
utf16str += '\n';
OutputDebugString(utf16str.c_str());
@ -1639,7 +1639,7 @@ bool LLSimpleXUIParser::processText()
void LLSimpleXUIParser::parserWarning(const std::string& message)
{
#ifdef LL_WINDOWS
#ifdef LL_WINDOWS && BUG_2707_HUNT
// use Visual Studo friendly formatting of output message for easy access to originating xml
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()).c_str());
utf16str += '\n';
@ -1651,7 +1651,7 @@ void LLSimpleXUIParser::parserWarning(const std::string& message)
void LLSimpleXUIParser::parserError(const std::string& message)
{
#ifdef LL_WINDOWS
#ifdef LL_WINDOWS && BUG_2707_HUNT
llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", mCurFileName.c_str(), LINE_NUMBER_HERE, message.c_str()).c_str());
utf16str += '\n';
OutputDebugString(utf16str.c_str());

4
indra/media_plugins/winmmshim/winmm_shim.cpp
View File

@ -61,12 +61,16 @@ void ll_winmm_shim_initialize(){
{ // we have a dll, let's get out pointers!
initialized = true;
init_function_pointers(winmm_handle);
#if BUG_2707_HUNT
::OutputDebugStringA("WINMM_SHIM.DLL: real winmm.dll initialized successfully\n");
#endif
}
else
{
// failed to initialize real winmm.dll
#if BUG_2707_HUNT
::OutputDebugStringA("WINMM_SHIM.DLL: Failed to initialize real winmm.dll\n");
#endif
}
}
LeaveCriticalSection(&sCriticalSection);