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

winport: add title size check and fixed code style/typo

This commit is contained in:
Mattia Rombi 2020-06-18 16:47:51 +02:00
parent 3466c7f69a
commit 357843c543
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2961,39 +2961,43 @@ void WavEnd()
NDS_UnPause(); NDS_UnPause();
} }
void UpdateTitle(const char* curr_title) void UpdateTitle(const char* currTitle)
{ {
if (gameInfo.hasRomBanner()) if (gameInfo.hasRomBanner())
{ {
if (curr_title == nullptr) { if (currTitle == nullptr) {
curr_title = EMU_DESMUME_NAME_AND_VERSION(); currTitle = EMU_DESMUME_NAME_AND_VERSION();
} }
char new_title[512]; char newTitle[512];
char game_title[128]; char gameTitle[128];
strcpy(new_title, curr_title); strcpy(newTitle, currTitle);
int newLength = strlen(newTitle);
const RomBanner& banner = gameInfo.getRomBanner(); const RomBanner& banner = gameInfo.getRomBanner();
sprintf(game_title, " | %ws", banner.titles[CommonSettings.fwConfig.language]); sprintf(gameTitle, " | %ws", banner.titles[CommonSettings.fwConfig.language]);
int index = 0, lenght = strlen(game_title); int index = 0, gameLength = strlen(gameTitle);
for (int i = 0; i < lenght; i++) for (int i = 0; i < gameLength; i++)
{ {
if (game_title[i] == '\n') if (gameTitle[i] == '\n')
{ {
game_title[i] = ' '; gameTitle[i] = ' ';
index = i; index = i;
} }
} }
if (index != 0) if (index != 0)
{ {
game_title[index] = '\0'; gameTitle[index] = '\0';
strcat(new_title + strlen(new_title), game_title); if (newLength + gameLength < 512) strcat(newTitle + newLength, gameTitle);
} }
SetWindowText(MainWindow->getHWnd(), new_title); newTitle[511] = '\0'; // Stay safe
SetWindowText(MainWindow->getHWnd(), newTitle);
} }
} }

2
desmume/src/frontend/windows/main.h
View File

@ -45,7 +45,7 @@ void AviRecordTo();
void AviEnd(); void AviEnd();
void WavRecordTo(int wavmode); void WavRecordTo(int wavmode);
void WavEnd(); void WavEnd();
void UpdateTitle(const char* curr_title = nullptr); void UpdateTitle(const char* currTitle = nullptr);
void UpdateToolWindows(); void UpdateToolWindows();
bool DemandLua(); bool DemandLua();
void SetRotate(HWND hwnd, int rot, bool user = true); void SetRotate(HWND hwnd, int rot, bool user = true);