diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h index b27be0f0a1..bd40043cb9 100644 --- a/common/include/PS2Edefs.h +++ b/common/include/PS2Edefs.h @@ -241,7 +241,7 @@ extern "C" { // basic funcs s32 CALLBACK GSinit(); -s32 CALLBACK GSopen(void *pDsp, char *Title, int multithread); +s32 CALLBACK GSopen(void *pDsp, const char *Title, int multithread); void CALLBACK GSclose(); void CALLBACK GSshutdown(); void CALLBACK GSsetSettingsDir( const char* dir ); @@ -572,7 +572,7 @@ typedef void (CALLBACK* _PS2EsetEmuVersion)(const char* emuId, u32 version); // // GS // NOTE: GSreadFIFOX/GSwriteCSR functions CANNOT use XMM/MMX regs // If you want to use them, need to save and restore current ones -typedef s32 (CALLBACK* _GSopen)(void *pDsp, char *Title, int multithread); +typedef s32 (CALLBACK* _GSopen)(void *pDsp, const char *Title, int multithread); typedef s32 (CALLBACK* _GSopen2)( void *pDsp, u32 flags ); typedef void (CALLBACK* _GSvsync)(int field); typedef void (CALLBACK* _GSgifTransfer)(const u32 *pMem, u32 size); diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 28553dd613..19437e9c6c 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -179,7 +179,7 @@ EXPORT_C GSclose() } } -static int _GSopen(void** dsp, char* title, GSRendererType renderer, int threads = -1) +static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int threads = -1) { GSDevice* dev = NULL; @@ -528,7 +528,7 @@ EXPORT_C_(int) GSopen2(void** dsp, uint32 flags) } stored_toggle_state = toggle_state; - int retval = _GSopen(dsp, NULL, renderer); + int retval = _GSopen(dsp, "", renderer); if (s_gs != NULL) s_gs->SetAspectRatio(0); // PCSX2 manages the aspect ratios @@ -538,7 +538,7 @@ EXPORT_C_(int) GSopen2(void** dsp, uint32 flags) return retval; } -EXPORT_C_(int) GSopen(void** dsp, char* title, int mt) +EXPORT_C_(int) GSopen(void** dsp, const char* title, int mt) { /* if(!XInitThreads()) return -1; diff --git a/plugins/GSnull/GS.cpp b/plugins/GSnull/GS.cpp index 252d38b94c..2054d2ddae 100644 --- a/plugins/GSnull/GS.cpp +++ b/plugins/GSnull/GS.cpp @@ -121,7 +121,7 @@ EXPORT_C_(void) GSshutdown() GSLog::Close(); } -EXPORT_C_(s32) GSopen(void *pDsp, char *Title, int multithread) +EXPORT_C_(s32) GSopen(void *pDsp, const char *Title, int multithread) { int err = 0; GSLog::WriteLn("GS open."); diff --git a/plugins/GSnull/Linux/GSLinux.cpp b/plugins/GSnull/Linux/GSLinux.cpp index af3fd65b7f..9f8349a200 100644 --- a/plugins/GSnull/Linux/GSLinux.cpp +++ b/plugins/GSnull/Linux/GSLinux.cpp @@ -20,7 +20,7 @@ Display *display; int screen; GtkScrolledWindow *win; -int GSOpenWindow(void *pDsp, char *Title) +int GSOpenWindow(void *pDsp, const char *Title) { display = XOpenDisplay(0); screen = DefaultScreen(display); diff --git a/plugins/GSnull/Linux/GSLinux.h b/plugins/GSnull/Linux/GSLinux.h index 23e1375afc..5b872ef223 100644 --- a/plugins/GSnull/Linux/GSLinux.h +++ b/plugins/GSnull/Linux/GSLinux.h @@ -20,7 +20,7 @@ #include #include -extern int GSOpenWindow(void *pDsp, char *Title); +extern int GSOpenWindow(void *pDsp, const char *Title); extern int GSOpenWindow2(void *pDsp, u32 flags); extern void GSCloseWindow(); extern void GSProcessMessages(); diff --git a/plugins/GSnull/Windows/GSwin.cpp b/plugins/GSnull/Windows/GSwin.cpp index 079b11000b..b7b48416e9 100644 --- a/plugins/GSnull/Windows/GSwin.cpp +++ b/plugins/GSnull/Windows/GSwin.cpp @@ -34,7 +34,7 @@ LRESULT CALLBACK MsgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return 0; } -int GSOpenWindow(void *pDsp, char *Title) +int GSOpenWindow(void *pDsp, const char *Title) { WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, MsgProc, 0L, 0L, GetModuleHandle(NULL), NULL, NULL, NULL, NULL, diff --git a/plugins/GSnull/Windows/GSwin.h b/plugins/GSnull/Windows/GSwin.h index cefdb93eaf..723867158a 100644 --- a/plugins/GSnull/Windows/GSwin.h +++ b/plugins/GSnull/Windows/GSwin.h @@ -18,7 +18,7 @@ #include #include -extern int GSOpenWindow(void *pDsp, char *Title); +extern int GSOpenWindow(void *pDsp, const char *Title); extern void GSCloseWindow(); extern void GSProcessMessages(); extern void HandleKeyEvent(keyEvent *ev); diff --git a/plugins/zerogs/dx/GSmain.cpp b/plugins/zerogs/dx/GSmain.cpp index 33e03afe34..3e04de6654 100644 --- a/plugins/zerogs/dx/GSmain.cpp +++ b/plugins/zerogs/dx/GSmain.cpp @@ -358,7 +358,7 @@ LRESULT WINAPI MsgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) return DefWindowProc( hWnd, msg, wParam, lParam ); } -s32 CALLBACK GSopen(void *pDsp, char *Title, int multithread) { +s32 CALLBACK GSopen(void *pDsp, const char *Title, int multithread) { g_GSMultiThreaded = multithread; diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp index 2409690560..95c27eac7f 100644 --- a/plugins/zzogl-pg/opengl/GSmain.cpp +++ b/plugins/zzogl-pg/opengl/GSmain.cpp @@ -282,7 +282,7 @@ __forceinline void InitMisc() ResetRegs(); } -EXPORT_C_(s32) GSopen(void *pDsp, char *Title, int multithread) +EXPORT_C_(s32) GSopen(void *pDsp, const char *Title, int multithread) { FUNCLOG