Remove instances of strupr and replace with openw3d version

Author: rm5248

Code/Combat/refinerygameobj.cpp

@@ -487,7 +487,7 @@ RefineryGameObj::CnC_Initialize (BaseControllerClass *base)
 		if (anim_phys_obj != NULL && anim_phys_obj->Peek_Model () != NULL) {
 
 			StringClass name = anim_phys_obj->Peek_Model ()->Get_Name ();
-			::strupr (name.Peek_Buffer ());
+            name.To_Upper();
 			if (::strstr (name, "REF_TIB_DUMP") != NULL) {
 
 				//

Code/Combat/warfactorygameobj.cpp

@@ -398,7 +398,7 @@ WarFactoryGameObj::CnC_Initialize (BaseControllerClass *base)
 		if (anim_phys_obj != NULL && anim_phys_obj->Peek_Model () != NULL) {
 
 			StringClass name = anim_phys_obj->Peek_Model ()->Get_Name ();
-			::strupr (name.Peek_Buffer ());
+            name.To_Upper();
 			if (::strstr (name, "WEP#CONSTRUCT") != NULL) {
 
 				//

Code/Commando/GameSpyBanList.cpp

@@ -54,6 +54,7 @@
 #include "sctextobj.h"
 #include "ConsoleMode.h"
 #include "gamesideservercontrol.h"
+#include "wwstring.h"
 #include <cstdio>
 
 
@@ -212,7 +213,7 @@ bool cGameSpyBanList::Is_User_Banned(const char *nickname, const char *challenge
 			char *a = strdup(t->Get_Nick_Name());
 			char *b = strdup(nickname);
 
-			_strupr(a); _strupr(b);
+            openw3d::string_to_upper(a); openw3d::string_to_upper(b);
 
 			//
 			// This code means that you can put a BAN name in as
@@ -343,4 +344,4 @@ void cGameSpyBanList::LoadBans(void) {
 		BanList->Add_Tail(t);
 	}
 	fclose(outf);
-}
+}

Code/Commando/dlgcncwinscreen.cpp

@@ -307,7 +307,7 @@ CNCWinScreenMenuClass::On_Init_Dialog (void)
 		//
 		// Strip off the .mix if present.
 		//
-		strupr(map_name);
+        openw3d::string_to_upper(map_name);
 		char *dot = strstr(map_name, ".MIX");
 		strcpy(map_name, The_Game()->Get_Map_Name());
 		if (dot) {
@@ -669,4 +669,4 @@ CNCWinScreenMenuClass::Build_Player_Display_Name (const cPlayer *player, WideStr
 #endif
 
 	outName = player->Get_Name();
-}
+}

Code/SControl/servercontrol.cpp

@@ -41,6 +41,7 @@
 #include	"servercontrol.h"
 #include "systimer.h"
 #include <limits>
+#include "wwstring.h"
 
 /*
 ** Single instance of server control.
@@ -261,7 +262,7 @@ void ServerControlClass::Parse_Message(void *buffer, int len, unsigned int addre
 		char text[MAX_SERVER_CONTROL_MESSAGE_SIZE + 1];
 		memcpy(text, message->Message, MAX_SERVER_CONTROL_MESSAGE_SIZE);
 		text[MAX_SERVER_CONTROL_MESSAGE_SIZE] = 0;
-		strupr(text);
+        openw3d::string_to_upper(text);
 
 		switch (message->Type) {
 			/*
@@ -568,4 +569,4 @@ void ServerControlClass::Set_Welcome_Message(char *message)
 		memset(WelcomeMessage, 0, sizeof(WelcomeMessage));
 		strncpy(WelcomeMessage, message, sizeof(WelcomeMessage)-1);
 	}
-}
+}

Code/Tools/LightMap/LightMapDoc.cpp

@@ -1684,7 +1684,7 @@ BOOL LightMapDoc::OnSaveDocument (LPCTSTR pathname)
 			strcpy (lightmapdirectory, filename);
 
 			// Convert filename to uppercase.
-			_strupr (filename);
+			openw3d::string_to_upper (filename);
 
 			W3dFile->Open (FileClass::READ);
 

Code/Tools/MixViewer/AVAssetSuck.cpp

@@ -102,7 +102,7 @@ void AVAssetSuckerClass::Thread_Suck(void)
 		for (int i=0 ; i<filename_list.Count() ; i++) {
 
 			strcpy(name, filename_list[i].Peek_Buffer());
-			strupr(name);
+            openw3d::string_to_upper(name);
 
 			if (strstr(name, ".WAV") == 0) {
 				if (strstr(name, ".TGA") == 0) {

Code/Tools/MixViewer/MixPatchMaker.cpp

@@ -117,7 +117,7 @@ void MixPatchMakerClass::Thread_Make(void)
 			for (int i=0 ; i<new_filename_list.Count() ; i++) {
 
 				strcpy(name, new_filename_list[i].Peek_Buffer());
-				strupr(name);
+                openw3d::string_to_upper(name);
 				bool copy = false;
 
 				if (stricmp(name, "STRINGS.TDB") == 0) {
@@ -448,4 +448,4 @@ bool MixPatchMakerClass::Find_File(char *file_name, char *path, char *found_path
 	}
 
 	return(false);
-}
+}

Code/Tools/max2w3d/util.cpp

@@ -311,12 +311,12 @@ void Create_Relative_Path(char *rel_path,	const char *curr, const char *full_pat
 	int curr_len = strlen(curr);
 	char *up_curr = (char *)malloc(curr_len + 1);
 	strcpy(up_curr, curr);
-	_strupr(up_curr);
+	openw3d::string_to_upper(up_curr);
 
 	int full_len = strlen(full_path);
 	char *up_full = (char *)malloc(full_len + 1);
 	strcpy(up_full, full_path);
-	_strupr(up_full);
+	openw3d::string_to_upper(up_full);
 
 	char *rel_p = rel_path;
 

Code/ww3d2/animatedsoundmgr.cpp

@@ -223,7 +223,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 			//	Get the animation name from the section name
 			//
 			StringClass animation_name = section->Section;
-			::strupr (animation_name.Peek_Buffer ());
+            animation_name.To_Upper();
 
 			//
 			//	Allocate a sound list
@@ -354,7 +354,7 @@ AnimatedSoundMgrClass::Find_Sound_List (HAnimClass *anim)
 	//
 	//	Make the name uppercase
 	//
-	::strupr (full_name.Peek_Buffer ());
+    full_name.To_Upper();
 
 	//
 	//	Lookup the sound list for this animation