refactor: Remove superfluous defines from Language.h (#1739)

Skyaero42 · web-flow · commit 98e4f7e04844 · 2025-10-24T18:47:48.000+02:00
diff --git a/Generals/Code/GameEngine/Include/Common/Language.h b/Generals/Code/GameEngine/Include/Common/Language.h
@@ -75,27 +75,6 @@ typedef enum
 
 } LanguageID;
 
-#define GameStrcpy wcscpy
-#define GameStrlen wcslen
-#define GameStrcat wcscat
-#define GameStrcmp wcscmp
-#define GameStrncmp wcsncmp
-#define GameStricmp wcsicmp
-#define GameStrnicmp wcsnicmp
-#define GameStrtok wcstok
-#define GameSprintf swprintf
-#define GameVsprintf vswprintf
-/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
-#define GameAtoi(S) wcstol( (S), NULL, 10)
-#define GameAtod(S) wcstod( (S), NULL )
-#define GameItoa _itow
-#define GameSscanf swscanf
-#define GameStrstr wcsstr
-#define GameStrchr wcschr
-#define GameIsDigit iswdigit
-#define GameIsAscii iswascii
-#define GameIsAlNum iswalnum
-#define GameIsAlpha iswalpha
 #define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0
 
 // INLINING ///////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
@@ -48,7 +48,6 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/Language.h"
 #include "GameClient/Image.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
@@ -196,7 +195,7 @@ Int GameWindowManager::winFontHeight( GameFont *font )
 Int GameWindowManager::winIsDigit( Int c )
 {
 
-	return GameIsDigit( c );
+	return iswdigit( c );
 
 }
 
@@ -206,7 +205,7 @@ Int GameWindowManager::winIsDigit( Int c )
 Int GameWindowManager::winIsAscii( Int c )
 {
 
-	return GameIsAscii( c );
+	return iswascii( c );
 
 }
 
@@ -216,7 +215,7 @@ Int GameWindowManager::winIsAscii( Int c )
 Int GameWindowManager::winIsAlNum( Int c )
 {
 
-	return GameIsAlNum( c );
+	return iswalnum( c );
 
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
@@ -1130,7 +1130,7 @@ void IMEManager::updateCompositionString( void )
 				else
 				{
 					m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
-					convRes = GameStrlen ( m_compositionString );
+					convRes = wcslen( m_compositionString );
 				}
 
 				// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
@@ -927,7 +927,7 @@ WideChar Keyboard::translateKey( WideChar keyCode )
 				return( m_keyNames[ ubKeyCode ].shifted2 );
 			}
 
-			if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
+			if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted );
 			}
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Language.h b/GeneralsMD/Code/GameEngine/Include/Common/Language.h
@@ -75,27 +75,6 @@ typedef enum
 
 } LanguageID;
 
-#define GameStrcpy wcscpy
-#define GameStrlen wcslen
-#define GameStrcat wcscat
-#define GameStrcmp wcscmp
-#define GameStrncmp wcsncmp
-#define GameStricmp wcsicmp
-#define GameStrnicmp wcsnicmp
-#define GameStrtok wcstok
-#define GameSprintf swprintf
-#define GameVsprintf vswprintf
-/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
-#define GameAtoi(S) wcstol( (S), NULL, 10)
-#define GameAtod(S) wcstod( (S), NULL )
-#define GameItoa _itow
-#define GameSscanf swscanf
-#define GameStrstr wcsstr
-#define GameStrchr wcschr
-#define GameIsDigit iswdigit
-#define GameIsAscii iswascii
-#define GameIsAlNum iswalnum
-#define GameIsAlpha iswalpha
 #define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0
 
 // INLINING ///////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
@@ -48,7 +48,6 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/Language.h"
 #include "GameClient/Image.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
@@ -196,7 +195,7 @@ Int GameWindowManager::winFontHeight( GameFont *font )
 Int GameWindowManager::winIsDigit( Int c )
 {
 
-	return GameIsDigit( c );
+	return iswdigit( c );
 
 }
 
@@ -206,7 +205,7 @@ Int GameWindowManager::winIsDigit( Int c )
 Int GameWindowManager::winIsAscii( Int c )
 {
 
-	return GameIsAscii( c );
+	return iswascii( c );
 
 }
 
@@ -216,7 +215,7 @@ Int GameWindowManager::winIsAscii( Int c )
 Int GameWindowManager::winIsAlNum( Int c )
 {
 
-	return GameIsAlNum( c );
+	return iswalnum( c );
 
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
@@ -1130,7 +1130,7 @@ void IMEManager::updateCompositionString( void )
 				else
 				{
 					m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
-					convRes = GameStrlen ( m_compositionString );
+					convRes = wcslen( m_compositionString );
 				}
 
 				// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
@@ -927,7 +927,7 @@ WideChar Keyboard::translateKey( WideChar keyCode )
 				return( m_keyNames[ ubKeyCode ].shifted2 );
 			}
 
-			if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
+			if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted );
 			}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@`
`48`	`48`	`#include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine`
`49`	`49`
`50`	`50`	`// USER INCLUDES //////////////////////////////////////////////////////////////`
`51`		`-#include "Common/Language.h"`
`52`	`51`	`#include "GameClient/Image.h"`
`53`	`52`	`#include "GameClient/Display.h"`
`54`	`53`	`#include "GameClient/GameWindowManager.h"`
`@@ -196,7 +195,7 @@ Int GameWindowManager::winFontHeight( GameFont *font )`
`196`	`195`	`Int GameWindowManager::winIsDigit( Int c )`
`197`	`196`	`{`
`198`	`197`
`199`		`- return GameIsDigit( c );`
	`198`	`+ return iswdigit( c );`
`200`	`199`
`201`	`200`	`}`
`202`	`201`
`@@ -206,7 +205,7 @@ Int GameWindowManager::winIsDigit( Int c )`
`206`	`205`	`Int GameWindowManager::winIsAscii( Int c )`
`207`	`206`	`{`
`208`	`207`
`209`		`- return GameIsAscii( c );`
	`208`	`+ return iswascii( c );`
`210`	`209`
`211`	`210`	`}`
`212`	`211`
`@@ -216,7 +215,7 @@ Int GameWindowManager::winIsAscii( Int c )`
`216`	`215`	`Int GameWindowManager::winIsAlNum( Int c )`
`217`	`216`	`{`
`218`	`217`
`219`		`- return GameIsAlNum( c );`
	`218`	`+ return iswalnum( c );`
`220`	`219`
`221`	`220`	`}`
`222`	`221`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ void IMEManager::updateCompositionString( void )`
`1130`	`1130`	`else`
`1131`	`1131`	`{`
`1132`	`1132`	`m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );`
`1133`		`- convRes = GameStrlen ( m_compositionString );`
	`1133`	`+ convRes = wcslen( m_compositionString );`
`1134`	`1134`	`}`
`1135`	`1135`
`1136`	`1136`	`// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters`
Original file line number	Diff line number	Diff line change
`@@ -927,7 +927,7 @@ WideChar Keyboard::translateKey( WideChar keyCode )`
`927`	`927`	`return( m_keyNames[ ubKeyCode ].shifted2 );`
`928`	`928`	`}`
`929`	`929`
`930`		`- if( isShift() \|\| getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )`
	`930`	`+ if( isShift() \|\| getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )`
`931`	`931`	`{`
`932`	`932`	`return( m_keyNames[ ubKeyCode ].shifted );`
`933`	`933`	`}`