Cleanup C4267 warnings (w3dhub#74)

* Fixes to avoid C4267 warnings in Widestring.cpp/h

* More C4275 Cleanup

* Updated Chunkio

* More warning C4267 fixes

* More  C4267 warnings work

* (chore) Cleaned up more warnings including remaining C4267.

* Fixes to avoid C4267 warnings in Widestring.cpp/h

* More C4275 Cleanup

* Updated Chunkio

* More warning C4267 fixes

* More  C4267 warnings work

* (chore) Cleaned up more warnings including remaining C4267.

* rebase on main

* Fixup

* Changes requested from PR

* Removed the redundant StringClass(unsigned initial_len, bool) overload in Code/wwlib/wwstring.h

* Fix indentations

* More formating cleanup

* More indent cleanup

* Attempt to force github repo to switch these files back to CRLF

* Remove comment about CRLF

* Remove comment about CRLF

* Copied files from main and re did changes to see if that fixes whitespace issues in github.

Author: caseychaos1212

Code/BinkMovie/subtitle.cpp

@@ -145,7 +145,7 @@ void SubTitleClass::Set_Caption(wchar_t* string)
 
 	// Make a copy of caption
 	if (string != NULL) {
-		unsigned int length = wcslen(string);
+		size_t length = wcslen(string);
 		mCaption = new wchar_t[length + 1];
 		WWASSERT(mCaption != NULL);
 

Code/Combat/diaglog.cpp

@@ -39,6 +39,9 @@
 #include "wwfile.h"
 #include "timemgr.h"
 
+#include <cassert>
+#include <limits>
+
 #include <wtypes.h>	// for SYSTEMTIME
 
 FileClass * _DiagLogFile = NULL;
@@ -100,8 +103,10 @@ void	DiagLogClass::Log_Timed( const char * type, const char * format, ... )
 
 		StringClass line;
 		float time = TimeManager::Get_Total_Seconds();
-		line.Format( "%s; %1.2f; %s%c%c", type, time, data, 0x0D, 0x0A );
-		_DiagLogFile->Write( line, ::strlen( line ) );
+		line.Format("%s; %1.2f; %s%c%c", type, time, data, 0x0D, 0x0A);
+		const size_t length = ::strlen(line);
+		assert(length <= static_cast<size_t>(std::numeric_limits<int>::max()));
+		_DiagLogFile->Write(line, static_cast<int>(length));
 	}
 }
 

Code/Combat/scriptman.cpp

@@ -187,13 +187,20 @@ void ScriptManager::Load_Scripts(const char* dll_filename)
 
 				// Copy the dll from the PKG (mix) file into our temporary _scripts directory
 				static char buffer[16000];
-				int scripts_size = scripts_dll->Size();
-				int cur_pos = 0;
+				size_t scripts_size = scripts_dll->Size();
+				size_t cur_pos = 0;
 				while (cur_pos < scripts_size) {
-					int read_count = WWMath::Min(scripts_size - cur_pos,sizeof(buffer));
-					scripts_dll->Read(buffer,read_count);
-					unpacked_scripts.Write(buffer,read_count);
-					cur_pos += read_count;
+					size_t remaining = scripts_size - cur_pos;
+					size_t requested = remaining;
+					if (requested > sizeof(buffer)) {
+						requested = sizeof(buffer);
+					}
+					int read_count = scripts_dll->Read(buffer, static_cast<int>(requested));
+					if (read_count <= 0) {
+						break;
+					}
+					unpacked_scripts.Write(buffer, read_count);
+					cur_pos += static_cast<size_t>(read_count);
 				}
 
 

Code/Combat/soldier.cpp

@@ -1415,19 +1415,22 @@ tm.Rotate_Z( 3.6f );
 			FileClass * file = _TheFileFactory->Get_File( name );
 tm.Pre_Rotate_X( 0.3f );
 			if ( file && file->Is_Available() ) {
-				int size = file->Size();
+				size_t size = file->Size();
 tm.Pre_Rotate_Y( 0.4f );
 				file->Open();
 tm.Pre_Rotate_Z( 0.5f );
 				while ( size > 0 ) {
 					unsigned char buffer[ 4096 ];
-					int amount = std::min( (int)size, (int)sizeof(buffer) );
+					const size_t chunk = std::min<size_t>(size, sizeof(buffer));
 tm.Translate_X( 3.1f );
-					amount = file->Read( buffer, amount );
+					const int amount = file->Read(buffer, static_cast<int>(chunk));
 tm.Translate_Y( 4.6f );
+			if (amount <= 0) {
+				break;
+					}
 					crc = CRC_Memory( buffer, amount, crc );
 tm.Translate_Z( 8.2f );
-					size -= amount;
+					size -= static_cast<size_t>(amount);
 				}
 				file->Close();
 			} else {
@@ -5308,3 +5311,4 @@ void	SoldierGameObj::Update_Locked_Facing( void )
 	}
 	*/
 
