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

steam_helper: Load vrclient_x64 to initialize the registry.

Browse Source 
CW-Bug-Id: #24510
This commit is contained in:
Rémi Bernon 2024-11-21 12:46:45 +01:00 committed by Arkadiusz Hiler
parent 80b7a10809
commit 14149c4bad
1 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
steam_helper/steam.cpp
View File

@ -459,7 +459,6 @@ static DWORD WINAPI initialize_vr_data(void *arg)
vr::IVRCompositor* compositor; vr::IVRCompositor* compositor;
VkInstance vk_instance = NULL; VkInstance vk_instance = NULL;
BOOL vr_initialized = FALSE; BOOL vr_initialized = FALSE;
HKEY vr_key = (HKEY)arg;
vr::EVRInitError error; vr::EVRInitError error;
HMODULE hvulkan = NULL; HMODULE hvulkan = NULL;
DWORD vr_status = ~0u; DWORD vr_status = ~0u;
@ -472,9 +471,16 @@ static DWORD WINAPI initialize_vr_data(void *arg)
LSTATUS status; LSTATUS status;
unsigned int i; unsigned int i;
VkResult res; VkResult res;
HKEY vr_key;
WINE_TRACE("Starting VR info initialization.\n"); WINE_TRACE("Starting VR info initialization.\n");
if ((status = RegOpenKeyExA( HKEY_CURRENT_USER, "Software\\Wine\\VR", 0, KEY_ALL_ACCESS, &vr_key )))
{
WINE_WARN( "Could not create key, status %#x.\n", status );
return 0;
}
if (!(lib_vrclient = load_vrclient())) if (!(lib_vrclient = load_vrclient()))
{ {
WINE_ERR("Could not load libopenvr_api.so.\n"); WINE_ERR("Could not load libopenvr_api.so.\n");
@ -714,54 +720,26 @@ done:
static void setup_vr_registry(void) static void setup_vr_registry(void)
{ {
WCHAR pathW[PATH_MAX]; BOOL (CDECL *init)(void);
LSTATUS status; HMODULE vrclient;
HANDLE thread; HANDLE thread;
HKEY vr_key;
DWORD disp;
if ((status = RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\VR", 0, NULL, REG_OPTION_VOLATILE, #ifdef _WIN64
KEY_ALL_ACCESS, NULL, &vr_key, &disp))) if (!(vrclient = LoadLibraryA( "vrclient_x64" )))
#else
if (!(vrclient = LoadLibraryA( "vrclient" )))
#endif
{ {
WINE_ERR("Could not create key, status %#x.\n", status); ERR( "Failed to load vrclient module, skipping initialization\n" );
return;
}
if (disp != REG_CREATED_NEW_KEY)
{
WINE_ERR("VR key already exists, disp %#x.\n", disp);
RegCloseKey(vr_key);
return; return;
} }
if(GetEnvironmentVariableW(PROTON_VR_RUNTIME_W, pathW, ARRAY_SIZE(pathW))) if ((init = (decltype(init))GetProcAddress( vrclient, "vrclient_init_registry" ))) init();
{ else ERR( "Failed to find vrclient_init_registry export\n" );
if ((status = RegSetValueExW(vr_key, PROTON_VR_RUNTIME_W, 0, REG_SZ,
(BYTE *)pathW, (lstrlenW(pathW) + 1) * sizeof(WCHAR))))
{
WINE_ERR("Could not set PROTON_VR_RUNTIME value, status %#x.\n", status);
set_vr_status(vr_key, ~0u);
RegCloseKey(vr_key);
return;
}
}
else
{
WINE_TRACE("Linux OpenVR runtime is not available\n");
set_vr_status(vr_key, ~0u);
RegCloseKey(vr_key);
return;
}
if (!set_vr_status(vr_key, 0)) if (!(thread = CreateThread( NULL, 0, initialize_vr_data, NULL, 0, NULL )))
{ {
RegCloseKey(vr_key); ERR( "Could not create thread, error %u.\n", GetLastError() );
return;
}
if (!(thread = CreateThread(NULL, 0, initialize_vr_data, (void *)vr_key, 0, NULL)))
{
WINE_ERR("Could not create thread, error %u.\n", GetLastError());
RegCloseKey(vr_key);
return; return;
} }
CloseHandle(thread); CloseHandle(thread);