R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move 'PrintLastError()' to utility.cpp

Browse Source
This commit is contained in:
Amos 2022-01-19 23:14:50 +01:00
parent b1d3a01a71
commit 03e700bac1
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
r5dev/public/include/utility.h
View File

@ -11,6 +11,7 @@ DWORD64 FindPatternSIMD(const char* szModule, const unsigned char* szPattern, co
/////////////////////////////////////////////////////////////////////////////
// Utility
void DbgPrint(LPCSTR sFormat, ...);
void PrintLastError(void);
void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize);
std::string Base64Encode(const std::string& in);
std::string Base64Decode(const std::string& in);

16
r5dev/public/utility.cpp
View File

@ -133,6 +133,22 @@ void DbgPrint(LPCSTR sFormat, ...)
OutputDebugString(sBuffer);
}
///////////////////////////////////////////////////////////////////////////////
// For printing the last error to the console if any.
void PrintLastError(void)
{
DWORD errorMessageID = ::GetLastError();
if (errorMessageID != NULL)
{
LPSTR messageBuffer = nullptr;
size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
spdlog::error("{}\n", messageBuffer);
LocalFree(messageBuffer);
}
}
///////////////////////////////////////////////////////////////////////////////
// For dumping data from a buffer to a file on the disk
void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize)

2
r5dev/sdklauncher.vcxproj
View File

@ -184,6 +184,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="public\utility.cpp" />
<ClCompile Include="sdklauncher\sdklauncher.cpp" />
<ClCompile Include="thirdparty\detours\src\creatwth.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
@ -211,6 +212,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="core\stdafx.h" />
<ClInclude Include="public\include\utility.h" />
<ClInclude Include="sdklauncher\sdklauncher.h" />
<ClInclude Include="sdklauncher\sdklauncher_res.h" />
<ClInclude Include="thirdparty\detours\include\detours.h" />

6
r5dev/sdklauncher.vcxproj.filters
View File

@ -39,6 +39,9 @@
<ClCompile Include="thirdparty\detours\src\creatwth.cpp">
<Filter>Detours Files</Filter>
</ClCompile>
<ClCompile Include="public\utility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resource\sdklauncher.rc">
@ -64,6 +67,9 @@
<ClInclude Include="thirdparty\detours\include\detours.h">
<Filter>Detours Files\include</Filter>
</ClInclude>
<ClInclude Include="public\include\utility.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="resource\ico\sdklauncher_rel.ico">

19
r5dev/sdklauncher/sdklauncher.cpp
View File

@ -2,24 +2,7 @@
#include "sdklauncher.h"
//-----------------------------------------------------------------------------
// Print the error message to the console if any.
//-----------------------------------------------------------------------------
void PrintLastError()
{
DWORD errorMessageID = ::GetLastError();
if (errorMessageID != NULL)
{
LPSTR messageBuffer = nullptr;
size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
spdlog::error("{}\n", messageBuffer);
LocalFree(messageBuffer);
}
}
//-----------------------------------------------------------------------------
// Purpose case switch:
// Purpose switch case:
// * Launch the game in user specified mode and state.
// * Load specified command line arguments from a file on the disk.
// * Format the file paths for the game exe and specified hook dll.