From 3d23b9aef0d1cdfb546ec0af99347be90c0ad48f Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Fri, 7 Oct 2016 17:20:30 +0100 Subject: [PATCH] Rebrand to Cxbx-Reloaded and prepare for initial Proof of Concept release --- src/Common/Win32/EmuShared.cpp | 8 ++-- src/Common/Win32/XBController.cpp | 10 ++--- src/Common/Xbe.cpp | 2 +- src/Core/Xbe.cpp | 2 +- src/Cxbx.h | 4 +- src/Cxbx/DlgControllerConfig.cpp | 2 +- src/Cxbx/DlgVideoConfig.cpp | 2 +- src/Cxbx/WinMain.cpp | 4 +- src/Cxbx/WndAbout.cpp | 2 +- src/Cxbx/WndMain.cpp | 62 +++++++++++++++---------------- src/CxbxKrnl/CxbxKrnl.cpp | 4 +- src/CxbxKrnl/Emu.cpp | 8 ++-- src/CxbxKrnl/EmuD3D8.cpp | 2 +- src/CxbxKrnl/EmuXapi.cpp | 2 +- src/CxbxKrnl/HLEIntercept.cpp | 2 +- 15 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/Common/Win32/EmuShared.cpp b/src/Common/Win32/EmuShared.cpp index e0fc03170..9a7d8ccf7 100644 --- a/src/Common/Win32/EmuShared.cpp +++ b/src/Common/Win32/EmuShared.cpp @@ -136,8 +136,8 @@ CXBXKRNL_API void EmuShared::Cleanup() // ****************************************************************** CXBXKRNL_API EmuShared::EmuShared() { - m_XBController.Load("Software\\Cxbx\\XBController"); - m_XBVideo.Load("Software\\Cxbx\\XBVideo"); + m_XBController.Load("Software\\Cxbx-Reloaded\\XBController"); + m_XBVideo.Load("Software\\Cxbx-Reloaded\\XBVideo"); } // ****************************************************************** @@ -145,6 +145,6 @@ CXBXKRNL_API EmuShared::EmuShared() // ****************************************************************** CXBXKRNL_API EmuShared::~EmuShared() { - m_XBController.Save("Software\\Cxbx\\XBController"); - m_XBVideo.Save("Software\\Cxbx\\XBVideo"); + m_XBController.Save("Software\\Cxbx-Reloaded\\XBController"); + m_XBVideo.Save("Software\\Cxbx-Reloaded\\XBVideo"); } \ No newline at end of file diff --git a/src/Common/Win32/XBController.cpp b/src/Common/Win32/XBController.cpp index fc6913781..5ae33e584 100644 --- a/src/Common/Win32/XBController.cpp +++ b/src/Common/Win32/XBController.cpp @@ -371,7 +371,7 @@ bool XBController::ConfigPoll(char *szStatus) Map(CurConfigObject, DeviceInstance.tszInstanceName, dwHow, dwFlags); - printf("Cxbx: Detected %s%s on %s%lu\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType); + printf("Cxbx-Reloaded: Detected %s%s on %s%lu\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType); sprintf(szStatus, "Success: %s Mapped to '%s%s' on '%s'!", m_DeviceNameLookup[CurConfigObject], szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName); @@ -408,7 +408,7 @@ bool XBController::ConfigPoll(char *szStatus) { Map(CurConfigObject, "SysKeyboard", dwHow, dwFlags); - printf("Cxbx: Detected Key %d on SysKeyboard\n", dwHow); + printf("Cxbx-Reloaded: Detected Key %d on SysKeyboard\n", dwHow); sprintf(szStatus, "Success: %s Mapped to Key %d on SysKeyboard", m_DeviceNameLookup[CurConfigObject], dwHow); @@ -446,7 +446,7 @@ bool XBController::ConfigPoll(char *szStatus) { Map(CurConfigObject, "SysMouse", dwHow, dwFlags); - printf("Cxbx: Detected Button %d on SysMouse\n", dwHow); + printf("Cxbx-Reloaded: Detected Button %d on SysMouse\n", dwHow); sprintf(szStatus, "Success: %s Mapped to Button %d on SysMouse", m_DeviceNameLookup[CurConfigObject], dwHow); @@ -518,7 +518,7 @@ bool XBController::ConfigPoll(char *szStatus) Map(CurConfigObject, "SysMouse", dwHow, dwFlags); - printf("Cxbx: Detected Movement on the %s%s on SysMouse\n", szDirection, szObjName); + printf("Cxbx-Reloaded: Detected Movement on the %s%s on SysMouse\n", szDirection, szObjName); sprintf(szStatus, "Success: %s Mapped to %s%s on SysMouse", m_DeviceNameLookup[CurConfigObject], szDirection, szObjName); @@ -1064,7 +1064,7 @@ int XBController::Insert(const char *szDeviceName) } } - MessageBox(NULL, "Unexpected Circumstance (Too Many Controller Devices)! Please contact caustik!", "Cxbx", MB_OK | MB_ICONEXCLAMATION); + MessageBox(NULL, "Unexpected Circumstance (Too Many Controller Devices)! Please contact caustik!", "Cxbx-Reloaded", MB_OK | MB_ICONEXCLAMATION); ExitProcess(1); diff --git a/src/Common/Xbe.cpp b/src/Common/Xbe.cpp index d7b3460cf..c3605c479 100644 --- a/src/Common/Xbe.cpp +++ b/src/Common/Xbe.cpp @@ -1027,7 +1027,7 @@ void Xbe::DumpInformation(FILE *x_file) if(GetError() != 0) return; - fprintf(x_file, "XBE information generated by CXBX (Version " _CXBX_VERSION ")\n"); + fprintf(x_file, "XBE information generated by Cxbx-Reloaded (Version " _CXBX_VERSION ")\n"); fprintf(x_file, "\n"); fprintf(x_file, "Title identified as \"%s\"\n", m_szAsciiTitle); fprintf(x_file, "\n"); diff --git a/src/Core/Xbe.cpp b/src/Core/Xbe.cpp index 808d1bc55..4f800a9fa 100644 --- a/src/Core/Xbe.cpp +++ b/src/Core/Xbe.cpp @@ -1023,7 +1023,7 @@ void Xbe::DumpInformation(FILE *x_file) if(GetError() != 0) return; - fprintf(x_file, "XBE information generated by CXBX (Version " _CXBX_VERSION ")\n"); + fprintf(x_file, "XBE information generated by Cxbx-Reloaded (Version " _CXBX_VERSION ")\n"); fprintf(x_file, "\n"); fprintf(x_file, "Title identified as \"%s\"\n", m_szAsciiTitle); fprintf(x_file, "\n"); diff --git a/src/Cxbx.h b/src/Cxbx.h index f23db8763..a9fba48c4 100644 --- a/src/Cxbx.h +++ b/src/Cxbx.h @@ -84,9 +84,9 @@ typedef signed long sint32; /*! version string dependent on trace flag */ #ifndef _DEBUG_TRACE -#define _CXBX_VERSION "0.8.1-Pre3" +#define _CXBX_VERSION "0.0.1-POC" #else -#define _CXBX_VERSION "0.8.1-Pre3-Trace" +#define _CXBX_VERSION "0.0.1-POC-Trace" #endif /*! debug mode choices */ diff --git a/src/Cxbx/DlgControllerConfig.cpp b/src/Cxbx/DlgControllerConfig.cpp index 74d30c466..9ef068f32 100644 --- a/src/Cxbx/DlgControllerConfig.cpp +++ b/src/Cxbx/DlgControllerConfig.cpp @@ -83,7 +83,7 @@ INT_PTR CALLBACK DlgControllerConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, /*! if changes have been made, check if the user wants to save them */ if(g_bHasChanges) { - int ret = MessageBox(hWndDlg, "Do you wish to apply your changes?", "Cxbx", MB_ICONQUESTION | MB_YESNOCANCEL); + int ret = MessageBox(hWndDlg, "Do you wish to apply your changes?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNOCANCEL); switch(ret) { diff --git a/src/Cxbx/DlgVideoConfig.cpp b/src/Cxbx/DlgVideoConfig.cpp index de151a605..13b5b36bc 100644 --- a/src/Cxbx/DlgVideoConfig.cpp +++ b/src/Cxbx/DlgVideoConfig.cpp @@ -149,7 +149,7 @@ INT_PTR CALLBACK DlgVideoConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPAR /*! if changes have been made, check if the user wants to save them */ if(g_bHasChanges) { - int ret = MessageBox(hWndDlg, "Do you wish to apply your changes?", "Cxbx", MB_ICONQUESTION | MB_YESNOCANCEL); + int ret = MessageBox(hWndDlg, "Do you wish to apply your changes?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNOCANCEL); switch(ret) { diff --git a/src/Cxbx/WinMain.cpp b/src/Cxbx/WinMain.cpp index b12128ccc..a43bfb671 100644 --- a/src/Cxbx/WinMain.cpp +++ b/src/Cxbx/WinMain.cpp @@ -48,7 +48,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine /*! verify CxbxKrnl.dll is the same version as Cxbx.exe */ if(!CxbxKrnlVerifyVersion(_CXBX_VERSION)) { - MessageBox(NULL, "CxbxKrnl.dll is the incorrect version", "Cxbx", MB_OK); + MessageBox(NULL, "CxbxKrnl.dll is the incorrect version", "Cxbx-Reloaded", MB_OK); return 1; } @@ -85,7 +85,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine /*! if an error occurred, notify user */ if(MainWindow->GetError() != 0) { - MessageBox(NULL, MainWindow->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(NULL, MainWindow->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); } delete MainWindow; diff --git a/src/Cxbx/WndAbout.cpp b/src/Cxbx/WndAbout.cpp index 74a02c359..adc47438c 100644 --- a/src/Cxbx/WndAbout.cpp +++ b/src/Cxbx/WndAbout.cpp @@ -40,7 +40,7 @@ WndAbout::WndAbout(HINSTANCE x_hInstance, HWND x_parent) : Wnd(x_hInstance) { m_classname = "WndAbout"; - m_wndname = "Cxbx : About"; + m_wndname = "Cxbx-Reloaded : About"; m_w = 400; m_h = 300; diff --git a/src/Cxbx/WndMain.cpp b/src/Cxbx/WndMain.cpp index 9c35da976..e0caf38e6 100644 --- a/src/Cxbx/WndMain.cpp +++ b/src/Cxbx/WndMain.cpp @@ -53,7 +53,7 @@ WndMain::WndMain(HINSTANCE x_hInstance) : Wnd(x_hInstance), m_bCreated(false), m // initialize members { m_classname = "WndMain"; - m_wndname = "Cxbx " _CXBX_VERSION; + m_wndname = "Cxbx-Reloaded " _CXBX_VERSION; m_w = 640; m_h = 480; @@ -315,7 +315,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP char AsciiTitle[255]; - sprintf(AsciiTitle, "Cxbx : Emulating %s...", m_Xbe->m_szAsciiTitle); + sprintf(AsciiTitle, "Cxbx-Reloaded : Emulating %s...", m_Xbe->m_szAsciiTitle); SetWindowText(m_hwnd, AsciiTitle); @@ -326,7 +326,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP case WM_DESTROY: { m_hwndChild = NULL; - SetWindowText(m_hwnd, "Cxbx " _CXBX_VERSION); + SetWindowText(m_hwnd, "Cxbx-Reloaded " _CXBX_VERSION); RefreshMenus(); } break; @@ -386,7 +386,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(m_Xbe != 0 && m_Xbe->GetError() == 0) sprintf(buffer, "%s Loaded!", m_Xbe->m_szAsciiTitle); else - sprintf(buffer, "%s", "Disclaimer: Cxbx has no affiliation with Microsoft"); + sprintf(buffer, "%s", "Disclaimer: Cxbx-Reloaded has no affiliation with Microsoft"); RECT rect = {0, 480-15-5, 640-100-4-69, 480-5}; @@ -615,7 +615,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP // ask permission to overwrite if file already exists if(_access(ofn.lpstrFile, 0) != -1) { - if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx", MB_ICONQUESTION | MB_YESNO) != IDYES) + if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNO) != IDYES) return TRUE; } @@ -686,14 +686,14 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP } if(m_Xbe->GetError() != 0) - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); else { char buffer[255]; sprintf(buffer, "%s's logo bitmap was successfully exported.", m_Xbe->m_szAsciiTitle); - MessageBox(m_hwnd, buffer, "Cxbx", MB_ICONINFORMATION | MB_OK); + MessageBox(m_hwnd, buffer, "Cxbx-Reloaded", MB_ICONINFORMATION | MB_OK); printf("WndMain: %s\n", buffer); } @@ -772,7 +772,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(bmp_err != 0) { - MessageBox(m_hwnd, bmp_err, "Cxbx", MB_OK | MB_ICONEXCLAMATION); + MessageBox(m_hwnd, bmp_err, "Cxbx-Reloaded", MB_OK | MB_ICONEXCLAMATION); break; } } @@ -781,7 +781,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(m_Xbe->GetError() != 0) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); if(m_Xbe->IsFatal()) CloseXbe(); @@ -801,7 +801,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP printf("WndMain: %s\n", buffer); - MessageBox(m_hwnd, buffer, "Cxbx", MB_ICONINFORMATION | MB_OK); + MessageBox(m_hwnd, buffer, "Cxbx-Reloaded", MB_ICONINFORMATION | MB_OK); } } } @@ -883,7 +883,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP // ask permission to overwrite if file exists if(_access(ofn.lpstrFile, 0) != -1) { - if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx", MB_ICONQUESTION | MB_YESNO) != IDYES) + if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNO) != IDYES) return TRUE; } @@ -893,7 +893,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP // verify file was opened if(TxtFile == 0) - MessageBox(m_hwnd, "Could not open text file.", "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, "Could not open text file.", "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); else { m_Xbe->DumpInformation(TxtFile); @@ -902,7 +902,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(m_Xbe->GetError()) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); } else { @@ -912,7 +912,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP printf("WndMain: %s\n", buffer); - MessageBox(m_hwnd, buffer, "Cxbx", MB_ICONINFORMATION | MB_OK); + MessageBox(m_hwnd, buffer, "Cxbx-Reloaded", MB_ICONINFORMATION | MB_OK); } } } @@ -927,7 +927,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(m_Xbe->GetError()) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); } else { @@ -955,7 +955,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP else m_KrnlDebug = DM_NONE; - MessageBox(m_hwnd, "This will not take effect until the next time emulation is started.\n", "Cxbx", MB_OK); + MessageBox(m_hwnd, "This will not take effect until the next time emulation is started.\n", "Cxbx-Reloaded", MB_OK); m_bExeChanged = true; @@ -995,7 +995,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP if(GetSaveFileName(&ofn) != FALSE) { - MessageBox(m_hwnd, "This will not take effect until emulation is (re)started.\n", "Cxbx", MB_OK); + MessageBox(m_hwnd, "This will not take effect until emulation is (re)started.\n", "Cxbx-Reloaded", MB_OK); strncpy(m_KrnlDebugFilename, ofn.lpstrFile, 259); @@ -1107,7 +1107,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP Sleep(10); if(AboutWnd->GetError() != 0) - MessageBox(m_hwnd, AboutWnd->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, AboutWnd->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); delete AboutWnd; } @@ -1219,7 +1219,7 @@ void WndMain::LoadLogo() if(m_Xbe->GetError() != 0) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONEXCLAMATION | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONEXCLAMATION | MB_OK); if(m_Xbe->IsFatal()) CloseXbe(); @@ -1405,7 +1405,7 @@ void WndMain::UpdateDebugConsoles() { freopen("CONOUT$", "wt", stdout); - SetConsoleTitle("Cxbx : Debug Console"); + SetConsoleTitle("Cxbx-Reloaded : Debug Console"); SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_RED); @@ -1510,7 +1510,7 @@ void WndMain::OpenXbe(const char *x_filename) if(m_Xbe->GetError() != 0) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); delete m_Xbe; m_Xbe = 0; @@ -1588,7 +1588,7 @@ void WndMain::CloseXbe() if(m_bXbeChanged) { - int ret = MessageBox(m_hwnd, "Changes have been made, do you wish to save?", "Cxbx", MB_ICONQUESTION | MB_YESNOCANCEL); + int ret = MessageBox(m_hwnd, "Changes have been made, do you wish to save?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNOCANCEL); if(ret == IDYES) SaveXbeAs(); @@ -1626,7 +1626,7 @@ void WndMain::SaveXbe(const char *x_filename) // ask permission to overwrite if the file already exists if(_access(x_filename, 0) != -1) { - if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx", MB_ICONQUESTION | MB_YESNO) != IDYES) + if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNO) != IDYES) return; } @@ -1635,7 +1635,7 @@ void WndMain::SaveXbe(const char *x_filename) m_Xbe->Export(x_filename); if(m_Xbe->GetError() != 0) - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); else { char buffer[255]; @@ -1644,7 +1644,7 @@ void WndMain::SaveXbe(const char *x_filename) printf("WndMain: %s was successfully saved.\n", m_Xbe->m_szAsciiTitle); - MessageBox(m_hwnd, buffer, "Cxbx", MB_ICONINFORMATION | MB_OK); + MessageBox(m_hwnd, buffer, "Cxbx-Reloaded", MB_ICONINFORMATION | MB_OK); m_bXbeChanged = false; } @@ -1685,7 +1685,7 @@ void WndMain::ImportExe(const char *x_filename) if(i_exe->GetError() != 0) { - MessageBox(m_hwnd, i_exe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, i_exe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); delete i_exe; @@ -1696,7 +1696,7 @@ void WndMain::ImportExe(const char *x_filename) if(m_Xbe->GetError() != 0) { - MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, m_Xbe->GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); delete m_Xbe; m_Xbe = 0; @@ -1799,7 +1799,7 @@ bool WndMain::ConvertToExe(const char *x_filename, bool x_bVerifyIfExists, HWND { if(_access(filename, 0) != -1) { - if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx", MB_ICONQUESTION | MB_YESNO) != IDYES) + if(MessageBox(m_hwnd, "Overwrite existing file?", "Cxbx-Reloaded", MB_ICONQUESTION | MB_YESNO) != IDYES) return false; } } @@ -1812,7 +1812,7 @@ bool WndMain::ConvertToExe(const char *x_filename, bool x_bVerifyIfExists, HWND if(i_EmuExe.GetError() != 0) { - MessageBox(m_hwnd, i_EmuExe.GetError(), "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, i_EmuExe.GetError(), "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); return false; } else @@ -1861,7 +1861,7 @@ void WndMain::StartEmulation(EnumAutoConvert x_AutoConvert, HWND hwndParent) if((int)ShellExecute(NULL, "open", szExeFileName, szArgsBuffer, szBuffer, SW_SHOWDEFAULT) <= 32) { m_bCanStart = true; - MessageBox(m_hwnd, "Emulation failed.\n\n If this message repeats, the Xbe is not supported.", "Cxbx", MB_ICONSTOP | MB_OK); + MessageBox(m_hwnd, "Emulation failed.\n\n If this message repeats, the Xbe is not supported.", "Cxbx-Reloaded", MB_ICONSTOP | MB_OK); printf("WndMain: %s shell failed.\n", m_Xbe->m_szAsciiTitle); } @@ -1878,7 +1878,7 @@ void WndMain::StopEmulation() if(!IsWindow(m_hwndChild)) { m_hwndChild = NULL; - SetWindowText(m_hwnd, "Cxbx " _CXBX_VERSION); + SetWindowText(m_hwnd, "Cxbx-Reloaded " _CXBX_VERSION); RefreshMenus(); } diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/CxbxKrnl/CxbxKrnl.cpp index 9e0aa95ee..d1a817a34 100644 --- a/src/CxbxKrnl/CxbxKrnl.cpp +++ b/src/CxbxKrnl/CxbxKrnl.cpp @@ -372,7 +372,7 @@ extern "C" CXBXKRNL_API void CxbxKrnlInit freopen("CONOUT$", "wt", stdout); freopen("CONIN$", "rt", stdin); - SetConsoleTitle("Cxbx : Kernel Debug Console"); + SetConsoleTitle("Cxbx-Reloaded : Kernel Debug Console"); SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_RED); @@ -457,7 +457,7 @@ extern "C" CXBXKRNL_API void CxbxKrnlInit // Initialize devices : char szBuffer[260]; SHGetSpecialFolderPath(NULL, szBuffer, CSIDL_APPDATA, TRUE); - strcat(szBuffer, "\\Cxbx\\"); + strcat(szBuffer, "\\Cxbx-Reloaded\\"); std::string basePath(szBuffer); CxbxBasePath = basePath + "\\EmuDisk\\"; diff --git a/src/CxbxKrnl/Emu.cpp b/src/CxbxKrnl/Emu.cpp index 1a5f60593..e4e255c30 100644 --- a/src/CxbxKrnl/Emu.cpp +++ b/src/CxbxKrnl/Emu.cpp @@ -184,7 +184,7 @@ extern int EmuException(LPEXCEPTION_POINTERS e) e->ContextRecord->Eip += 1; - int ret = MessageBox(g_hEmuWindow, buffer, "Cxbx", MB_ICONSTOP | MB_ABORTRETRYIGNORE); + int ret = MessageBox(g_hEmuWindow, buffer, "Cxbx-Reloaded", MB_ICONSTOP | MB_ABORTRETRYIGNORE); if(ret == IDABORT) { @@ -245,7 +245,7 @@ extern int EmuException(LPEXCEPTION_POINTERS e) " Press \"Cancel\" to debug.", e->ExceptionRecord->ExceptionCode, e->ContextRecord->Eip); - if(MessageBox(g_hEmuWindow, buffer, "Cxbx", MB_ICONSTOP | MB_OKCANCEL) == IDOK) + if(MessageBox(g_hEmuWindow, buffer, "Cxbx-Reloaded", MB_ICONSTOP | MB_OKCANCEL) == IDOK) { printf("EmuMain (0x%X): Aborting Emulation\n", GetCurrentThreadId()); fflush(stdout); @@ -300,13 +300,13 @@ int ExitException(LPEXCEPTION_POINTERS e) fflush(stdout); - MessageBox(g_hEmuWindow, "Warning: Could not safely terminate process!", "Cxbx", MB_OK); + MessageBox(g_hEmuWindow, "Warning: Could not safely terminate process!", "Cxbx-Reloaded", MB_OK); count++; if(count > 1) { - MessageBox(g_hEmuWindow, "Warning: Multiple Problems!", "Cxbx", MB_OK); + MessageBox(g_hEmuWindow, "Warning: Multiple Problems!", "Cxbx-Reloaded", MB_OK); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index f6bcbbee1..a020485f0 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -364,7 +364,7 @@ static DWORD WINAPI EmuRenderWindow(LPVOID lpVoid) wcstombs(tAsciiTitle, XbeCert->wszTitleName, 40); } - sprintf(AsciiTitle, "Cxbx : Emulating %s", tAsciiTitle); + sprintf(AsciiTitle, "Cxbx-Reloaded : Emulating %s", tAsciiTitle); } // create the window diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/CxbxKrnl/EmuXapi.cpp index f06cd6823..13f3c7111 100644 --- a/src/CxbxKrnl/EmuXapi.cpp +++ b/src/CxbxKrnl/EmuXapi.cpp @@ -984,7 +984,7 @@ DWORD WINAPI XTL::EmuXLaunchNewImage sprintf(szDashboardPath, "%s\\xboxdash.xbe", symbolicLinkObject->NativePath.c_str()); if (PathFileExists(szDashboardPath)) { - MessageBox(CxbxKrnl_hEmuParent, "The title is rebooting to dashboard", "Cxbx", 0); + MessageBox(CxbxKrnl_hEmuParent, "The title is rebooting to dashboard", "Cxbx-Reloaded", 0); char szXboxDashboardPath[MAX_PATH]; sprintf(szXboxDashboardPath, "%c:\\xboxdash.xbe", symbolicLinkObject->DriveLetter); EmuXLaunchNewImage(szXboxDashboardPath, pLaunchData); diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp index 761e7bab5..626902ca5 100644 --- a/src/CxbxKrnl/HLEIntercept.cpp +++ b/src/CxbxKrnl/HLEIntercept.cpp @@ -80,7 +80,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead { SHGetSpecialFolderPath(NULL, szCacheFileName, CSIDL_APPDATA, TRUE); - strcat(szCacheFileName, "\\Cxbx\\"); + strcat(szCacheFileName, "\\Cxbx-Reloaded\\"); CreateDirectory(szCacheFileName, NULL);