Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Introduce library util

Browse Source
This commit is contained in:
momo5502
2016-09-17 00:14:59 +02:00
parent 1925b191f9
commit 25585fc9a4
9 changed files with 78 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Steam/Proxy.cpp
View File

@ -2,8 +2,8 @@
namespace Steam
{
HMODULE Proxy::Client = nullptr;
HMODULE Proxy::Overlay = nullptr;
::Utils::Library Proxy::Client;
::Utils::Library Proxy::Overlay;
bool Proxy::Inititalize()
{
@ -12,20 +12,16 @@ namespace Steam
SetDllDirectoryA(Proxy::GetSteamDirectory().data());
Proxy::Client = LoadLibraryA(STEAMCLIENT_LIB);
Proxy::Overlay = LoadLibraryA(GAMEOVERLAY_LIB);
Proxy::Client = ::Utils::Library(STEAMCLIENT_LIB, false);
Proxy::Overlay = ::Utils::Library(GAMEOVERLAY_LIB, false);
return (Proxy::Client && Proxy::Overlay);
return (Proxy::Client.Valid() && Proxy::Overlay.Valid());
}
void Proxy::Uninititalize()
{
// Freeing libraries causes crashes
//if (Proxy::Client) FreeLibrary(Proxy::Client);
Proxy::Client = nullptr;
//if (Proxy::Overlay) FreeLibrary(Proxy::Overlay);
Proxy::Overlay = nullptr;
Proxy::Client = ::Utils::Library();
Proxy::Overlay = ::Utils::Library();
}
std::string Proxy::GetSteamDirectory()
@ -46,27 +42,17 @@ namespace Steam
void Proxy::SetOverlayNotificationPosition(uint32_t eNotificationPosition)
{
if (Proxy::Overlay)
if (Proxy::Overlay.Valid())
{
FARPROC SetNotificationPositionFn = GetProcAddress(Proxy::Overlay, "SetNotificationPosition");
if (SetNotificationPositionFn)
{
::Utils::Hook::Call<void(uint32_t)>(SetNotificationPositionFn)(eNotificationPosition);
}
Proxy::Overlay.Get<void(uint32_t)>("SetNotificationPosition")(eNotificationPosition);
}
}
bool Proxy::IsOverlayEnabled()
{
if (Proxy::Overlay)
if (Proxy::Overlay.Valid())
{
FARPROC IsOverlayEnabledFn = GetProcAddress(Proxy::Overlay, "IsOverlayEnabled");
if (IsOverlayEnabledFn)
{
return ::Utils::Hook::Call<bool()>(IsOverlayEnabledFn)();
}
return Proxy::Overlay.Get<bool()>("IsOverlayEnabled")();
}
return false;
@ -74,14 +60,9 @@ namespace Steam
bool Proxy::BOverlayNeedsPresent()
{
if (Proxy::Overlay)
if (Proxy::Overlay.Valid())
{
FARPROC BOverlayNeedsPresentFn = GetProcAddress(Proxy::Overlay, "BOverlayNeedsPresent");
if (BOverlayNeedsPresentFn)
{
return ::Utils::Hook::Call<bool()>(BOverlayNeedsPresentFn)();
}
return Proxy::Overlay.Get<bool()>("BOverlayNeedsPresent")();
}
return false;

4
src/Steam/Proxy.hpp
View File

@ -22,8 +22,8 @@ namespace Steam
static bool BOverlayNeedsPresent();
private:
static HMODULE Client;
static HMODULE Overlay;
static ::Utils::Library Client;
static ::Utils::Library Overlay;
static std::string GetSteamDirectory();
};