vrclient: Generate w32<->u64 structure converters.

vrclient_x64/cppIVRApplications_IVRApplications_005.cpp

@@ -69,7 +69,9 @@ NTSTATUS IVRApplications_IVRApplications_005_LaunchTemplateApplication( void *ar
 {
     struct IVRApplications_IVRApplications_005_LaunchTemplateApplication_params *params = (struct IVRApplications_IVRApplications_005_LaunchTemplateApplication_params *)args;
     struct u_IVRApplications_IVRApplications_005 *iface = (struct u_IVRApplications_IVRApplications_005 *)params->u_iface;
-    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
+    u_AppOverrideKeys_t u_pKeys;
+    if (params->pKeys) u_pKeys = *params->pKeys;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys ? &u_pKeys : nullptr, params->unKeys );
     return 0;
 }
 

vrclient_x64/cppIVRApplications_IVRApplications_006.cpp

@@ -69,7 +69,9 @@ NTSTATUS IVRApplications_IVRApplications_006_LaunchTemplateApplication( void *ar
 {
     struct IVRApplications_IVRApplications_006_LaunchTemplateApplication_params *params = (struct IVRApplications_IVRApplications_006_LaunchTemplateApplication_params *)args;
     struct u_IVRApplications_IVRApplications_006 *iface = (struct u_IVRApplications_IVRApplications_006 *)params->u_iface;
-    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
+    u_AppOverrideKeys_t u_pKeys;
+    if (params->pKeys) u_pKeys = *params->pKeys;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys ? &u_pKeys : nullptr, params->unKeys );
     return 0;
 }
 

vrclient_x64/cppIVRApplications_IVRApplications_007.cpp

@@ -69,7 +69,9 @@ NTSTATUS IVRApplications_IVRApplications_007_LaunchTemplateApplication( void *ar
 {
     struct IVRApplications_IVRApplications_007_LaunchTemplateApplication_params *params = (struct IVRApplications_IVRApplications_007_LaunchTemplateApplication_params *)args;
     struct u_IVRApplications_IVRApplications_007 *iface = (struct u_IVRApplications_IVRApplications_007 *)params->u_iface;
-    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
+    u_AppOverrideKeys_t u_pKeys;
+    if (params->pKeys) u_pKeys = *params->pKeys;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys ? &u_pKeys : nullptr, params->unKeys );
     return 0;
 }
 

vrclient_x64/cppIVRNotifications_IVRNotifications_001.cpp

@@ -17,7 +17,9 @@ NTSTATUS IVRNotifications_IVRNotifications_001_CreateNotification( void *args )
 {
     struct IVRNotifications_IVRNotifications_001_CreateNotification_params *params = (struct IVRNotifications_IVRNotifications_001_CreateNotification_params *)args;
     struct u_IVRNotifications_IVRNotifications_001 *iface = (struct u_IVRNotifications_IVRNotifications_001 *)params->u_iface;
-    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->strType, params->strText, params->strCategory, params->photo, params->notificationId );
+    u_NotificationBitmap u_photo;
+    if (params->photo) u_photo = *params->photo;
+    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->strType, params->strText, params->strCategory, params->photo ? &u_photo : nullptr, params->notificationId );
     return 0;
 }
 

vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp

@@ -9,7 +9,9 @@ NTSTATUS IVRNotifications_IVRNotifications_002_CreateNotification( void *args )
 {
     struct IVRNotifications_IVRNotifications_002_CreateNotification_params *params = (struct IVRNotifications_IVRNotifications_002_CreateNotification_params *)args;
     struct u_IVRNotifications_IVRNotifications_002 *iface = (struct u_IVRNotifications_IVRNotifications_002 *)params->u_iface;
-    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->type, params->pchText, params->style, params->pImage, params->pNotificationId );
+    u_NotificationBitmap_t u_pImage;
+    if (params->pImage) u_pImage = *params->pImage;
+    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->type, params->pchText, params->style, params->pImage ? &u_pImage : nullptr, params->pNotificationId );
     return 0;
 }
 

vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp

