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

build fixings 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1500 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
daco65 2008-12-11 15:12:17 +00:00
parent c2fd281a49
commit 607f5b289f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,10 @@ void PanicAlert(const char* format, ...)
else else
{ {
#ifdef _WIN32 #ifdef _WIN32
std::string msg; char buffer[2048];
StringFromFormatV(&msg, format, args); CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", msg.c_str()); LOG(MASTER_LOG, "PANIC: %s", buffer);
MessageBox(0, msg.c_str(), "PANIC!", MB_ICONWARNING); MessageBox(0, buffer, "PANIC!", MB_ICONWARNING);
#elif __GNUC__ #elif __GNUC__
//#error Do a messagebox! //#error Do a messagebox!
vprintf(format, args); vprintf(format, args);
@ -68,10 +68,10 @@ bool PanicYesNo(const char* format, ...)
va_start(args, format); va_start(args, format);
bool retval; bool retval;
#ifdef _WIN32 #ifdef _WIN32
std::string msg; char buffer[2048];
StringFromFormatV(&msg, format, args); CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "PANIC: %s", msg.c_str()); LOG(MASTER_LOG, "PANIC: %s", buffer);
retval = IDYES == MessageBox(0, msg.c_str(), "PANIC! Continue?", MB_ICONQUESTION | MB_YESNO); retval = IDYES == MessageBox(0, buffer, "PANIC! Continue?", MB_ICONQUESTION | MB_YESNO);
#elif __GNUC__ #elif __GNUC__
//vprintf(format, args); //vprintf(format, args);
return(true); //#error Do a messagebox! return(true); //#error Do a messagebox!
@ -88,10 +88,10 @@ bool AskYesNo(const char* format, ...)
va_start(args, format); va_start(args, format);
bool retval; bool retval;
#ifdef _WIN32 #ifdef _WIN32
std::string msg; char buffer[2048];
StringFromFormatV(&msg, format, args); CharArrayFromFormatV(buffer, 2048, format, args);
LOG(MASTER_LOG, "ASK: %s", msg.c_str()); LOG(MASTER_LOG, "ASK: %s", buffer);
retval = IDYES == MessageBox(0, msg.c_str(), "Dolphin", MB_ICONQUESTION | MB_YESNO); retval = IDYES == MessageBox(0, buffer, "Dolphin", MB_ICONQUESTION | MB_YESNO);
#elif __GNUC__ #elif __GNUC__
//vprintf(format, args); //vprintf(format, args);
return(true); //#error Do a messagebox! return(true); //#error Do a messagebox!

2
Source/PluginSpecs/pluginspecs_video.h
View File

@ -18,7 +18,7 @@ typedef void (*TVideoLog)(const char* _pMessage, BOOL _bBreak);
typedef void (*TSysMessage)(const char *fmt, ...); typedef void (*TSysMessage)(const char *fmt, ...);
typedef void (*TRequestWindowSize)(int _iWidth, int _iHeight, BOOL _bFullscreen); typedef void (*TRequestWindowSize)(int _iWidth, int _iHeight, BOOL _bFullscreen);
typedef void (*TCopiedToXFB)(void); typedef void (*TCopiedToXFB)(void);
typedef BOOL (*TPeekMessages)(void); typedef unsigned int (*TPeekMessages)(void);
typedef void (*TUpdateInterrupts)(void); typedef void (*TUpdateInterrupts)(void);
typedef void (*TUpdateFPSDisplay)(const char* text); // sets the window title typedef void (*TUpdateFPSDisplay)(const char* text); // sets the window title
typedef void (*TKeyPressed)(int keycode, BOOL shift, BOOL control); // sets the window title typedef void (*TKeyPressed)(int keycode, BOOL shift, BOOL control); // sets the window title

4
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -71,7 +71,7 @@ BOOL APIENTRY DllMain( HINSTANCE hinstDLL, // DLL module handle
return TRUE; return TRUE;
} }
BOOL Callback_PeekMessages() unsigned int Callback_PeekMessages()
{ {
//TODO: peek message //TODO: peek message
MSG msg; MSG msg;
@ -308,7 +308,7 @@ HRESULT ScreenShot(TCHAR *File)
return S_OK; return S_OK;
} }
BOOL Video_Screenshot(TCHAR* _szFilename) unsigned int Video_Screenshot(TCHAR* _szFilename)
{ {
if (ScreenShot(_szFilename) == S_OK) if (ScreenShot(_szFilename) == S_OK)
return TRUE; return TRUE;