Adding improvements based on feedback

Author: Bart Roossien

Core/GameEngine/Source/Common/System/AsciiString.cpp

@@ -140,7 +140,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 			m_data->peek()[usableNumChars] = 0;
 		}
 		if (strToCat)
-			strlcat(m_data->peek(), strToCat, usableNumChars + 1);
+			strcat(m_data->peek(), strToCat);
 		return;
 	}
 
@@ -169,7 +169,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 		newData->peek()[usableNumChars] = 0;
 	}
 	if (strToCat)
-		strlcat(newData->peek(), strToCat, usableNumChars + 1);
+		strcat(newData->peek(), strToCat);
 
 	releaseBuffer();
 	m_data = newData;

Core/GameEngine/Source/Common/System/Debug.cpp

@@ -210,14 +210,14 @@ static const char *getCurrentTickString(void)
 	Empty the buffer passed in, then optionally prepend the current TickCount
 	value in string form, depending on the setting of theDebugFlags.
 */
-static void prepBuffer(char *buffer, int size)
+static void prepBuffer(char *buffer)
 {
 	buffer[0] = 0;
 #ifdef ALLOW_DEBUG_UTILS
 	if (theDebugFlags & DEBUG_FLAG_PREPEND_TIME)
 	{
 		strcpy(buffer, getCurrentTickString());
-		strlcat(buffer, " ", size);
+		strcat(buffer, " ");
 	}
 #endif
 }
@@ -436,7 +436,7 @@ void DebugLog(const char *format, ...)
 	if (theDebugFlags == 0)
 		MessageBoxWrapper("DebugLog - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
 
-	prepBuffer(theBuffer, ARRAY_SIZE(theBuffer));
+	prepBuffer(theBuffer);
 
 	va_list args;
 	va_start(args, format);
@@ -508,8 +508,8 @@ void DebugCrash(const char *format, ...)
 	// make it big to avoid weird overflow bugs in debug mode
 	char theCrashBuffer[ LARGE_BUFFER ];
 
-	prepBuffer(theCrashBuffer, LARGE_BUFFER);
-	strlcat(theCrashBuffer, "ASSERTION FAILURE: ", LARGE_BUFFER);
+	prepBuffer(theCrashBuffer);
+	strlcat(theCrashBuffer, "ASSERTION FAILURE: ", ARRAY_SIZE(theCrashBuffer));
 
 	va_list arg;
 	va_start(arg, format);
@@ -538,7 +538,7 @@ void DebugCrash(const char *format, ...)
 #endif
 	}
 
-	strlcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue", LARGE_BUFFER);
+	strlcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue", ARRAY_SIZE(theCrashBuffer));
 
 	const int result = doCrashBox(theCrashBuffer, useLogging);
 
@@ -737,9 +737,9 @@ void ReleaseCrash(const char *reason)
 	}
 
 	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, _MAX_PATH);
+	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, ARRAY_SIZE(prevbuf));
 	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strlcat(curbuf, RELEASECRASH_FILE_NAME, _MAX_PATH);
+	strlcat(curbuf, RELEASECRASH_FILE_NAME, ARRAY_SIZE(curbuf));
 
  	remove(prevbuf);
 	rename(curbuf, prevbuf);
@@ -826,9 +826,9 @@ void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
 	char curbuf[ _MAX_PATH ];
 
 	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, _MAX_PATH);
+	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, ARRAY_SIZE(prevbuf));
 	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strlcat(curbuf, RELEASECRASH_FILE_NAME, _MAX_PATH);
+	strlcat(curbuf, RELEASECRASH_FILE_NAME, ARRAY_SIZE(curbuf));
 
  	remove(prevbuf);
 	rename(curbuf, prevbuf);

Core/GameEngine/Source/Common/System/GameMemory.cpp

@@ -2976,7 +2976,7 @@ void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appen
 	{
 		char tmp[256];
 		strcpy(tmp,filename);
-		strlcat(tmp,".csv", ARRAY_SIZE(tmp));
+		strlcat(tmp, ".csv", ARRAY_SIZE(tmp));
 		perfStatsFile = fopen(tmp, "w");
 	}
 	else

Core/GameEngine/Source/Common/System/GameMemoryInit.cpp

