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

steam_helper: Try to handle same app id restart ourselves instead of forwarding to Steam command handler.

Browse Source 
CW-Bug-Id: #23816
This commit is contained in:
Paul Gofman 2024-05-16 19:25:43 -06:00 committed by Arkadiusz Hiler
parent 77f1af2afc
commit 6202be5348
1 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
steam_helper/steam.cpp
View File

@ -1356,8 +1356,10 @@ static BOOL steam_command_handler(int argc, char *argv[])
typedef NTSTATUS (WINAPI *__WINE_UNIX_SPAWNVP)(char *const argv[], int wait); typedef NTSTATUS (WINAPI *__WINE_UNIX_SPAWNVP)(char *const argv[], int wait);
static __WINE_UNIX_SPAWNVP p__wine_unix_spawnvp; static __WINE_UNIX_SPAWNVP p__wine_unix_spawnvp;
NTSTATUS status = STATUS_UNSUCCESSFUL; NTSTATUS status = STATUS_UNSUCCESSFUL;
BOOL restart_self = FALSE;
char **unix_argv; char **unix_argv;
HMODULE module; HMODULE module;
const char *sgi;
int i, j; int i, j;
static char *unix_steam[] = static char *unix_steam[] =
{ {
@ -1370,6 +1372,33 @@ static BOOL steam_command_handler(int argc, char *argv[])
if (argc > 1 && StrStrIA(argv[1], "steam://") != argv[1] && argv[1][0] != '-') if (argc > 1 && StrStrIA(argv[1], "steam://") != argv[1] && argv[1][0] != '-')
return FALSE; return FALSE;
if (argc > 2 && !strcmp(argv[1], "--") && (sgi = getenv("SteamGameId")))
{
char s[64];
snprintf(s, sizeof(s), "steam://launch/%s", sgi);
if (!(restart_self = !strcmp(argv[2], s)))
{
snprintf(s, sizeof(s), "steam://rungameid/%s", sgi);
restart_self = !strcmp(argv[2], s);
}
}
if (restart_self)
{
HANDLE event;
event = OpenEventA(SYNCHRONIZE, FALSE, "PROTON_STEAM_EXE_RESTART_APP");
if (event)
{
SetEvent(event);
CloseHandle(event);
WINE_TRACE("Signalled app restart.\n");
}
else
WINE_ERR("Restart event not found.\n");
return TRUE;
}
if (!p__wine_unix_spawnvp) if (!p__wine_unix_spawnvp)
{ {
module = GetModuleHandleA("ntdll.dll"); module = GetModuleHandleA("ntdll.dll");
@ -1737,8 +1766,46 @@ int main(int argc, char *argv[])
if(wait_handle != INVALID_HANDLE_VALUE) if(wait_handle != INVALID_HANDLE_VALUE)
{ {
HANDLE waits[2];
DWORD ret;
int wait_count;
waits[0] = wait_handle;
waits[1] = NULL;
wait_count = 1;
if (game_process)
{
if ((waits[1] = CreateEventA(NULL, FALSE, FALSE, "PROTON_STEAM_EXE_RESTART_APP")))
{
++wait_count;
}
else
{
WINE_ERR("Failed to create restart event, err %lu.\n", GetLastError());
}
}
FreeConsole(); FreeConsole();
WaitForSingleObject(wait_handle, INFINITE); while ((ret = WaitForMultipleObjects(wait_count, waits, FALSE, INFINITE) != WAIT_OBJECT_0))
{
BOOL should_await;
if (ret != WAIT_OBJECT_0 + 1)
{
WINE_ERR("Wait failed.\n");
break;
}
if (child != INVALID_HANDLE_VALUE)
{
if (WaitForSingleObject(child, 0) == WAIT_TIMEOUT)
{
WINE_ERR("Child is still running, not restarting.\n");
continue;
}
CloseHandle(child);
}
child = run_process(&should_await, game_process);
}
CloseHandle(waits[1]);
} }
if (event != INVALID_HANDLE_VALUE) if (event != INVALID_HANDLE_VALUE)