Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'momo5502:main' into main

Browse Source
This commit is contained in:
Mike 2023-03-17 08:46:23 -04:00 committed by GitHub
commit 4715f22611
9 changed files with 149 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/curl vendored

@ -1 +1 @@
Subproject commit f6d6f3ce01e377932f1ce7c24ee34d45a36950b8
Subproject commit 1b9ea3239d22147e00d8cccb666cd8f9344b181e

11
src/client/component/dvars_patches.cpp
View File

@ -13,16 +13,11 @@ namespace dvars_patches
{
void patch_dvars()
{
if (game::is_server())
{
game::register_dvar_bool("com_pauseSupported", false, game::DVAR_NONE, "Whether is pause is ever supported by the game mode");
}
game::register_sessionmode_dvar_bool("com_pauseSupported", !game::is_server(), game::DVAR_SERVERINFO, "Whether is pause is ever supported by the game mode");
}
void patch_flags()
{
game::dvar_set_flags("com_pauseSupported", game::DVAR_SERVERINFO);
if (game::is_client())
{
game::dvar_set_flags("r_dof_enable", game::DVAR_ARCHIVE);
@ -65,8 +60,8 @@ namespace dvars_patches
public:
void post_unpack() override
{
patch_dvars();
scheduler::once(patch_flags, scheduler::pipeline::main, 10s);
scheduler::once(patch_dvars, scheduler::pipeline::main);
scheduler::once(patch_flags, scheduler::pipeline::main);
if (game::is_server())
{

155
src/client/component/steam_proxy.cpp
View File

@ -7,8 +7,6 @@
#include <utils/finally.hpp>
#include <utils/concurrency.hpp>
#include "game/utils.hpp"
#include "steam/interface.hpp"
#include "steam/steam.hpp"
@ -22,8 +20,8 @@ namespace steam_proxy
utils::nt::library steam_client_module{};
utils::nt::library steam_overlay_module{};
void* steam_pipe = nullptr;
void* global_user = nullptr;
steam::HSteamPipe steam_pipe = 0;
steam::HSteamUser global_user = 0;
steam::interface client_engine{};
steam::interface client_user{};
@ -31,6 +29,9 @@ namespace steam_proxy
steam::interface client_friends{};
steam::interface client_ugc{};
steam::client* steam_client{};
steam::ugc* steam_ugc{};
utils::concurrency::container<subscribed_item_map> subscribed_items;
enum class ownership_state
@ -64,6 +65,8 @@ namespace steam_proxy
void load_client()
{
SetEnvironmentVariableA("SteamAppId", std::to_string(steam::SteamUtils()->GetAppID()).data());
const std::filesystem::path steam_path = steam::SteamAPI_GetSteamInstallPath();
if (steam_path.empty()) return;
@ -76,8 +79,8 @@ namespace steam_proxy
client_engine = load_client_engine();
if (!client_engine) return;
steam_pipe = steam_client_module.invoke<void*>("Steam_CreateSteamPipe");
global_user = steam_client_module.invoke<void*>(
steam_pipe = steam_client_module.invoke<steam::HSteamPipe>("Steam_CreateSteamPipe");
global_user = steam_client_module.invoke<steam::HSteamUser>(
"Steam_ConnectToGlobalUser", steam_pipe);
client_user = client_engine.invoke<void*>(8, global_user, steam_pipe);
@ -94,19 +97,21 @@ namespace steam_proxy
client_friends = nullptr;
client_ugc = nullptr;
steam_pipe = nullptr;
global_user = nullptr;
steam_pipe = 0;
global_user = 0;
steam_client_module = utils::nt::library{nullptr};
steam_client = nullptr;
steam_ugc = nullptr;
}
bool perform_cleanup_if_needed()
{
if (steam_client) return true;
if (steam_client_module
&& steam_pipe
&& global_user
&& steam_client_module.invoke<bool>("Steam_BConnected", global_user,
steam_pipe)
&& steam_client_module.invoke<bool>("Steam_BConnected", global_user, steam_pipe)
&& steam_client_module.invoke<bool>("Steam_BLoggedOn", global_user, steam_pipe)
)
{
@ -224,7 +229,16 @@ namespace steam_proxy
void pre_destroy() override
{
if (steam_client_module && steam_pipe)
if (steam_client)
{
if (global_user)
{
steam_client->ReleaseUser(steam_pipe, global_user);
}
steam_client->BReleaseSteamPipe(steam_pipe);
}
else if (steam_client_module && steam_pipe)
{
if (global_user)
{
@ -232,7 +246,7 @@ namespace steam_proxy
global_user);
}
steam_client_module.invoke<bool>("Steam_BReleaseSteamPipe", steam_pipe);
(void)steam_client_module.invoke<bool>("Steam_BReleaseSteamPipe", steam_pipe);
}
}
@ -257,6 +271,87 @@ namespace steam_proxy
return "";
}
void initialize()
{
if (client_engine || !steam_client_module) return;
steam_client = steam_client_module.invoke<steam::client*>("CreateInterface", "SteamClient017", nullptr);
if (!steam_client) return;
steam_pipe = steam_client->CreateSteamPipe();
global_user = steam_client->ConnectToGlobalUser(steam_pipe);
}
void create_ugc()
{
if (!steam_client) return;
auto* ugc = steam_client->GetISteamUGC(global_user, steam_pipe, "STEAMUGC_INTERFACE_VERSION008");
steam_ugc = static_cast<steam::ugc*>(ugc);
}
void update_map_client(subscribed_item_map& map)
{
const auto app_id = steam::SteamUtils()->GetAppID();
const auto num_items = client_ugc.invoke<uint32_t>("GetNumSubscribedItems", app_id);
if (!num_items)
{
return;
}
std::vector<uint64_t> ids;
ids.resize(num_items);
auto result = client_ugc.invoke<uint32_t>("GetSubscribedItems", app_id, ids.data(),
num_items);
result = std::min(num_items, result);
for (uint32_t i = 0; i < result; ++i)
{
char buffer[0x1000] = {0};
subscribed_item item{};
item.state = client_ugc.invoke<uint32_t>("GetItemState", app_id, ids[i]);
item.available = client_ugc.invoke<bool>("GetItemInstallInfo", app_id, ids[i],
&item.size_on_disk,
buffer,
sizeof(buffer), &item.time_stamp);
item.path = buffer;
map[ids[i]] = std::move(item);
}
}
void update_map_steam(subscribed_item_map& map)
{
const auto num_items = steam_ugc->GetNumSubscribedItems();
if (!num_items)
{
return;
}
std::vector<uint64_t> ids;
ids.resize(num_items);
auto result = steam_ugc->GetSubscribedItems(ids.data(), num_items);
result = std::min(num_items, result);
for (uint32_t i = 0; i < result; ++i)
{
char buffer[0x1000] = {0};
subscribed_item item{};
item.state = steam_ugc->GetItemState(ids[i]);
item.available = steam_ugc->GetItemInstallInfo(ids[i], &item.size_on_disk, buffer, sizeof(buffer),
&item.time_stamp);
item.path = buffer;
map[ids[i]] = std::move(item);
}
}
void update_subscribed_items()
{
subscribed_item_map map{};
@ -269,41 +364,15 @@ namespace steam_proxy
});
});
if (!client_ugc)
{
return;
}
try
{
const auto app_id = steam::SteamUtils()->GetAppID();
const auto num_items = client_ugc.invoke<uint32_t>("GetNumSubscribedItems", app_id);
if (!num_items)
if (client_ugc)
{
return;
update_map_client(map);
}
std::vector<uint64_t> ids;
ids.resize(num_items);
auto result = client_ugc.invoke<uint32_t>("GetSubscribedItems", app_id, ids.data(),
num_items);
result = std::min(num_items, result);
for (uint32_t i = 0; i < result; ++i)
else if (steam_ugc)
{
char buffer[0x1000] = {0};
subscribed_item item{};
item.state = client_ugc.invoke<uint32_t>("GetItemState", app_id, ids[i]);
item.available = client_ugc.invoke<bool>("GetItemInstallInfo", app_id, ids[i],
&item.size_on_disk,
buffer,
sizeof(buffer), &item.time_stamp);
item.path = buffer;
map[ids[i]] = std::move(item);
update_map_steam(map);
}
}
catch (...)

3
src/client/component/steam_proxy.hpp
View File

@ -18,6 +18,9 @@ namespace steam_proxy
using subscribed_item_map = std::unordered_map<uint64_t, subscribed_item>;
void initialize();
void create_ugc();
void update_subscribed_items();
void access_subscribed_items(const std::function<void(const subscribed_item_map&)>& callback);
}

4
src/client/game/symbols.hpp
View File

@ -108,6 +108,10 @@ namespace game
const char* description)> Dvar_RegisterBool{
0x1422D0900, 0x14057B500
};
WEAK symbol<dvar_t* (dvarStrHash_t hash, const char* dvarName, bool value, dvarFlags_e flags,
const char* description)> Dvar_SessionModeRegisterBool{
0x1422D0D40, 0x14057BAA0
};
WEAK symbol<dvar_t*(dvarStrHash_t hash, const char* dvarName, const char* value, dvarFlags_e flags,
const char* description)> Dvar_RegisterString{
0x1422D0B70

13
src/client/game/utils.cpp
View File

@ -38,6 +38,19 @@ namespace game
return dvar->current.value.enabled;
}
dvar_t* register_sessionmode_dvar_bool(const char* dvar_name, const bool value, const dvarFlags_e flags, const char* description)
{
const auto hash = Dvar_GenerateHash(dvar_name);
auto registered_dvar = Dvar_SessionModeRegisterBool(hash, dvar_name, value, flags, description);
if (registered_dvar)
{
registered_dvar->debugName = dvar_name;
}
return registered_dvar;
}
dvar_t* register_dvar_bool(const char* dvar_name, const bool value, const dvarFlags_e flags, const char* description)
{
const auto hash = Dvar_GenerateHash(dvar_name);

1
src/client/game/utils.hpp
View File

@ -9,6 +9,7 @@ namespace game
bool get_dvar_bool(const char* dvar_name);
dvar_t* register_dvar_bool(const char* dvar_name, bool value, dvarFlags_e flags, const char* description);
dvar_t* register_sessionmode_dvar_bool(const char* dvar_name, const bool value, const dvarFlags_e flags, const char* description);
void dvar_add_flags(const char* dvar, dvarFlags_e flags);
void dvar_set_flags(const char* dvar_name, dvarFlags_e flags);
}

8
src/client/steam/interfaces/client.cpp
View File

@ -1,5 +1,6 @@
#include <std_include.hpp>
#include "../steam.hpp"
#include "../../component/steam_proxy.hpp"
namespace steam
{
@ -225,6 +226,13 @@ namespace steam
void* client::GetISteamUGC(HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char* pchVersion)
{
static auto x = []
{
steam_proxy::create_ugc();
return 0;
}();
(void)x;
static ugc u;
return &u;
}

5
src/client/steam/steam.cpp
View File

@ -4,7 +4,7 @@
#include <utils/nt.hpp>
#include <utils/io.hpp>
#include "loader/component_loader.hpp"
#include "../component/steam_proxy.hpp"
namespace steam
{
@ -118,6 +118,9 @@ namespace steam
::utils::nt::library::load(steam_path / "vstdlib_s64.dll");
::utils::nt::library::load(steam_path / "gameoverlayrenderer64.dll");
::utils::nt::library::load(steam_path / "steamclient64.dll");
steam_proxy::initialize();
return true;
}