Merge branch 'master' into l10n/master

Author: Dutchman101

Client/core/CCrashDumpWriter.cpp

@@ -10,6 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <SharedUtil.Misc.h>
 
 #define MAX_MODULE_PATH 512
 
@@ -149,16 +150,16 @@ bool CExceptionInformation_Impl::GetModule(void* pQueryAddress, char* szOutputBu
      * See if we're able to use GetModuleHandleExA.  According to Microsoft,
      * this API is only available on Windows XP and Vista.
      */
-    auto pfnGetModuleHandleExA = reinterpret_cast<_pfnGetModuleHandleExA>(static_cast<void*>(GetProcAddress(hKern32, "GetModuleHandleExA")));
+    _pfnGetModuleHandleExA pfnGetModuleHandleExA = nullptr;
+    if (!SharedUtil::TryGetProcAddress(hKern32, "GetModuleHandleExA", pfnGetModuleHandleExA))
+        return false;
 
     /*
      * TODO:  Possibly use our own code to do this for other systems.
      * It is possible to enumerate all modules and get their starting/ending
      * offsets, so it would just be a simple comparison of addresses to
      * do this...
      */
-    if (NULL == pfnGetModuleHandleExA)
-        return false;
 
     if (0 == pfnGetModuleHandleExA(0x00000004 /*GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS*/, (LPCSTR)pQueryAddress, &hModule))
     {

Client/core/CExceptionInformation_Impl.cpp

@@ -10,6 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <SharedUtil.Misc.h>
 #include "CModManager.h"
 #define DECLARE_PROFILER_SECTION_CModManager
 #include "profiler/SharedUtil.Profiler.h"
@@ -186,17 +187,16 @@ bool CModManager::TryStart()
         return false;
     }
 
-    CClientBase* (__cdecl * InitClient)() = nullptr;
-    InitClient = reinterpret_cast<decltype(InitClient)>(static_cast<void*>(GetProcAddress(library, "InitClient")));
-
-    if (InitClient == nullptr)
+    using InitClientFn = CClientBase* (__cdecl*)();
+    InitClientFn initClient = nullptr;
+    if (!SharedUtil::TryGetProcAddress(library, "InitClient", initClient))
     {
         CCore::GetSingleton().GetConsole()->Printf("Unable to initialize deathmatch's DLL (missing init)");
         FreeLibrary(library);
         return false;
     }
 
-    CClientBase* client = InitClient();
+    CClientBase* client = initClient();
 
     if (client == nullptr || client->ClientInitialize(m_arguments.c_str(), CCore::GetSingletonPtr()) != 0)
     {

Client/core/CModManager.cpp

@@ -10,6 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <SharedUtil.Misc.h>
 
 using std::string;
 
@@ -62,14 +63,14 @@ PVOID CModuleLoader::GetFunctionPointer(const string& FunctionName)
 {
     if (m_bStatus)
     {
-        FARPROC fpProcAddr;
-
-        fpProcAddr = GetProcAddress(m_hLoadedModule, FunctionName.c_str());
+        FARPROC fpProcAddr = nullptr;
+        if (!SharedUtil::TryGetProcAddress(m_hLoadedModule, FunctionName.c_str(), fpProcAddr))
+            return nullptr;
 
         return static_cast<PVOID>(fpProcAddr);
     }
     else
-        return NULL;
+        return nullptr;
 }
 
 const SString& CModuleLoader::GetLastErrorMessage() const

Client/core/CModuleLoader.cpp

@@ -15,6 +15,7 @@
 #include <WinTrust.h>
 #include <SoftPub.h>
 #include <Psapi.h>
+#include <SharedUtil.Misc.h>
 
 #define STEAM_GTASA_APP_ID "12120"
 
@@ -46,6 +47,33 @@ struct HandleDeleter
 
 using HandleScope = std::unique_ptr<std::remove_pointer_t<HANDLE>, HandleDeleter>;
 
+namespace
+{
+DWORD GetProcessBaseName(HANDLE process, LPWSTR buffer, DWORD bufferLength)
+{
+    using ModuleBaseNameFn = DWORD(WINAPI*)(HANDLE, HMODULE, LPWSTR, DWORD);
+    ModuleBaseNameFn       moduleBaseNameFn = nullptr;
+
+    if (HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); kernel32 != nullptr)
+    {
+        if (SharedUtil::TryGetProcAddress(kernel32, "K32GetModuleBaseNameW", moduleBaseNameFn) ||
+            SharedUtil::TryGetProcAddress(kernel32, "GetModuleBaseNameW", moduleBaseNameFn))
+        {
+            return moduleBaseNameFn(process, nullptr, buffer, bufferLength);
+        }
+    }
+
+    HMODULE psapi = GetModuleHandleW(L"psapi.dll");
+    if (psapi == nullptr)
+        psapi = LoadLibraryW(L"psapi.dll");
+
+    if (psapi != nullptr && SharedUtil::TryGetProcAddress(psapi, "GetModuleBaseNameW", moduleBaseNameFn))
+        return moduleBaseNameFn(process, nullptr, buffer, bufferLength);
+
+    return 0;
+}
+}            // namespace
+
 struct SignerInfo
 {
     SignerInfo(HCRYPTMSG Msg)
@@ -325,7 +353,7 @@ static bool IsSteamProcess(DWORD pid)
 
     wchar_t processName[MAX_PATH];
 
-    if (!GetModuleBaseNameW(process, nullptr, processName, sizeof(processName) / sizeof(wchar_t)))
+    if (GetProcessBaseName(process, processName, static_cast<DWORD>(sizeof(processName) / sizeof(processName[0]))) == 0)
         return false;
 
     if (wcsicmp(processName, L"steam.exe") != 0)
@@ -380,7 +408,10 @@ bool CSteamClient::Load()
     static auto pAddDllDirectory = ([]() -> decltype(&AddDllDirectory) {
         if (const HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); kernel32 != nullptr)
         {
-            return reinterpret_cast<decltype(&AddDllDirectory)>(static_cast<void*>(GetProcAddress(kernel32, "AddDllDirectory")));
+            decltype(&AddDllDirectory) addDllDirectory = nullptr;
+            if (!SharedUtil::TryGetProcAddress(kernel32, "AddDllDirectory", addDllDirectory))
+                return nullptr;
+            return addDllDirectory;
         }
 
         return nullptr;
@@ -439,10 +470,8 @@ bool CSteamClient::Load()
     }
 
     releaseLibraryLock.reset();
-    
-    Native::CreateInterface = reinterpret_cast<decltype(Native::CreateInterface)>(static_cast<void*>(GetProcAddress(dll, "CreateInterface")));
 
-    if (!Native::CreateInterface)
+    if (!SharedUtil::TryGetProcAddress(dll, "CreateInterface", Native::CreateInterface))
     {
         FreeLibrary(dll);
         return false;