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

Use DeSmuME name - but not in firmware.cpp 

1. didn't like every line in the file being touched
2. DESMUME_NAME is cosmetic; it may have had special meaning in this file. I didnt feel like investigating it any more
This commit is contained in:
Mattia Rombi 2020-06-18 16:40:59 +02:00 committed by zeromus
parent ebf073e5c0
commit 622b763bf1
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/frontend/windows/AboutBox.cpp
View File

@ -131,7 +131,7 @@ BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lpar
{ {
char buf[256] = {0}; char buf[256] = {0};
memset(&buf[0], 0, sizeof(buf)); memset(&buf[0], 0, sizeof(buf));
sprintf(buf, "DeSmuME%s", EMU_DESMUME_VERSION_STRING()); sprintf(buf, DESMUME_NAME "%s", EMU_DESMUME_VERSION_STRING());
SetDlgItemText(dialog, IDC_TXT_VERSION, buf); SetDlgItemText(dialog, IDC_TXT_VERSION, buf);
sprintf(buf, "compiled %s - %s %s", __DATE__, __TIME__, EMU_DESMUME_COMPILER_DETAIL()); sprintf(buf, "compiled %s - %s %s", __DATE__, __TIME__, EMU_DESMUME_COMPILER_DETAIL());
SetDlgItemText(dialog, IDC_TXT_COMPILED, buf); SetDlgItemText(dialog, IDC_TXT_COMPILED, buf);

10
desmume/src/frontend/windows/cheatsWin.cpp
View File

@ -593,7 +593,7 @@ INT_PTR CALLBACK CheatsAdd_XX_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lp
{ {
if (!cheats->add_AR(buf, tempCheat.description, tempCheat.enabled)) if (!cheats->add_AR(buf, tempCheat.description, tempCheat.enabled))
{ {
MessageBox(dialog, "Syntax error in Action Replay code.\nTry again", "DeSmuME", MessageBox(dialog, "Syntax error in Action Replay code.\nTry again", DESMUME_NAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
@ -602,7 +602,7 @@ INT_PTR CALLBACK CheatsAdd_XX_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lp
{ {
if (!cheats->update_AR(buf, tempCheat.description, tempCheat.enabled, cheatEditPos)) if (!cheats->update_AR(buf, tempCheat.description, tempCheat.enabled, cheatEditPos))
{ {
MessageBox(dialog, "Syntax error in Action Replay code.\nTry again", "DeSmuME", MessageBox(dialog, "Syntax error in Action Replay code.\nTry again", DESMUME_NAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
@ -614,7 +614,7 @@ INT_PTR CALLBACK CheatsAdd_XX_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lp
{ {
if (!cheats->add_CB(buf, tempCheat.description, tempCheat.enabled)) if (!cheats->add_CB(buf, tempCheat.description, tempCheat.enabled))
{ {
MessageBox(dialog, "Syntax error in Codebreaker code.\nTry again", "DeSmuME", MessageBox(dialog, "Syntax error in Codebreaker code.\nTry again", DESMUME_NAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
@ -623,7 +623,7 @@ INT_PTR CALLBACK CheatsAdd_XX_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lp
{ {
if (!cheats->update_CB(buf, tempCheat.description, tempCheat.enabled, cheatEditPos)) if (!cheats->update_CB(buf, tempCheat.description, tempCheat.enabled, cheatEditPos))
{ {
MessageBox(dialog, "Syntax error in Codebreaker code.\nTry again", "DeSmuME", MessageBox(dialog, "Syntax error in Codebreaker code.\nTry again", DESMUME_NAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
@ -1634,7 +1634,7 @@ bool CheatsExportDialog(HWND hwnd)
if (cheatsExport->getCheatsNum() > 0) if (cheatsExport->getCheatsNum() > 0)
res = DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_EXPORT), hwnd, (DLGPROC) CheatsExportProc); res = DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_EXPORT), hwnd, (DLGPROC) CheatsExportProc);
else else
MessageBox(hwnd, "Cheats for this game in database not founded.", "DeSmuME", MB_OK | MB_ICONERROR); MessageBox(hwnd, "Cheats for this game in database not founded.", DESMUME_NAME, MB_OK | MB_ICONERROR);
} }
else else
{ {

12
desmume/src/frontend/windows/main.cpp
View File

@ -1638,7 +1638,7 @@ bool DemandLua()
HMODULE mod = LoadLibrary("lua51.dll"); HMODULE mod = LoadLibrary("lua51.dll");
if(!mod) if(!mod)
{ {
MessageBox(NULL, "lua51.dll was not found. Please get it into your PATH or in the same directory as desmume.exe", "DeSmuME", MB_OK | MB_ICONERROR); MessageBox(NULL, "lua51.dll was not found. Please get it into your PATH or in the same directory as desmume.exe", DESMUME_NAME, MB_OK | MB_ICONERROR);
return false; return false;
} }
FreeLibrary(mod); FreeLibrary(mod);
@ -1856,7 +1856,7 @@ static void RefreshMicSettings()
{ {
if(!LoadSamples(MicSampleName)) if(!LoadSamples(MicSampleName))
{ {
MessageBox(NULL, "Unable to read the mic sample", "DeSmuME", (MB_OK | MB_ICONEXCLAMATION)); MessageBox(NULL, "Unable to read the mic sample", DESMUME_NAME, (MB_OK | MB_ICONEXCLAMATION));
} }
else else
{ {
@ -1968,7 +1968,7 @@ int _main()
ColorCtrl_Register(); ColorCtrl_Register();
if (!RegWndClass("DeSmuME", WindowProcedure, CS_DBLCLKS, LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME)))) if (!RegWndClass("DeSmuME", WindowProcedure, CS_DBLCLKS, LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME))))
{ {
MessageBox(NULL, "Error registering windows class", "DeSmuME", MB_OK); MessageBox(NULL, "Error registering windows class", DESMUME_NAME, MB_OK);
exit(-1); exit(-1);
} }
@ -2107,7 +2107,7 @@ int _main()
WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
NULL)) NULL))
{ {
MessageBox(NULL, "Error creating main window", "DeSmuME", MB_OK); MessageBox(NULL, "Error creating main window", DESMUME_NAME, MB_OK);
delete MainWindow; delete MainWindow;
exit(-1); exit(-1);
} }
@ -2129,7 +2129,7 @@ int _main()
if(MenuInit() == 0) if(MenuInit() == 0)
{ {
MessageBox(NULL, "Error creating main menu", "DeSmuME", MB_OK); MessageBox(NULL, "Error creating main menu", DESMUME_NAME, MB_OK);
delete MainWindow; delete MainWindow;
exit(-1); exit(-1);
} }
@ -2483,7 +2483,7 @@ int _main()
CommonSettings.fwConfig.nickname[char_index] = temp_str[char_index]; CommonSettings.fwConfig.nickname[char_index] = temp_str[char_index];
} }
GetPrivateProfileString("Firmware","Message", "DeSmuME makes you happy!", temp_str, 27, IniName); GetPrivateProfileString("Firmware","Message", defaultMessage, temp_str, 27, IniName);
CommonSettings.fwConfig.messageLength = strlen( temp_str); CommonSettings.fwConfig.messageLength = strlen( temp_str);
for ( char_index = 0; char_index < CommonSettings.fwConfig.messageLength; char_index++) { for ( char_index = 0; char_index < CommonSettings.fwConfig.messageLength; char_index++) {
CommonSettings.fwConfig.message[char_index] = temp_str[char_index]; CommonSettings.fwConfig.message[char_index] = temp_str[char_index];

2
desmume/src/frontend/windows/memView.cpp
View File

@ -421,7 +421,7 @@ INT_PTR CALLBACK MemView_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if(error) if(error)
{ {
MessageBox(hDlg, "Error:\nInvalid address specified.\nThe address must be an hexadecimal value.", "DeSmuME", (MB_OK | MB_ICONERROR)); MessageBox(hDlg, "Error:\nInvalid address specified.\nThe address must be an hexadecimal value.", DESMUME_NAME, (MB_OK | MB_ICONERROR));
SetWindowText(gAddress, ""); SetWindowText(gAddress, "");
return 1; return 1;
} }

2
desmume/src/version.cpp
View File

@ -42,8 +42,6 @@
#endif #endif
#endif #endif
#define DESMUME_NAME "DeSmuME"
#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64) #if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
#define DESMUME_PLATFORM_STRING " x64" #define DESMUME_PLATFORM_STRING " x64"
#elif defined(__i386__) || defined(_M_IX86) || defined(_WIN32) #elif defined(__i386__) || defined(_M_IX86) || defined(_WIN32)

4
desmume/src/version.h
View File

@ -18,6 +18,10 @@
#include <string> #include <string>
#include "types.h" #include "types.h"
#ifndef DESMUME_NAME
#define DESMUME_NAME "DeSmuME"
#endif // !DESMUME_NAME
extern const u8 DESMUME_VERSION_MAJOR; extern const u8 DESMUME_VERSION_MAJOR;
extern const u8 DESMUME_VERSION_MINOR; extern const u8 DESMUME_VERSION_MINOR;
extern const u8 DESMUME_VERSION_BUILD; extern const u8 DESMUME_VERSION_BUILD;