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

1. Trying to fix Issue #88. 

2. Fix a grammar mistake.
This commit is contained in:
owomomo 2020-12-19 13:31:00 +08:00
parent ead6ff6dc5
commit 4828b29338
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/win/debugger.cpp
View File

@ -546,13 +546,14 @@ void Disassemble(HWND hWnd, int id, int scrollid, unsigned int addr)
{ {
// make a copy // make a copy
strcpy(debug_str_decoration_comment, node->comment); strcpy(debug_str_decoration_comment, node->comment);
strcat(debug_str_decoration_comment, "\n"); strcat(debug_str_decoration_comment, "\r\n");
// divide the debug_str_decoration_comment into strings (Comment1, Comment2, ...) // divide the debug_str_decoration_comment into strings (Comment1, Comment2, ...)
debug_decoration_comment = debug_str_decoration_comment; debug_decoration_comment = debug_str_decoration_comment;
debug_decoration_comment_end_pos = strstr(debug_decoration_comment, "\n"); debug_decoration_comment_end_pos = strstr(debug_decoration_comment, "\r\n");
while (debug_decoration_comment_end_pos) while (debug_decoration_comment_end_pos)
{ {
debug_decoration_comment_end_pos[0] = 0; // set \0 instead of \r debug_decoration_comment_end_pos[0] = 0; // set \0 instead of \r
debug_decoration_comment_end_pos[1] = 0; // set \0 instead of \n
strcat(debug_str, "; "); strcat(debug_str, "; ");
strcat(debug_str, debug_decoration_comment); strcat(debug_str, debug_decoration_comment);
strcat(debug_str, "\n"); strcat(debug_str, "\n");
@ -563,7 +564,7 @@ void Disassemble(HWND hWnd, int id, int scrollid, unsigned int addr)
debug_decoration_comment_end_pos += 2; debug_decoration_comment_end_pos += 2;
debug_decoration_comment = debug_decoration_comment_end_pos; debug_decoration_comment = debug_decoration_comment_end_pos;
debug_decoration_comment_end_pos = strstr(debug_decoration_comment_end_pos, "\n"); debug_decoration_comment_end_pos = strstr(debug_decoration_comment_end_pos, "\r\n");
} }
} }
} }

1
src/drivers/win/debuggersp.cpp
View File

@ -485,7 +485,6 @@ Name* parseNameFile(const char* filename)
n = parse(buffer, filename); n = parse(buffer, filename);
fclose(f); fclose(f);
free(buffer); free(buffer);
} }
} }

2
src/drivers/win/memview.cpp
View File

@ -2429,7 +2429,7 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
if (discardBookmarkCount || outOfRangeBookmarkCount) if (discardBookmarkCount || outOfRangeBookmarkCount)
{ {
char reason[64]; char reason[64];
sprintf(buffer, "Import complete, but %d bookmark%s %s are not imported:\n", discardBookmarkCount + outOfRangeBookmarkCount, discardBookmarkCount + outOfRangeBookmarkCount == 1 ? "" : "s", discardBookmarkCount + outOfRangeBookmarkCount == 1 ? "is" : "are"); sprintf(buffer, "Import complete, but %d bookmark%s %s not imported:\n", discardBookmarkCount + outOfRangeBookmarkCount, discardBookmarkCount + outOfRangeBookmarkCount == 1 ? "" : "s", discardBookmarkCount + outOfRangeBookmarkCount == 1 ? "is" : "are");
if (outOfRangeBookmarkCount) if (outOfRangeBookmarkCount)
{ {
sprintf(reason, "%d %s outside the valid address range of the game.", outOfRangeBookmarkCount, outOfRangeBookmarkCount == 1 ? "is" : "are"); sprintf(reason, "%d %s outside the valid address range of the game.", outOfRangeBookmarkCount, outOfRangeBookmarkCount == 1 ? "is" : "are");

BIN
src/drivers/win/res.aps
View File

Binary file not shown.