proton: undo the effect of PYTHONSAFEPATH if any

Makefile.in

@@ -1233,7 +1233,7 @@ all-dist: $(DIST_WINEMONO)
 ## xalia
 ##
 
-XALIA_VER := 0.4.8
+XALIA_VER := 0.4.9
 XALIA_ZIP := xalia-$(XALIA_VER)-net48-mono.zip
 DIST_XALIA_DIR := $(DST_DIR)/share/xalia
 DIST_XALIA := $(OBJ)/.xalia-dist

proton

@@ -35,6 +35,12 @@ from ctypes import c_void_p
 from ctypes import c_size_t
 from ctypes import c_ssize_t
 
+# PYTHONSAFEPATH might be set, so add the script directory to the path for relative imports
+try:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+except NameError:
+    pass
+
 from filelock import FileLock
 from random import randrange
 

vrclient_x64/Makefile.in

@@ -13,6 +13,7 @@ EXTRADEFS = -DGNUC
 
 SOURCES = \
 	flatapi.c \
+	vrapplications_manual.c \
 	vrclient_generated.c \
 	vrclient_main.c \
 	vrcompositor_manual.c \

vrclient_x64/gen_wrapper.py

@@ -245,7 +245,7 @@
 ]
 
 MANUAL_METHODS = {
-    "IVRApplications_LaunchInternalProcess": lambda ver, abi: abi == 'u',
+    "IVRApplications_LaunchInternalProcess": True,
     "IVRApplications_RegisterSubprocess": lambda ver, abi: abi == 'u',
     "IVRClientCore_BIsHmdPresent": lambda ver, abi: abi == 'w',
     "IVRClientCore_Init": lambda ver, abi: True,

vrclient_x64/vrapplications_manual.c

@@ -0,0 +1,120 @@
+#include "vrclient_private.h"
+#include "winreg.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
+
+static BOOL launch_through_register_subprocess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments,
+        const char *pchWorkingDirectory, uint32_t *ret)
+{
+    static struct u_iface apps_iface;
+    struct IVRApplications_IVRApplications_008_RegisterSubprocess_params params = { 0 };
+    PROCESS_INFORMATION pi;
+    STARTUPINFOA si = { sizeof(si) };
+
+    TRACE("pchBinaryPath %s, pchArguments %s, pchWorkingDirectory %s.\n",
+            debugstr_a(pchBinaryPath), debugstr_a(pchArguments), debugstr_a(pchWorkingDirectory));
+
+    if (!apps_iface.handle)
+    {
+        int return_code;
+        struct vrclient_VRClientCoreFactory_params params = {.name = "IVRApplications_008", .return_code = &return_code};
+        VRCLIENT_CALL( vrclient_VRClientCoreFactory, &params );
+        apps_iface = params._ret;
+    }
+    if (!apps_iface.handle)
+    {
+        FIXME("IVRApplications_008 not found.\n");
+        return FALSE;
+    }
+
+    *ret = 104; /* VRApplicationError_UnknownApplication */
+    if (!CreateProcessA(pchBinaryPath, (char *)pchArguments, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, pchWorkingDirectory, &si, &pi))
+    {
+        ERR( "CreateProcessW failed, err %lu.\n", GetLastError() );
+        return TRUE;
+    }
+    params.u_iface = apps_iface;
+    params.nPid = GetProcessId(pi.hProcess);
+    VRCLIENT_CALL( IVRApplications_IVRApplications_008_RegisterSubprocess, &params );
+    *ret = params._ret;
+    if (params._ret) TerminateProcess(pi.hProcess, -1);
+    else             ResumeThread(pi.hThread);
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+    return TRUE;
+}
+
+uint32_t __thiscall winIVRApplications_IVRApplications_004_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
+{
+    struct IVRApplications_IVRApplications_004_LaunchInternalProcess_params params =
+    {
+        .u_iface = _this->u_iface,
+        .pchBinaryPath = pchBinaryPath,
+        .pchArguments = pchArguments,
+        .pchWorkingDirectory = pchWorkingDirectory,
+    };
+    TRACE("%p\n", _this);
+    if (!launch_through_register_subprocess(_this, pchBinaryPath, pchArguments, pchWorkingDirectory, &params._ret))
+        VRCLIENT_CALL( IVRApplications_IVRApplications_004_LaunchInternalProcess, &params );
+    return params._ret;
+}
+
+uint32_t __thiscall winIVRApplications_IVRApplications_005_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
+{
+    struct IVRApplications_IVRApplications_005_LaunchInternalProcess_params params =
+    {
+        .u_iface = _this->u_iface,
+        .pchBinaryPath = pchBinaryPath,
+        .pchArguments = pchArguments,
+        .pchWorkingDirectory = pchWorkingDirectory,
+    };
+    TRACE("%p\n", _this);
+    if (!launch_through_register_subprocess(_this, pchBinaryPath, pchArguments, pchWorkingDirectory, &params._ret))
+        VRCLIENT_CALL( IVRApplications_IVRApplications_005_LaunchInternalProcess, &params );
+    return params._ret;
+}
+
+uint32_t __thiscall winIVRApplications_IVRApplications_006_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
+{
+    struct IVRApplications_IVRApplications_006_LaunchInternalProcess_params params =
+    {
+        .u_iface = _this->u_iface,
+        .pchBinaryPath = pchBinaryPath,
+        .pchArguments = pchArguments,
+        .pchWorkingDirectory = pchWorkingDirectory,
+    };
+    TRACE("%p\n", _this);
+    if (!launch_through_register_subprocess(_this, pchBinaryPath, pchArguments, pchWorkingDirectory, &params._ret))
+        VRCLIENT_CALL( IVRApplications_IVRApplications_006_LaunchInternalProcess, &params );
+    return params._ret;
+}
+
+uint32_t __thiscall winIVRApplications_IVRApplications_007_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
+{
+    struct IVRApplications_IVRApplications_007_LaunchInternalProcess_params params =
+    {
+        .u_iface = _this->u_iface,
+        .pchBinaryPath = pchBinaryPath,
+        .pchArguments = pchArguments,
+        .pchWorkingDirectory = pchWorkingDirectory,
+    };
+    TRACE("%p\n", _this);
+    if (!launch_through_register_subprocess(_this, pchBinaryPath, pchArguments, pchWorkingDirectory, &params._ret))
+        VRCLIENT_CALL( IVRApplications_IVRApplications_007_LaunchInternalProcess, &params );
+    return params._ret;
+}
+
+uint32_t __thiscall winIVRApplications_IVRApplications_008_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
+{
+    struct IVRApplications_IVRApplications_008_LaunchInternalProcess_params params =
+    {
+        .u_iface = _this->u_iface,
+        .pchBinaryPath = pchBinaryPath,
+        .pchArguments = pchArguments,
+        .pchWorkingDirectory = pchWorkingDirectory,
+    };
+    TRACE("%p\n", _this);
+    if (!launch_through_register_subprocess(_this, pchBinaryPath, pchArguments, pchWorkingDirectory, &params._ret))
+        VRCLIENT_CALL( IVRApplications_IVRApplications_008_LaunchInternalProcess, &params );
+    return params._ret;
+}

