unicode stormlib causing problems

Author: briaguya-ai

extern/StormLib/src/SBaseCommon.cpp

@@ -151,7 +151,7 @@ void StringCreatePseudoFileName(char * szBuffer, size_t cchMaxChars, unsigned in
 // Utility functions (UNICODE) only exist in the ANSI version of the library
 // In ANSI builds, TCHAR = char, so we don't need these functions implemented
 
-#ifdef _UNICODE
+#if 0
 void StringCopy(TCHAR * szTarget, size_t cchTarget, const char * szSource)
 {
     if(cchTarget > 0)

extern/StormLib/src/StormCommon.h

@@ -193,7 +193,7 @@ char * StringCopy(char * szTarget, size_t cchTarget, const char * szSource);
 void StringCat(char * szTarget, size_t cchTargetMax, const char * szSource);
 void StringCreatePseudoFileName(char * szBuffer, size_t cchMaxChars, unsigned int nIndex, const char * szExtension);
 
-#ifdef _UNICODE
+#if 0
 void StringCopy(TCHAR * szTarget, size_t cchTarget, const char * szSource);
 void StringCopy(char * szTarget, size_t cchTarget, const TCHAR * szSource);
 void StringCopy(TCHAR * szTarget, size_t cchTarget, const TCHAR * szSource);

extern/StormLib/src/StormLib.h

@@ -108,7 +108,7 @@ extern "C" {
 #if defined(_MSC_VER) && !defined(STORMLIB_NO_AUTO_LINK)
   #ifndef WDK_BUILD
     #ifdef _DEBUG                                 // DEBUG VERSIONS
-      #ifndef _UNICODE
+      #if 1
         #ifdef _DLL
           #pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version
         #else
@@ -122,7 +122,7 @@ extern "C" {
         #endif
       #endif
     #else                                         // RELEASE VERSIONS
-      #ifndef _UNICODE
+      #if 1
         #ifdef _DLL
           #pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version
         #else

extern/StormLib/test/StormTest.cpp

@@ -603,7 +603,7 @@ static void CreateFullPathName(TCHAR * szBuffer, size_t cchBuffer, LPCTSTR szSub
     }
 }
 
-#ifdef _UNICODE
+#if 0
 static void CreateFullPathName(char * szBuffer, size_t cchBuffer, LPCTSTR szSubDir, LPCTSTR szNamePart1, LPCTSTR szNamePart2 = NULL)
 {
     TCHAR szFullPathT[MAX_PATH];
@@ -1791,7 +1791,7 @@ static DWORD CreateNewArchive_V2(TLogHelper * pLogger, LPCTSTR szPlainName, DWOR
 // Creates new archive with UNICODE name. Adds prefix to the name
 static DWORD CreateNewArchiveU(TLogHelper * pLogger, const wchar_t * szPlainName, DWORD dwCreateFlags, DWORD dwMaxFileCount)
 {
-#ifdef _UNICODE
+#if 0
     HANDLE hMpq = NULL;
     TCHAR szMpqName[MAX_PATH+1];
     TCHAR szFullPath[MAX_PATH];

extern/StormLib/test/TLogHelper.cpp

@@ -19,7 +19,7 @@ class TLogHelper
     TLogHelper(const char * szNewMainTitle = NULL, const TCHAR * szNewSubTitle1 = NULL, const TCHAR * szNewSubTitle2 = NULL);
     ~TLogHelper();
 
-#if defined(UNICODE) || defined(UNICODE)
+#if 0
     // TCHAR-based functions. They are only needed on UNICODE builds.
     // On ANSI builds is TCHAR = char, so we don't need them at all
     int  PrintWithClreol(const TCHAR * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine);
@@ -46,7 +46,7 @@ class TLogHelper
 
     protected:
 
-#if defined(UNICODE) || defined(UNICODE)
+#if 0
     TCHAR * CopyFormatCharacter(TCHAR * szBuffer, const TCHAR *& szFormat);
 #endif
     char * CopyFormatCharacter(char * szBuffer, const char *& szFormat);
@@ -129,7 +129,7 @@ TLogHelper::~TLogHelper()
 // TCHAR-based functions. They are only needed on UNICODE builds.
 // On ANSI builds is TCHAR = char, so we don't need them at all
 
-#if defined(UNICODE) || defined(UNICODE)
+#if 0
 int TLogHelper::PrintWithClreol(const TCHAR * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine)
 {
     TCHAR szFormatBuff[0x200];
@@ -383,7 +383,7 @@ DWORD TLogHelper::PrintVerdict(DWORD dwErrCode)
 //-----------------------------------------------------------------------------
 // Protected functions
 
-#ifdef _UNICODE
+#if 0
 TCHAR * TLogHelper::CopyFormatCharacter(TCHAR * szBuffer, const TCHAR *& szFormat)
 {
 //  static LPCTSTR szStringFormat = _T("\"%s\"");