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

Better quit_hard

Browse Source
This commit is contained in:
Diavolo 2021-07-18 17:36:01 +02:00
parent 26d8a5885b
commit a6b17cf64d
5 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/Command.cpp
View File

@ -252,7 +252,7 @@ namespace Components
Game::TeleportPlayer(&Game::g_entities[clientNum], pos, orientation);
// Logging that will spam the console and screen if people use cinematics
//Logging that will spam the console and screen if people use cinematics
//Logger::Print("Successfully teleported player!\n");
//Toast::Show("cardicon_abduction", "Success", "You have been teleported!", toastDurationShort);
});

34
src/Components/Modules/QuickPatch.cpp
View File

@ -399,36 +399,10 @@ namespace Components
// quit_hard
Command::Add("quit_hard", [](Command::Params*)
{
typedef enum _HARDERROR_RESPONSE_OPTION {
OptionAbortRetryIgnore,
OptionOk,
OptionOkCancel,
OptionRetryCancel,
OptionYesNo,
OptionYesNoCancel,
OptionShutdownSystem
} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
typedef enum _HARDERROR_RESPONSE {
ResponseReturnToCaller,
ResponseNotHandled,
ResponseAbort,
ResponseCancel,
ResponseIgnore,
ResponseNo,
ResponseOk,
ResponseRetry,
ResponseYes
} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE;
BOOLEAN hasPerms;
HARDERROR_RESPONSE response;
auto result = ImportFunction<NTSTATUS __stdcall(ULONG, BOOLEAN, BOOLEAN, PBOOLEAN)>("ntdll.dll", "RtlAdjustPrivilege")
(19, true, false, &hasPerms);
result = ImportFunction<NTSTATUS __stdcall(NTSTATUS, ULONG, LPCSTR, PVOID, HARDERROR_RESPONSE_OPTION, PHARDERROR_RESPONSE)>("ntdll.dll", "NtRaiseHardError")
(0xC000007B /*0x0000000A*/, 0, nullptr, nullptr, OptionShutdownSystem, &response);
int data = false;
const Utils::Library ntdll("ntdll.dll");
ntdll.invoke_pascal<void>("RtlAdjustPrivilege", 19, true, false, &data);
ntdll.invoke_pascal<void>("NtRaiseHardError", 0xC000007B, 0, nullptr, nullptr, 6, &data);
});
// bounce dvar

10
src/Steam/Proxy.cpp
View File

@ -384,11 +384,11 @@ namespace Steam
Proxy::LaunchWatchGuard();
Proxy::Overlay = ::Utils::Library(GAMEOVERLAY_LIB, false);
if (!Proxy::Overlay.valid()) return false;
if (!Proxy::Overlay.is_valid()) return false;
}
Proxy::Client = ::Utils::Library(STEAMCLIENT_LIB, false);
if (!Proxy::Client.valid()) return false;
if (!Proxy::Client.is_valid()) return false;
Proxy::SteamClient = Proxy::Client.get<ISteamClient008*(const char*, int*)>("CreateInterface")("SteamClient008", nullptr);
if(!Proxy::SteamClient) return false;
@ -526,7 +526,7 @@ namespace Steam
void Proxy::SetOverlayNotificationPosition(uint32_t eNotificationPosition)
{
if (Proxy::Overlay.valid())
if (Proxy::Overlay.is_valid())
{
Proxy::Overlay.get<void(uint32_t)>("SetNotificationPosition")(eNotificationPosition);
}
@ -534,7 +534,7 @@ namespace Steam
bool Proxy::IsOverlayEnabled()
{
if (Proxy::Overlay.valid())
if (Proxy::Overlay.is_valid())
{
return Proxy::Overlay.get<bool()>("IsOverlayEnabled")();
}
@ -544,7 +544,7 @@ namespace Steam
bool Proxy::BOverlayNeedsPresent()
{
if (Proxy::Overlay.valid())
if (Proxy::Overlay.is_valid())
{
return Proxy::Overlay.get<bool()>("BOverlayNeedsPresent")();
}

6
src/Utils/Library.cpp
View File

@ -15,9 +15,9 @@ namespace Utils
}
}
bool Library::valid()
bool Library::is_valid() const
{
return (this->getModule() != nullptr);
return this->_module != nullptr;
}
HMODULE Library::getModule()
@ -27,7 +27,7 @@ namespace Utils
void Library::free()
{
if (this->valid())
if (this->is_valid())
{
FreeLibrary(this->getModule());
}

39
src/Utils/Library.hpp
View File

@ -9,18 +9,45 @@ namespace Utils
Library(const std::string& buffer, bool freeOnDestroy = true);
~Library();
bool valid();
bool is_valid() const;
HMODULE getModule();
template <typename T>
std::function<T> get(const std::string& process)
T get_proc(const std::string& process) const
{
if (!this->valid())
{
throw std::runtime_error("Library not loaded!");
if (!this->is_valid()) T{};
return reinterpret_cast<T>(GetProcAddress(this->_module, process.data()));
}
return reinterpret_cast<T*>(GetProcAddress(this->getModule(), process.data()));
template <typename T>
std::function<T> get(const std::string& process) const
{
if (!this->is_valid()) return std::function<T>();
return static_cast<T*>(this->get_proc<void*>(process));
}
template <typename T, typename... Args>
T invoke(const std::string& process, Args ... args) const
{
auto method = this->get<T(__cdecl)(Args ...)>(process);
if (method) return method(args...);
return T();
}
template <typename T, typename... Args>
T invoke_pascal(const std::string& process, Args ... args) const
{
auto method = this->get<T(__stdcall)(Args ...)>(process);
if (method) return method(args...);
return T();
}
template <typename T, typename... Args>
T invoke_this(const std::string& process, void* this_ptr, Args ... args) const
{
auto method = this->get<T(__thiscall)(void*, Args ...)>(this_ptr, process);
if (method) return method(args...);
return T();
}
void free();