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

Fix bug causing init errors not getting logged

Browse Source 
Initialize console and spdlog before anything else that is using the console to log errors to (in this case, winsock init errors were never getting logged).
This commit is contained in:
Kawe Mazidjatari 2023-01-31 17:09:56 +01:00
parent 13a31febd4
commit b7dd5e11c1
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/core/dllmain.cpp
View File

@ -21,8 +21,6 @@ void SDK_Init()
CheckCPU(); // Check CPU as early as possible, SpdLog also uses SSE intrinsics.
MathLib_Init(); // Initialize Mathlib.
WinSock_Init(); // Initialize Winsock.
curl_global_init(CURL_GLOBAL_ALL);
if (strstr(GetCommandLineA(), "-launcher"))
@ -42,6 +40,8 @@ void SDK_Init()
Console_Init();
#endif // !DEDICATED
SpdLog_Init();
WinSock_Init(); // Initialize Winsock.
for (size_t i = 0; i < SDK_ARRAYSIZE(R5R_EMBLEM); i++)
{
std::string svEscaped = StringEscape(R5R_EMBLEM[i]);
@ -50,7 +50,7 @@ void SDK_Init()
spdlog::info("\n");
Systems_Init();
WinSys_Attach();
WinSys_Init();
#ifndef DEDICATED
Input_Init();
@ -77,7 +77,7 @@ void SDK_Shutdown()
WinSock_Shutdown();
Systems_Shutdown();
WinSys_Detach();
WinSys_Shutdown();
#ifndef DEDICATED
Input_Shutdown();

12
r5dev/core/init.cpp
View File

@ -153,7 +153,7 @@ void Systems_Init()
initTimer.End();
spdlog::info("+-------------------------------------------------------------+\n");
spdlog::info("Detour->Init() '{:10.6f}' seconds ('{:12d}' clocks)\n", initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
spdlog::info("{:16s} '{:10.6f}' seconds ('{:12d}' clocks)\n", "Detour->Init()", initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
initTimer.Start();
@ -179,7 +179,7 @@ void Systems_Init()
}
initTimer.End();
spdlog::info("Detour->Attach() '{:10.6f}' seconds ('{:12d}' clocks)\n", initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
spdlog::info("{:16s} '{:10.6f}' seconds ('{:12d}' clocks)\n", "Detour->Attach()", initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
spdlog::info("+-------------------------------------------------------------+\n");
ConVar::Init();
@ -219,7 +219,7 @@ void Systems_Shutdown()
DetourTransactionCommit();
shutdownTimer.End();
spdlog::info("Detour->Detach() '{:10.6f}' seconds ('{:12d}' clocks)\n", shutdownTimer.GetDuration().GetSeconds(), shutdownTimer.GetDuration().GetCycles());
spdlog::info("{:16s} '{:10.6f}' seconds ('{:12d}' clocks)\n", "Detour->Detach()", shutdownTimer.GetDuration().GetSeconds(), shutdownTimer.GetDuration().GetCycles());
spdlog::info("+-------------------------------------------------------------+\n");
}
@ -240,7 +240,7 @@ void WinSock_Init()
int nError = ::WSAStartup(MAKEWORD(2, 2), &wsaData);
if (nError != 0)
{
std::cerr << "Failed to start Winsock via WSAStartup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
spdlog::error("{:s}: Failed to start Winsock: ({:s})\n", __FUNCTION__, NET_ErrorString(WSAGetLastError()));
}
}
void WinSock_Shutdown()
@ -248,7 +248,7 @@ void WinSock_Shutdown()
int nError = ::WSACleanup();
if (nError != 0)
{
std::cerr << "Failed to stop Winsock via WSACleanup: (" << NET_ErrorString(WSAGetLastError()) << ")" << std::endl;
spdlog::error("{:s}: Failed to stop Winsock: ({:s})\n", __FUNCTION__, NET_ErrorString(WSAGetLastError()));
}
}
void QuerySystemInfo()
@ -404,6 +404,8 @@ void DetourRegister() // Register detour classes to be searched and hooked.
// Launcher
REGISTER(VPRX);
REGISTER(VLauncher);
REGISTER(VAppSystemGroup);
REGISTER(VApplication);
// FileSystem

9
r5dev/windows/system.cpp
View File

@ -77,15 +77,10 @@ ConsoleHandlerRoutine(
void WinSys_Init()
{
#ifdef DEDICATED
VGetVersionExA = (IGetVersionExA)DetourFindFunction("KERNEL32.dll", "GetVersionExA");
VPeekMessageA = (IPeekMessage)DetourFindFunction("USER32.dll", "PeekMessageA");
VPeekMessageW = (IPeekMessage)DetourFindFunction("USER32.dll", "PeekMessageW");
}
void WinSys_Attach()
{
#ifdef DEDICATED
WinSys_Init();
///////////////////////////////////////////////////////////////////////////
DetourTransactionBegin();
@ -106,7 +101,7 @@ void WinSys_Attach()
#endif // DEDICATED
}
void WinSys_Detach()
void WinSys_Shutdown()
{
#ifdef DEDICATED
///////////////////////////////////////////////////////////////////////////

4
r5dev/windows/system.h
View File

@ -5,5 +5,5 @@ WINAPI
ConsoleHandlerRoutine(
DWORD eventCode);
void WinSys_Attach();
void WinSys_Detach();
void WinSys_Init();
void WinSys_Shutdown();