+

Code/Combat/vehicle.cpp

@@ -2253,12 +2253,12 @@ void	VehicleGameObj::Update_Damage_Meshes( void )
 				show_damage25 = true;
 			}
 
-			static const char *	DAMAGE25_BONE_NAME		= "DAMAGE25";
-			static const char *	DAMAGE50_BONE_NAME		= "DAMAGE50";
-			static const char *	DAMAGE75_BONE_NAME		= "DAMAGE75";
-			static int				DAMAGE25_BONE_NAME_LEN	= ::strlen( DAMAGE25_BONE_NAME );
-			static int				DAMAGE50_BONE_NAME_LEN	= ::strlen( DAMAGE50_BONE_NAME );
-			static int				DAMAGE75_BONE_NAME_LEN	= ::strlen( DAMAGE75_BONE_NAME );
+			static const char	DAMAGE25_BONE_NAME[]	= "DAMAGE25";
+			static const char	DAMAGE50_BONE_NAME[]	= "DAMAGE50";
+			static const char	DAMAGE75_BONE_NAME[]	= "DAMAGE75";
+			static constexpr size_t	DAMAGE25_BONE_NAME_LEN	= sizeof( DAMAGE25_BONE_NAME ) - 1;
+			static constexpr size_t	DAMAGE50_BONE_NAME_LEN	= sizeof( DAMAGE50_BONE_NAME ) - 1;
+			static constexpr size_t	DAMAGE75_BONE_NAME_LEN	= sizeof( DAMAGE75_BONE_NAME ) - 1;
 
 			//
 			//	Loop over all the bones in the model, showing and hiding any that represent

Code/Combat/viseme.cpp

@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <climits>
 #include <wwdebug.h>
 #include "viseme.h"
 #include <ctype.h>
