Skip to content

Commit

Permalink
Loader: major codestyle changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SNMetamorph committed Nov 4, 2023
1 parent 09eb8c8 commit 6543f8f
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 49 deletions.
24 changes: 12 additions & 12 deletions sources/exception.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,37 @@ CException::CException(
int lineNumber
)
{
m_szFuncName = funcName;
m_szFileName = fileName;
m_szDescription = description;
m_iLineNumber = lineNumber;
m_szMessage.clear();
m_funcName = funcName;
m_fileName = fileName;
m_description = description;
m_lineNumber = lineNumber;
m_message.clear();
}

const std::string &CException::GetFormattedMessage()
{
std::stringstream exMessage;
exMessage << m_szFuncName << "() [" << m_szFileName << ":" << m_iLineNumber << "]: " << m_szDescription << "\n";
m_szMessage = exMessage.str();
return m_szMessage;
exMessage << m_funcName << "() [" << m_fileName << ":" << m_lineNumber << "]: " << m_description << "\n";
m_message = exMessage.str();
return m_message;
}

const std::string &CException::GetDescription() const
{
return m_szDescription;
return m_description;
}

const std::string &CException::GetFunctionName() const
{
return m_szFuncName;
return m_funcName;
}

const std::string &CException::GetFileName() const
{
return m_szFileName;
return m_fileName;
}

int CException::GetLineNumber() const
{
return m_iLineNumber;
return m_lineNumber;
}
10 changes: 5 additions & 5 deletions sources/exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ class CException
};

private:
int m_iLineNumber;
std::string m_szDescription;
std::string m_szFuncName;
std::string m_szFileName;
std::string m_szMessage;
int m_lineNumber;
std::string m_description;
std::string m_funcName;
std::string m_fileName;
std::string m_message;
};

10 changes: 5 additions & 5 deletions sources/loader/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ void CApplication::ParseParameters(int argc, char *argv[])
if (parameter.compare("+process_name") == 0)
{
std::string argument = argv[++i];
m_szProcessName = argument;
m_processName = argument;
continue;
}
else if (parameter.compare("+library_name") == 0)
{
std::string argument = argv[++i];
m_szLibraryName = argument;
m_libraryName = argument;
continue;
}
else if (parameter.compare("+inject_delay") == 0)
{
std::string argument = argv[++i];
m_iInjectDelay = std::stoi(argument);
m_injectDelay = std::stoi(argument);
continue;
}
}
Expand All @@ -69,7 +69,7 @@ void CApplication::StartMainLoop()
PrintTitleText();
try
{
InjectStatus status = m_pInjectStrategy->Start(m_iInjectDelay, m_szProcessName, m_szLibraryName);
InjectStatus status = m_injectStrategy->Start(m_injectDelay, m_processName, m_libraryName);
if (status == InjectStatus::Success || status == InjectStatus::AlreadyInjected) {
break;
}
Expand Down Expand Up @@ -112,6 +112,6 @@ void CApplication::PrintTitleText()
void CApplication::InitInjectStrategy()
{
#ifdef _WIN32
m_pInjectStrategy = std::make_unique<CWin32InjectStrategy>();
m_injectStrategy = std::make_unique<CWin32InjectStrategy>();
#endif
}
8 changes: 4 additions & 4 deletions sources/loader/application.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class CApplication
void PrintTitleText();
void InitInjectStrategy();

size_t m_iInjectDelay = 3000;
std::unique_ptr<IInjectStrategy> m_pInjectStrategy;
std::string m_szProcessName = DEFAULT_PROCESS_NAME;
std::string m_szLibraryName = DEFAULT_LIBRARY_NAME;
size_t m_injectDelay = 3000;
std::unique_ptr<IInjectStrategy> m_injectStrategy;
std::string m_processName = DEFAULT_PROCESS_NAME;
std::string m_libraryName = DEFAULT_LIBRARY_NAME;
};
34 changes: 17 additions & 17 deletions sources/string_stack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,53 @@ GNU General Public License for more details.

CStringStack::CStringStack(int stringLen)
{
m_iStackIndex = 0;
m_iStringLen = stringLen;
m_StringBuffer.clear();
m_stackIndex = 0;
m_stringLen = stringLen;
m_stringBuffer.clear();
}

void CStringStack::Push(const char *str)
{
AllocString();
char *stringAddr = &m_StringBuffer[m_iStackIndex * m_iStringLen];
strncpy(stringAddr, str, m_iStringLen);
++m_iStackIndex;
char *stringAddr = &m_stringBuffer[m_stackIndex * m_stringLen];
strncpy(stringAddr, str, m_stringLen);
++m_stackIndex;
}

void CStringStack::PushPrintf(const char *format, ...)
{
va_list args;
AllocString();
char *stringAddr = &m_StringBuffer[m_iStackIndex * m_iStringLen];
char *stringAddr = &m_stringBuffer[m_stackIndex * m_stringLen];
va_start(args, format);
vsnprintf(stringAddr, m_iStringLen, format, args);
vsnprintf(stringAddr, m_stringLen, format, args);
va_end(args);
++m_iStackIndex;
++m_stackIndex;
}

void CStringStack::Pop()
{
if (m_iStackIndex > 0)
--m_iStackIndex;
if (m_stackIndex > 0)
--m_stackIndex;
}

void CStringStack::Clear()
{
m_iStackIndex = 0;
m_stackIndex = 0;
}

const char *CStringStack::StringAt(int index) const
{
if (index >= 0 && index < m_iStackIndex)
return &m_StringBuffer[index * m_iStringLen];
if (index >= 0 && index < m_stackIndex)
return &m_stringBuffer[index * m_stringLen];
else
return nullptr;
}

void CStringStack::AllocString()
{
int currentSize = m_StringBuffer.size();
int desiredSize = m_iStackIndex * m_iStringLen + m_iStringLen;
int currentSize = m_stringBuffer.size();
int desiredSize = m_stackIndex * m_stringLen + m_stringLen;
if (currentSize < desiredSize)
m_StringBuffer.resize(desiredSize);
m_stringBuffer.resize(desiredSize);
}
12 changes: 6 additions & 6 deletions sources/string_stack.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ class CStringStack
void Push(const char *str);
void PushPrintf(const char *format, ...);

inline int GetStringLength() const { return m_iStringLen; };
inline int GetStringCount() const { return m_iStackIndex; };
inline int GetBufferSize() const { return m_StringBuffer.capacity(); };
inline int GetStringLength() const { return m_stringLen; };
inline int GetStringCount() const { return m_stackIndex; };
inline int GetBufferSize() const { return m_stringBuffer.capacity(); };
const char *StringAt(int index) const;

private:
void AllocString();

int m_iStackIndex = 0;
int m_iStringLen = 0;
std::vector<char> m_StringBuffer;
int m_stackIndex = 0;
int m_stringLen = 0;
std::vector<char> m_stringBuffer;
};

0 comments on commit 6543f8f

Please sign in to comment.