mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2025-12-06 04:04:53 +01:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

8
dll/common_includes.h
View file

@ -141,6 +141,12 @@ inline void reset_LastError()
#include <utime.h>
#include <inttypes.h>
#ifndef PRIu64
#define PRIu64 "I64u"
#endif
#ifndef PRIuPTR
#define PRIuPTR "Iu"
#endif
#define PRI_ZU "zu"
#define PATH_MAX_STRING_SIZE 512
@ -225,4 +231,4 @@ inline std::string ascii_to_lowercase(std::string data) {
#define FRIEND_AVATAR_MAX_IMAGE_LENGTH (5 * 1024 * 1024)
#endif//__INCLUDED_COMMON_INCLUDES__
#endif//__INCLUDED_COMMON_INCLUDES__

18
dll/dll.h
View file

@ -25,6 +25,15 @@
#define STEAMCLIENT_API static
#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) \
struct GB_CCallbackInternal_ ## fname : private GB_CCallbackInterImp< sizeof(cb_type) > { \
public: \
@ -158,12 +167,3 @@ class GB_CCallbackInterImp : protected CCallbackBase
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 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;
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;
}
@ -243,7 +243,7 @@ int Local_Storage::store_data(std::string folder, std::string file, char *data,
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;
}
@ -777,7 +777,7 @@ void Local_Storage::setAppId(uint32 appid)
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) {
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);
}
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);
}

6
dll/local_storage.h
View file

@ -41,7 +41,7 @@ struct image_t
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_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 copy_file_data(std::string src_full_path, std::string dest_full_path);
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);
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_settings(std::string file, char *data, unsigned int max_length);
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;
create_background_notify_task(Settings_Background_Task_IDs::NOTIFY_AVATAR_IMAGE, NULL);
} else {
PRINT_DEBUG("%s %d %dx%d %"PRI_ZU".\n",
PRINT_DEBUG("%s %d %dx%d %" PRI_ZU ".\n",
"Settings::set_profile_image failed",
eAvatarSize,
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_server->set_profile_image(k_EAvatarSize32x32, &profile_small);
} 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) {
settings_client->set_profile_image(k_EAvatarSize64x64, &profile_medium);
settings_server->set_profile_image(k_EAvatarSize64x64, &profile_medium);
} 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) {
settings_client->set_profile_image(k_EAvatarSize184x184, &profile_large);
settings_server->set_profile_image(k_EAvatarSize184x184, &profile_large);
} 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);
}
{

32
dll/steam_friends.cpp
View file

@ -137,7 +137,7 @@ void Steam_Friends::Callback(Common_Message *msg)
Friend *f = find_friend(userID.ConvertToUint64());
if (f) {
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();
if (raw_image.length() > 0 && raw_image.length() < FRIEND_AVATAR_MAX_IMAGE_LENGTH) {
@ -173,10 +173,10 @@ void Steam_Friends::Callback(Common_Message *msg)
}
if (eAvatarSize != k_EAvatarSizeMAX) {
switch (img_type) {
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",
userID.ConvertToUint64(),
"size",
@ -188,7 +188,7 @@ void Steam_Friends::Callback(Common_Message *msg)
std::string convert;
int n_width = 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",
userID.ConvertToUint64(),
"size",
@ -208,7 +208,7 @@ void Steam_Friends::Callback(Common_Message *msg)
std::string convert;
int n_width = 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",
userID.ConvertToUint64(),
"size",
@ -225,7 +225,7 @@ void Steam_Friends::Callback(Common_Message *msg)
break;
default:
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",
userID.ConvertToUint64(),
"size",
@ -256,7 +256,7 @@ void Steam_Friends::Callback(Common_Message *msg)
if (msg->friend_avatar().img().type() == Image::REQUEST) {
CSteamID requestID((uint64)msg->dest_id());
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 height = (uint32_t)msg->friend_avatar().img().img_height();
@ -289,7 +289,7 @@ void Steam_Friends::Callback(Common_Message *msg)
raw_image,
(n_width * n_height * sizeof(uint32))) == true) {
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",
userID.ConvertToUint64(),
"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);
if (pixdata.length() <= 0 || 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",
userID.ConvertToUint64(),
"for PNG image size",
@ -311,7 +311,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes");
} 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",
userID.ConvertToUint64(),
"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) {
// Try again using RAW.
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",
userID.ConvertToUint64(),
"for JPG image size",
@ -339,7 +339,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes");
} 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",
userID.ConvertToUint64(),
"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) {
// No more attempts.
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",
userID.ConvertToUint64(),
"for RAW image size",
@ -368,7 +368,7 @@ void Steam_Friends::Callback(Common_Message *msg)
pixdata.length() - FRIEND_AVATAR_MAX_IMAGE_LENGTH,
"bytes");
} 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",
userID.ConvertToUint64(),
"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) {
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",
userID.ConvertToUint64(),
"for unsupported image type",
@ -413,7 +413,7 @@ void Steam_Friends::Callback(Common_Message *msg)
}
}
delete raw_image;
delete [] raw_image;
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;
} else {
// 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();
msg_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
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);
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_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
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);
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_->set_source_id(settings->get_local_steam_id().ConvertToUint64());
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 ",
(generate == true) ? "Generating empty" : "Notifying changed",
"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.
std::lock_guard<std::recursive_mutex> lock(global_mutex);
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;
}
@ -777,7 +777,7 @@ int GetMediumFriendAvatar( CSteamID steamIDFriend )
{
std::lock_guard<std::recursive_mutex> lock(global_mutex);
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;
}
@ -788,7 +788,7 @@ int GetLargeFriendAvatar( CSteamID steamIDFriend )
{
std::lock_guard<std::recursive_mutex> lock(global_mutex);
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;
}