Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-27 05:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

lsteamclient: Use a list to map lin SteamNetworkingMessage_t to wrapper.

Browse Source 
CW-Bug-Id: #22649
This commit is contained in:
Paul Gofman 2023-08-23 18:06:14 -06:00 committed by Arkadiusz Hiler
parent a7bdd61d20
commit a798b8308f
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lsteamclient/steamclient_manual_common.cpp
View File

@ -3,6 +3,7 @@ extern "C" {
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/list.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(steamclient); WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
@ -26,15 +27,40 @@ extern "C" {
#define SDK_VERSION 1531 #define SDK_VERSION 1531
#include "steamclient_manual_common.h" #include "steamclient_manual_common.h"
#include <pthread.h>
struct msg_wrapper { struct msg_wrapper {
struct winSteamNetworkingMessage_t_153a win_msg; struct winSteamNetworkingMessage_t_153a win_msg;
struct SteamNetworkingMessage_t *lin_msg; struct SteamNetworkingMessage_t *lin_msg;
struct list mapping_entry;
void (*orig_FreeData)(SteamNetworkingMessage_t *); void (*orig_FreeData)(SteamNetworkingMessage_t *);
}; };
/***** manual struct converter for SteamNetworkingMessage_t *****/ /***** manual struct converter for SteamNetworkingMessage_t *****/
static struct list msg_lin_to_win_mapping = LIST_INIT(msg_lin_to_win_mapping);
static pthread_mutex_t msg_lin_to_win_mapping_mutex = PTHREAD_MUTEX_INITIALIZER;
static struct msg_wrapper *msg_wrapper_from_lin(struct SteamNetworkingMessage_t *lin_msg)
{
struct msg_wrapper *msg = NULL, *m;
pthread_mutex_lock(&msg_lin_to_win_mapping_mutex);
LIST_FOR_EACH_ENTRY(m, &msg_lin_to_win_mapping, struct msg_wrapper, mapping_entry)
{
if (m->lin_msg == lin_msg)
{
msg = m;
break;
}
}
pthread_mutex_unlock(&msg_lin_to_win_mapping_mutex);
if (!msg)
fprintf(stderr, "err:lsteamclient:msg_wrapper_from_lin Mapping for %p not found.\n", lin_msg);
return msg;
}
static void __attribute__((ms_abi)) win_FreeData(struct winSteamNetworkingMessage_t_153a *win_msg) static void __attribute__((ms_abi)) win_FreeData(struct winSteamNetworkingMessage_t_153a *win_msg)
{ {
struct msg_wrapper *msg = CONTAINING_RECORD(win_msg, struct msg_wrapper, win_msg); struct msg_wrapper *msg = CONTAINING_RECORD(win_msg, struct msg_wrapper, win_msg);
@ -52,14 +78,21 @@ static void __attribute__((ms_abi)) win_Release(struct winSteamNetworkingMessage
TRACE("%p\n", msg); TRACE("%p\n", msg);
msg->lin_msg->m_pfnRelease(msg->lin_msg); msg->lin_msg->m_pfnRelease(msg->lin_msg);
pthread_mutex_lock(&msg_lin_to_win_mapping_mutex);
list_remove(&msg->mapping_entry);
pthread_mutex_unlock(&msg_lin_to_win_mapping_mutex);
SecureZeroMemory(msg, sizeof(*msg)); SecureZeroMemory(msg, sizeof(*msg));
HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, msg);
} }
static void lin_FreeData(struct SteamNetworkingMessage_t *lin_msg) static void lin_FreeData(struct SteamNetworkingMessage_t *lin_msg)
{ {
struct msg_wrapper *msg = (struct msg_wrapper *)lin_msg->m_pData; /* ! see assignment, below */ struct msg_wrapper *msg = msg_wrapper_from_lin(lin_msg);
TRACE("%p\n", msg); TRACE("%p\n", msg);
if (!msg)
return;
if(msg->win_msg.m_pfnFreeData) if(msg->win_msg.m_pfnFreeData)
((void (__attribute__((ms_abi))*)(struct winSteamNetworkingMessage_t_153a *))msg->win_msg.m_pfnFreeData)(&msg->win_msg); ((void (__attribute__((ms_abi))*)(struct winSteamNetworkingMessage_t_153a *))msg->win_msg.m_pfnFreeData)(&msg->win_msg);
} }
@ -95,8 +128,10 @@ void *network_message_lin_to_win_(void *msg_, unsigned int version)
msg->orig_FreeData = msg->lin_msg->m_pfnFreeData; msg->orig_FreeData = msg->lin_msg->m_pfnFreeData;
msg->lin_msg->m_pfnFreeData = lin_FreeData; msg->lin_msg->m_pfnFreeData = lin_FreeData;
/* ! store the wrapper here and restore the original pointer from win_msg before calling orig_FreeData */
msg->lin_msg->m_pData = msg; pthread_mutex_lock(&msg_lin_to_win_mapping_mutex);
list_add_head(&msg_lin_to_win_mapping, &msg->mapping_entry);
pthread_mutex_unlock(&msg_lin_to_win_mapping_mutex);
return &msg->win_msg; return &msg->win_msg;
} }