@@ -123,7 +123,7 @@ void userMemoryManagerInitPools()
 		}
 		--pEnd;
 	}
-	strlcat(buf, "\\Data\\INI\\MemoryPools.ini", _MAX_PATH);
+	strlcat(buf, "\\Data\\INI\\MemoryPools.ini", ARRAY_SIZE(buf));
 
 	FILE* fp = fopen(buf, "r");
 	if (fp)

Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp

@@ -257,8 +257,8 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 	cload.Close_Chunk();
 
 	strcpy(Name,aheader.HierarchyName);
-	strlcat(Name,".", ARRAY_SIZE(Name));
-	strlcat(Name,aheader.Name, ARRAY_SIZE(Name));
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
 
 	// TSS chasing crash bug 05/26/99
    WWASSERT(HierarchyName != NULL);

Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp

@@ -236,7 +236,7 @@ bool HModelDefClass::read_connection(ChunkLoadClass & cload,HmdlNodeDefStruct *
 	}
 
 	strcpy(node->RenderObjName,ModelName);
-	strlcat(node->RenderObjName,".", ARRAY_SIZE(node->RenderObjName));
+	strlcat(node->RenderObjName, ".", ARRAY_SIZE(node->RenderObjName));
 	strlcat(node->RenderObjName, con.RenderObjName, ARRAY_SIZE(node->RenderObjName));
 
 	if (pre30) {

Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP

@@ -36,7 +36,7 @@
 #include <time.h>
 #include <direct.h>
 #include <errno.h>
-#include <stringex.h>
+#include <WWCommon.h>
 //#include "wlib/wstring.h"
 
 #include "DownloadDebug.h"
@@ -679,7 +679,7 @@ HRESULT  Cftp::FindFile( LPCSTR szRemoteFileName, int * piSize )
 	_splitpath( szRemoteFileName, NULL, m_szRemoteFilePath+strlen(m_szRemoteFilePath),
 		m_szRemoteFileName, ext );
 
-	strlcat(m_szRemoteFileName, ext, sizeof(m_szRemoteFileName));
+	strlcat(m_szRemoteFileName, ext, ARRAY_SIZE(m_szRemoteFileName));
 
 	for( i = 0; i < (int)strlen( m_szRemoteFilePath ); i++ )
 	{

Core/Libraries/Source/WWVegas/WWLib/Except.cpp

@@ -225,7 +225,7 @@ char const * Last_Error_Text(void)
 static void Add_Txt (char const *txt)
 {
 	if (strlen(ExceptionText) + strlen(txt) < ARRAY_SIZE(ExceptionText) - 1) {
-		strlcat(ExceptionText, txt, ARRAY_SIZE(ExceptionText));
+		strcat(ExceptionText, txt);
 	}
 #if (0)
 	/*

Core/Libraries/Source/debug/CMakeLists.txt

@@ -33,7 +33,7 @@ target_include_directories(core_debug INTERFACE
 )
 
 target_link_libraries(core_debug PRIVATE
-    core_wwcommon
     core_config
+    core_wwcommon
     corei_always
 )

Core/Libraries/Source/debug/debug_debug.cpp

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <Utility/stdio_adapter.h>
 #include <string.h>
-#include <stringex.h>
+#include <WWCommon.h>
 #include <new>      // needed for placement new prototype
 
 // a little dummy variable that makes the linker actually include
@@ -347,7 +347,7 @@ bool Debug::AssertDone(void)
                         "time being (stops logging this assertion as well).";
     char *help=(char *)DebugAllocMemory(ioBuffer[curType].used+strlen(addInfo)+1);
     strcpy(help,ioBuffer[curType].buffer+82);
-    strlcat(help, addInfo, sizeof(help));
+    strlcat(help, addInfo, ARRAY_SIZE(help));
 
     // First hit? Then do a stack trace
     if (curFrameEntry->hits==1)
@@ -611,7 +611,7 @@ bool Debug::CrashDone(bool die)
 #endif
     char *help=(char *)DebugAllocMemory(ioBuffer[curType].used+strlen(addInfo)+1);
     strcpy(help,ioBuffer[curType].buffer+82);
-    strlcat(help,addInfo, sizeof(help));
+    strlcat(help, addInfo, ARRAY_SIZE(help));
 
     // First hit? Then do a stack trace
     if (curFrameEntry->hits==1)