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

Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

This commit is contained in:
thrust26 2018-09-02 17:48:02 +02:00
parent 2130498727 28f8dcc312
commit f607fab9bb
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -59,6 +59,7 @@
"iostream": "cpp", "iostream": "cpp",
"cstdint": "cpp", "cstdint": "cpp",
"ostream": "cpp", "ostream": "cpp",
"__memory": "cpp" "__memory": "cpp",
"iosfwd": "cpp"
} }
} }

2
src/common/ZipHandler.cxx
View File

@ -256,7 +256,7 @@ ZipHandler::zip_error ZipHandler::zip_file_open(const char* filename, zip_file**
goto error; goto error;
} }
strcpy_s(string, strlen(filename) + 1, filename); strncpy(string, filename, strlen(filename) + 1);
newzip->filename = string; newzip->filename = string;
*zip = newzip; *zip = newzip;

2
src/debugger/gui/PromptWidget.cxx
View File

@ -689,7 +689,7 @@ void PromptWidget::textPaste()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PromptWidget::addToHistory(const char* str) void PromptWidget::addToHistory(const char* str)
{ {
strncpy_s(_history[_historyIndex], str, kLineBufferSize - 1); strncpy(_history[_historyIndex], str, kLineBufferSize - 1);
_historyIndex = (_historyIndex + 1) % kHistorySize; _historyIndex = (_historyIndex + 1) % kHistorySize;
_historyLine = 0; _historyLine = 0;

2
src/emucore/tia/TIA.cxx
View File

@ -1242,7 +1242,9 @@ void TIA::cycle(uInt32 colorClocks)
if (++myHctr >= 228) if (++myHctr >= 228)
nextLine(); nextLine();
#ifdef SOUND_SUPPORT
myAudio.tick(); myAudio.tick();
#endif
++myTimestamp; ++myTimestamp;
} }