vrclient: Use 64bit handles for unix side interface pointers.

Based on a patch from Billy Laws.
2025-05-17 17:08:11 +03:00 · 2025-01-16 10:28:44 +01:00 · 2025-01-16 10:28:44 +01:00 · f925f2f0d3
commit f925f2f0d3
parent d89c5c80bb
29 changed files with 4182 additions and 4175 deletions
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@ -462,9 +462,15 @@ class Method:
    def get_arguments(self):
        return self._cursor.get_arguments()
    def returns_unix_iface(self):
        return self.name.startswith('GetGenericInterface')
    def write_params(self, out):
        returns_record = self.result_type.get_canonical().kind == TypeKind.RECORD
        if self.returns_unix_iface():
            ret = 'struct u_iface _ret'
        else:
            ret = "*_ret" if returns_record else "_ret"
            ret = f'{declspec(self.result_type, ret, "w_")}'
@ -476,7 +482,7 @@ class Method:
            params = [ret] + params
            names = ['_ret'] + names
-        params = ['void *u_iface'] + params
+        params = ['struct u_iface u_iface'] + params
        names = ['u_iface'] + names
        out(f'struct {self.full_name}_params\n')
@ -965,7 +971,7 @@ def handle_class(klass):
        out(u'    );\n')
        out(u'__ASM_BLOCK_END\n')
        out(u'\n')
-        out(f'struct w_iface *create_{winclassname}(void *u_iface)\n')
+        out(f'struct w_iface *create_{winclassname}( struct u_iface u_iface )\n')
        out(u'{\n')
        out(u'    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));\n')
        out(u'    TRACE("-> %p\\n", r);\n')
@ -980,7 +986,7 @@ def handle_class(klass):
        out(u'}\n\n')
        # flat (FnTable) API
-        out(f'struct w_iface *create_{winclassname}_FnTable(void *u_iface)\n')
+        out(f'struct w_iface *create_{winclassname}_FnTable( struct u_iface u_iface )\n')
        out(u'{\n')
        out(u'    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));\n')
        out(f'    struct thunk *thunks = alloc_thunks({len(klass.methods)});\n')
@ -1405,8 +1411,8 @@ with open("vrclient_generated.h", "w") as file:
    out(u'/* This file is auto-generated, do not edit. */\n\n')
    for _, klass in sorted(all_classes.items()):
-        out(f"extern struct w_iface *create_win{klass.full_name}(void *);\n")
+        out(f"extern struct w_iface *create_win{klass.full_name}( struct u_iface );\n")
-        out(f"extern struct w_iface *create_win{klass.full_name}_FnTable(void *);\n")
+        out(f"extern struct w_iface *create_win{klass.full_name}_FnTable( struct u_iface );\n")
        out(f"extern void destroy_win{klass.full_name}(struct w_iface *);\n")
        out(f"extern void destroy_win{klass.full_name}_FnTable(struct w_iface *);\n")
--- a/vrclient_x64/unixlib.h
+++ b/vrclient_x64/unixlib.h
@ -61,14 +61,14 @@ struct vrclient_init_registry_params
 struct vrclient_HmdSystemFactory_params
 {
-    void *_ret;
+    struct u_iface _ret;
    const char *name;
    int *return_code;
 };
 struct vrclient_VRClientCoreFactory_params
 {
-    void *_ret;
+    struct u_iface _ret;
    const char *name;
    int *return_code;
 };
--- a/vrclient_x64/unixlib_generated.h
+++ b/vrclient_x64/unixlib_generated.h
--- a/vrclient_x64/vrclient_generated.h
+++ b/vrclient_x64/vrclient_generated.h
@ -1,434 +1,434 @@
 /* This file is auto-generated, do not edit. */