@@ -9,9 +9,12 @@ NTSTATUS IVROverlayView_IVROverlayView_003_AcquireOverlayView( void *args )
 {
     struct IVROverlayView_IVROverlayView_003_AcquireOverlayView_params *params = (struct IVROverlayView_IVROverlayView_003_AcquireOverlayView_params *)args;
     struct u_IVROverlayView_IVROverlayView_003 *iface = (struct u_IVROverlayView_IVROverlayView_003 *)params->u_iface;
+    u_VRNativeDevice_t u_pNativeDevice;
+    if (params->pNativeDevice) u_pNativeDevice = *params->pNativeDevice;
     u_VROverlayView_t u_pOverlayView;
     if (params->pOverlayView) u_pOverlayView = *params->pOverlayView;
-    params->_ret = iface->AcquireOverlayView( params->ulOverlayHandle, params->pNativeDevice, params->pOverlayView ? &u_pOverlayView : nullptr, params->unOverlayViewSize );
+    params->_ret = iface->AcquireOverlayView( params->ulOverlayHandle, params->pNativeDevice ? &u_pNativeDevice : nullptr, params->pOverlayView ? &u_pOverlayView : nullptr, params->unOverlayViewSize );
+    if (params->pNativeDevice) *params->pNativeDevice = u_pNativeDevice;
     if (params->pOverlayView) *params->pOverlayView = u_pOverlayView;
     return 0;
 }

vrclient_x64/gen_wrapper.py

@@ -222,6 +222,8 @@ unique_structs = []
 MANUAL_STRUCTS = [
     "COpenVRContext", # not actually used
 ]
+MANUAL_WOW64_STRUCTS = [
+]
 
 UNIX_FUNCS = [
     'vrclient_init',
@@ -408,15 +410,25 @@ class Struct:
             out(f'C_ASSERT( sizeof({prefix}{version}().{f.name}) >= {f.size} );\n')
         out(u'\n')
 
-    def write_converter(self, prefix):
+    def write_converter(self, abi):
         version = all_versions[sdkver][self.name]
-        out(f'{self._abi}_{version}::operator {prefix}{version}() const\n')
+        u_bits = abi[1:3] if abi[0] == 'u' else self._abi[1:3]
+
+        if u_bits == '64':
+            out(u'#ifdef __x86_64__\n')
+        elif u_bits == '32':
+            out(u'#ifdef __i386__\n')
+        else:
+            assert False
+
+        out(f'{self._abi}_{version}::operator {abi}_{version}() const\n')
         out(u'{\n')
-        out(f'    {prefix}{version} ret;\n')
+        out(f'    {abi}_{version} ret;\n')
         for field in self.fields:
             out(f'    ret.{field.name} = this->{field.name};\n')
         out(u'    return ret;\n')
         out(u'}\n')
+        out(u'#endif\n\n')
 
     def needs_conversion(self, other):
         if other.id in self._conv_cache:
@@ -1078,6 +1090,8 @@ def struct_needs_conversion(struct):
         return True
     if abis['w64'].needs_conversion(abis['u64']):
         return True
+    if abis['w32'].needs_conversion(abis['u64']):
+        return True
 
     assert abis['u32'].size <= abis['w32'].size
     if abis['u32'].size < abis['w32'].size:
@@ -1572,15 +1586,15 @@ with open('vrclient_structs_generated.h', 'w') as file:
                 continue
 
             if not abis["w64"].needs_conversion(abis["u64"]):
-                abis['w64'].write_definition(out, "w64_", [])
+                abis['w64'].write_definition(out, "w64_", ["w32_"])
             else:
                 abis['w64'].write_definition(out, "w64_", ["u64_"])
-                abis['u64'].write_definition(out, "u64_", ["w64_"])
+                abis['u64'].write_definition(out, "u64_", ["w64_", "w32_"])
 
             if not abis["w32"].needs_conversion(abis["u32"]):
-                abis['w32'].write_definition(out, "w32_", [])
+                abis['w32'].write_definition(out, "w32_", ["u64_"])
             else:
-                abis['w32'].write_definition(out, "w32_", ["u32_"])
+                abis['w32'].write_definition(out, "w32_", ["u32_", "u64_"])
                 abis['u32'].write_definition(out, "u32_", ["w32_"])
 
             out(u'#ifdef __i386__\n')
@@ -1721,15 +1735,13 @@ with open('unixlib_generated.cpp', 'w') as file:
                 continue
 
             if abis["w64"].needs_conversion(abis["u64"]):
-                out(u'#ifdef __x86_64__\n')
+                abis['w64'].write_converter('u64')
-                abis['w64'].write_converter('u64_')
+                abis['u64'].write_converter('w64')
-                out(u'\n')
-                abis['u64'].write_converter('w64_')
-                out(u'#endif\n\n')
 
             if abis["w32"].needs_conversion(abis["u32"]):
-                out(u'#ifdef __i386__\n')
+                abis['w32'].write_converter('u32')
-                abis['w32'].write_converter('u32_')
+                abis['u32'].write_converter('w32')
-                out(u'\n')
+
-                abis['u32'].write_converter('w32_')
+            if name not in MANUAL_WOW64_STRUCTS:
-                out(u'#endif\n\n')
+                abis['w32'].write_converter('u64')
+                abis['u64'].write_converter('w32')