diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index b8931d1b0a9..7183b144385 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -2072,7 +2072,7 @@ void CharsetRendererNut::setCurID(int32 id) { _curId = id; if (!_fr[id]) { char fontname[11]; - sprintf(fontname, "font%d.nut", id); + Common::sprintf_s(fontname, "font%d.nut", id); _fr[id] = new NutRenderer(_vm, fontname); } _current = _fr[id]; diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index b12acea0205..0c2d5394465 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -349,13 +349,13 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) { chr = string[num++]; switch (chr) { case 'b': - //dst += sprintf((char *)dst, "%b", args[val++]); + //dst += Common::sprintf_s((char *)dst, "%b", args[val++]); break; case 'c': *dst++ = args[val++]; break; case 'd': - dst += sprintf((char *)dst, "%d", args[val++]); + dst += Common::sprintf_s((char *)dst, sizeof(string) - (dst - dst0), "%d", args[val++]); break; case 's': src = getStringAddress(args[val++]); @@ -365,7 +365,7 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) { } break; case 'x': - dst += sprintf((char *)dst, "%x", args[val++]); + dst += Common::sprintf_s((char *)dst, sizeof(string) - (dst - dst0), "%x", args[val++]); break; default: *dst++ = '%'; diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index cd8a8661673..7a8d8c3123c 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -216,7 +216,7 @@ void ScummEngine_v80he::o80_writeConfigFile() { case 43: // HE 100 case 6: // number value = pop(); - sprintf((char *)string, "%d", value); + Common::sprintf_s(string, "%d", value); copyScriptString(option, sizeof(option)); copyScriptString(section, sizeof(section)); copyScriptString(filename, sizeof(filename)); diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 4a87027fe8e..93cf727ddd1 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -81,7 +81,7 @@ bool ImuseDigiSndMgr::openMusicBundle(SoundDesc *sound, int &disk) { char musicfile[20]; if (disk == -1) disk = _vm->VAR(_vm->VAR_CURRENTDISK); - sprintf(musicfile, "musdisk%d.bun", disk); + Common::sprintf_s(musicfile, "musdisk%d.bun", disk); // if (_disk != _vm->VAR(_vm->VAR_CURRENTDISK)) { // _vm->_DiMUSE_v1->parseScriptCmds(0x1000, 0, 0, 0, 0, 0, 0, 0); // _vm->_DiMUSE_v1->parseScriptCmds(0x2000, 0, 0, 0, 0, 0, 0, 0); @@ -117,7 +117,7 @@ bool ImuseDigiSndMgr::openVoiceBundle(SoundDesc *sound, int &disk) { char voxfile[20]; if (disk == -1) disk = _vm->VAR(_vm->VAR_CURRENTDISK); - sprintf(voxfile, "voxdisk%d.bun", disk); + Common::sprintf_s(voxfile, "voxdisk%d.bun", disk); // if (_disk != _vm->VAR(_vm->VAR_CURRENTDISK)) { // _vm->_DiMUSE_v1->parseScriptCmds(0x1000, 0, 0, 0, 0, 0, 0, 0); // _vm->_DiMUSE_v1->parseScriptCmds(0x2000, 0, 0, 0, 0, 0, 0, 0); diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index b9d36092f5d..10c6250ec52 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -831,7 +831,7 @@ void ScummEngine_v3::processKeyboard(Common::KeyState lastKeyHit) { updateIQPoints(); - sprintf(text, "IQ Points: Episode = %d, Series = %d", _scummVars[244], _scummVars[245]); + Common::sprintf_s(text, "IQ Points: Episode = %d, Series = %d", _scummVars[244], _scummVars[245]); Indy3IQPointsDialog indy3IQPointsDialog(this, text); runDialog(indy3IQPointsDialog); } diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index 067d75aac98..d8dd53e871c 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -1055,17 +1055,17 @@ void Insane::postCase16(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 tmp; turnBen(true); - sprintf(buf, "^f01%02o", curFrame & 0x3f); + Common::sprintf_s(buf, "^f01%02o", curFrame & 0x3f); smlayer_showStatusMsg(-1, renderBitmap, codecparam, 180, 168, 1, 2, 0, "%s", buf); tmp = 400-curFrame; if (tmp < 0) tmp += 1300; - sprintf(buf, "^f01%04d", tmp); + Common::sprintf_s(buf, "^f01%04d", tmp); smlayer_showStatusMsg(-1, renderBitmap, codecparam, 202, 168, 1, 2, 0, "%s", buf); - sprintf(buf, "^f01%02o", curFrame & 0xff); + Common::sprintf_s(buf, "^f01%02o", curFrame & 0xff); smlayer_showStatusMsg(-1, renderBitmap, codecparam, 240, 168, 1, 2, 0, "%s", buf); smlayer_showStatusMsg(-1, renderBitmap, codecparam, 170, 43, 1, 2, 0, "%s", buf); diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 57f686f4d6d..aa9875c39e9 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -863,7 +863,7 @@ void ScummEngine::resetRoomObjects() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "roomobj-%d-", _roomResource); + Common::sprintf_s(buf, "roomobj-%d-", _roomResource); ptr = findResource(MKTAG('V','E','R','B'), ptr); dumpResource(buf, od->obj_nr, ptr); } @@ -928,7 +928,7 @@ void ScummEngine_v3old::resetRoomObjects() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "roomobj-%d-", _roomResource); + Common::sprintf_s(buf, "roomobj-%d-", _roomResource); dumpResource(buf, od->obj_nr, room + od->OBCDoffset); } } @@ -962,7 +962,7 @@ void ScummEngine_v4::resetRoomObjects() { od->obj_nr = READ_LE_UINT16(ptr + 6); if (_dumpScripts) { char buf[32]; - sprintf(buf, "roomobj-%d-", _roomResource); + Common::sprintf_s(buf, "roomobj-%d-", _roomResource); dumpResource(buf, od->obj_nr, ptr); } } @@ -1981,7 +1981,7 @@ void ScummEngine::loadFlObject(uint object, uint room) { if (_dumpScripts) { char buf[32]; const byte *ptr = foir.obcd; - sprintf(buf, "roomobj-%u-", room); + Common::sprintf_s(buf, "roomobj-%u-", room); ptr = findResource(MKTAG('V','E','R','B'), ptr); dumpResource(buf, object, ptr); } diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index 3eb18d2543b..f310739b25b 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -221,9 +221,9 @@ void ScummEngine::askForDisk(const char *filename, int disknum) { _imuseDigital->stopAllSounds(); #ifdef MACOSX - sprintf(buf, "Cannot find file: '%s'\nPlease insert disc %d.\nPress OK to retry, Quit to exit", filename, disknum); + Common::sprintf_s(buf, "Cannot find file: '%s'\nPlease insert disc %d.\nPress OK to retry, Quit to exit", filename, disknum); #else - sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, ConfMan.get("path").c_str()); + Common::sprintf_s(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, ConfMan.get("path").c_str()); #endif result = displayMessage("Quit", "%s", buf); @@ -232,7 +232,7 @@ void ScummEngine::askForDisk(const char *filename, int disknum) { } #endif } else { - sprintf(buf, "Cannot find file: '%s'", filename); + Common::sprintf_s(buf, "Cannot find file: '%s'", filename); InfoDialog dialog(this, Common::U32String(buf)); runDialog(dialog); error("Cannot find file: '%s'", filename); @@ -1445,7 +1445,7 @@ void ScummEngine::dumpResource(const char *tag, int id, const byte *ptr, int len else size = READ_BE_UINT32(ptr + 4); - sprintf(buf, "dumps/%s%d.dmp", tag, id); + Common::sprintf_s(buf, "dumps/%s%d.dmp", tag, id); out.open(buf); if (out.isOpen() == false) @@ -1662,7 +1662,7 @@ const char *nameOfResType(ResType type) { case rtSpoolBuffer: return "SpoolBuffer"; default: - sprintf(buf, "rt%d", type); + Common::sprintf_s(buf, "rt%d", type); return buf; } } diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp index 47364495633..782e33877aa 100644 --- a/engines/scumm/resource_v3.cpp +++ b/engines/scumm/resource_v3.cpp @@ -108,7 +108,7 @@ void ScummEngine_v3::loadCharset(int no) { Common::File file; char buf[20]; - sprintf(buf, "%02d.LFL", 99 - no); + Common::sprintf_s(buf, "%02d.LFL", 99 - no); file.open(buf); if (file.isOpen() == false) { diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp index e35205f851f..4713358fdd4 100644 --- a/engines/scumm/resource_v4.cpp +++ b/engines/scumm/resource_v4.cpp @@ -163,7 +163,7 @@ void ScummEngine_v4::loadCharset(int no) { char buf[20]; byte *data; - sprintf(buf, "%03d.LFL", 900 + no); + Common::sprintf_s(buf, "%03d.LFL", 900 + no); file.open(buf); if (file.isOpen() == false) { diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index b911710fec2..71766e5aab1 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -360,7 +360,7 @@ void ScummEngine::setupRoomSubBlocks() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "room-%d-", _roomResource); + Common::sprintf_s(buf, "room-%d-", _roomResource); dumpResource(buf, id, ptr - _resourceHeaderSize); } @@ -380,7 +380,7 @@ void ScummEngine::setupRoomSubBlocks() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "room-%d-", _roomResource); + Common::sprintf_s(buf, "room-%d-", _roomResource); dumpResource(buf, id, ptr - _resourceHeaderSize); } } @@ -396,7 +396,7 @@ void ScummEngine::setupRoomSubBlocks() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "room-%d-", _roomResource); + Common::sprintf_s(buf, "room-%d-", _roomResource); dumpResource(buf, id, ptr - _resourceHeaderSize); } } @@ -423,7 +423,7 @@ void ScummEngine::setupRoomSubBlocks() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "room-%d-", _roomResource); + Common::sprintf_s(buf, "room-%d-", _roomResource); dumpResource(buf, id, ptr - _resourceHeaderSize); } } @@ -733,7 +733,7 @@ void ScummEngine_v3old::setupRoomSubBlocks() { if (_dumpScripts) { char buf[32]; - sprintf(buf, "room-%d-", _roomResource); + Common::sprintf_s(buf, "room-%d-", _roomResource); // HACK: to determine the sizes of the local scripts, we assume that // a) their order in the data file is the same as in the index diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 936e56f5b86..c12407b8f2e 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1431,8 +1431,8 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) { if (s.isLoading()) { char md5str1[32+1], md5str2[32+1]; for (i = 0; i < 16; i++) { - sprintf(md5str1 + i*2, "%02x", (int)_gameMD5[i]); - sprintf(md5str2 + i*2, "%02x", (int)md5Backup[i]); + Common::sprintf_s(md5str1 + i*2, 3, "%02x", (int)_gameMD5[i]); + Common::sprintf_s(md5str2 + i*2, 3, "%02x", (int)md5Backup[i]); } debug(2, "Save version: %d", s.getVersion()); diff --git a/engines/scumm/script_v4.cpp b/engines/scumm/script_v4.cpp index 4d3896d9ba5..62052370855 100644 --- a/engines/scumm/script_v4.cpp +++ b/engines/scumm/script_v4.cpp @@ -418,7 +418,7 @@ void ScummEngine_v4::o4_saveLoadGame() { char name[32]; if (_game.version <= 2) { // use generic name - sprintf(name, "Game %c", 'A'+slot-1); + Common::sprintf_s(name, "Game %c", 'A'+slot-1); } else { // use name entered by the user char* ptr; diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 589500c6e61..d6c18592de6 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -982,7 +982,7 @@ SmushFont *SmushPlayer::getFont(int font) { } else { int numFonts = (_vm->_game.id == GID_CMI && !(_vm->_game.features & GF_DEMO)) ? 5 : 4; assert(font >= 0 && font < numFonts); - sprintf(file_font, "font%d.nut", font); + Common::sprintf_s(file_font, "font%d.nut", font); _sf[font] = new SmushFont(_vm, file_font, _vm->_game.id == GID_DIG && font != 0); } diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index bca8581cc30..70072425529 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -752,14 +752,14 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle if (!file) error("startTalkSound: Out of memory"); - sprintf(filename, "audio/%s.%u/%u.voc", roomname, offset, b); + Common::sprintf_s(filename, "audio/%s.%u/%u.voc", roomname, offset, b); if (!_vm->openFile(*file, filename)) { - sprintf(filename, "audio/%s_%u/%u.voc", roomname, offset, b); + Common::sprintf_s(filename, "audio/%s_%u/%u.voc", roomname, offset, b); _vm->openFile(*file, filename); } if (!file->isOpen()) { - sprintf(filename, "%u.%u.voc", offset, b); + Common::sprintf_s(filename, "%u.%u.voc", offset, b); _vm->openFile(*file, filename); } diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index d868eb9ca9d..c0139fef4fc 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -1656,7 +1656,7 @@ void ScummEngine_v7::loadLanguageBundle() { } // The tag is the basetag, followed by a dot and then the index - sprintf(_languageIndex[_languageIndexSize].tag, "%s.%03d", baseTag, idx); + Common::sprintf_s(_languageIndex[_languageIndexSize].tag, "%s.%03d", baseTag, idx); // That was another index entry _languageIndexSize++;