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

revert 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1511 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-12-12 11:27:50 +00:00
parent 13acef8793
commit 8149e1481a
3 changed files with 88 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Common/Common.vcproj
View File

@ -46,7 +46,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -117,7 +117,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
MinimalRebuild="true" MinimalRebuild="true"
@ -192,7 +192,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -267,7 +267,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -340,7 +340,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="3"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -412,7 +412,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="3"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
FloatingPointModel="0" FloatingPointModel="0"

157
Source/Core/Common/Src/Common.cpp
View File

@ -19,7 +19,6 @@
#include "Common.h" #include "Common.h"
#include "StringUtil.h" #include "StringUtil.h"
#include <wx/msgdlg.h>
namespace namespace
{ {
@ -31,100 +30,104 @@ void RegisterPanicAlertHandler(PanicAlertHandler handler)
panic_handler = handler; panic_handler = handler;
} }
void PanicAlert(const char* format, ...)
{
va_list args;
va_start(args, format);
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
panic_handler(buffer, false);
}
else
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
#if defined(HAVE_WX) && HAVE_WX
wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC!"), wxICON_EXCLAMATION);
#else
vprintf(format, args);
printf("\n");
#endif
}
va_end(args);
}
void SuccessAlert(const char* format, ...) void SuccessAlert(const char* format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
if (panic_handler) if (panic_handler)
{ {
char buffer[2048]; char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args); CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "SUCCESS: %s", buffer); LOG(MASTER_LOG, "SUCCESS: %s", buffer);
panic_handler(buffer, false); panic_handler(buffer, false);
} }
else else
{ {
char buffer[2048]; #ifdef _WIN32
CharArrayFromFormatV(buffer, 2048, format, args); char buffer[2048];
LOG(MASTER_LOG, "SUCCESS: %s", buffer); CharArrayFromFormatV(buffer, 2048, format, args);
#if defined(HAVE_WX) && HAVE_WX LOG(MASTER_LOG, "SUCCESS: %s", buffer);
wxMessageBox(wxString::FromAscii(buffer), wxT("SUCCESS!"), wxICON_EXCLAMATION); MessageBox(0, buffer, "SUCCESS!", MB_ICONWARNING);
#else #elif __GNUC__
vprintf(format, args); //#error Do a messagebox!
printf("\n"); vprintf(format, args);
printf("\n");
// asm ("int $3") ;
#endif #endif
}
} va_end(args);
}
va_end(args); void PanicAlert(const char* format, ...)
{
va_list args;
va_start(args, format);
if (panic_handler)
{
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
panic_handler(buffer, false);
}
else
{
#ifdef _WIN32
char buffer[2048];
CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", buffer);
MessageBox(0, buffer, "PANIC!", MB_ICONWARNING);
#elif __GNUC__
//#error Do a messagebox!
vprintf(format, args);
printf("\n");
// asm ("int $3") ;
#endif
}
va_end(args);
} }
bool PanicYesNo(const char* format, ...) bool PanicYesNo(const char* format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
bool retval; bool retval;
char buffer[2048]; #ifdef _WIN32
CharArrayFromFormatV(buffer, 2048, format, args); char buffer[2048];
LOG(MASTER_LOG, "PANIC: %s", buffer); CharArrayFromFormatV(buffer, 2048, format, args);
#if defined(HAVE_WX) && HAVE_WX LOG(MASTER_LOG, "PANIC: %s", buffer);
retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC! Continue?"), wxICON_QUESTION | wxYES_NO); retval = IDYES == MessageBox(0, buffer, "PANIC! Continue?", MB_ICONQUESTION | MB_YESNO);
#else #elif __GNUC__
vprintf(format, args); //vprintf(format, args);
printf("\n"); return(true); //#error Do a messagebox!
#endif #endif
va_end(args);
return(retval); va_end(args);
return(retval);
} }
bool AskYesNo(const char* format, ...) bool AskYesNo(const char* format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
bool retval; bool retval;
char buffer[2048]; #ifdef _WIN32
CharArrayFromFormatV(buffer, 2048, format, args); char buffer[2048];
LOG(MASTER_LOG, "ASK: %s", buffer); CharArrayFromFormatV(buffer, 2048, format, args);
#if defined(HAVE_WX) && HAVE_WX LOG(MASTER_LOG, "ASK: %s", buffer);
retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("Dolphin"), wxICON_QUESTION | wxYES_NO); retval = IDYES == MessageBox(0, buffer, "Dolphin", MB_ICONQUESTION | MB_YESNO);
#else #elif __GNUC__
vprintf(format, args); //vprintf(format, args);
printf("\n"); return(true); //#error Do a messagebox!
#endif #endif
va_end(args);
return(retval); va_end(args);
return(retval);
} }
// Standard implementation of logging - simply print to standard output. // Standard implementation of logging - simply print to standard output.

4
Source/Core/Common/Src/Common.h
View File

@ -190,8 +190,8 @@ inline u64 swap64(u64 data) {return(((u64)swap32(data) << 32) | swap32(data >> 3
// Utility functions // Utility functions
void PanicAlert(const char* format, ...); void PanicAlert(const char* text, ...);
void SuccessAlert(const char* format, ...); void SuccessAlert(const char* text, ...);
bool PanicYesNo(const char* text, ...); bool PanicYesNo(const char* text, ...);
bool AskYesNo(const char* text, ...); bool AskYesNo(const char* text, ...);