Mirrors/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-06-12 05:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

lsteamclient: Use a generic interface wrapper struct.

Browse Source 
CW-Bug-Id: #22729
This commit is contained in:
Rémi Bernon
2023-09-24 14:50:45 +02:00
committed by Arkadiusz Hiler
parent eb531f7764
commit 7e5eed6c71
42 changed files with 12530 additions and 13575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lsteamclient/steamclient_main.c
View File

@ -638,7 +638,7 @@ uint32 manual_convert_nNativeKeyCode(uint32 win_vk)
static const struct {
const char *iface_version;
void *(*ctor)(void *);
struct w_steam_iface *(*ctor)(void *);
} constructors[] = {
#include "win_constructors_table.dat"
};
@ -647,30 +647,30 @@ struct steamclient_interface
{
struct list entry;
const char *name;
void *linux_side;
void *interface;
void *u_iface;
struct w_steam_iface *w_iface;
};
static struct list steamclient_interfaces = LIST_INIT(steamclient_interfaces);
void *create_win_interface(const char *name, void *linux_side)
struct w_steam_iface *create_win_interface(const char *name, void *u_iface)
{
struct steamclient_interface *e;
void *ret = NULL;
struct w_steam_iface *ret = NULL;
int i;
TRACE("trying to create %s\n", name);
if (!linux_side)
if (!u_iface)
return NULL;
EnterCriticalSection(&steamclient_cs);
LIST_FOR_EACH_ENTRY(e, &steamclient_interfaces, struct steamclient_interface, entry)
{
if (e->linux_side == linux_side && !strcmp(e->name, name))
if (e->u_iface == u_iface && !strcmp(e->name, name))
{
ret = e->interface;
ret = e->w_iface;
TRACE("-> %p\n", ret);
goto done;
}
@ -680,9 +680,8 @@ void *create_win_interface(const char *name, void *linux_side)
{
if (!strcmp(name, constructors[i].iface_version))
{
ret = constructors[i].ctor(linux_side);
if (allocated_from_steamclient_dll(ret)
|| allocated_from_steamclient_dll(*(void **)ret) /* vtable */)
ret = constructors[i].ctor(u_iface);
if (allocated_from_steamclient_dll(ret) || allocated_from_steamclient_dll(ret->vtable))
{
/* Don't cache interfaces allocated from steamclient.dll space.
* steamclient may get reloaded by the app, miss the previous
@ -692,8 +691,8 @@ void *create_win_interface(const char *name, void *linux_side)
e = HeapAlloc(GetProcessHeap(), 0, sizeof(*e));
e->name = constructors[i].iface_version;
e->linux_side = linux_side;
e->interface = ret;
e->u_iface = u_iface;
e->w_iface = ret;
list_add_tail(&steamclient_interfaces, &e->entry);
break;