-extern struct w_iface *create_winIVRApplications_IVRApplications_001(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_001( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_001_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_001_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_001(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_002(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_002( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_002_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_002_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_002(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_003(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_003( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_003_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_003_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_003(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_004(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_004( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_004_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_004_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_004(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_005(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_005( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_005_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_005_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_005(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_006(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_006( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_006_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_006_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_006(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRApplications_IVRApplications_007(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_007( struct u_iface );
-extern struct w_iface *create_winIVRApplications_IVRApplications_007_FnTable(void *);
+extern struct w_iface *create_winIVRApplications_IVRApplications_007_FnTable( struct u_iface );
 extern void destroy_winIVRApplications_IVRApplications_007(struct w_iface *);
 extern void destroy_winIVRApplications_IVRApplications_007_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004( struct u_iface );
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004_FnTable(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004_FnTable( struct u_iface );
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_004(struct w_iface *);
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005( struct u_iface );
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005_FnTable(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005_FnTable( struct u_iface );
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_005(struct w_iface *);
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006( struct u_iface );
-extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable(void *);
+extern struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable( struct u_iface );
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_006(struct w_iface *);
 extern void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_002(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_002( struct u_iface );
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_002_FnTable(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_002_FnTable( struct u_iface );
 extern void destroy_winIVRChaperone_IVRChaperone_002(struct w_iface *);
 extern void destroy_winIVRChaperone_IVRChaperone_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_003(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_003( struct u_iface );
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_003_FnTable(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_003_FnTable( struct u_iface );
 extern void destroy_winIVRChaperone_IVRChaperone_003(struct w_iface *);
 extern void destroy_winIVRChaperone_IVRChaperone_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_004(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_004( struct u_iface );
-extern struct w_iface *create_winIVRChaperone_IVRChaperone_004_FnTable(void *);
+extern struct w_iface *create_winIVRChaperone_IVRChaperone_004_FnTable( struct u_iface );
 extern void destroy_winIVRChaperone_IVRChaperone_004(struct w_iface *);
 extern void destroy_winIVRChaperone_IVRChaperone_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRClientCore_IVRClientCore_002(void *);
+extern struct w_iface *create_winIVRClientCore_IVRClientCore_002( struct u_iface );
-extern struct w_iface *create_winIVRClientCore_IVRClientCore_002_FnTable(void *);
+extern struct w_iface *create_winIVRClientCore_IVRClientCore_002_FnTable( struct u_iface );
 extern void destroy_winIVRClientCore_IVRClientCore_002(struct w_iface *);
 extern void destroy_winIVRClientCore_IVRClientCore_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRClientCore_IVRClientCore_003(void *);
+extern struct w_iface *create_winIVRClientCore_IVRClientCore_003( struct u_iface );
-extern struct w_iface *create_winIVRClientCore_IVRClientCore_003_FnTable(void *);
+extern struct w_iface *create_winIVRClientCore_IVRClientCore_003_FnTable( struct u_iface );
 extern void destroy_winIVRClientCore_IVRClientCore_003(struct w_iface *);
 extern void destroy_winIVRClientCore_IVRClientCore_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_005(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_005( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_005_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_005_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_005(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_006(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_006( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_006_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_006_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_006(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_007(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_007( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_007_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_007_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_007(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_007_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_008(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_008( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_008_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_008_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_008(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_008_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_009(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_009( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_009_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_009_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_009(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_009_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_010(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_010( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_010_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_010_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_010(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_010_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_011(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_011( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_011_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_011_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_011(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_011_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_012(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_012( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_012_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_012_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_012(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_012_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_013(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_013( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_013_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_013_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_013(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_013_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_014(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_014( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_014_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_014_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_014(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_014_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_015(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_015( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_015_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_015_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_015(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_015_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_016(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_016( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_016_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_016_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_016(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_016_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_017(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_017( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_017_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_017_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_017(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_017_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_018(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_018( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_018_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_018_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_018(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_018_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_019(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_019( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_019_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_019_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_019(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_019_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_020(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_020( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_020_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_020_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_020(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_020_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_021(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_021( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_021_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_021_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_021(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_021_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_022(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_022( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_022_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_022_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_022(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_022_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_024(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_024( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_024_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_024_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_024(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_024_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_026(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_026( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_026_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_026_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_026(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_026_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_027(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_027( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_027_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_027_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_027(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_027_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_028(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_028( struct u_iface );
-extern struct w_iface *create_winIVRCompositor_IVRCompositor_028_FnTable(void *);
+extern struct w_iface *create_winIVRCompositor_IVRCompositor_028_FnTable( struct u_iface );
 extern void destroy_winIVRCompositor_IVRCompositor_028(struct w_iface *);
 extern void destroy_winIVRCompositor_IVRCompositor_028_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRControlPanel_IVRControlPanel_006(void *);
+extern struct w_iface *create_winIVRControlPanel_IVRControlPanel_006( struct u_iface );
-extern struct w_iface *create_winIVRControlPanel_IVRControlPanel_006_FnTable(void *);
+extern struct w_iface *create_winIVRControlPanel_IVRControlPanel_006_FnTable( struct u_iface );
 extern void destroy_winIVRControlPanel_IVRControlPanel_006(struct w_iface *);
 extern void destroy_winIVRControlPanel_IVRControlPanel_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRDriverManager_IVRDriverManager_001(void *);
+extern struct w_iface *create_winIVRDriverManager_IVRDriverManager_001( struct u_iface );
-extern struct w_iface *create_winIVRDriverManager_IVRDriverManager_001_FnTable(void *);
+extern struct w_iface *create_winIVRDriverManager_IVRDriverManager_001_FnTable( struct u_iface );
 extern void destroy_winIVRDriverManager_IVRDriverManager_001(struct w_iface *);
 extern void destroy_winIVRDriverManager_IVRDriverManager_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001(void *);
+extern struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001( struct u_iface );
-extern struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable(void *);
+extern struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable( struct u_iface );
 extern void destroy_winIVRExtendedDisplay_IVRExtendedDisplay_001(struct w_iface *);
 extern void destroy_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001(void *);
+extern struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001( struct u_iface );
-extern struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001_FnTable(void *);
+extern struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001_FnTable( struct u_iface );
 extern void destroy_winIVRHeadsetView_IVRHeadsetView_001(struct w_iface *);
 extern void destroy_winIVRHeadsetView_IVRHeadsetView_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001(void *);
+extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001( struct u_iface );
-extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001_FnTable(void *);
+extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001_FnTable( struct u_iface );
 extern void destroy_winIVRIOBuffer_IVRIOBuffer_001(struct w_iface *);
 extern void destroy_winIVRIOBuffer_IVRIOBuffer_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002(void *);
+extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002( struct u_iface );
-extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002_FnTable(void *);
+extern struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002_FnTable( struct u_iface );
 extern void destroy_winIVRIOBuffer_IVRIOBuffer_002(struct w_iface *);
 extern void destroy_winIVRIOBuffer_IVRIOBuffer_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_003(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_003( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_003_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_003_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_003(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_004(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_004( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_004_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_004_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_004(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_005(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_005( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_005_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_005_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_005(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_006(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_006( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_006_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_006_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_006(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_007(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_007( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_007_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_007_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_007(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_007_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRInput_IVRInput_010(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_010( struct u_iface );
-extern struct w_iface *create_winIVRInput_IVRInput_010_FnTable(void *);
+extern struct w_iface *create_winIVRInput_IVRInput_010_FnTable( struct u_iface );
 extern void destroy_winIVRInput_IVRInput_010(struct w_iface *);
 extern void destroy_winIVRInput_IVRInput_010_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRMailbox_IVRMailbox_001(void *);
+extern struct w_iface *create_winIVRMailbox_IVRMailbox_001( struct u_iface );
-extern struct w_iface *create_winIVRMailbox_IVRMailbox_001_FnTable(void *);
+extern struct w_iface *create_winIVRMailbox_IVRMailbox_001_FnTable( struct u_iface );
 extern void destroy_winIVRMailbox_IVRMailbox_001(struct w_iface *);
 extern void destroy_winIVRMailbox_IVRMailbox_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRNotifications_IVRNotifications_001(void *);
+extern struct w_iface *create_winIVRNotifications_IVRNotifications_001( struct u_iface );
-extern struct w_iface *create_winIVRNotifications_IVRNotifications_001_FnTable(void *);
+extern struct w_iface *create_winIVRNotifications_IVRNotifications_001_FnTable( struct u_iface );
 extern void destroy_winIVRNotifications_IVRNotifications_001(struct w_iface *);
 extern void destroy_winIVRNotifications_IVRNotifications_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRNotifications_IVRNotifications_002(void *);
+extern struct w_iface *create_winIVRNotifications_IVRNotifications_002( struct u_iface );
-extern struct w_iface *create_winIVRNotifications_IVRNotifications_002_FnTable(void *);
+extern struct w_iface *create_winIVRNotifications_IVRNotifications_002_FnTable( struct u_iface );
 extern void destroy_winIVRNotifications_IVRNotifications_002(struct w_iface *);
 extern void destroy_winIVRNotifications_IVRNotifications_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlayView_IVROverlayView_003(void *);
+extern struct w_iface *create_winIVROverlayView_IVROverlayView_003( struct u_iface );
-extern struct w_iface *create_winIVROverlayView_IVROverlayView_003_FnTable(void *);
+extern struct w_iface *create_winIVROverlayView_IVROverlayView_003_FnTable( struct u_iface );
 extern void destroy_winIVROverlayView_IVROverlayView_003(struct w_iface *);
 extern void destroy_winIVROverlayView_IVROverlayView_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_001(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_001( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_001_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_001_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_001(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_002(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_002( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_002_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_002_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_002(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_003(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_003( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_003_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_003_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_003(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_004(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_004( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_004_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_004_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_004(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_005(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_005( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_005_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_005_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_005(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_007(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_007( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_007_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_007_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_007(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_007_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_008(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_008( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_008_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_008_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_008(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_008_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_010(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_010( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_010_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_010_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_010(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_010_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_011(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_011( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_011_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_011_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_011(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_011_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_012(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_012( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_012_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_012_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_012(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_012_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_013(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_013( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_013_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_013_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_013(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_013_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_014(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_014( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_014_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_014_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_014(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_014_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_016(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_016( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_016_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_016_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_016(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_016_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_017(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_017( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_017_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_017_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_017(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_017_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_018(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_018( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_018_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_018_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_018(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_018_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_019(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_019( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_019_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_019_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_019(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_019_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_020(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_020( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_020_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_020_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_020(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_020_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_021(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_021( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_021_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_021_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_021(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_021_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_022(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_022( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_022_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_022_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_022(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_022_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_024(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_024( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_024_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_024_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_024(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_024_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_025(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_025( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_025_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_025_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_025(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_025_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_026(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_026( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_026_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_026_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_026(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_026_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVROverlay_IVROverlay_027(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_027( struct u_iface );
-extern struct w_iface *create_winIVROverlay_IVROverlay_027_FnTable(void *);
+extern struct w_iface *create_winIVROverlay_IVROverlay_027_FnTable( struct u_iface );
 extern void destroy_winIVROverlay_IVROverlay_027(struct w_iface *);
 extern void destroy_winIVROverlay_IVROverlay_027_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_001(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_001( struct u_iface );
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_001_FnTable(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_001_FnTable( struct u_iface );
 extern void destroy_winIVRRenderModels_IVRRenderModels_001(struct w_iface *);
 extern void destroy_winIVRRenderModels_IVRRenderModels_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_002(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_002( struct u_iface );
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_002_FnTable(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_002_FnTable( struct u_iface );
 extern void destroy_winIVRRenderModels_IVRRenderModels_002(struct w_iface *);
 extern void destroy_winIVRRenderModels_IVRRenderModels_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_004(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_004( struct u_iface );
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_004_FnTable(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_004_FnTable( struct u_iface );
 extern void destroy_winIVRRenderModels_IVRRenderModels_004(struct w_iface *);
 extern void destroy_winIVRRenderModels_IVRRenderModels_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_005(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_005( struct u_iface );
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_005_FnTable(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_005_FnTable( struct u_iface );
 extern void destroy_winIVRRenderModels_IVRRenderModels_005(struct w_iface *);
 extern void destroy_winIVRRenderModels_IVRRenderModels_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_006(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_006( struct u_iface );
-extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_006_FnTable(void *);
+extern struct w_iface *create_winIVRRenderModels_IVRRenderModels_006_FnTable( struct u_iface );
 extern void destroy_winIVRRenderModels_IVRRenderModels_006(struct w_iface *);
 extern void destroy_winIVRRenderModels_IVRRenderModels_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRResources_IVRResources_001(void *);
+extern struct w_iface *create_winIVRResources_IVRResources_001( struct u_iface );
-extern struct w_iface *create_winIVRResources_IVRResources_001_FnTable(void *);
+extern struct w_iface *create_winIVRResources_IVRResources_001_FnTable( struct u_iface );
 extern void destroy_winIVRResources_IVRResources_001(struct w_iface *);
 extern void destroy_winIVRResources_IVRResources_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRScreenshots_IVRScreenshots_001(void *);
+extern struct w_iface *create_winIVRScreenshots_IVRScreenshots_001( struct u_iface );
-extern struct w_iface *create_winIVRScreenshots_IVRScreenshots_001_FnTable(void *);
+extern struct w_iface *create_winIVRScreenshots_IVRScreenshots_001_FnTable( struct u_iface );
 extern void destroy_winIVRScreenshots_IVRScreenshots_001(struct w_iface *);
 extern void destroy_winIVRScreenshots_IVRScreenshots_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSettings_IVRSettings_001(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_001( struct u_iface );
-extern struct w_iface *create_winIVRSettings_IVRSettings_001_FnTable(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_001_FnTable( struct u_iface );
 extern void destroy_winIVRSettings_IVRSettings_001(struct w_iface *);
 extern void destroy_winIVRSettings_IVRSettings_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSettings_IVRSettings_002(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_002( struct u_iface );
-extern struct w_iface *create_winIVRSettings_IVRSettings_002_FnTable(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_002_FnTable( struct u_iface );
 extern void destroy_winIVRSettings_IVRSettings_002(struct w_iface *);
 extern void destroy_winIVRSettings_IVRSettings_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSettings_IVRSettings_003(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_003( struct u_iface );
-extern struct w_iface *create_winIVRSettings_IVRSettings_003_FnTable(void *);
+extern struct w_iface *create_winIVRSettings_IVRSettings_003_FnTable( struct u_iface );
 extern void destroy_winIVRSettings_IVRSettings_003(struct w_iface *);
 extern void destroy_winIVRSettings_IVRSettings_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_003(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_003( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_003_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_003_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_003(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_004(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_004( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_004_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_004_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_004(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_005(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_005( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_005_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_005_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_005(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_006(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_006( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_006_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_006_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_006(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_006_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_009(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_009( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_009_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_009_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_009(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_009_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_010(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_010( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_010_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_010_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_010(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_010_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_011(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_011( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_011_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_011_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_011(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_011_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_012(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_012( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_012_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_012_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_012(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_012_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_014(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_014( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_014_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_014_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_014(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_014_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_015(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_015( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_015_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_015_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_015(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_015_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_016(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_016( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_016_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_016_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_016(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_016_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_017(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_017( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_017_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_017_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_017(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_017_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_019(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_019( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_019_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_019_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_019(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_019_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_020(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_020( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_020_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_020_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_020(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_020_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_021(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_021( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_021_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_021_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_021(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_021_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRSystem_IVRSystem_022(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_022( struct u_iface );
-extern struct w_iface *create_winIVRSystem_IVRSystem_022_FnTable(void *);
+extern struct w_iface *create_winIVRSystem_IVRSystem_022_FnTable( struct u_iface );
 extern void destroy_winIVRSystem_IVRSystem_022(struct w_iface *);
 extern void destroy_winIVRSystem_IVRSystem_022_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_001(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_001_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_002(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_002_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_003(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_003_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_004(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_004_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_005(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_005_FnTable(struct w_iface *);
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006( struct u_iface );
-extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable(void *);
+extern struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable( struct u_iface );
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_006(struct w_iface *);
 extern void destroy_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable(struct w_iface *);
--- a/vrclient_x64/vrclient_main.c
+++ b/vrclient_x64/vrclient_main.c
@ -47,14 +47,14 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
            break;
        case DLL_PROCESS_DETACH:
-            if (compositor_data.client_core_linux_side)
+            if (compositor_data.u_client_core_iface.handle)
            {
                struct IVRClientCore_IVRClientCore_003_Cleanup_params params =
                {
-                    .u_iface = compositor_data.client_core_linux_side,
+                    .u_iface = compositor_data.u_client_core_iface,
                };
                VRCLIENT_CALL( IVRClientCore_IVRClientCore_003_Cleanup, &params );
-                compositor_data.client_core_linux_side = NULL;
+                compositor_data.u_client_core_iface.handle = 0;
            }
            VRCLIENT_CALL( vrclient_unload, NULL );
            vrclient_loaded = FALSE;
@ -94,14 +94,14 @@ static BOOL array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_
    return TRUE;
 }
-struct w_iface *create_win_interface(const char *name, void *linux_side)
+struct w_iface *create_win_interface( const char *name, struct u_iface u_iface )
 {
    iface_constructor constructor;
    TRACE("trying to create %s\n", name);
-    if (!linux_side) return NULL;
+    if (!u_iface.handle) return NULL;
-    if ((constructor = find_iface_constructor( name ))) return constructor( linux_side );
+    if ((constructor = find_iface_constructor( name ))) return constructor( u_iface );
    ERR("Don't recognize interface name: %s\n", name);
    return NULL;
@ -387,13 +387,13 @@ done:
    return is_hmd_present;
 }
-static void *ivrclientcore_get_generic_interface( void *object, const char *name_and_version, struct client_core_data *user_data )
+static struct w_iface *ivrclientcore_get_generic_interface( struct u_iface object, const char *name_and_version, struct client_core_data *user_data )
 {
    struct w_iface *win_object;
    struct generic_interface *iface;
    iface_destructor destructor;
-    TRACE( "%p %p\n", object, name_and_version );
+    TRACE( "%#I64x %p\n", object.handle, name_and_version );
    if (!(win_object = create_win_interface(name_and_version, object)))
    {
@ -583,26 +583,25 @@ void *__thiscall winIVRClientCore_IVRClientCore_002_GetGenericInterface( struct
    VRCLIENT_CALL( IVRClientCore_IVRClientCore_002_GetGenericInterface, &params );
-    if (!params._ret)
+    if (!params._ret.handle)
    {
        WARN( "Failed to create %s.\n", pchNameAndVersion );
        return NULL;
    }
-    params._ret = ivrclientcore_get_generic_interface( params._ret, pchNameAndVersion, &_this->user_data );
+    return ivrclientcore_get_generic_interface( params._ret, pchNameAndVersion, &_this->user_data );
    return params._ret;
 }
 int8_t __thiscall winIVRClientCore_IVRClientCore_002_BIsHmdPresent( struct w_iface *_this )
 {
    struct IVRClientCore_IVRClientCore_002_BIsHmdPresent_params params = {.u_iface = _this->u_iface};
-    TRACE( "linux_side %p, compositor_data.client_core_linux_side %p.\n", _this->u_iface,
+    TRACE( "u_iface %#I64x, compositor_data.u_client_core_iface %#I64x.\n", _this->u_iface.handle,
-           compositor_data.client_core_linux_side );
+           compositor_data.u_client_core_iface.handle );
    /* BIsHmdPresent() currently always returns FALSE on Linux if called before Init().
     * Return true if the value stored by steam.exe helper in registry says the HMD is presnt. */
-    if (compositor_data.client_core_linux_side || !is_hmd_present_reg())
+    if (compositor_data.u_client_core_iface.handle || !is_hmd_present_reg())
    {
        VRCLIENT_CALL( IVRClientCore_IVRClientCore_002_BIsHmdPresent, &params );
        return params._ret;
@ -628,7 +627,7 @@ uint32_t __thiscall winIVRClientCore_IVRClientCore_003_Init( struct w_iface *_th
    VRCLIENT_CALL( IVRClientCore_IVRClientCore_003_Init, &params );
    if (params._ret) WARN( "error %#x\n", params._ret );
-    else compositor_data.client_core_linux_side = params.u_iface;
+    else compositor_data.u_client_core_iface = params.u_iface;
    return params._ret;
 }
@ -663,26 +662,25 @@ void *__thiscall winIVRClientCore_IVRClientCore_003_GetGenericInterface( struct
    VRCLIENT_CALL( IVRClientCore_IVRClientCore_003_GetGenericInterface, &params );
-    if (!params._ret)
+    if (!params._ret.handle)
    {
        WARN( "Failed to create %s.\n", pchNameAndVersion );
        return NULL;
    }
-    params._ret = ivrclientcore_get_generic_interface( params._ret, pchNameAndVersion, &_this->user_data );
+    return ivrclientcore_get_generic_interface( params._ret, pchNameAndVersion, &_this->user_data );
    return params._ret;
 }
 int8_t __thiscall winIVRClientCore_IVRClientCore_003_BIsHmdPresent( struct w_iface *_this )
 {
    struct IVRClientCore_IVRClientCore_003_BIsHmdPresent_params params = {.u_iface = _this->u_iface};
-    TRACE( "linux_side %p, compositor_data.client_core_linux_side %p.\n", _this->u_iface,
+    TRACE( "u_iface %#I64x, compositor_data.u_client_core_iface %#I64x.\n", _this->u_iface.handle,
-           compositor_data.client_core_linux_side );
+           compositor_data.u_client_core_iface.handle );
    /* BIsHmdPresent() currently always returns FALSE on Linux if called before Init().
     * Return true if the value stored by steam.exe helper in registry says the HMD is presnt. */
-    if (compositor_data.client_core_linux_side || !is_hmd_present_reg())
+    if (compositor_data.u_client_core_iface.handle || !is_hmd_present_reg())
    {
        VRCLIENT_CALL( IVRClientCore_IVRClientCore_003_BIsHmdPresent, &params );
        return params._ret;
--- a/vrclient_x64/vrclient_private.h
+++ b/vrclient_x64/vrclient_private.h
@ -53,7 +53,7 @@ struct compositor_data
    ID3D12DXVKInteropDevice *d3d12_device;
    ID3D12CommandQueue *d3d12_queue;
    BOOL d3d11_explicit_handoff, handoff_called;
-    void *client_core_linux_side;
+    struct u_iface u_client_core_iface;
 #define X(proc) PFN_##proc p_##proc;
    VK_PROCS
@ -84,21 +84,21 @@ extern struct compositor_data compositor_data;
 struct w_iface
 {
    vtable_ptr *vtable;
-    void *u_iface;
+    struct u_iface u_iface;
    union
    {
        struct client_core_data user_data; /* for IVRClientCore */
    };
 };
-typedef struct w_iface *(*iface_constructor)( void * );
+typedef struct w_iface *(*iface_constructor)( struct u_iface );
 extern iface_constructor find_iface_constructor( const char *iface_version );
 typedef void (*iface_destructor)( struct w_iface * );
 extern iface_destructor find_iface_destructor( const char *iface_version );
 extern void init_rtti( char *base );
-struct w_iface *create_win_interface(const char *name, void *linux_side);
+struct w_iface *create_win_interface( const char *name, struct u_iface u_iface );
 void free_compositor_data_d3d12_device(void);
 struct generic_interface
--- a/vrclient_x64/vrclient_structs.h
+++ b/vrclient_x64/vrclient_structs.h
@ -7,8 +7,6 @@
 #ifdef __cplusplus
 #include <array>
 extern "C"
 {
 #endif /* __cplusplus */
 #ifdef __cplusplus
@ -128,6 +126,11 @@ enum ETextureType
    TextureType_DXGISharedHandle = 5,
 };
 struct u_iface
 {
    UINT64 handle;
 #ifdef __cplusplus
-} /* extern "C" */
+    template< typename T > struct u_iface &operator=(const T* value) { this->handle = (UINT_PTR)value; return *this; }
    template< typename T > operator T*() const { return (T*)(UINT_PTR)this->handle; }
 #endif /* __cplusplus */
 };
--- a/vrclient_x64/vrcompositor_manual.c
+++ b/vrclient_x64/vrcompositor_manual.c
@ -442,7 +442,7 @@ static void set_skybox_override_done( const w_Texture_t *textures, uint32_t coun
    compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue( compositor_data.dxvk_device );
 }
-static void post_present_handoff_init( void *linux_side, unsigned int version )
+static void post_present_handoff_init( struct u_iface u_iface, unsigned int version )
 {
    /* I sure hope no application will submit both D3D11 and D3D12 textures... */
    if (compositor_data.dxvk_device)
@ -460,7 +460,7 @@ static void post_present_handoff_done(void)
        compositor_data.d3d12_device->lpVtbl->UnlockCommandQueue( compositor_data.d3d12_device, compositor_data.d3d12_queue );
 }
-static void wait_get_poses_init( void *linux_side )
+static void wait_get_poses_init( struct u_iface u_iface )
 {
    if (compositor_data.dxvk_device)
        compositor_data.dxvk_device->lpVtbl->LockSubmissionQueue( compositor_data.dxvk_device );
@ -468,7 +468,7 @@ static void wait_get_poses_init( void *linux_side )
        compositor_data.d3d12_device->lpVtbl->LockCommandQueue( compositor_data.d3d12_device, compositor_data.d3d12_queue );
 }
-static void wait_get_poses_done( void *linux_side )
+static void wait_get_poses_done( struct u_iface u_iface )
 {
    if (compositor_data.dxvk_device)
        compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue( compositor_data.dxvk_device );
--- a/vrclient_x64/winIVRApplications.c
+++ b/vrclient_x64/winIVRApplications.c
@ -325,7 +325,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_001(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -340,7 +340,7 @@ void destroy_winIVRApplications_IVRApplications_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(21);
@ -685,7 +685,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_002(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -700,7 +700,7 @@ void destroy_winIVRApplications_IVRApplications_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(20);
@ -1060,7 +1060,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_003(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1075,7 +1075,7 @@ void destroy_winIVRApplications_IVRApplications_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(21);
@ -1466,7 +1466,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_004(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1481,7 +1481,7 @@ void destroy_winIVRApplications_IVRApplications_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(23);
@ -1891,7 +1891,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_005(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1906,7 +1906,7 @@ void destroy_winIVRApplications_IVRApplications_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(24);
@ -2424,7 +2424,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_006(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2439,7 +2439,7 @@ void destroy_winIVRApplications_IVRApplications_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(31);
@ -2951,7 +2951,7 @@ __ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_007_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRApplications_IVRApplications_007(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_007( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2966,7 +2966,7 @@ void destroy_winIVRApplications_IVRApplications_007(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRApplications_IVRApplications_007_FnTable(void *u_iface)
+struct w_iface *create_winIVRApplications_IVRApplications_007_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(30);
--- a/vrclient_x64/winIVRChaperone.c
+++ b/vrclient_x64/winIVRChaperone.c
@ -139,7 +139,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperone_IVRChaperone_002(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -154,7 +154,7 @@ void destroy_winIVRChaperone_IVRChaperone_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperone_IVRChaperone_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(9);
@ -305,7 +305,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperone_IVRChaperone_003(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -320,7 +320,7 @@ void destroy_winIVRChaperone_IVRChaperone_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperone_IVRChaperone_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(8);
@ -483,7 +483,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperone_IVRChaperone_004(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -498,7 +498,7 @@ void destroy_winIVRChaperone_IVRChaperone_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperone_IVRChaperone_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperone_IVRChaperone_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(9);
--- a/vrclient_x64/winIVRChaperoneSetup.c
+++ b/vrclient_x64/winIVRChaperoneSetup.c
@ -241,7 +241,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -256,7 +256,7 @@ void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(16);
@ -588,7 +588,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -603,7 +603,7 @@ void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(20);
@ -930,7 +930,7 @@ __ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -945,7 +945,7 @@ void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(20);
--- a/vrclient_x64/winIVRClientCore.c
+++ b/vrclient_x64/winIVRClientCore.c
@ -76,7 +76,7 @@ __ASM_BLOCK_BEGIN(winIVRClientCore_IVRClientCore_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRClientCore_IVRClientCore_002(void *u_iface)
+struct w_iface *create_winIVRClientCore_IVRClientCore_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -91,7 +91,7 @@ void destroy_winIVRClientCore_IVRClientCore_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRClientCore_IVRClientCore_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRClientCore_IVRClientCore_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(7);
@ -189,7 +189,7 @@ __ASM_BLOCK_BEGIN(winIVRClientCore_IVRClientCore_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRClientCore_IVRClientCore_003(void *u_iface)
+struct w_iface *create_winIVRClientCore_IVRClientCore_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -204,7 +204,7 @@ void destroy_winIVRClientCore_IVRClientCore_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRClientCore_IVRClientCore_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRClientCore_IVRClientCore_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(7);
--- a/vrclient_x64/winIVRCompositor.c
+++ b/vrclient_x64/winIVRCompositor.c
@ -352,7 +352,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_005(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -367,7 +367,7 @@ void destroy_winIVRCompositor_IVRCompositor_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(24);
@ -698,7 +698,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_006(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -713,7 +713,7 @@ void destroy_winIVRCompositor_IVRCompositor_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(20);
@ -1028,7 +1028,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_007_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_007(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_007( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1043,7 +1043,7 @@ void destroy_winIVRCompositor_IVRCompositor_007(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_007_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_007_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(19);
@ -1452,7 +1452,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_008_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_008(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_008( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1467,7 +1467,7 @@ void destroy_winIVRCompositor_IVRCompositor_008(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_008_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_008_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(26);
@ -1819,7 +1819,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_009_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_009(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_009( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1834,7 +1834,7 @@ void destroy_winIVRCompositor_IVRCompositor_009(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_009_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_009_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(24);
@ -2184,7 +2184,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_010_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_010(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_010( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2199,7 +2199,7 @@ void destroy_winIVRCompositor_IVRCompositor_010(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_010_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_010_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(24);
@ -2549,7 +2549,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_011_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_011(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_011( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2564,7 +2564,7 @@ void destroy_winIVRCompositor_IVRCompositor_011(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_011_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_011_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(24);
@ -2943,7 +2943,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_012_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_012(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_012( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2958,7 +2958,7 @@ void destroy_winIVRCompositor_IVRCompositor_012(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_012_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_012_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(26);
@ -3352,7 +3352,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_013_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_013(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_013( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -3367,7 +3367,7 @@ void destroy_winIVRCompositor_IVRCompositor_013(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_013_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_013_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(27);
@ -3787,7 +3787,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_014_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_014(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_014( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -3802,7 +3802,7 @@ void destroy_winIVRCompositor_IVRCompositor_014(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_014_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_014_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(29);
@ -4340,7 +4340,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_015_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_015(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_015( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -4355,7 +4355,7 @@ void destroy_winIVRCompositor_IVRCompositor_015(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_015_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_015_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(37);
@ -4859,7 +4859,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_016_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_016(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_016( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -4874,7 +4874,7 @@ void destroy_winIVRCompositor_IVRCompositor_016(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_016_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_016_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(35);
@ -5391,7 +5391,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_017_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_017(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_017( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -5406,7 +5406,7 @@ void destroy_winIVRCompositor_IVRCompositor_017(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_017_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_017_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(36);
@ -5952,7 +5952,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_018_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_018(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_018( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -5967,7 +5967,7 @@ void destroy_winIVRCompositor_IVRCompositor_018(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_018_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_018_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(38);
@ -6546,7 +6546,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_019_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_019(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_019( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -6561,7 +6561,7 @@ void destroy_winIVRCompositor_IVRCompositor_019(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_019_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_019_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(40);
@ -7155,7 +7155,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_020_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_020(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_020( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -7170,7 +7170,7 @@ void destroy_winIVRCompositor_IVRCompositor_020(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_020_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_020_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(41);
@ -7791,7 +7791,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_021_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_021(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_021( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -7806,7 +7806,7 @@ void destroy_winIVRCompositor_IVRCompositor_021(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_021_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_021_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(43);
@ -8468,7 +8468,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_022_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_022(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_022( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -8483,7 +8483,7 @@ void destroy_winIVRCompositor_IVRCompositor_022(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_022_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_022_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(46);
@ -9177,7 +9177,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_024_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_024(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_024( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -9192,7 +9192,7 @@ void destroy_winIVRCompositor_IVRCompositor_024(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_024_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_024_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(48);
@ -9934,7 +9934,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_026_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_026(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_026( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -9949,7 +9949,7 @@ void destroy_winIVRCompositor_IVRCompositor_026(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_026_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_026_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(51);
@ -10694,7 +10694,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_027_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_027(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_027( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -10709,7 +10709,7 @@ void destroy_winIVRCompositor_IVRCompositor_027(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_027_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_027_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(51);
@ -11458,7 +11458,7 @@ __ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_028_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRCompositor_IVRCompositor_028(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_028( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -11473,7 +11473,7 @@ void destroy_winIVRCompositor_IVRCompositor_028(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRCompositor_IVRCompositor_028_FnTable(void *u_iface)
+struct w_iface *create_winIVRCompositor_IVRCompositor_028_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(52);
--- a/vrclient_x64/winIVRControlPanel.c
+++ b/vrclient_x64/winIVRControlPanel.c
@ -405,7 +405,7 @@ __ASM_BLOCK_BEGIN(winIVRControlPanel_IVRControlPanel_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRControlPanel_IVRControlPanel_006(void *u_iface)
+struct w_iface *create_winIVRControlPanel_IVRControlPanel_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -420,7 +420,7 @@ void destroy_winIVRControlPanel_IVRControlPanel_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRControlPanel_IVRControlPanel_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRControlPanel_IVRControlPanel_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(28);
--- a/vrclient_x64/winIVRDriverManager.c
+++ b/vrclient_x64/winIVRDriverManager.c
@ -75,7 +75,7 @@ __ASM_BLOCK_BEGIN(winIVRDriverManager_IVRDriverManager_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRDriverManager_IVRDriverManager_001(void *u_iface)
+struct w_iface *create_winIVRDriverManager_IVRDriverManager_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -90,7 +90,7 @@ void destroy_winIVRDriverManager_IVRDriverManager_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRDriverManager_IVRDriverManager_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRDriverManager_IVRDriverManager_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(4);
--- a/vrclient_x64/winIVRExtendedDisplay.c
+++ b/vrclient_x64/winIVRExtendedDisplay.c
@ -65,7 +65,7 @@ __ASM_BLOCK_BEGIN(winIVRExtendedDisplay_IVRExtendedDisplay_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001(void *u_iface)
+struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -80,7 +80,7 @@ void destroy_winIVRExtendedDisplay_IVRExtendedDisplay_001(struct w_iface *object
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(3);
--- a/vrclient_x64/winIVRHeadsetView.c
+++ b/vrclient_x64/winIVRHeadsetView.c
@ -139,7 +139,7 @@ __ASM_BLOCK_BEGIN(winIVRHeadsetView_IVRHeadsetView_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001(void *u_iface)
+struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -154,7 +154,7 @@ void destroy_winIVRHeadsetView_IVRHeadsetView_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRHeadsetView_IVRHeadsetView_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(9);
--- a/vrclient_x64/winIVRIOBuffer.c
+++ b/vrclient_x64/winIVRIOBuffer.c
@ -97,7 +97,7 @@ __ASM_BLOCK_BEGIN(winIVRIOBuffer_IVRIOBuffer_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001(void *u_iface)
+struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -112,7 +112,7 @@ void destroy_winIVRIOBuffer_IVRIOBuffer_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(5);
@ -243,7 +243,7 @@ __ASM_BLOCK_BEGIN(winIVRIOBuffer_IVRIOBuffer_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002(void *u_iface)
+struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -258,7 +258,7 @@ void destroy_winIVRIOBuffer_IVRIOBuffer_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRIOBuffer_IVRIOBuffer_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(6);
--- a/vrclient_x64/winIVRInput.c
+++ b/vrclient_x64/winIVRInput.c
@ -315,7 +315,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_003(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -330,7 +330,7 @@ void destroy_winIVRInput_IVRInput_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(17);
@ -702,7 +702,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_004(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -717,7 +717,7 @@ void destroy_winIVRInput_IVRInput_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(18);
@ -1196,7 +1196,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_005(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1211,7 +1211,7 @@ void destroy_winIVRInput_IVRInput_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(25);
@ -1720,7 +1720,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_006(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1735,7 +1735,7 @@ void destroy_winIVRInput_IVRInput_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(26);
@ -2280,7 +2280,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_007_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_007(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_007( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2295,7 +2295,7 @@ void destroy_winIVRInput_IVRInput_007(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_007_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_007_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(28);
@ -2905,7 +2905,7 @@ __ASM_BLOCK_BEGIN(winIVRInput_IVRInput_010_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRInput_IVRInput_010(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_010( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2920,7 +2920,7 @@ void destroy_winIVRInput_IVRInput_010(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRInput_IVRInput_010_FnTable(void *u_iface)
+struct w_iface *create_winIVRInput_IVRInput_010_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(32);
--- a/vrclient_x64/winIVRMailbox.c
+++ b/vrclient_x64/winIVRMailbox.c
@ -80,7 +80,7 @@ __ASM_BLOCK_BEGIN(winIVRMailbox_IVRMailbox_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRMailbox_IVRMailbox_001(void *u_iface)
+struct w_iface *create_winIVRMailbox_IVRMailbox_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -95,7 +95,7 @@ void destroy_winIVRMailbox_IVRMailbox_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRMailbox_IVRMailbox_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRMailbox_IVRMailbox_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(4);
--- a/vrclient_x64/winIVRNotifications.c
+++ b/vrclient_x64/winIVRNotifications.c
@ -68,7 +68,7 @@ __ASM_BLOCK_BEGIN(winIVRNotifications_IVRNotifications_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRNotifications_IVRNotifications_001(void *u_iface)
+struct w_iface *create_winIVRNotifications_IVRNotifications_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -83,7 +83,7 @@ void destroy_winIVRNotifications_IVRNotifications_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRNotifications_IVRNotifications_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRNotifications_IVRNotifications_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(3);
@ -153,7 +153,7 @@ __ASM_BLOCK_BEGIN(winIVRNotifications_IVRNotifications_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRNotifications_IVRNotifications_002(void *u_iface)
+struct w_iface *create_winIVRNotifications_IVRNotifications_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -168,7 +168,7 @@ void destroy_winIVRNotifications_IVRNotifications_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRNotifications_IVRNotifications_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRNotifications_IVRNotifications_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(2);
--- a/vrclient_x64/winIVROverlay.c
+++ b/vrclient_x64/winIVROverlay.c
@ -607,7 +607,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_001(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -622,7 +622,7 @@ void destroy_winIVROverlay_IVROverlay_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_001_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(40);
@ -1319,7 +1319,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_002(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1334,7 +1334,7 @@ void destroy_winIVROverlay_IVROverlay_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_002_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(42);
@ -2098,7 +2098,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_003(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2113,7 +2113,7 @@ void destroy_winIVROverlay_IVROverlay_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_003_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(46);
@ -2913,7 +2913,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_004(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2928,7 +2928,7 @@ void destroy_winIVROverlay_IVROverlay_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_004_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(48);
@ -3790,7 +3790,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_005(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -3805,7 +3805,7 @@ void destroy_winIVROverlay_IVROverlay_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_005_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(52);
@ -4751,7 +4751,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_007_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_007(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_007( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -4766,7 +4766,7 @@ void destroy_winIVROverlay_IVROverlay_007(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_007_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_007_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(57);
@ -5762,7 +5762,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_008_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_008(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_008( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -5777,7 +5777,7 @@ void destroy_winIVROverlay_IVROverlay_008(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_008_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_008_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(60);
@ -6827,7 +6827,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_010_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_010(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_010( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -6842,7 +6842,7 @@ void destroy_winIVROverlay_IVROverlay_010(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_010_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_010_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(63);
@ -7960,7 +7960,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_011_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_011(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_011( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -7975,7 +7975,7 @@ void destroy_winIVROverlay_IVROverlay_011(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_011_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_011_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(67);
@ -9113,7 +9113,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_012_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_012(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_012( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -9128,7 +9128,7 @@ void destroy_winIVROverlay_IVROverlay_012(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_012_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_012_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(68);
@ -10344,7 +10344,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_013_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_013(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_013( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -10359,7 +10359,7 @@ void destroy_winIVROverlay_IVROverlay_013(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_013_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_013_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(73);
@ -11615,7 +11615,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_014_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_014(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_014( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -11630,7 +11630,7 @@ void destroy_winIVROverlay_IVROverlay_014(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_014_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_014_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(75);
@ -12981,7 +12981,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_016_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_016(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_016( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -12996,7 +12996,7 @@ void destroy_winIVROverlay_IVROverlay_016(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_016_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_016_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(81);
@ -14387,7 +14387,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_017_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_017(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_017( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -14402,7 +14402,7 @@ void destroy_winIVROverlay_IVROverlay_017(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_017_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_017_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(83);
@ -15780,7 +15780,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_018_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_018(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_018( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -15795,7 +15795,7 @@ void destroy_winIVROverlay_IVROverlay_018(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_018_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_018_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(82);
@ -17172,7 +17172,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_019_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_019(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_019( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -17187,7 +17187,7 @@ void destroy_winIVROverlay_IVROverlay_019(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_019_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_019_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(82);
@ -18537,7 +18537,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_020_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_020(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_020( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -18552,7 +18552,7 @@ void destroy_winIVROverlay_IVROverlay_020(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_020_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_020_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(80);
@ -19840,7 +19840,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_021_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_021(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_021( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -19855,7 +19855,7 @@ void destroy_winIVROverlay_IVROverlay_021(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_021_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_021_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(76);
@ -21230,7 +21230,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_022_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_022(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_022( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -21245,7 +21245,7 @@ void destroy_winIVROverlay_IVROverlay_022(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_022_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_022_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(82);
@ -22558,7 +22558,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_024_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_024(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_024( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -22573,7 +22573,7 @@ void destroy_winIVROverlay_IVROverlay_024(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_024_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_024_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(78);
@ -23900,7 +23900,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_025_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_025(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_025( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -23915,7 +23915,7 @@ void destroy_winIVROverlay_IVROverlay_025(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_025_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_025_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(79);
@ -25287,7 +25287,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_026_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_026(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_026( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -25302,7 +25302,7 @@ void destroy_winIVROverlay_IVROverlay_026(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_026_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_026_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(82);
@ -26645,7 +26645,7 @@ __ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_027_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlay_IVROverlay_027(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_027( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -26660,7 +26660,7 @@ void destroy_winIVROverlay_IVROverlay_027(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlay_IVROverlay_027_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlay_IVROverlay_027_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(80);
--- a/vrclient_x64/winIVROverlayView.c
+++ b/vrclient_x64/winIVROverlayView.c
@ -77,7 +77,7 @@ __ASM_BLOCK_BEGIN(winIVROverlayView_IVROverlayView_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVROverlayView_IVROverlayView_003(void *u_iface)
+struct w_iface *create_winIVROverlayView_IVROverlayView_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -92,7 +92,7 @@ void destroy_winIVROverlayView_IVROverlayView_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVROverlayView_IVROverlayView_003_FnTable(void *u_iface)
+struct w_iface *create_winIVROverlayView_IVROverlayView_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(4);
--- a/vrclient_x64/winIVRRenderModels.c
+++ b/vrclient_x64/winIVRRenderModels.c
@ -75,7 +75,7 @@ __ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_001(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -90,7 +90,7 @@ void destroy_winIVRRenderModels_IVRRenderModels_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(4);
@ -267,7 +267,7 @@ __ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_002(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -282,7 +282,7 @@ void destroy_winIVRRenderModels_IVRRenderModels_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -476,7 +476,7 @@ __ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_004(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -491,7 +491,7 @@ void destroy_winIVRRenderModels_IVRRenderModels_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(14);
@ -739,7 +739,7 @@ __ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_005(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -754,7 +754,7 @@ void destroy_winIVRRenderModels_IVRRenderModels_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(18);
@ -1024,7 +1024,7 @@ __ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_006(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1039,7 +1039,7 @@ void destroy_winIVRRenderModels_IVRRenderModels_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRRenderModels_IVRRenderModels_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRRenderModels_IVRRenderModels_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(19);
--- a/vrclient_x64/winIVRResources.c
+++ b/vrclient_x64/winIVRResources.c
@ -51,7 +51,7 @@ __ASM_BLOCK_BEGIN(winIVRResources_IVRResources_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRResources_IVRResources_001(void *u_iface)
+struct w_iface *create_winIVRResources_IVRResources_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -66,7 +66,7 @@ void destroy_winIVRResources_IVRResources_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRResources_IVRResources_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRResources_IVRResources_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(2);
--- a/vrclient_x64/winIVRScreenshots.c
+++ b/vrclient_x64/winIVRScreenshots.c
@ -131,7 +131,7 @@ __ASM_BLOCK_BEGIN(winIVRScreenshots_IVRScreenshots_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRScreenshots_IVRScreenshots_001(void *u_iface)
+struct w_iface *create_winIVRScreenshots_IVRScreenshots_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -146,7 +146,7 @@ void destroy_winIVRScreenshots_IVRScreenshots_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRScreenshots_IVRScreenshots_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRScreenshots_IVRScreenshots_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(7);
--- a/vrclient_x64/winIVRSettings.c
+++ b/vrclient_x64/winIVRSettings.c
@ -209,7 +209,7 @@ __ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSettings_IVRSettings_001(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -224,7 +224,7 @@ void destroy_winIVRSettings_IVRSettings_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSettings_IVRSettings_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -456,7 +456,7 @@ __ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSettings_IVRSettings_002(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -471,7 +471,7 @@ void destroy_winIVRSettings_IVRSettings_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSettings_IVRSettings_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -688,7 +688,7 @@ __ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSettings_IVRSettings_003(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -703,7 +703,7 @@ void destroy_winIVRSettings_IVRSettings_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSettings_IVRSettings_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRSettings_IVRSettings_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(11);
--- a/vrclient_x64/winIVRSystem.c
+++ b/vrclient_x64/winIVRSystem.c
@ -579,7 +579,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_003(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -594,7 +594,7 @@ void destroy_winIVRSystem_IVRSystem_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(38);
@ -1197,7 +1197,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_004(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1212,7 +1212,7 @@ void destroy_winIVRSystem_IVRSystem_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(36);
@ -1830,7 +1830,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_005(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1845,7 +1845,7 @@ void destroy_winIVRSystem_IVRSystem_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(37);
@ -2533,7 +2533,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_006(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -2548,7 +2548,7 @@ void destroy_winIVRSystem_IVRSystem_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(42);
@ -3233,7 +3233,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_009_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_009(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_009( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -3248,7 +3248,7 @@ void destroy_winIVRSystem_IVRSystem_009(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_009_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_009_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(42);
@ -3987,7 +3987,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_010_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_010(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_010( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -4002,7 +4002,7 @@ void destroy_winIVRSystem_IVRSystem_010(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_010_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_010_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(46);
@ -4755,7 +4755,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_011_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_011(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_011( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -4770,7 +4770,7 @@ void destroy_winIVRSystem_IVRSystem_011(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_011_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_011_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(46);
@ -5497,7 +5497,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_012_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_012(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_012( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -5512,7 +5512,7 @@ void destroy_winIVRSystem_IVRSystem_012(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_012_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_012_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(44);
@ -6248,7 +6248,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_014_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_014(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_014( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -6263,7 +6263,7 @@ void destroy_winIVRSystem_IVRSystem_014(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_014_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_014_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(44);
@ -6998,7 +6998,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_015_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_015(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_015( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -7013,7 +7013,7 @@ void destroy_winIVRSystem_IVRSystem_015(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_015_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_015_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(44);
@ -7762,7 +7762,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_016_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_016(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_016( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -7777,7 +7777,7 @@ void destroy_winIVRSystem_IVRSystem_016(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_016_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_016_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(45);
@ -8528,7 +8528,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_017_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_017(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_017( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -8543,7 +8543,7 @@ void destroy_winIVRSystem_IVRSystem_017(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_017_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_017_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(45);
@ -9327,7 +9327,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_019_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_019(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_019( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -9342,7 +9342,7 @@ void destroy_winIVRSystem_IVRSystem_019(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_019_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_019_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(47);
@ -10139,7 +10139,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_020_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_020(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_020( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -10154,7 +10154,7 @@ void destroy_winIVRSystem_IVRSystem_020(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_020_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_020_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(48);
@ -10940,7 +10940,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_021_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_021(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_021( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -10955,7 +10955,7 @@ void destroy_winIVRSystem_IVRSystem_021(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_021_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_021_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(47);
@ -11728,7 +11728,7 @@ __ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_022_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRSystem_IVRSystem_022(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_022( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -11743,7 +11743,7 @@ void destroy_winIVRSystem_IVRSystem_022(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRSystem_IVRSystem_022_FnTable(void *u_iface)
+struct w_iface *create_winIVRSystem_IVRSystem_022_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(46);
--- a/vrclient_x64/winIVRTrackedCamera.c
+++ b/vrclient_x64/winIVRTrackedCamera.c
@ -278,7 +278,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_001_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -293,7 +293,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_001(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(18);
@ -474,7 +474,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_002_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -489,7 +489,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_002(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(8);
@ -730,7 +730,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_003_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -745,7 +745,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_003(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -1002,7 +1002,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_004_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1017,7 +1017,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_004(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -1276,7 +1276,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_005_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1291,7 +1291,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_005(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(12);
@ -1576,7 +1576,7 @@ __ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_006_vtables)
    );
 __ASM_BLOCK_END
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    TRACE("-> %p\n", r);
@ -1591,7 +1591,7 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_006(struct w_iface *object)
    HeapFree(GetProcessHeap(), 0, object);
 }
-struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable(void *u_iface)
+struct w_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable( struct u_iface u_iface )
 {
    struct w_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));
    struct thunk *thunks = alloc_thunks(14);