renil/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator synced 2025-05-23 21:57:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clang fixes.

Browse Source
This commit is contained in:
redpolline 2024-12-21 11:25:59 -05:00
parent c5afbe9fea
commit 59cb19e56a
9 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dll/common_includes.h
View File

@ -141,6 +141,12 @@ inline void reset_LastError()
#include <utime.h> #include <utime.h>
#include <inttypes.h> #include <inttypes.h>
#ifndef PRIu64
#define PRIu64 "I64u"
#endif
#ifndef PRIuPTR
#define PRIuPTR "Iu"
#endif
#define PRI_ZU "zu" #define PRI_ZU "zu"
#define PATH_MAX_STRING_SIZE 512 #define PATH_MAX_STRING_SIZE 512

18
dll/dll.h
View File

@ -25,6 +25,15 @@
#define STEAMCLIENT_API static #define STEAMCLIENT_API static
#endif #endif
Steam_Client *get_steam_client();
bool steamclient_has_ipv6_functions();
Steam_Client *try_get_steam_client();
HSteamUser flat_hsteamuser();
HSteamPipe flat_hsteampipe();
HSteamUser flat_gs_hsteamuser();
HSteamPipe flat_gs_hsteampipe();
#define GOLDBERG_CALLBACK_INTERNAL(parent, fname, cb_type) \ #define GOLDBERG_CALLBACK_INTERNAL(parent, fname, cb_type) \
struct GB_CCallbackInternal_ ## fname : private GB_CCallbackInterImp< sizeof(cb_type) > { \ struct GB_CCallbackInternal_ ## fname : private GB_CCallbackInterImp< sizeof(cb_type) > { \
public: \ public: \
@ -158,12 +167,3 @@ class GB_CCallbackInterImp : protected CCallbackBase
return; return;
} }
}; };
Steam_Client *get_steam_client();
bool steamclient_has_ipv6_functions();
Steam_Client *try_get_steam_client();
HSteamUser flat_hsteamuser();
HSteamPipe flat_hsteampipe();
HSteamUser flat_gs_hsteamuser();
HSteamPipe flat_gs_hsteampipe();

10
dll/local_storage.cpp
View File