vrclient_x64/winIVRApplications.c

@@ -1420,19 +1420,7 @@ int8_t __thiscall winIVRApplications_IVRApplications_004_IsQuitUserPromptRequest
     return params._ret;
 }
 
-uint32_t __thiscall winIVRApplications_IVRApplications_004_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
-{
-    struct IVRApplications_IVRApplications_004_LaunchInternalProcess_params params =
-    {
-        .u_iface = _this->u_iface,
-        .pchBinaryPath = pchBinaryPath,
-        .pchArguments = pchArguments,
-        .pchWorkingDirectory = pchWorkingDirectory,
-    };
-    TRACE("%p\n", _this);
-    VRCLIENT_CALL( IVRApplications_IVRApplications_004_LaunchInternalProcess, &params );
-    return params._ret;
-}
+extern uint32_t __thiscall winIVRApplications_IVRApplications_004_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory);
 
 extern vtable_ptr winIVRApplications_IVRApplications_004_vtable;
 
@@ -1844,19 +1832,7 @@ int8_t __thiscall winIVRApplications_IVRApplications_005_IsQuitUserPromptRequest
     return params._ret;
 }
 
-uint32_t __thiscall winIVRApplications_IVRApplications_005_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
-{
-    struct IVRApplications_IVRApplications_005_LaunchInternalProcess_params params =
-    {
-        .u_iface = _this->u_iface,
-        .pchBinaryPath = pchBinaryPath,
-        .pchArguments = pchArguments,
-        .pchWorkingDirectory = pchWorkingDirectory,
-    };
-    TRACE("%p\n", _this);
-    VRCLIENT_CALL( IVRApplications_IVRApplications_005_LaunchInternalProcess, &params );
-    return params._ret;
-}
+extern uint32_t __thiscall winIVRApplications_IVRApplications_005_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory);
 
 extern vtable_ptr winIVRApplications_IVRApplications_005_vtable;
 
