diff --git a/pcsx2/gui/CpuUsageProviderMSW.cpp b/pcsx2/gui/CpuUsageProviderMSW.cpp index fc94c14ff8..f46a5d952a 100644 --- a/pcsx2/gui/CpuUsageProviderMSW.cpp +++ b/pcsx2/gui/CpuUsageProviderMSW.cpp @@ -90,13 +90,13 @@ CpuUsageProviderMSW::CpuUsageProviderMSW() case RPC_E_TOO_LATE: break; // harmless failure, expected with wxWidgets. case RPC_E_NO_GOOD_SECURITY_PACKAGES: - throw Exception::RuntimeError( "(CpuUsageProviderMSW) CoInitializeSecurity failed: No good security packages! .. whatever tht means." ); + throw Exception::RuntimeError().SetDiagMsg( L"(CpuUsageProviderMSW) CoInitializeSecurity failed: No good security packages! .. whatever tht means." ); case E_OUTOFMEMORY: throw Exception::OutOfMemory( L"(CpuUsageProviderMSW) Out of Memory error returned during call to CoInitializeSecurity." ); default: - throw Exception::RuntimeError( wxsFormat( L"(CpuUsageProviderMSW) CoInitializeSecurity failed with an unknown error code: %d", hr ), wxEmptyString ); + throw Exception::RuntimeError().SetDiagMsg( wxsFormat( L"(CpuUsageProviderMSW) CoInitializeSecurity failed with an unknown error code: %d", hr ) ); } } @@ -224,11 +224,11 @@ void CpuUsageProviderMSW::UpdateStats() throw Exception::OutOfMemory( L"(CpuUsageProviderMSW) Out of Memory Enumerating WMI Object." ); default: - throw Exception::RuntimeError( wxsFormat( L"(CpuUsageProviderMSW) WMI Object Enumeration failed with an unknown error code: %d", hRes ), wxEmptyString ); + throw Exception::RuntimeError().SetDiagMsg( wxsFormat( L"(CpuUsageProviderMSW) WMI Object Enumeration failed with an unknown error code: %d", hRes ) ); } if( msg != NULL ) - throw Exception::RuntimeError( wxString("(CpuUsageProviderMSW) ") + msg, wxEmptyString ); + throw Exception::RuntimeError().SetDiagMsg( (wxString)L"(CpuUsageProviderMSW) " + msg ); return; } diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 2dee82b695..44be09d420 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -63,7 +63,7 @@ GSPanel::GSPanel( wxWindow* parent ) m_HasFocus = false; if ( !wxWindow::Create(parent, wxID_ANY) ) - throw Exception::RuntimeError( "GSPanel constructor esplode!!" ); + throw Exception::RuntimeError().SetDiagMsg( L"GSPanel constructor esplode!!" ); SetName( L"GSPanel" ); diff --git a/pcsx2/windows/WinConsolePipe.cpp b/pcsx2/windows/WinConsolePipe.cpp index 2d0f03e1dc..d19a80ee8b 100644 --- a/pcsx2/windows/WinConsolePipe.cpp +++ b/pcsx2/windows/WinConsolePipe.cpp @@ -178,11 +178,11 @@ WinPipeRedirection::WinPipeRedirection( FILE* stdstream ) m_crtFile = _open_osfhandle( (intptr_t)m_writepipe, _O_TEXT ); if( m_crtFile == -1 ) - throw Exception::RuntimeError( "_open_osfhandle returned -1." ); + throw Exception::RuntimeError().SetDiagMsg( "_open_osfhandle returned -1." ); m_fp = _fdopen( m_crtFile, "w" ); if( m_fp == NULL ) - throw Exception::RuntimeError( "_fdopen returned NULL." ); + throw Exception::RuntimeError().SetDiagMsg( "_fdopen returned NULL." ); *m_stdfp = *m_fp; // omg hack. but it works >_< setvbuf( stdstream, NULL, _IONBF, 0 );