@ -34,7 +34,7 @@ struct File_Data {
std::string name; std::string name;
}; };
std::string convert_vector_image_pixel_t_to_std_string(std::vector<image_pixel_t> & in) { std::string convert_vector_image_pixel_t_to_std_string(std::vector<image_pixel_t> in) {
std::string out; std::string out;
for (auto i : in) { for (auto i : in) {
@ -233,7 +233,7 @@ void Local_Storage::setAppId(uint32 appid)
} }
int Local_Storage::store_file_data(std::string folder, std::string file, char *data, unsigned int length) int Local_Storage::store_file_data(std::string folder, std::string file, const char *data, unsigned int length)
{ {
return -1; return -1;
} }
@ -243,7 +243,7 @@ int Local_Storage::store_data(std::string folder, std::string file, char *data,
return -1; return -1;
} }
int Local_Storage::store_data_settings(std::string file, char *data, unsigned int length) int Local_Storage::store_data_settings(std::string file, const char *data, unsigned int length)
{ {
return -1; return -1;
} }
@ -777,7 +777,7 @@ void Local_Storage::setAppId(uint32 appid)
this->appid = std::to_string(appid) + PATH_SEPARATOR; this->appid = std::to_string(appid) + PATH_SEPARATOR;
} }
int Local_Storage::store_file_data(std::string folder, std::string file, char *data, unsigned int length) int Local_Storage::store_file_data(std::string folder, std::string file, const char *data, unsigned int length)
{ {
if (folder.back() != *PATH_SEPARATOR) { if (folder.back() != *PATH_SEPARATOR) {
folder.append(PATH_SEPARATOR); folder.append(PATH_SEPARATOR);
@ -836,7 +836,7 @@ int Local_Storage::store_data(std::string folder, std::string file, char *data,
return store_file_data(save_directory + appid + folder, file, data, length); return store_file_data(save_directory + appid + folder, file, data, length);
} }
int Local_Storage::store_data_settings(std::string file, char *data, unsigned int length) int Local_Storage::store_data_settings(std::string file, const char *data, unsigned int length)
{ {
return store_file_data(get_global_settings_path(), file, data, length); return store_file_data(get_global_settings_path(), file, data, length);
} }

6
dll/local_storage.h
View File

@ -41,7 +41,7 @@ struct image_t
std::vector<image_pixel_t> pix_map; std::vector<image_pixel_t> pix_map;
}; };
std::string convert_vector_image_pixel_t_to_std_string(std::vector<image_pixel_t> & in); std::string convert_vector_image_pixel_t_to_std_string(std::vector<image_pixel_t> in);
std::string convert_raw_uint8_to_png_std_string(uint8 * in, int width, int height, int components); std::string convert_raw_uint8_to_png_std_string(uint8 * in, int width, int height, int components);
std::string convert_raw_uint8_to_jpg_std_string(uint8 * in, int width, int height, int components); std::string convert_raw_uint8_to_jpg_std_string(uint8 * in, int width, int height, int components);
@ -74,11 +74,11 @@ public:
static int get_file_data(std::string full_path, char *data, unsigned int max_length, unsigned int offset=0); static int get_file_data(std::string full_path, char *data, unsigned int max_length, unsigned int offset=0);
static int copy_file_data(std::string src_full_path, std::string dest_full_path); static int copy_file_data(std::string src_full_path, std::string dest_full_path);
void setAppId(uint32 appid); void setAppId(uint32 appid);
static int store_file_data(std::string folder, std::string file, char *data, unsigned int length); static int store_file_data(std::string folder, std::string file, const char *data, unsigned int length);
static std::vector<std::string> get_filenames_path(std::string path); static std::vector<std::string> get_filenames_path(std::string path);
int store_data(std::string folder, std::string file, char *data, unsigned int length); int store_data(std::string folder, std::string file, char *data, unsigned int length);
int store_data_settings(std::string file, char *data, unsigned int length); int store_data_settings(std::string file, const char *data, unsigned int length);
int get_data(std::string folder, std::string file, char *data, unsigned int max_length, unsigned int offset=0); int get_data(std::string folder, std::string file, char *data, unsigned int max_length, unsigned int offset=0);
int get_data_settings(std::string file, char *data, unsigned int max_length); int get_data_settings(std::string file, char *data, unsigned int max_length);
int count_files(std::string folder); int count_files(std::string folder);

2
dll/settings.cpp
View File

@ -450,7 +450,7 @@ int Settings::set_profile_image(int eAvatarSize, Image_Data * image)
profile_images[eAvatarSize] = ref; profile_images[eAvatarSize] = ref;
create_background_notify_task(Settings_Background_Task_IDs::NOTIFY_AVATAR_IMAGE, NULL); create_background_notify_task(Settings_Background_Task_IDs::NOTIFY_AVATAR_IMAGE, NULL);
} else { } else {
PRINT_DEBUG("%s %d %dx%d %"PRI_ZU".\n", PRINT_DEBUG("%s %d %dx%d %" PRI_ZU ".\n",
"Settings::set_profile_image failed", "Settings::set_profile_image failed",
eAvatarSize, eAvatarSize,
image->width, image->width,

6
dll/settings_parser.cpp
View File

@ -469,19 +469,19 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
settings_client->set_profile_image(k_EAvatarSize32x32, &profile_small); settings_client->set_profile_image(k_EAvatarSize32x32, &profile_small);
settings_server->set_profile_image(k_EAvatarSize32x32, &profile_small); settings_server->set_profile_image(k_EAvatarSize32x32, &profile_small);
} else { } else {
PRINT_DEBUG("%s %"PRI_ZU" %d %d\n", "Small user avatar image not defined.", profile_small.data.length(), profile_small.width, profile_small.height); PRINT_DEBUG("%s %" PRI_ZU " %d %d\n", "Small user avatar image not defined.", profile_small.data.length(), profile_small.width, profile_small.height);
} }
if (profile_medium.data.length() > 0 && profile_medium.width > 0 && profile_medium.height > 0) { if (profile_medium.data.length() > 0 && profile_medium.width > 0 && profile_medium.height > 0) {
settings_client->set_profile_image(k_EAvatarSize64x64, &profile_medium); settings_client->set_profile_image(k_EAvatarSize64x64, &profile_medium);
settings_server->set_profile_image(k_EAvatarSize64x64, &profile_medium); settings_server->set_profile_image(k_EAvatarSize64x64, &profile_medium);
} else { } else {
PRINT_DEBUG("%s %"PRI_ZU" %d %d\n", "Medium user avatar image not defined.", profile_medium.data.length(), profile_medium.width, profile_medium.height); PRINT_DEBUG("%s %" PRI_ZU " %d %d\n", "Medium user avatar image not defined.", profile_medium.data.length(), profile_medium.width, profile_medium.height);
} }
if (profile_large.data.length() > 0 && profile_large.width > 0 && profile_large.height > 0) { if (profile_large.data.length() > 0 && profile_large.width > 0 && profile_large.height > 0) {
settings_client->set_profile_image(k_EAvatarSize184x184, &profile_large); settings_client->set_profile_image(k_EAvatarSize184x184, &profile_large);
settings_server->set_profile_image(k_EAvatarSize184x184, &profile_large); settings_server->set_profile_image(k_EAvatarSize184x184, &profile_large);
} else { } else {
PRINT_DEBUG("%s %"PRI_ZU" %d %d\n", "Large user avatar image not defined.", profile_large.data.length(), profile_large.width, profile_large.height); PRINT_DEBUG("%s %" PRI_ZU " %d %d\n", "Large user avatar image not defined.", profile_large.data.length(), profile_large.width, profile_large.height);
} }
{ {

30
dll/steam_friends.cpp
View File

@ -137,7 +137,7 @@ void Steam_Friends::Callback(Common_Message *msg)
Friend *f = find_friend(userID.ConvertToUint64()); Friend *f = find_friend(userID.ConvertToUint64());
if (f) { if (f) {
if (msg->friend_avatar().img().type() == Image::NOTIFY) { if (msg->friend_avatar().img().type() == Image::NOTIFY) {
PRINT_DEBUG("%s %"PRIu64".\n", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for", userID.ConvertToUint64()); PRINT_DEBUG("%s %" PRIu64 ".\n", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for", userID.ConvertToUint64());
std::string raw_image = msg->friend_avatar().img().img_data(); std::string raw_image = msg->friend_avatar().img().img_data();
if (raw_image.length() > 0 && raw_image.length() < FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (raw_image.length() > 0 && raw_image.length() < FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
@ -176,7 +176,7 @@ void Steam_Friends::Callback(Common_Message *msg)
switch (img_type) { switch (img_type) {
case Image::RAW: case Image::RAW:
PRINT_DEBUG("%s %"PRIu64" %s %d %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s.\n",
"Steam_Friends::Callback Got Friend_Avatar NOTIFY for", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"size", "size",
@ -188,7 +188,7 @@ void Steam_Friends::Callback(Common_Message *msg)
std::string convert; std::string convert;
int n_width = 0; int n_width = 0;
int n_height = 0; int n_height = 0;
PRINT_DEBUG("%s %"PRIu64" %s %d %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s.\n",
"Steam_Friends::Callback Got Friend_Avatar NOTIFY for", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"size", "size",
@ -208,7 +208,7 @@ void Steam_Friends::Callback(Common_Message *msg)
std::string convert; std::string convert;
int n_width = 0; int n_width = 0;
int n_height = 0; int n_height = 0;
PRINT_DEBUG("%s %"PRIu64" %s %d %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s.\n",
"Steam_Friends::Callback Got Friend_Avatar NOTIFY for", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"size", "size",
@ -225,7 +225,7 @@ void Steam_Friends::Callback(Common_Message *msg)
break; break;
default: default:
raw_image.clear(); raw_image.clear();
PRINT_DEBUG("%s %"PRIu64" %s %d %s %d.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s %d.\n",
"Steam_Friends::Callback Got Friend_Avatar NOTIFY for", "Steam_Friends::Callback Got Friend_Avatar NOTIFY for",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"size", "size",
@ -256,7 +256,7 @@ void Steam_Friends::Callback(Common_Message *msg)
if (msg->friend_avatar().img().type() == Image::REQUEST) { if (msg->friend_avatar().img().type() == Image::REQUEST) {
CSteamID requestID((uint64)msg->dest_id()); CSteamID requestID((uint64)msg->dest_id());
if (settings->get_local_steam_id() == requestID) { if (settings->get_local_steam_id() == requestID) {
PRINT_DEBUG("%s %"PRIu64".\n", "Steam_Friends::Callback Got Friend_Avatar REQUEST from", userID.ConvertToUint64()); PRINT_DEBUG("%s %" PRIu64 ".\n", "Steam_Friends::Callback Got Friend_Avatar REQUEST from", userID.ConvertToUint64());
uint32_t width = (uint32_t)msg->friend_avatar().img().img_width(); uint32_t width = (uint32_t)msg->friend_avatar().img().img_width();
uint32_t height = (uint32_t)msg->friend_avatar().img().img_height(); uint32_t height = (uint32_t)msg->friend_avatar().img().img_height();
@ -289,7 +289,7 @@ void Steam_Friends::Callback(Common_Message *msg)
raw_image, raw_image,
(n_width * n_height * sizeof(uint32))) == true) { (n_width * n_height * sizeof(uint32))) == true) {
uint32_t img_type = (uint32_t)msg->friend_avatar().img().img_type(); uint32_t img_type = (uint32_t)msg->friend_avatar().img().img_type();
PRINT_DEBUG("%s %"PRIu64" %s %d %s %d.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s %d.\n",
"Steam_Friends::Callback Got Friend_Avatar REQUEST from", "Steam_Friends::Callback Got Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for image type", "for image type",
@ -302,7 +302,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata = convert_raw_uint8_to_png_std_string(raw_image, n_width, n_height, 4); pixdata = convert_raw_uint8_to_png_std_string(raw_image, n_width, n_height, 4);
if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s %"PRI_ZU" %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s %" PRI_ZU " %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for PNG image size", "for PNG image size",
@ -311,7 +311,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH, pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes"); "bytes");
} else { } else {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for PNG image size", "for PNG image size",
@ -330,7 +330,7 @@ void Steam_Friends::Callback(Common_Message *msg)
if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
// Try again using RAW. // Try again using RAW.
if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s %"PRI_ZU" %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s %" PRI_ZU " %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for JPG image size", "for JPG image size",
@ -339,7 +339,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH, pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes"); "bytes");
} else { } else {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for JPG image size", "for JPG image size",
@ -359,7 +359,7 @@ void Steam_Friends::Callback(Common_Message *msg)
if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() <= 0 || pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
// No more attempts. // No more attempts.
if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) { if (pixdata.length() >= FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s %"PRI_ZU" %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s %" PRI_ZU " %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for RAW image size", "for RAW image size",
@ -368,7 +368,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH, pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes"); "bytes");
} else { } else {
PRINT_DEBUG("%s %"PRIu64" %s %d. %s.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d. %s.\n",
"Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from", "Steam_Friends::Callback Cannot complete Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for RAW image size", "for RAW image size",
@ -381,7 +381,7 @@ void Steam_Friends::Callback(Common_Message *msg)
if (img_type != Image::PNG && img_type != Image::JPG && img_type != Image::RAW) { if (img_type != Image::PNG && img_type != Image::JPG && img_type != Image::RAW) {
pixdata.clear(); pixdata.clear();
PRINT_DEBUG("%s %"PRIu64" %s %d %s %d.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d %s %d.\n",
"Steam_Friends::Callback Got Friend_Avatar REQUEST from", "Steam_Friends::Callback Got Friend_Avatar REQUEST from",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"for unsupported image type", "for unsupported image type",
@ -413,7 +413,7 @@ void Steam_Friends::Callback(Common_Message *msg)
} }
} }
delete raw_image; delete [] raw_image;
raw_image = NULL; raw_image = NULL;
} }
} }

14
dll/steam_friends.h
View File

@ -137,7 +137,7 @@ struct Avatar_Numbers add_friend_avatars(CSteamID id)
return avatar_ids->second; return avatar_ids->second;
} else { } else {
// Request avatar data. // Request avatar data.
PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar small request for %"PRIu64".\n", steam_id); PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar small request for %" PRIu64 ".\n", steam_id);
Common_Message * msg_ = new Common_Message(); Common_Message * msg_ = new Common_Message();
msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64()); msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
msg_->set_dest_id(steam_id); msg_->set_dest_id(steam_id);
@ -155,7 +155,7 @@ struct Avatar_Numbers add_friend_avatars(CSteamID id)
msg_->set_allocated_friend_avatar(friend_avatar); msg_->set_allocated_friend_avatar(friend_avatar);
network->sendTo(msg_, true); network->sendTo(msg_, true);
PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar medium request for %"PRIu64".\n", steam_id); PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar medium request for %" PRIu64 ".\n", steam_id);
msg_ = new Common_Message(); msg_ = new Common_Message();
msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64()); msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
msg_->set_dest_id(steam_id); msg_->set_dest_id(steam_id);
@ -173,7 +173,7 @@ struct Avatar_Numbers add_friend_avatars(CSteamID id)
msg_->set_allocated_friend_avatar(friend_avatar); msg_->set_allocated_friend_avatar(friend_avatar);
network->sendTo(msg_, true); network->sendTo(msg_, true);
PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar large request for %"PRIu64".\n", steam_id); PRINT_DEBUG("Steam_Friends::add_friend_avatars sending Friend_Avatar large request for %" PRIu64 ".\n", steam_id);
msg_ = new Common_Message(); msg_ = new Common_Message();
msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64()); msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
msg_->set_dest_id(steam_id); msg_->set_dest_id(steam_id);
@ -193,7 +193,7 @@ struct Avatar_Numbers add_friend_avatars(CSteamID id)
} }
} }
PRINT_DEBUG("%s %s %s %"PRIu64".\n", PRINT_DEBUG("%s %s %s %" PRIu64 ".\n",
"Steam_Friends::add_friend_avatars ", "Steam_Friends::add_friend_avatars ",
(generate == true) ? "Generating empty" : "Notifying changed", (generate == true) ? "Generating empty" : "Notifying changed",
"avatar image for", "avatar image for",
@ -767,7 +767,7 @@ int GetSmallFriendAvatar( CSteamID steamIDFriend )
//IMPORTANT NOTE: don't change friend avatar numbers for the same friend or else some games endlessly allocate stuff. //IMPORTANT NOTE: don't change friend avatar numbers for the same friend or else some games endlessly allocate stuff.
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend); struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend);
PRINT_DEBUG("Steam_Friends::GetSmallFriendAvatar %"PRIu64" -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.smallest); PRINT_DEBUG("Steam_Friends::GetSmallFriendAvatar %" PRIu64 " -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.smallest);
return numbers.smallest; return numbers.smallest;
} }
@ -777,7 +777,7 @@ int GetMediumFriendAvatar( CSteamID steamIDFriend )
{ {
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend); struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend);
PRINT_DEBUG("Steam_Friends::GetMediumFriendAvatar %"PRIu64" -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.medium); PRINT_DEBUG("Steam_Friends::GetMediumFriendAvatar %" PRIu64 " -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.medium);
return numbers.medium; return numbers.medium;
} }
@ -788,7 +788,7 @@ int GetLargeFriendAvatar( CSteamID steamIDFriend )
{ {
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend); struct Avatar_Numbers numbers = add_friend_avatars(steamIDFriend);
PRINT_DEBUG("Steam_Friends::GetLargeFriendAvatar %"PRIu64" -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.large); PRINT_DEBUG("Steam_Friends::GetLargeFriendAvatar %" PRIu64 " -> %d.\n", steamIDFriend.ConvertToUint64(), numbers.large);
return numbers.large; return numbers.large;
} }

48
overlay_experimental/steam_overlay.cpp
View File

@ -189,7 +189,7 @@ bool Steam_Overlay::LoadProfileImage(const CSteamID & id, const int eAvatarSize)
} }
bool Steam_Overlay::LoadProfileImage(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) { bool Steam_Overlay::LoadProfileImage(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) {
PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %"PRIu64" size %d.\n", id.ConvertToUint64(), eAvatarSize); PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %" PRIu64 " size %d.\n", id.ConvertToUint64(), eAvatarSize);
bool ret = false; bool ret = false;
Profile_Image * image = NULL; Profile_Image * image = NULL;
@ -212,7 +212,7 @@ bool Steam_Overlay::LoadProfileImage(const CSteamID & id, const int eAvatarSize,
width > 0 && width > 0 &&
height > 0) { height > 0) {
PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %"PRIu64" size %d image_handle %d width %d height %d.\n", PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %" PRIu64 " size %d image_handle %d width %d height %d.\n",
id.ConvertToUint64(), eAvatarSize, image_handle, width, height); id.ConvertToUint64(), eAvatarSize, image_handle, width, height);
if (image->raw_image != NULL) { if (image->raw_image != NULL) {
@ -234,16 +234,16 @@ bool Steam_Overlay::LoadProfileImage(const CSteamID & id, const int eAvatarSize,
} else { } else {
delete raw_image; delete raw_image;
raw_image = NULL; raw_image = NULL;
PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %"PRIu64" size %d could not get pixel data.\n", PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %" PRIu64 " size %d could not get pixel data.\n",
id.ConvertToUint64(), eAvatarSize); id.ConvertToUint64(), eAvatarSize);
} }
} }
} else { } else {
PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %"PRIu64" size %d pixel data has invalid size.\n", PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %" PRIu64 " size %d pixel data has invalid size.\n",
id.ConvertToUint64(), eAvatarSize); id.ConvertToUint64(), eAvatarSize);
} }
} else { } else {
PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %"PRIu64" size %d profile pixel data not loaded.\n", PRINT_DEBUG("Steam_Overlay::LoadProfileImage() profile id %" PRIu64 " size %d profile pixel data not loaded.\n",
id.ConvertToUint64(), eAvatarSize); id.ConvertToUint64(), eAvatarSize);
} }
} }
@ -265,7 +265,7 @@ void Steam_Overlay::DestroyProfileImage(const CSteamID & id, const int eAvatarSi
} }
void Steam_Overlay::DestroyProfileImage(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) { void Steam_Overlay::DestroyProfileImage(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) {
PRINT_DEBUG("Steam_Overlay::DestroyProfileImage() %"PRIu64" size %d.\n", id.ConvertToUint64(), eAvatarSize); PRINT_DEBUG("Steam_Overlay::DestroyProfileImage() %" PRIu64 " size %d.\n", id.ConvertToUint64(), eAvatarSize);
Profile_Image * image = NULL; Profile_Image * image = NULL;
std::lock_guard<std::recursive_mutex> lock(overlay_mutex); std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
@ -304,7 +304,7 @@ bool Steam_Overlay::CreateProfileImageResource(const CSteamID & id, const int eA
} }
bool Steam_Overlay::CreateProfileImageResource(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) { bool Steam_Overlay::CreateProfileImageResource(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) {
PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() %"PRIu64" size %d.\n", id.ConvertToUint64(), eAvatarSize); PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() %" PRIu64 " size %d.\n", id.ConvertToUint64(), eAvatarSize);
bool ret = false; bool ret = false;
Profile_Image * image = NULL; Profile_Image * image = NULL;
@ -327,16 +327,16 @@ bool Steam_Overlay::CreateProfileImageResource(const CSteamID & id, const int eA
std::shared_ptr<uint64_t> test2; std::shared_ptr<uint64_t> test2;
test2 = test.lock(); test2 = test.lock();
if (!test2) { if (!test2) {
PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() Unable to create resource for profile id %"PRIu64" size %d.\n", PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() Unable to create resource for profile id %" PRIu64 " size %d.\n",
id.ConvertToUint64(), eAvatarSize); id.ConvertToUint64(), eAvatarSize);
} else { } else {
image->image_resource = test; image->image_resource = test;
ret = true; ret = true;
PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() created resource for profile id %"PRIu64" size %d -> %"PRIu64".\n", PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() created resource for profile id %" PRIu64 " size %d -> %" PRIu64 ".\n",
id.ConvertToUint64(), eAvatarSize, *test2); id.ConvertToUint64(), eAvatarSize, *test2);
} }
} else { } else {
PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() invalid raw data for profile id %"PRIu64" size %d.\n", PRINT_DEBUG("Steam_Overlay::CreateProfileImageResource() invalid raw data for profile id %" PRIu64 " size %d.\n",
id.ConvertToUint64(), eAvatarSize); id.ConvertToUint64(), eAvatarSize);
} }
} }
@ -359,7 +359,7 @@ void Steam_Overlay::DestroyProfileImageResource(const CSteamID & id, const int e
void Steam_Overlay::DestroyProfileImageResource(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images) void Steam_Overlay::DestroyProfileImageResource(const CSteamID & id, const int eAvatarSize, Profile_Image_Set & images)
{ {
PRINT_DEBUG("Steam_Overlay::DestroyProfileImageResource() %"PRIu64" size %d.\n", id.ConvertToUint64(), eAvatarSize); PRINT_DEBUG("Steam_Overlay::DestroyProfileImageResource() %" PRIu64 " size %d.\n", id.ConvertToUint64(), eAvatarSize);
Profile_Image * image = NULL; Profile_Image * image = NULL;
std::lock_guard<std::recursive_mutex> lock(overlay_mutex); std::lock_guard<std::recursive_mutex> lock(overlay_mutex);
@ -2093,14 +2093,14 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
if (loadType == 0x0) { if (loadType == 0x0) {
if (LoadProfileImage(userID, eAvatarSize) == true) { if (LoadProfileImage(userID, eAvatarSize) == true) {
reload = true; reload = true;
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Got avatar image size", "Steam_Overlay::display_imgui_image Got avatar image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
userID.ConvertToUint64(), userID.ConvertToUint64(),
". Load OK."); ". Load OK.");
} else{ } else{
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Unable to get avatar image size", "Steam_Overlay::display_imgui_image Unable to get avatar image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
@ -2125,7 +2125,7 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
}; };
if (type != 0x0) { if (type != 0x0) {
PRINT_DEBUG("%s %"PRIu64" %s %d.\n", PRINT_DEBUG("%s %" PRIu64 " %s %d.\n",
"Steam_Overlay::display_imgui_image Queuing Lazy Load avatar image for", "Steam_Overlay::display_imgui_image Queuing Lazy Load avatar image for",
userID.ConvertToUint64(), userID.ConvertToUint64(),
"size", "size",
@ -2180,14 +2180,14 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
if (CreateProfileImageResource(userID, eAvatarSize) == true) { if (CreateProfileImageResource(userID, eAvatarSize) == true) {
reload = true; reload = true;
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Got profile image size", "Steam_Overlay::display_imgui_image Got profile image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
userID.ConvertToUint64(), userID.ConvertToUint64(),
". Resource OK."); ". Resource OK.");
} else { } else {
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Unable to get avatar image size", "Steam_Overlay::display_imgui_image Unable to get avatar image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
@ -2239,7 +2239,7 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
ret = 1; ret = 1;
} }
} else { } else {
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Unable to get avatar image size", "Steam_Overlay::display_imgui_image Unable to get avatar image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
@ -2248,7 +2248,7 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
} }
} else { } else {
if (loadType == 0x0) { if (loadType == 0x0) {
PRINT_DEBUG("%s %d %s %"PRIu64" %s\n", PRINT_DEBUG("%s %d %s %" PRIu64 " %s\n",
"Steam_Overlay::display_imgui_image Unable to display avatar image size", "Steam_Overlay::display_imgui_image Unable to display avatar image size",
eAvatarSize, eAvatarSize,
"for user", "for user",
@ -2319,7 +2319,7 @@ int Steam_Overlay::display_imgui_image(uint32_t displayImageType,
imageData); imageData);
_renderer->ReleaseImageResource(test); _renderer->ReleaseImageResource(test);
} else { } else {
PRINT_DEBUG("Steam_Overlay::display_imgui_image created resource for custom image %p -> %"PRIu64".\n", PRINT_DEBUG("Steam_Overlay::display_imgui_image created resource for custom image %p -> %" PRIu64 ".\n",
imageData, imageData,
*test2); *test2);
result->second.image_data.image_resource = test; result->second.image_data.image_resource = test;
@ -2458,7 +2458,7 @@ void Steam_Overlay::OverlayProc()
k_EAvatarSize32x32, k_EAvatarSize32x32,
0x1) != 1) { 0x1) != 1) {
ImGui::ColorButton("test", ImVec4(255, 0, 0, 255), 0, ImVec2(32 * 0.4f, 32 * 0.4f)); ImGui::ColorButton("test", ImVec4(255, 0, 0, 255), 0, ImVec2(32 * 0.4f, 32 * 0.4f));
PRINT_DEBUG("%s %"PRIu64".\n", PRINT_DEBUG("%s %" PRIu64 ".\n",
"SteamOverlay::OverlayProc Failed to display friend avatar for", "SteamOverlay::OverlayProc Failed to display friend avatar for",
(uint64)i.first.id()); (uint64)i.first.id());
} }
@ -2785,7 +2785,7 @@ void Steam_Overlay::OverlayProc()
if (Local_Storage::is_directory(future_path) == true) { if (Local_Storage::is_directory(future_path) == true) {
current_path.clear(); current_path.clear();
show_drive_list = false; show_drive_list = false;
PRINT_DEBUG("%s %s %"PRI_ZU" %"PRI_ZU".\n", "SteamOverlay::OverlayProc Next directory will be", future_path.c_str(), x.first.find_last_of((char)PATH_SEPARATOR), x.first.length()); PRINT_DEBUG("%s %s %" PRI_ZU " %" PRI_ZU ".\n", "SteamOverlay::OverlayProc Next directory will be", future_path.c_str(), x.first.find_last_of((char)PATH_SEPARATOR), x.first.length());
} else { } else {
future_path.clear(); future_path.clear();
} }
@ -2973,7 +2973,7 @@ void Steam_Overlay::OverlayProc()
} }
id.width = temp_pi.width; id.width = temp_pi.width;
id.height = temp_pi.height; id.height = temp_pi.height;
PRINT_DEBUG("%s %d %s %"PRIu64".\n", PRINT_DEBUG("%s %d %s %" PRIu64 ".\n",
"SteamOverlay::OverlayProc Attempting to set new avatar image size", "SteamOverlay::OverlayProc Attempting to set new avatar image size",
new_image_size, new_image_size,
"for profile", "for profile",
@ -3238,7 +3238,7 @@ void Steam_Overlay::RunCallbacks()
break; break;
}; };
uint32_t retry = 0x0; uint32_t retry = 0x0;
PRINT_DEBUG("%s %"PRIu64".\n", PRINT_DEBUG("%s %" PRIu64 ".\n",
"Steam_Overlay::RunCallbacks Lazy loading Friend Avatars for", "Steam_Overlay::RunCallbacks Lazy loading Friend Avatars for",
x.first.ConvertToUint64()); x.first.ConvertToUint64());
if (x.second & 0x1) { if (x.second & 0x1) {
@ -3504,7 +3504,7 @@ void Steam_Overlay::OnAvatarImageLoaded(AvatarImageLoaded_t *pParam)
{ {
if (pParam != NULL) { if (pParam != NULL) {
if (pParam->m_steamID != k_steamIDNil) { if (pParam->m_steamID != k_steamIDNil) {
PRINT_DEBUG("%s %"PRIu64". %s %d.\n", PRINT_DEBUG("%s %" PRIu64 ". %s %d.\n",
"Steam_Overlay::OnAvatarImageLoaded Destroy avatar images for", "Steam_Overlay::OnAvatarImageLoaded Destroy avatar images for",
pParam->m_steamID.ConvertToUint64(), pParam->m_steamID.ConvertToUint64(),
"New reference", "New reference",