From ba43f1356c7910cc71eae7415e576ed8f26491fa Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avast.com>
Date: Thu, 2 Feb 2023 08:58:35 +0100
Subject: Linux build errors

---
 test/StormTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index ca409f1..5bdb47b 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -4209,7 +4209,7 @@ int _tmain(int argc, TCHAR * argv[])
                 break;
         }
     }
-#endif  TEST_STREAM_OPERATIONS
+#endif  // TEST_STREAM_OPERATIONS
 
 #ifdef TEST_MASTER_MIRROR       // Test master-mirror reading operations
     if(dwErrCode == ERROR_SUCCESS)
-- 
cgit v1.2.3


From d0bbc57516e04d68456f3766844f8cef23127d05 Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avast.com>
Date: Thu, 2 Feb 2023 09:00:07 +0100
Subject: Linux build errors

---
 test/StormTest.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index 5bdb47b..6ff91c3 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -2242,7 +2242,7 @@ static DWORD TestArchive_LoadFiles(TLogHelper * pLogger, HANDLE hMpq, DWORD bIgn
         if(SFileHasFile(hMpq, szFileName))
         {
             dwErrCode = LoadMpqFile(*pLogger, hMpq, szFileName, 0, dwSearchFlags, &pFileData);
-            if(dwErrCode != ERROR_SUCCESS && bIgnoreOpenErrors == FALSE)
+            if(dwErrCode != ERROR_SUCCESS && bIgnoreOpenErrors == 0)
             {
                 pLogger->PrintError("Error loading the file %s", szFileName);
                 break;
@@ -2760,7 +2760,7 @@ static DWORD TestOpenArchive_SignatureTest(LPCTSTR szPlainName, LPCTSTR szOrigin
     return dwErrCode;
 }
 
-static DWORD TestOpenArchive_CompactArchive(LPCTSTR szPlainName, LPCTSTR szCopyName, BOOL bAddUserData)
+static DWORD TestOpenArchive_CompactArchive(LPCTSTR szPlainName, LPCTSTR szCopyName, DWORD bAddUserData)
 {
     TLogHelper Logger("CompactMpqTest", szPlainName);
     ULONGLONG PreMpqDataSize = (bAddUserData) ? 0x400 : 0;
-- 
cgit v1.2.3


From 4fb49e6aa0a017768c58a2261a8da8dd59639557 Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avast.com>
Date: Thu, 2 Feb 2023 09:03:11 +0100
Subject: Linux build errors

---
 test/StormTest.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/StormTest.cpp b/test/StormTest.cpp
index 6ff91c3..e8a52dc 100644
--- a/test/StormTest.cpp
+++ b/test/StormTest.cpp
@@ -36,6 +36,8 @@
 //------------------------------------------------------------------------------
 // Local structures
 
+#define ID_XHSC 0x58485343      // 'XHSC'
+
 // Artificial error code for situations where we don't know the result
 #define ERROR_UNDETERMINED_RESULT 0xC000FFFF
 
@@ -230,8 +232,8 @@ static const wchar_t szUnicodeName6[] = {   // Arabic
 
 static SFILE_MARKERS MpqMarkers[] =
 {
-    {sizeof(SFILE_MARKERS), ID_MPQ, "(hash table)", "(block table)"},
-    {sizeof(SFILE_MARKERS), 'XHSC', "(cash table)", "(clock table)"}
+    {sizeof(SFILE_MARKERS), ID_MPQ,  "(hash table)", "(block table)"},
+    {sizeof(SFILE_MARKERS), ID_XHSC, "(cash table)", "(clock table)"}
 };
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3


From bd8100dd50dc276a8093cada4cb53d4cf721014c Mon Sep 17 00:00:00 2001
From: Ladislav Zezula <ladislav.zezula@avast.com>
Date: Thu, 2 Feb 2023 09:07:20 +0100
Subject: Linux build errors

---
 test/TLogHelper.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test')

diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp
index 0570c65..84dc0aa 100644
--- a/test/TLogHelper.cpp
+++ b/test/TLogHelper.cpp
@@ -108,6 +108,7 @@ void TestStrCopy(wchar_t * szTarget, size_t cchTarget, const char * szSource, si
     }
 }
 
+#ifdef STORMLIB_WINDOWS
 wchar_t * CopyFormatCharacter(wchar_t * szBuffer, const wchar_t *& szFormat)
 {
     static const wchar_t * szStringFormat = _T("%s");
@@ -136,6 +137,7 @@ wchar_t * CopyFormatCharacter(wchar_t * szBuffer, const wchar_t *& szFormat)
     *szBuffer++ = *szFormat++;
     return szBuffer;
 }
+#endif  // STORMLIB_WINDOWS
 
 char * CopyFormatCharacter(char * szBuffer, const char *& szFormat)
 {
-- 
cgit v1.2.3