Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-14 15:48:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

lsteamclient: Reallocate new interface only when linux_side changes.

Browse Source 
This fixes Batman: AK's Denuvo DRM incorrectly flagging the game as
pirated.
This commit is contained in:
Rémi Bernon 2020-02-18 00:45:22 +01:00 committed by Andrew Eikum
parent 20f6b88943
commit c6cead45dc
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/makefile_base.mak
View File

@ -1047,6 +1047,7 @@ $(LSTEAMCLIENT_CONFIGURE_FILES64): $(LSTEAMCLIENT64) $(MAKEFILE_DEP) | $(LSTEAMC
-I"../$(TOOLS_DIR64)"/include/ \ -I"../$(TOOLS_DIR64)"/include/ \
-I"../$(TOOLS_DIR64)"/include/wine/ \ -I"../$(TOOLS_DIR64)"/include/wine/ \
-I"../$(TOOLS_DIR64)"/include/wine/windows/ \ -I"../$(TOOLS_DIR64)"/include/wine/windows/ \
-I"../$(WINE)"/include/ \
-L"../$(TOOLS_DIR64)"/lib64/ \ -L"../$(TOOLS_DIR64)"/lib64/ \
-L"../$(TOOLS_DIR64)"/lib64/wine/ \ -L"../$(TOOLS_DIR64)"/lib64/wine/ \
--dll ../$(LSTEAMCLIENT64) && \ --dll ../$(LSTEAMCLIENT64) && \
@ -1065,6 +1066,7 @@ $(LSTEAMCLIENT_CONFIGURE_FILES32): $(LSTEAMCLIENT32) $(MAKEFILE_DEP) | $(LSTEAMC
-I"../$(TOOLS_DIR32)"/include/ \ -I"../$(TOOLS_DIR32)"/include/ \
-I"../$(TOOLS_DIR32)"/include/wine/ \ -I"../$(TOOLS_DIR32)"/include/wine/ \
-I"../$(TOOLS_DIR32)"/include/wine/windows/ \ -I"../$(TOOLS_DIR32)"/include/wine/windows/ \
-I"../$(WINE)"/include/ \
-L"../$(TOOLS_DIR32)"/lib/ \ -L"../$(TOOLS_DIR32)"/lib/ \
-L"../$(TOOLS_DIR32)"/lib/wine/ \ -L"../$(TOOLS_DIR32)"/lib/wine/ \
--dll ../$(LSTEAMCLIENT32) && \ --dll ../$(LSTEAMCLIENT32) && \

50
lsteamclient/steamclient_main.c
View File

@ -10,6 +10,7 @@
#include "winnls.h" #include "winnls.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/library.h" #include "wine/library.h"
#include "wine/list.h"
#include "steam_defs.h" #include "steam_defs.h"
#ifdef __linux__ #ifdef __linux__
@ -24,6 +25,8 @@ char g_tmppath[PATH_MAX];
static char *controller_glyphs[512]; /* at least k_EControllerActionOrigin_Count */ static char *controller_glyphs[512]; /* at least k_EControllerActionOrigin_Count */
static CRITICAL_SECTION steamclient_cs = { NULL, -1, 0, 0, 0, 0 };
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
{ {
TRACE("(%p, %u, %p)\n", instance, reason, reserved); TRACE("(%p, %u, %p)\n", instance, reason, reserved);
@ -355,23 +358,58 @@ static const struct {
#include "win_constructors_table.dat" #include "win_constructors_table.dat"
}; };
struct steamclient_interface
{
struct list entry;
const char *name;
void *linux_side;
void *interface;
};
static struct list steamclient_interfaces = LIST_INIT(steamclient_interfaces);
void *create_win_interface(const char *name, void *linux_side) void *create_win_interface(const char *name, void *linux_side)
{ {
struct steamclient_interface *e;
void *ret = NULL;
int i; int i;
TRACE("trying to create %s\n", name); TRACE("trying to create %s\n", name);
if(!linux_side) if (!linux_side)
return NULL; return NULL;
for(i = 0; i < sizeof(constructors) / sizeof(*constructors); ++i){ EnterCriticalSection(&steamclient_cs);
if(!strcmp(name, constructors[i].iface_version))
return constructors[i].ctor(linux_side); LIST_FOR_EACH_ENTRY(e, &steamclient_interfaces, struct steamclient_interface, entry)
{
if (e->linux_side == linux_side && !strcmp(e->name, name))
{
ret = e->interface;
TRACE("-> %p\n", ret);
goto done;
}
} }
ERR("Don't recognize interface name: %s\n", name); for (i = 0; i < sizeof(constructors) / sizeof(*constructors); ++i)
{
if (!strcmp(name, constructors[i].iface_version))
{
e = HeapAlloc(GetProcessHeap(), 0, sizeof(*e));
e->name = constructors[i].iface_version;
e->linux_side = linux_side;
e->interface = constructors[i].ctor(linux_side);
list_add_tail(&steamclient_interfaces, &e->entry);
return NULL; ret = e->interface;
break;
}
}
done:
LeaveCriticalSection(&steamclient_cs);
if (!ret) ERR("Don't recognize interface name: %s\n", name);
return ret;
} }
static void *steamclient_lib; static void *steamclient_lib;