From 5284e8987fcfc173b6c654ff30fe2a3340707b01 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 20 Aug 2022 03:15:51 +0200 Subject: [PATCH] Use abstract class for CCommandLine --- r5dev/launcher/launcher.cpp | 5 +- r5dev/public/icommandline.h | 25 +++++- r5dev/tier0/commandline.cpp | 149 ------------------------------------ r5dev/tier0/commandline.h | 25 ------ 4 files changed, 26 insertions(+), 178 deletions(-) diff --git a/r5dev/launcher/launcher.cpp b/r5dev/launcher/launcher.cpp index c2ed0faa..09bfda19 100644 --- a/r5dev/launcher/launcher.cpp +++ b/r5dev/launcher/launcher.cpp @@ -6,6 +6,7 @@ //===========================================================================// #include "core/stdafx.h" #include "tier0/commandline.h" +#include "tier1/strtools.h" #include "launcher/launcher.h" int HWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) @@ -47,9 +48,9 @@ void RemoveSpuriousGameParameters() char lastGameArg[MAX_PATH]; for (int i = 0; i < CommandLine()->ParmCount() - 1; i++) { - if (_stricmp(CommandLine()->GetParm(i), "-game") == 0) + if (Q_stricmp(CommandLine()->GetParm(i), "-game") == 0) { - _snprintf(lastGameArg, sizeof(lastGameArg), "\"%s\"", CommandLine()->GetParm(i + 1)); + Q_snprintf(lastGameArg, sizeof(lastGameArg), "\"%s\"", CommandLine()->GetParm(i + 1)); ++nGameArgs; ++i; } diff --git a/r5dev/public/icommandline.h b/r5dev/public/icommandline.h index a361c05d..1d60ebf3 100644 --- a/r5dev/public/icommandline.h +++ b/r5dev/public/icommandline.h @@ -1,9 +1,30 @@ #ifndef ICOMMANDLINE_H #define ICOMMANDLINE_H -class ICommandLine +abstract_class ICommandLine { - void* __vftable /*VFT*/; +public: + virtual void CreateCmdLine(const char* pszCommandline) = 0; + virtual void CreateCmdLine(int argc, char** argv) = 0; + virtual void CreatePool(void* pMem) = 0; + + virtual const char* GetCmdLine(void) const = 0; + + virtual const char* CheckParm(const char* psz, const char** ppszValue = NULL) const = 0; + virtual void RemoveParm(const char* pszParm) = 0; + virtual void AppendParm(const char* pszParm, const char* pszValues) = 0; + + virtual const char* ParmValue(const char* psz, const char* pDefaultVal = NULL) const = 0; + virtual int ParmValue(const char* psz, int nDefaultVal) const = 0; + virtual float ParmValue(const char* psz, float flDefaultVal) const = 0; + + virtual int ParmCount(void) const = 0; + virtual int FindParm(const char* psz) const = 0; + virtual const char* GetParm(int nIndex) const = 0; + virtual bool GuardLocked(void) const = 0; // True = mutex locked. + virtual void SetParm(int nIndex, char const* pParm) = 0; + + virtual void CleanUpParms(void) = 0; }; #endif // ICOMMANDLINE_H diff --git a/r5dev/tier0/commandline.cpp b/r5dev/tier0/commandline.cpp index 93c02a5d..2d92fd15 100644 --- a/r5dev/tier0/commandline.cpp +++ b/r5dev/tier0/commandline.cpp @@ -8,155 +8,6 @@ #include "tier0/commandline.h" #include "tier1/cvar.h" -//----------------------------------------------------------------------------- -// Purpose: -//----------------------------------------------------------------------------- -CCommandLine::CCommandLine(void) -{ - m_pszCmdLine = NULL; - m_nParmCount = 0; -} - -//----------------------------------------------------------------------------- -// Purpose: -//----------------------------------------------------------------------------- -CCommandLine::~CCommandLine(void) -{ - CleanUpParms(); - delete[] m_pszCmdLine; -} - -//----------------------------------------------------------------------------- -// Purpose: Create a command line from the passed in string -// Note that if you pass in a @filename, then the routine will read settings -// from a file instead of the command line -//----------------------------------------------------------------------------- -void CCommandLine::CreateCmdLine(const char* pszCommandline) -{ - const int index = 0; - CallVFunc(index, this, pszCommandline); -} - -//----------------------------------------------------------------------------- -// Purpose: creates a command line from the arguments passed in -//----------------------------------------------------------------------------- -void CCommandLine::CreateCmdLine(int argc, char** argv) -{ - const int index = 1; - CallVFunc(index, this, argc, argv); -} - -//----------------------------------------------------------------------------- -// Purpose: allocates a pool for the command line [seems unused] -//----------------------------------------------------------------------------- -void CCommandLine::CreatePool(void* pMem) -{ - const int index = 2; - CallVFunc(index, this, pMem); -} - -//----------------------------------------------------------------------------- -// Purpose: Return current command line -// Output : const char -//----------------------------------------------------------------------------- -const char* CCommandLine::GetCmdLine(void) -{ - const int index = 3; - return CallVFunc(index, this); -} - -//----------------------------------------------------------------------------- -// Purpose: Search for the parameter in the current commandline -// Input : *psz - -// **ppszValue - -// Output : char -//----------------------------------------------------------------------------- -const char* CCommandLine::CheckParm(const char* psz, const char** ppszValue) -{ - const int index = 4; - return CallVFunc(index, this, psz, ppszValue); -} - -//----------------------------------------------------------------------------- -// Purpose: Remove specified string ( and any args attached to it ) from command line -// Input : *pszParm - -//----------------------------------------------------------------------------- -void CCommandLine::RemoveParm(const char* pszParm) -{ - const int index = 5; - CallVFunc(index, this, pszParm); -} - -//----------------------------------------------------------------------------- -// Purpose: Append parameter and argument values to command line -// Input : *pszParm - -// *pszValues - -//----------------------------------------------------------------------------- -void CCommandLine::AppendParm(const char* pszParm, const char* pszValues) -{ - const int index = 6; - CallVFunc(index, this, pszParm, pszValues); -} - -//----------------------------------------------------------------------------- -// Purpose: returns the argument after the one specified, or the default if not found -//----------------------------------------------------------------------------- -float CCommandLine::ParmValue(const char* psz, float flDefaultVal) -{ - const int index = 7; - return CallVFunc(index, this, psz, flDefaultVal); -} -int CCommandLine::ParmValue(const char* psz, int nDefaultVal) -{ - const int index = 8; - return CallVFunc(index, this, psz, nDefaultVal); -} -const char* CCommandLine::ParmValue(const char* psz, const char* pDefaultVal) -{ - const int index = 9; - return CallVFunc(index, this, psz, pDefaultVal); -} - -//----------------------------------------------------------------------------- -// Purpose: returns individual command line arguments -//----------------------------------------------------------------------------- -int CCommandLine::ParmCount(void) -{ - const int index = 10; - return CallVFunc(index, this); -} - -int CCommandLine::FindParm(const char* psz) -{ - const int index = 11; - return CallVFunc(index, this, psz); -} - -const char* CCommandLine::GetParm(int nIndex) -{ - const int index = 12; - return CallVFunc(index, this, nIndex); -} - -void CCommandLine::SetParm(int nIndex, char const* pParm) -{ - const int index = 14; - CallVFunc(index, this, nIndex, pParm); -} - -//----------------------------------------------------------------------------- -// Individual command line arguments -//----------------------------------------------------------------------------- -void CCommandLine::CleanUpParms(void) -{ - for (int i = 0; i < m_nParmCount; ++i) - { - delete[] m_ppParms[i]; - m_ppParms[i] = NULL; - } - m_nParmCount = 0; -} - //----------------------------------------------------------------------------- // Instance singleton and expose interface to rest of code //----------------------------------------------------------------------------- diff --git a/r5dev/tier0/commandline.h b/r5dev/tier0/commandline.h index ede3007d..1baf3268 100644 --- a/r5dev/tier0/commandline.h +++ b/r5dev/tier0/commandline.h @@ -3,31 +3,6 @@ class CCommandLine : public ICommandLine // VTABLE @0x141369C78 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM { -public: - CCommandLine(void); - ~CCommandLine(void); - - void CreateCmdLine(const char* pszCommandline); - void CreateCmdLine(int argc, char** argv); - void CreatePool(void* pMem); - - const char* GetCmdLine(void); - - const char* CheckParm(const char* psz, const char** ppszValue = NULL); - void RemoveParm(const char* pszParm); - void AppendParm(const char* pszParm, const char* pszValues); - - const char* ParmValue(const char* psz, const char* pDefaultVal = NULL); - int ParmValue(const char* psz, int nDefaultVal); - float ParmValue(const char* psz, float flDefaultVal); - - int ParmCount(void); - int FindParm(const char* psz); - const char* GetParm(int nIndex); - void SetParm(int nIndex, char const* pParm); - - void CleanUpParms(void); - private: enum {