@@ -262,7 +263,7 @@ int VisemeManager::Get_Visemes(const char *word, int *visemelist, int maxvisemes
 //
 int VisemeManager::Lookup(const char *pchar, const char * /*word*/, int viseme[]) const
 {
-	int length = 0;
+	size_t length = 0;
 
 	char ch = (char)tolower(*pchar);
 	int index = ch - 'a';
@@ -277,12 +278,13 @@ int VisemeManager::Lookup(const char *pchar, const char * /*word*/, int viseme[]
 	VisemeTableItem *pI = &gsVisemeTable[pR->StartIndex + pR->Count - 1];
 	for (int i=0; i<pR->Count; i++,pI--) {
 		length = strlen(pI->LetterCombination);
-        if ( strnicmp(pchar, pI->LetterCombination, length) == 0 )
+		if (strnicmp(pchar, pI->LetterCombination, length) == 0)
 		{
 			// found!
 			viseme[0] = pI->Visemes[0];
 			viseme[1] = pI->Visemes[1];
-			return length;
+			WWASSERT(length <= static_cast<size_t>(INT_MAX));
+			return static_cast<int>(length);
 		}
 	}
 

Code/Commando/ConsoleMode.cpp

@@ -52,6 +52,7 @@
 #include "gamesideservercontrol.h"
 #include "specialbuilds.h"
 #include "ServerSettings.h"
+#include <limits>
 
 /*
 ** Single instance of console.
@@ -865,20 +866,23 @@ void ConsoleModeClass::Update_Profile(StringClass profile_string)
 		/*
 		** Get a checksum of the profile string.
 		*/
-		unsigned long crc = CRC::Memory((unsigned char*)profile_string.Peek_Buffer(), profile_string.Get_Length());
+		const size_t profile_length = profile_string.Get_Length();
+		WWASSERT(profile_length <= static_cast<size_t>(std::numeric_limits<unsigned long>::max()));
+		unsigned long crc = CRC::Memory((unsigned char*)profile_string.Peek_Buffer(), static_cast<unsigned long>(profile_length));
 		if (crc != LastProfileCRC) {
 
 
 			/*
 			** Create a copy of the string and scan it for '%'.
 			*/
-			int len = profile_string.Get_Length();
-			char *str = (char*) alloca(len * 2);
+			const size_t len = profile_string.Get_Length();
+			WWASSERT(len <= static_cast<size_t>(std::numeric_limits<int>::max()));
+			char *str = (char*) alloca(static_cast<size_t>(len) * 2);
 			char *src = profile_string.Peek_Buffer();
 			char *dst = str;
 			char c;
 
-			for (int i=0 ; i<len ; i++) {
+			for (size_t i=0 ; i<len ; i++) {
 				c = *src++;
 				/*
 				** % = 37. Double up % sign so it prints literally.

Code/Commando/ConsoleMode.h

@@ -36,6 +36,7 @@
 
 
 #include <win.h>
+#include <cstddef>
 
 class WideStringClass;
 class StringClass;
@@ -118,7 +119,7 @@ class ConsoleModeClass
 		** Input parsing variables.
 		*/
 		unsigned long LastKeypressTime;
-		int		Pos;
+		size_t	Pos;
 
 		/*
 		** Console title bar contents.
@@ -150,4 +151,4 @@ class ConsoleModeClass
 /*
 ** Single instance of console.
 */
-extern ConsoleModeClass ConsoleBox;
+extern ConsoleModeClass ConsoleBox;

Code/Commando/DlgWOLLogon.cpp

@@ -351,9 +351,9 @@ void DlgWOLLogon::UpdatePersonas(void)
 		combo->Reset_Content();
 
 		const LoginInfoList& personas = LoginInfo::GetList();
-		const unsigned int count = personas.size();
+		const size_t count = personas.size();
 
-		for (unsigned int index = 0; index < count; ++index)
+		for (size_t index = 0; index < count; ++index)
 			{
 			const WideStringClass& name = personas[index]->GetNickname();
 			combo->Add_String(name);

Code/Commando/DlgWOLSettings.cpp

@@ -455,9 +455,9 @@ void DlgWOLSettings::InitPersonaCombo(void)
 		{
 		// Populate the persona combo box with the list of WWOnline logins.
 		const LoginInfoList& logins = LoginInfo::GetList();
-		const unsigned int count = logins.size();
+		const size_t count = logins.size();
 
-		for (unsigned int index = 0; index < count; ++index)
+		for (size_t index = 0; index < count; ++index)
 			{
 			RefPtr<LoginInfo> login = logins[index];
 			WWASSERT(login.IsValid());
@@ -707,9 +707,9 @@ void DlgWOLSettings::InitServersCombo(const IRCServerList& servers)
 		int tmpSel = -1;
 
 		// walk the list of servers and add them to the combo box
-		const unsigned int serverCount = servers.size();
+		const size_t serverCount = servers.size();
 
-		for (unsigned int index = 0; index < serverCount; ++index)
+		for (size_t index = 0; index < serverCount; ++index)
 			{
 			const RefPtr<IRCServerData>& server = servers[index];
 
@@ -733,9 +733,9 @@ void DlgWOLSettings::InitServersCombo(const IRCServerList& servers)
 						float serverLat = server->GetLattitude();
 
 						// Find the ping server with the best time that matches this server's lat/long
-						const unsigned int pingersCount = pingers.size();
+						const size_t pingersCount = pingers.size();
 
-						for (unsigned int pingindex = 0; pingindex < pingersCount; ++pingindex)
+						for (size_t pingindex = 0; pingindex < pingersCount; ++pingindex)
 							{
 							const RefPtr<PingServerData>& thisPing = pingers[pingindex];
 							float pingLong = thisPing->GetLongitude();
@@ -952,9 +952,9 @@ void DlgWOLSettings::InitLocaleCombo(void)
 		std::vector<WideStringClass> localeNames;
 		mWOLSession->GetLocaleStrings(localeNames);
 
-		const unsigned int localeCount = localeNames.size();
+		const size_t localeCount = localeNames.size();
 
-		for (unsigned int index = 0; index < localeCount; ++index)
+		for (size_t index = 0; index < localeCount; ++index)
 			{
 			WideStringClass& locale = localeNames[index];
 			combo->Add_String(locale);