vrclient: Convert pid to Unix pid in IVRApplications::RegisterSubprocess().

CW-Bug-Id: #20589

Author: Paul Gofman

vrclient_x64/cppIVRApplications_IVRApplications_008.cpp

@@ -521,24 +521,6 @@ NTSTATUS wow64_IVRApplications_IVRApplications_008_GetSceneApplicationStateNameF
 }
 #endif
 
-NTSTATUS IVRApplications_IVRApplications_008_RegisterSubprocess( void *args )
-{
-    struct IVRApplications_IVRApplications_008_RegisterSubprocess_params *params = (struct IVRApplications_IVRApplications_008_RegisterSubprocess_params *)args;
-    struct u_IVRApplications_IVRApplications_008 *iface = (struct u_IVRApplications_IVRApplications_008 *)params->u_iface;
-    params->_ret = iface->RegisterSubprocess( params->nPid );
-    return 0;
-}
-
-#if defined(__x86_64__) || defined(__aarch64__)
-NTSTATUS wow64_IVRApplications_IVRApplications_008_RegisterSubprocess( void *args )
-{
-    struct wow64_IVRApplications_IVRApplications_008_RegisterSubprocess_params *params = (struct wow64_IVRApplications_IVRApplications_008_RegisterSubprocess_params *)args;
-    struct u_IVRApplications_IVRApplications_008 *iface = (struct u_IVRApplications_IVRApplications_008 *)params->u_iface;
-    params->_ret = iface->RegisterSubprocess( params->nPid );
-    return 0;
-}
-#endif
-
 NTSTATUS IVRApplications_IVRApplications_008_GetCurrentSceneProcessId( void *args )
 {
     struct IVRApplications_IVRApplications_008_GetCurrentSceneProcessId_params *params = (struct IVRApplications_IVRApplications_008_GetCurrentSceneProcessId_params *)args;

vrclient_x64/gen_wrapper.py

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

vrclient_x64/unix_vrapplications_manual.cpp

@@ -134,8 +134,36 @@ static NTSTATUS IVRApplications_LaunchInternalProcess( Iface *iface, Params *par
     return 0;
 }
 
+template< typename Iface, typename Params >
+static NTSTATUS IVRApplications_RegisterSubprocess( Iface *iface, Params *params, bool wow64 )
+{
+    HANDLE handle;
+    CLIENT_ID id;
+    int pid;
+
+    params->_ret = 102; /* VRApplicationError_NoApplication */
+    id.UniqueProcess = ULongToHandle(params->nPid);
+    id.UniqueThread  = 0;
+    if (NtOpenProcess( &handle, PROCESS_QUERY_INFORMATION, NULL, &id ))
+    {
+        ERR( "NtOpenProcess failed for %d.\n", params->nPid );
+        return 0;
+    }
+    if (NtQueryInformationProcess( handle, ProcessWineUnixPid, &pid, sizeof(pid), NULL ))
+    {
+        ERR( "NtQueryInformationProcess failed for %d.\n", params->nPid );
+        NtClose( handle );
+        return 0;
+    }
+    NtClose( handle );
+    params->_ret = iface->RegisterSubprocess( pid );
+    TRACE( "pid %04x, _ret %d.\n", params->nPid, params->_ret );
+    return 0;
+}
+
 VRCLIENT_UNIX_IMPL( IVRApplications, 004, LaunchInternalProcess );
 VRCLIENT_UNIX_IMPL( IVRApplications, 005, LaunchInternalProcess );
 VRCLIENT_UNIX_IMPL( IVRApplications, 006, LaunchInternalProcess );
 VRCLIENT_UNIX_IMPL( IVRApplications, 007, LaunchInternalProcess );
 VRCLIENT_UNIX_IMPL( IVRApplications, 008, LaunchInternalProcess );
+VRCLIENT_UNIX_IMPL( IVRApplications, 008, RegisterSubprocess );