@@ -2359,19 +2335,7 @@ int8_t __thiscall winIVRApplications_IVRApplications_006_IsQuitUserPromptRequest
     return params._ret;
 }
 
-uint32_t __thiscall winIVRApplications_IVRApplications_006_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
-{
-    struct IVRApplications_IVRApplications_006_LaunchInternalProcess_params params =
-    {
-        .u_iface = _this->u_iface,
-        .pchBinaryPath = pchBinaryPath,
-        .pchArguments = pchArguments,
-        .pchWorkingDirectory = pchWorkingDirectory,
-    };
-    TRACE("%p\n", _this);
-    VRCLIENT_CALL( IVRApplications_IVRApplications_006_LaunchInternalProcess, &params );
-    return params._ret;
-}
+extern uint32_t __thiscall winIVRApplications_IVRApplications_006_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory);
 
 uint32_t __thiscall winIVRApplications_IVRApplications_006_GetCurrentSceneProcessId(struct w_iface *_this)
 {
@@ -2887,19 +2851,7 @@ const char * __thiscall winIVRApplications_IVRApplications_007_GetSceneApplicati
     return get_unix_buffer( params._ret );
 }
 
-uint32_t __thiscall winIVRApplications_IVRApplications_007_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
-{
-    struct IVRApplications_IVRApplications_007_LaunchInternalProcess_params params =
-    {
-        .u_iface = _this->u_iface,
-        .pchBinaryPath = pchBinaryPath,
-        .pchArguments = pchArguments,
-        .pchWorkingDirectory = pchWorkingDirectory,
-    };
-    TRACE("%p\n", _this);
-    VRCLIENT_CALL( IVRApplications_IVRApplications_007_LaunchInternalProcess, &params );
-    return params._ret;
-}
+extern uint32_t __thiscall winIVRApplications_IVRApplications_007_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory);
 
 uint32_t __thiscall winIVRApplications_IVRApplications_007_GetCurrentSceneProcessId(struct w_iface *_this)
 {
@@ -3414,19 +3366,7 @@ const char * __thiscall winIVRApplications_IVRApplications_008_GetSceneApplicati
     return get_unix_buffer( params._ret );
 }
 
-uint32_t __thiscall winIVRApplications_IVRApplications_008_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory)
-{
-    struct IVRApplications_IVRApplications_008_LaunchInternalProcess_params params =
-    {
-        .u_iface = _this->u_iface,
-        .pchBinaryPath = pchBinaryPath,
-        .pchArguments = pchArguments,
-        .pchWorkingDirectory = pchWorkingDirectory,
-    };
-    TRACE("%p\n", _this);
-    VRCLIENT_CALL( IVRApplications_IVRApplications_008_LaunchInternalProcess, &params );
-    return params._ret;
-}
+extern uint32_t __thiscall winIVRApplications_IVRApplications_008_LaunchInternalProcess(struct w_iface *_this, const char *pchBinaryPath, const char *pchArguments, const char *pchWorkingDirectory);
 
 uint32_t __thiscall winIVRApplications_IVRApplications_008_RegisterSubprocess(struct w_iface *_this, uint32_t nPid)
 {