diff --git a/Generals/Code/GameEngine/Include/Common/Language.h b/Generals/Code/GameEngine/Include/Common/Language.h index d03ed08d98..857e12d801 100644 --- 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 index b600d6baf1..5db11bdbb3 100644 --- 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 index 6e2c250e2d..edb2f8c3dc 100644 --- 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 index c1eee9113b..5fa92da9b5 100644 --- 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 index cc1b80e263..203842054b 100644 --- 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 index ed965acaec..440f22106d 100644 --- 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 index cbe3698614..6f73416b85 100644 --- 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 index 5aa73b077d..3a1704a96b 100644 --- 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 ); }