From d9af7876974f4a98ed0049124c0ee4071916b270 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Tue, 3 Jun 2025 10:29:52 +0200 Subject: Cosmetics --- test/StormTest.cpp | 7 +++++-- test/stormlib-test-001.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/StormTest.cpp b/test/StormTest.cpp index dba91f3..c5b5121 100755 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -1436,9 +1436,12 @@ static DWORD LoadMpqFile(TLogHelper & Logger, HANDLE hMpq, LPCSTR szFileName, LC DWORD dwBytesRead; DWORD dwCrc32 = 0; DWORD dwErrCode = ERROR_SUCCESS; + TCHAR szSafeName[1024]; - // Do nothing if the file name is invalid - Logger.PrintProgress("Loading file %s ...", GetShortPlainName(szFileName)); + // Print the file name to the console. + // Prevent bad UTF-8 sequences to go through + SMemUTF8ToFileName(szSafeName, _countof(szSafeName), szFileName, NULL, 0, NULL); + Logger.PrintProgress(_T("Loading file %s ..."), GetShortPlainName(szSafeName)); #if defined(_MSC_VER) && defined(_DEBUG) //if(!_stricmp(szFileName, "(signature)")) diff --git a/test/stormlib-test-001.txt b/test/stormlib-test-001.txt index c386367..062652f 100644 --- a/test/stormlib-test-001.txt +++ b/test/stormlib-test-001.txt @@ -68,7 +68,7 @@ TestReadingMpq (MPQ_2023_v4_UTF8.s2ma) succeeded. TestReadingMpq (MPQ_2023_v1_GreenTD.w3x) succeeded. TestReadingMpq (MPQ_2023_v4_1F644C5A.SC2Replay) succeeded. TestReadingMpq () succeeded. -TestReadingMpq (MPQ_2024_v1_BadUtf8_5.0.2.w3x) succeeded. ... .. +TestReadingMpq (MPQ_2024_v1_BadUtf8_5.0.2.w3x) succeeded. TestReadingMpq (MPQ_2002_v1_ProtectedMap_InvalidUserData.w3x) succeeded. TestReadingMpq (MPQ_2002_v1_ProtectedMap_InvalidMpqFormat.w3x) succeeded. TestReadingMpq (MPQ_2002_v1_ProtectedMap_Spazzler.w3x) succeeded. -- cgit v1.2.3