vrclient: Fix x64 thunks for C API.proton-3.7-20180726

* Clean up the stack properly.
* Do not push parameters after shadow register space.

20 files changed, 2438 insertions, 2382 deletions

diff --git a/vrclient_x64/flatapi.h b/vrclient_x64/flatapi.h
index 00a14ce7..a52ed40b 100644
--- a/vrclient_x64/flatapi.h
+++ b/vrclient_x64/flatapi.h
@@ -1,6 +1,5 @@
 /* asm thunks for the flat (FnTable) API */
 
-extern void call_flat_method(void);
 #ifdef __i386__
 #include "pshpack1.h"
 struct thunk
@@ -15,7 +14,9 @@ struct thunk
 };
 #include "poppack.h"
 
-static inline void init_thunk( struct thunk *thunk, void *this, void *proc )
+extern void call_flat_method(void);
+
+static inline void init_thunk( struct thunk *thunk, void *this, void *proc, int param_count )
 {
   thunk->mov_ecx = 0xb9;
   thunk->this = this;
@@ -48,12 +49,27 @@ static const struct thunk thunk_template =
     { 0xff, 0xe0 }            /* jmp *%rax */
 };
 
-static inline void init_thunk( struct thunk *thunk, void *this, void *proc )
+typedef void (*pfn_call_flat_method)(void);
+
+extern void call_flat_method3(void);
+extern void call_flat_method4(void);
+extern void call_flat_method9(void);
+
+static inline pfn_call_flat_method get_call_flat_method_pfn( int param_count )
+{
+    if (param_count <= 3)
+        return call_flat_method3;
+    if (param_count <= 4)
+        return call_flat_method4;
+    return call_flat_method9;
+}
+
+static inline void init_thunk( struct thunk *thunk, void *this, void *proc, int param_count )
 {
     *thunk = thunk_template;
     thunk->this = this;
     thunk->proc = proc;
-    thunk->call_flat = call_flat_method;
+    thunk->call_flat = get_call_flat_method_pfn(param_count);
 }
 
 #endif
diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 2c5c586b..74393dd4 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -125,6 +125,9 @@ print_sizes = []
 
 class_versions = {}
 
+def get_param_count(f):
+    return len([p for p in f.get_children() if p.kind == clang.cindex.CursorKind.PARM_DECL])
+
 def ivrclientcore_init(cppname, method):
     if "002" in cppname:
         return "ivrclientcore_002_init"
@@ -137,7 +140,7 @@ def ivrclientcore_cleanup(cppname, method):
     return "ivrclientcore_cleanup"
 
 def ivrsystem_get_dxgi_output_info(cppname, method):
-    param_count = len([p for p in method.get_children() if p.kind == clang.cindex.CursorKind.PARM_DECL])
+    param_count = get_param_count(method)
     return {
         1: "get_dxgi_output_info",
         2: "get_dxgi_output_info2"
@@ -461,9 +464,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
             break
     cfile.write("} %s;\n\n" % winclassname)
     methods = []
+    methods_param_count = []
     for child in children:
         if child.kind == clang.cindex.CursorKind.CXX_METHOD:
             methods.append(handle_method(cfile, classnode.spelling, winclassname, cppname, child, cpp, cpp_h, methods, iface_version))
+            methods_param_count.append(get_param_count(child))
 
     cfile.write("extern vtable_ptr %s_vtable;\n\n" % winclassname)
     cfile.write("#ifndef __GNUC__\n")
@@ -499,7 +504,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
     cfile.write("    int i;\n\n")
     cfile.write("    TRACE(\"-> %p, vtable %p, thunks %p\\n\", r, vtable, thunks);\n")
     for i in range(len(methods)):
-        cfile.write("    init_thunk(&thunks[%d], r, %s_%s);\n" %(i, winclassname, methods[i]))
+        param_count = methods_param_count[i]
+        if param_count > 9:
+            # Additional call_flat_method() variants are needed to handle more parameters.
+            sys.exit("Unhandled parameter count %s for method %s" % (param_count, methods[i]))
+        cfile.write("    init_thunk(&thunks[%d], r, %s_%s, %s);\n" % (i, winclassname, methods[i], param_count))
     cfile.write("    for (i = 0; i < %d; i++)\n" % len(methods))
     cfile.write("        vtable[i] = &thunks[i];\n")
     cfile.write("    r->linux_side = linux_side;\n")
diff --git a/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_main.c
index afa50fb4..b17ae5c6 100644
--- a/vrclient_x64/vrclient_main.c
+++ b/vrclient_x64/vrclient_main.c
@@ -919,13 +919,44 @@ __ASM_GLOBAL_FUNC(call_flat_method,
     "pushl %eax\n\t"
     "jmp *%edx");
 #else
-__ASM_GLOBAL_FUNC(call_flat_method,
-    "popq %rax\n\t" // return address
-    "pushq %r9\n\t"
-    "pushq %rax\n\t"
+// handles "this" and up to 3 parameters
+__ASM_GLOBAL_FUNC(call_flat_method3,
     "movq %r8, %r9\n\t" // shift over arguments
     "movq %rdx, %r8\n\t"
     "movq %rcx, %rdx\n\t"
     "movq %r10, %rcx\n\t" // add This pointer
     "jmp *%r11");
+
+__ASM_GLOBAL_FUNC(call_flat_method4,
+    "subq $0x28, %rsp\n\t" // shadow register space and 1 parameter
+    "movq %r9, 0x20(%rsp)\n\t"
+    "movq %r8, %r9\n\t" // shift over arguments
+    "movq %rdx, %r8\n\t"
+    "movq %rcx, %rdx\n\t"
+    "movq %r10, %rcx\n\t" // add This pointer
+    "call *%r11\n\t"
+    "addq $0x28, %rsp\n\t"
+    "ret");
+
+// handles "this" and up to 9 parameters
+__ASM_GLOBAL_FUNC(call_flat_method9,
+    "subq $0x58, %rsp\n\t" // shadow register space and 6 parameters
+    "movq %r9, 0x20(%rsp)\n\t"
+    "movq 0x80(%rsp), %rax\n\t" // copy parameters
+    "movq %rax, 0x28(%rsp)\n\t"
+    "movq 0x88(%rsp), %rax\n\t"
+    "movq %rax, 0x30(%rsp)\n\t"
+    "movq 0x90(%rsp), %rax\n\t"
+    "movq %rax, 0x38(%rsp)\n\t"
+    "movq 0x98(%rsp), %rax\n\t"
+    "movq %rax, 0x40(%rsp)\n\t"
+    "movq 0xa0(%rsp), %rax\n\t"
+    "movq %rax, 0x48(%rsp)\n\t"
+    "movq %r8, %r9\n\t" // shift over arguments
+    "movq %rdx, %r8\n\t"
+    "movq %rcx, %rdx\n\t"
+    "movq %r10, %rcx\n\t" // add This pointer
+    "call *%r11\n\t"
+    "addq $0x58, %rsp\n\t"
+    "ret");
 #endif
diff --git a/vrclient_x64/winIVRApplications.c b/vrclient_x64/winIVRApplications.c
index d366d1e8..d9a1623b 100644
--- a/vrclient_x64/winIVRApplications.c
+++ b/vrclient_x64/winIVRApplications.c
@@ -307,37 +307,37 @@ winIVRApplications_IVRApplications_006 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_006_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_006_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_006_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_006_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_006_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_006_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_006_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_006_LaunchTemplateApplication);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_006_LaunchApplicationFromMimeType);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_006_LaunchDashboardOverlay);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_006_CancelApplicationLaunch);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_006_IdentifyApplication);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_006_GetApplicationProcessId);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_006_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyString);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyBool);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyUint64);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_006_SetApplicationAutoLaunch);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_006_GetApplicationAutoLaunch);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_006_SetDefaultApplicationForMimeType);
-    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_006_GetDefaultApplicationForMimeType);
-    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_006_GetApplicationSupportedMimeTypes);
-    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_006_GetApplicationsThatSupportMimeType);
-    init_thunk(&thunks[23], r, winIVRApplications_IVRApplications_006_GetApplicationLaunchArguments);
-    init_thunk(&thunks[24], r, winIVRApplications_IVRApplications_006_GetStartingApplication);
-    init_thunk(&thunks[25], r, winIVRApplications_IVRApplications_006_GetTransitionState);
-    init_thunk(&thunks[26], r, winIVRApplications_IVRApplications_006_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[27], r, winIVRApplications_IVRApplications_006_GetApplicationsTransitionStateNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRApplications_IVRApplications_006_IsQuitUserPromptRequested);
-    init_thunk(&thunks[29], r, winIVRApplications_IVRApplications_006_LaunchInternalProcess);
-    init_thunk(&thunks[30], r, winIVRApplications_IVRApplications_006_GetCurrentSceneProcessId);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_006_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_006_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_006_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_006_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_006_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_006_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_006_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_006_LaunchTemplateApplication, 4);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_006_LaunchApplicationFromMimeType, 2);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_006_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_006_CancelApplicationLaunch, 1);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_006_IdentifyApplication, 2);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_006_GetApplicationProcessId, 1);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_006_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_006_GetApplicationPropertyUint64, 3);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_006_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_006_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_006_SetDefaultApplicationForMimeType, 2);
+    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_006_GetDefaultApplicationForMimeType, 3);
+    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_006_GetApplicationSupportedMimeTypes, 3);
+    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_006_GetApplicationsThatSupportMimeType, 3);
+    init_thunk(&thunks[23], r, winIVRApplications_IVRApplications_006_GetApplicationLaunchArguments, 3);
+    init_thunk(&thunks[24], r, winIVRApplications_IVRApplications_006_GetStartingApplication, 2);
+    init_thunk(&thunks[25], r, winIVRApplications_IVRApplications_006_GetTransitionState, 0);
+    init_thunk(&thunks[26], r, winIVRApplications_IVRApplications_006_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[27], r, winIVRApplications_IVRApplications_006_GetApplicationsTransitionStateNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRApplications_IVRApplications_006_IsQuitUserPromptRequested, 0);
+    init_thunk(&thunks[29], r, winIVRApplications_IVRApplications_006_LaunchInternalProcess, 3);
+    init_thunk(&thunks[30], r, winIVRApplications_IVRApplications_006_GetCurrentSceneProcessId, 0);
     for (i = 0; i < 31; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -587,30 +587,30 @@ winIVRApplications_IVRApplications_005 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_005_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_005_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_005_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_005_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_005_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_005_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_005_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_005_LaunchTemplateApplication);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_005_LaunchDashboardOverlay);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_005_CancelApplicationLaunch);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_005_IdentifyApplication);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_005_GetApplicationProcessId);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_005_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyString);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyBool);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyUint64);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_005_SetApplicationAutoLaunch);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_005_GetApplicationAutoLaunch);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_005_GetStartingApplication);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_005_GetTransitionState);
-    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_005_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_005_GetApplicationsTransitionStateNameFromEnum);
-    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_005_IsQuitUserPromptRequested);
-    init_thunk(&thunks[23], r, winIVRApplications_IVRApplications_005_LaunchInternalProcess);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_005_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_005_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_005_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_005_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_005_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_005_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_005_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_005_LaunchTemplateApplication, 4);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_005_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_005_CancelApplicationLaunch, 1);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_005_IdentifyApplication, 2);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_005_GetApplicationProcessId, 1);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_005_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_005_GetApplicationPropertyUint64, 3);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_005_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_005_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_005_GetStartingApplication, 2);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_005_GetTransitionState, 0);
+    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_005_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_005_GetApplicationsTransitionStateNameFromEnum, 1);
+    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_005_IsQuitUserPromptRequested, 0);
+    init_thunk(&thunks[23], r, winIVRApplications_IVRApplications_005_LaunchInternalProcess, 3);
     for (i = 0; i < 24; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -852,29 +852,29 @@ winIVRApplications_IVRApplications_004 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_004_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_004_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_004_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_004_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_004_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_004_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_004_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_004_LaunchDashboardOverlay);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_004_CancelApplicationLaunch);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_004_IdentifyApplication);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_004_GetApplicationProcessId);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_004_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyString);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyBool);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyUint64);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_004_SetApplicationAutoLaunch);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_004_GetApplicationAutoLaunch);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_004_GetStartingApplication);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_004_GetTransitionState);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_004_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_004_GetApplicationsTransitionStateNameFromEnum);
-    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_004_IsQuitUserPromptRequested);
-    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_004_LaunchInternalProcess);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_004_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_004_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_004_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_004_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_004_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_004_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_004_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_004_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_004_CancelApplicationLaunch, 1);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_004_IdentifyApplication, 2);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_004_GetApplicationProcessId, 1);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_004_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_004_GetApplicationPropertyUint64, 3);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_004_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_004_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_004_GetStartingApplication, 2);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_004_GetTransitionState, 0);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_004_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_004_GetApplicationsTransitionStateNameFromEnum, 1);
+    init_thunk(&thunks[21], r, winIVRApplications_IVRApplications_004_IsQuitUserPromptRequested, 0);
+    init_thunk(&thunks[22], r, winIVRApplications_IVRApplications_004_LaunchInternalProcess, 3);
     for (i = 0; i < 23; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1100,27 +1100,27 @@ winIVRApplications_IVRApplications_003 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_003_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_003_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_003_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_003_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_003_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_003_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_003_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_003_LaunchDashboardOverlay);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_003_IdentifyApplication);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_003_GetApplicationProcessId);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_003_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyString);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyBool);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyUint64);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_003_SetApplicationAutoLaunch);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_003_GetApplicationAutoLaunch);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_003_GetStartingApplication);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_003_GetTransitionState);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_003_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_003_GetApplicationsTransitionStateNameFromEnum);
-    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_003_IsQuitUserPromptRequested);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_003_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_003_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_003_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_003_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_003_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_003_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_003_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_003_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_003_IdentifyApplication, 2);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_003_GetApplicationProcessId, 1);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_003_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_003_GetApplicationPropertyUint64, 3);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_003_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_003_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_003_GetStartingApplication, 2);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_003_GetTransitionState, 0);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_003_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_003_GetApplicationsTransitionStateNameFromEnum, 1);
+    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_003_IsQuitUserPromptRequested, 0);
     for (i = 0; i < 21; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1338,26 +1338,26 @@ winIVRApplications_IVRApplications_002 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_002_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_002_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_002_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_002_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_002_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_002_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_002_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_002_LaunchDashboardOverlay);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_002_IdentifyApplication);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_002_GetApplicationProcessId);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_002_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_002_GetApplicationPropertyString);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_002_GetApplicationPropertyBool);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_002_SetApplicationAutoLaunch);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_002_GetApplicationAutoLaunch);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_002_GetStartingApplication);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_002_GetTransitionState);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_002_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_002_GetApplicationsTransitionStateNameFromEnum);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_002_IsQuitUserPromptRequested);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_002_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_002_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_002_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_002_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_002_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_002_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_002_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_002_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_002_IdentifyApplication, 2);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_002_GetApplicationProcessId, 1);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_002_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_002_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_002_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_002_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_002_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_002_GetStartingApplication, 2);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_002_GetTransitionState, 0);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_002_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_002_GetApplicationsTransitionStateNameFromEnum, 1);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_002_IsQuitUserPromptRequested, 0);
     for (i = 0; i < 20; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1583,27 +1583,27 @@ winIVRApplications_IVRApplications_001 *create_winIVRApplications_IVRApplication
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_001_AddApplicationManifest);
-    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_001_RemoveApplicationManifest);
-    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_001_IsApplicationInstalled);
-    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_001_GetApplicationCount);
-    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_001_GetApplicationKeyByIndex);
-    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_001_GetApplicationKeyByProcessId);
-    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_001_LaunchApplication);
-    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_001_LaunchDashboardOverlay);
-    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_001_IdentifyApplication);
-    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_001_GetApplicationProcessId);
-    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_001_GetApplicationsErrorNameFromEnum);
-    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_001_GetApplicationPropertyString);
-    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_001_GetApplicationPropertyBool);
-    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_001_GetHomeApplication);
-    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_001_SetHomeApplication);
-    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_001_SetApplicationAutoLaunch);
-    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_001_GetApplicationAutoLaunch);
-    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_001_GetStartingApplication);
-    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_001_GetTransitionState);
-    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_001_PerformApplicationPrelaunchCheck);
-    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_001_GetApplicationsTransitionStateNameFromEnum);
+    init_thunk(&thunks[0], r, winIVRApplications_IVRApplications_001_AddApplicationManifest, 2);
+    init_thunk(&thunks[1], r, winIVRApplications_IVRApplications_001_RemoveApplicationManifest, 1);
+    init_thunk(&thunks[2], r, winIVRApplications_IVRApplications_001_IsApplicationInstalled, 1);
+    init_thunk(&thunks[3], r, winIVRApplications_IVRApplications_001_GetApplicationCount, 0);
+    init_thunk(&thunks[4], r, winIVRApplications_IVRApplications_001_GetApplicationKeyByIndex, 3);
+    init_thunk(&thunks[5], r, winIVRApplications_IVRApplications_001_GetApplicationKeyByProcessId, 3);
+    init_thunk(&thunks[6], r, winIVRApplications_IVRApplications_001_LaunchApplication, 1);
+    init_thunk(&thunks[7], r, winIVRApplications_IVRApplications_001_LaunchDashboardOverlay, 1);
+    init_thunk(&thunks[8], r, winIVRApplications_IVRApplications_001_IdentifyApplication, 2);
+    init_thunk(&thunks[9], r, winIVRApplications_IVRApplications_001_GetApplicationProcessId, 1);
+    init_thunk(&thunks[10], r, winIVRApplications_IVRApplications_001_GetApplicationsErrorNameFromEnum, 1);
+    init_thunk(&thunks[11], r, winIVRApplications_IVRApplications_001_GetApplicationPropertyString, 5);
+    init_thunk(&thunks[12], r, winIVRApplications_IVRApplications_001_GetApplicationPropertyBool, 3);
+    init_thunk(&thunks[13], r, winIVRApplications_IVRApplications_001_GetHomeApplication, 2);
+    init_thunk(&thunks[14], r, winIVRApplications_IVRApplications_001_SetHomeApplication, 1);
+    init_thunk(&thunks[15], r, winIVRApplications_IVRApplications_001_SetApplicationAutoLaunch, 2);
+    init_thunk(&thunks[16], r, winIVRApplications_IVRApplications_001_GetApplicationAutoLaunch, 1);
+    init_thunk(&thunks[17], r, winIVRApplications_IVRApplications_001_GetStartingApplication, 2);
+    init_thunk(&thunks[18], r, winIVRApplications_IVRApplications_001_GetTransitionState, 0);
+    init_thunk(&thunks[19], r, winIVRApplications_IVRApplications_001_PerformApplicationPrelaunchCheck, 1);
+    init_thunk(&thunks[20], r, winIVRApplications_IVRApplications_001_GetApplicationsTransitionStateNameFromEnum, 1);
     for (i = 0; i < 21; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRChaperone.c b/vrclient_x64/winIVRChaperone.c
index 6dca3780..c6dc0c6d 100644
--- a/vrclient_x64/winIVRChaperone.c
+++ b/vrclient_x64/winIVRChaperone.c
@@ -123,14 +123,14 @@ winIVRChaperone_IVRChaperone_003 *create_winIVRChaperone_IVRChaperone_003_FnTabl
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRChaperone_IVRChaperone_003_GetCalibrationState);
-    init_thunk(&thunks[1], r, winIVRChaperone_IVRChaperone_003_GetPlayAreaSize);
-    init_thunk(&thunks[2], r, winIVRChaperone_IVRChaperone_003_GetPlayAreaRect);
-    init_thunk(&thunks[3], r, winIVRChaperone_IVRChaperone_003_ReloadInfo);
-    init_thunk(&thunks[4], r, winIVRChaperone_IVRChaperone_003_SetSceneColor);
-    init_thunk(&thunks[5], r, winIVRChaperone_IVRChaperone_003_GetBoundsColor);
-    init_thunk(&thunks[6], r, winIVRChaperone_IVRChaperone_003_AreBoundsVisible);
-    init_thunk(&thunks[7], r, winIVRChaperone_IVRChaperone_003_ForceBoundsVisible);
+    init_thunk(&thunks[0], r, winIVRChaperone_IVRChaperone_003_GetCalibrationState, 0);
+    init_thunk(&thunks[1], r, winIVRChaperone_IVRChaperone_003_GetPlayAreaSize, 2);
+    init_thunk(&thunks[2], r, winIVRChaperone_IVRChaperone_003_GetPlayAreaRect, 1);
+    init_thunk(&thunks[3], r, winIVRChaperone_IVRChaperone_003_ReloadInfo, 0);
+    init_thunk(&thunks[4], r, winIVRChaperone_IVRChaperone_003_SetSceneColor, 1);
+    init_thunk(&thunks[5], r, winIVRChaperone_IVRChaperone_003_GetBoundsColor, 4);
+    init_thunk(&thunks[6], r, winIVRChaperone_IVRChaperone_003_AreBoundsVisible, 0);
+    init_thunk(&thunks[7], r, winIVRChaperone_IVRChaperone_003_ForceBoundsVisible, 1);
     for (i = 0; i < 8; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -260,15 +260,15 @@ winIVRChaperone_IVRChaperone_002 *create_winIVRChaperone_IVRChaperone_002_FnTabl
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRChaperone_IVRChaperone_002_GetCalibrationState);
-    init_thunk(&thunks[1], r, winIVRChaperone_IVRChaperone_002_GetSoftBoundsInfo);
-    init_thunk(&thunks[2], r, winIVRChaperone_IVRChaperone_002_GetHardBoundsInfo);
-    init_thunk(&thunks[3], r, winIVRChaperone_IVRChaperone_002_GetSeatedBoundsInfo);
-    init_thunk(&thunks[4], r, winIVRChaperone_IVRChaperone_002_ReloadInfo);
-    init_thunk(&thunks[5], r, winIVRChaperone_IVRChaperone_002_SetSceneColor);
-    init_thunk(&thunks[6], r, winIVRChaperone_IVRChaperone_002_GetBoundsColor);
-    init_thunk(&thunks[7], r, winIVRChaperone_IVRChaperone_002_AreBoundsVisible);
-    init_thunk(&thunks[8], r, winIVRChaperone_IVRChaperone_002_ForceBoundsVisible);
+    init_thunk(&thunks[0], r, winIVRChaperone_IVRChaperone_002_GetCalibrationState, 0);
+    init_thunk(&thunks[1], r, winIVRChaperone_IVRChaperone_002_GetSoftBoundsInfo, 1);
+    init_thunk(&thunks[2], r, winIVRChaperone_IVRChaperone_002_GetHardBoundsInfo, 2);
+    init_thunk(&thunks[3], r, winIVRChaperone_IVRChaperone_002_GetSeatedBoundsInfo, 1);
+    init_thunk(&thunks[4], r, winIVRChaperone_IVRChaperone_002_ReloadInfo, 0);
+    init_thunk(&thunks[5], r, winIVRChaperone_IVRChaperone_002_SetSceneColor, 1);
+    init_thunk(&thunks[6], r, winIVRChaperone_IVRChaperone_002_GetBoundsColor, 2);
+    init_thunk(&thunks[7], r, winIVRChaperone_IVRChaperone_002_AreBoundsVisible, 0);
+    init_thunk(&thunks[8], r, winIVRChaperone_IVRChaperone_002_ForceBoundsVisible, 1);
     for (i = 0; i < 9; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRChaperoneSetup.c b/vrclient_x64/winIVRChaperoneSetup.c
index f3f2c714..64fd5390 100644
--- a/vrclient_x64/winIVRChaperoneSetup.c
+++ b/vrclient_x64/winIVRChaperoneSetup.c
@@ -219,26 +219,26 @@ winIVRChaperoneSetup_IVRChaperoneSetup_005 *create_winIVRChaperoneSetup_IVRChape
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy);
-    init_thunk(&thunks[1], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_RevertWorkingCopy);
-    init_thunk(&thunks[2], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaSize);
-    init_thunk(&thunks[3], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaRect);
-    init_thunk(&thunks[4], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingCollisionBoundsInfo);
-    init_thunk(&thunks[5], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsInfo);
-    init_thunk(&thunks[6], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[7], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingStandingZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[8], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPlayAreaSize);
-    init_thunk(&thunks[9], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsInfo);
-    init_thunk(&thunks[10], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[11], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingStandingZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[12], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ReloadFromDisk);
-    init_thunk(&thunks[13], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[14], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsTagsInfo);
-    init_thunk(&thunks[15], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsTagsInfo);
-    init_thunk(&thunks[16], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPhysicalBoundsInfo);
-    init_thunk(&thunks[17], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLivePhysicalBoundsInfo);
-    init_thunk(&thunks[18], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ExportLiveToBuffer);
-    init_thunk(&thunks[19], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWorking);
+    init_thunk(&thunks[0], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy, 1);
+    init_thunk(&thunks[1], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_RevertWorkingCopy, 0);
+    init_thunk(&thunks[2], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaSize, 2);
+    init_thunk(&thunks[3], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaRect, 1);
+    init_thunk(&thunks[4], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingCollisionBoundsInfo, 2);
+    init_thunk(&thunks[5], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsInfo, 2);
+    init_thunk(&thunks[6], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[7], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingStandingZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[8], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPlayAreaSize, 2);
+    init_thunk(&thunks[9], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsInfo, 2);
+    init_thunk(&thunks[10], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[11], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingStandingZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[12], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ReloadFromDisk, 1);
+    init_thunk(&thunks[13], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[14], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsTagsInfo, 2);
+    init_thunk(&thunks[15], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsTagsInfo, 2);
+    init_thunk(&thunks[16], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPhysicalBoundsInfo, 2);
+    init_thunk(&thunks[17], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_GetLivePhysicalBoundsInfo, 2);
+    init_thunk(&thunks[18], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ExportLiveToBuffer, 2);
+    init_thunk(&thunks[19], r, winIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWorking, 2);
     for (i = 0; i < 20; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -424,22 +424,22 @@ winIVRChaperoneSetup_IVRChaperoneSetup_004 *create_winIVRChaperoneSetup_IVRChape
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy);
-    init_thunk(&thunks[1], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_RevertWorkingCopy);
-    init_thunk(&thunks[2], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaSize);
-    init_thunk(&thunks[3], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaRect);
-    init_thunk(&thunks[4], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingCollisionBoundsInfo);
-    init_thunk(&thunks[5], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveCollisionBoundsInfo);
-    init_thunk(&thunks[6], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[7], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingStandingZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[8], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingPlayAreaSize);
-    init_thunk(&thunks[9], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingCollisionBoundsInfo);
-    init_thunk(&thunks[10], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[11], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingStandingZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[12], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_ReloadFromDisk);
-    init_thunk(&thunks[13], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveSeatedZeroPoseToRawTrackingPose);
-    init_thunk(&thunks[14], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingWallTagInfo);
-    init_thunk(&thunks[15], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo);
+    init_thunk(&thunks[0], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy, 1);
+    init_thunk(&thunks[1], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_RevertWorkingCopy, 0);
+    init_thunk(&thunks[2], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaSize, 2);
+    init_thunk(&thunks[3], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaRect, 1);
+    init_thunk(&thunks[4], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingCollisionBoundsInfo, 2);
+    init_thunk(&thunks[5], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveCollisionBoundsInfo, 2);
+    init_thunk(&thunks[6], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[7], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingStandingZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[8], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingPlayAreaSize, 2);
+    init_thunk(&thunks[9], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingCollisionBoundsInfo, 2);
+    init_thunk(&thunks[10], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[11], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingStandingZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[12], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_ReloadFromDisk, 1);
+    init_thunk(&thunks[13], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveSeatedZeroPoseToRawTrackingPose, 1);
+    init_thunk(&thunks[14], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingWallTagInfo, 2);
+    init_thunk(&thunks[15], r, winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo, 2);
     for (i = 0; i < 16; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRClientCore.c b/vrclient_x64/winIVRClientCore.c
index af5db46e..aab78a71 100644
--- a/vrclient_x64/winIVRClientCore.c
+++ b/vrclient_x64/winIVRClientCore.c
@@ -116,13 +116,13 @@ winIVRClientCore_IVRClientCore_003 *create_winIVRClientCore_IVRClientCore_003_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRClientCore_IVRClientCore_003_Init);
-    init_thunk(&thunks[1], r, winIVRClientCore_IVRClientCore_003_Cleanup);
-    init_thunk(&thunks[2], r, winIVRClientCore_IVRClientCore_003_IsInterfaceVersionValid);
-    init_thunk(&thunks[3], r, winIVRClientCore_IVRClientCore_003_GetGenericInterface);
-    init_thunk(&thunks[4], r, winIVRClientCore_IVRClientCore_003_BIsHmdPresent);
-    init_thunk(&thunks[5], r, winIVRClientCore_IVRClientCore_003_GetEnglishStringForHmdError);
-    init_thunk(&thunks[6], r, winIVRClientCore_IVRClientCore_003_GetIDForVRInitError);
+    init_thunk(&thunks[0], r, winIVRClientCore_IVRClientCore_003_Init, 2);
+    init_thunk(&thunks[1], r, winIVRClientCore_IVRClientCore_003_Cleanup, 0);
+    init_thunk(&thunks[2], r, winIVRClientCore_IVRClientCore_003_IsInterfaceVersionValid, 1);
+    init_thunk(&thunks[3], r, winIVRClientCore_IVRClientCore_003_GetGenericInterface, 2);
+    init_thunk(&thunks[4], r, winIVRClientCore_IVRClientCore_003_BIsHmdPresent, 0);
+    init_thunk(&thunks[5], r, winIVRClientCore_IVRClientCore_003_GetEnglishStringForHmdError, 1);
+    init_thunk(&thunks[6], r, winIVRClientCore_IVRClientCore_003_GetIDForVRInitError, 1);
     for (i = 0; i < 7; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -237,13 +237,13 @@ winIVRClientCore_IVRClientCore_002 *create_winIVRClientCore_IVRClientCore_002_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRClientCore_IVRClientCore_002_Init);
-    init_thunk(&thunks[1], r, winIVRClientCore_IVRClientCore_002_Cleanup);
-    init_thunk(&thunks[2], r, winIVRClientCore_IVRClientCore_002_IsInterfaceVersionValid);
-    init_thunk(&thunks[3], r, winIVRClientCore_IVRClientCore_002_GetGenericInterface);
-    init_thunk(&thunks[4], r, winIVRClientCore_IVRClientCore_002_BIsHmdPresent);
-    init_thunk(&thunks[5], r, winIVRClientCore_IVRClientCore_002_GetEnglishStringForHmdError);
-    init_thunk(&thunks[6], r, winIVRClientCore_IVRClientCore_002_GetIDForVRInitError);
+    init_thunk(&thunks[0], r, winIVRClientCore_IVRClientCore_002_Init, 1);
+    init_thunk(&thunks[1], r, winIVRClientCore_IVRClientCore_002_Cleanup, 0);
+    init_thunk(&thunks[2], r, winIVRClientCore_IVRClientCore_002_IsInterfaceVersionValid, 1);
+    init_thunk(&thunks[3], r, winIVRClientCore_IVRClientCore_002_GetGenericInterface, 2);
+    init_thunk(&thunks[4], r, winIVRClientCore_IVRClientCore_002_BIsHmdPresent, 0);
+    init_thunk(&thunks[5], r, winIVRClientCore_IVRClientCore_002_GetEnglishStringForHmdError, 1);
+    init_thunk(&thunks[6], r, winIVRClientCore_IVRClientCore_002_GetIDForVRInitError, 1);
     for (i = 0; i < 7; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRCompositor.c b/vrclient_x64/winIVRCompositor.c
index 9122a14b..f24f0efc 100644
--- a/vrclient_x64/winIVRCompositor.c
+++ b/vrclient_x64/winIVRCompositor.c
@@ -407,49 +407,49 @@ winIVRCompositor_IVRCompositor_022 *create_winIVRCompositor_IVRCompositor_022_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_022_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_022_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_022_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_022_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_022_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_022_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_022_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_022_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_022_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_022_GetFrameTimings);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_022_GetFrameTimeRemaining);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_022_GetCumulativeStats);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_022_FadeToColor);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_022_GetCurrentFadeColor);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_022_FadeGrid);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_022_GetCurrentGridAlpha);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_022_SetSkyboxOverride);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_022_ClearSkyboxOverride);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_022_CompositorBringToFront);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_022_CompositorGoToBack);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_022_CompositorQuit);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_022_IsFullscreen);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_022_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_022_GetLastFrameRenderer);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_022_CanRenderScene);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_022_ShowMirrorWindow);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_022_HideMirrorWindow);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_022_IsMirrorWindowVisible);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_022_CompositorDumpImages);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_022_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_022_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_022_ForceReconnectProcess);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_022_SuspendRendering);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_022_GetMirrorTextureD3D11);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_022_ReleaseMirrorTextureD3D11);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_022_GetMirrorTextureGL);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_022_ReleaseSharedGLTexture);
-    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_022_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_022_UnlockGLSharedTextureForAccess);
-    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_022_GetVulkanInstanceExtensionsRequired);
-    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_022_GetVulkanDeviceExtensionsRequired);
-    init_thunk(&thunks[41], r, winIVRCompositor_IVRCompositor_022_SetExplicitTimingMode);
-    init_thunk(&thunks[42], r, winIVRCompositor_IVRCompositor_022_SubmitExplicitTimingData);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_022_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_022_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_022_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_022_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_022_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_022_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_022_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_022_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_022_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_022_GetFrameTimings, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_022_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_022_GetCumulativeStats, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_022_FadeToColor, 6);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_022_GetCurrentFadeColor, 1);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_022_FadeGrid, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_022_GetCurrentGridAlpha, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_022_SetSkyboxOverride, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_022_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_022_CompositorBringToFront, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_022_CompositorGoToBack, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_022_CompositorQuit, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_022_IsFullscreen, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_022_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_022_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_022_CanRenderScene, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_022_ShowMirrorWindow, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_022_HideMirrorWindow, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_022_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_022_CompositorDumpImages, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_022_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_022_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_022_ForceReconnectProcess, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_022_SuspendRendering, 1);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_022_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_022_ReleaseMirrorTextureD3D11, 1);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_022_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_022_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_022_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_022_UnlockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_022_GetVulkanInstanceExtensionsRequired, 2);
+    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_022_GetVulkanDeviceExtensionsRequired, 3);
+    init_thunk(&thunks[41], r, winIVRCompositor_IVRCompositor_022_SetExplicitTimingMode, 1);
+    init_thunk(&thunks[42], r, winIVRCompositor_IVRCompositor_022_SubmitExplicitTimingData, 0);
     for (i = 0; i < 43; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -856,49 +856,49 @@ winIVRCompositor_IVRCompositor_021 *create_winIVRCompositor_IVRCompositor_021_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_021_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_021_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_021_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_021_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_021_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_021_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_021_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_021_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_021_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_021_GetFrameTimings);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_021_GetFrameTimeRemaining);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_021_GetCumulativeStats);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_021_FadeToColor);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_021_GetCurrentFadeColor);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_021_FadeGrid);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_021_GetCurrentGridAlpha);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_021_SetSkyboxOverride);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_021_ClearSkyboxOverride);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_021_CompositorBringToFront);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_021_CompositorGoToBack);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_021_CompositorQuit);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_021_IsFullscreen);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_021_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_021_GetLastFrameRenderer);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_021_CanRenderScene);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_021_ShowMirrorWindow);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_021_HideMirrorWindow);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_021_IsMirrorWindowVisible);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_021_CompositorDumpImages);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_021_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_021_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_021_ForceReconnectProcess);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_021_SuspendRendering);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_021_GetMirrorTextureD3D11);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_021_ReleaseMirrorTextureD3D11);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_021_GetMirrorTextureGL);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_021_ReleaseSharedGLTexture);
-    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_021_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_021_UnlockGLSharedTextureForAccess);
-    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_021_GetVulkanInstanceExtensionsRequired);
-    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_021_GetVulkanDeviceExtensionsRequired);
-    init_thunk(&thunks[41], r, winIVRCompositor_IVRCompositor_021_SetExplicitTimingMode);
-    init_thunk(&thunks[42], r, winIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_021_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_021_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_021_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_021_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_021_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_021_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_021_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_021_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_021_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_021_GetFrameTimings, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_021_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_021_GetCumulativeStats, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_021_FadeToColor, 6);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_021_GetCurrentFadeColor, 1);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_021_FadeGrid, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_021_GetCurrentGridAlpha, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_021_SetSkyboxOverride, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_021_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_021_CompositorBringToFront, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_021_CompositorGoToBack, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_021_CompositorQuit, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_021_IsFullscreen, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_021_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_021_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_021_CanRenderScene, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_021_ShowMirrorWindow, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_021_HideMirrorWindow, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_021_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_021_CompositorDumpImages, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_021_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_021_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_021_ForceReconnectProcess, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_021_SuspendRendering, 1);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_021_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_021_ReleaseMirrorTextureD3D11, 1);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_021_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_021_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_021_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_021_UnlockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_021_GetVulkanInstanceExtensionsRequired, 2);
+    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_021_GetVulkanDeviceExtensionsRequired, 3);
+    init_thunk(&thunks[41], r, winIVRCompositor_IVRCompositor_021_SetExplicitTimingMode, 1);
+    init_thunk(&thunks[42], r, winIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData, 0);
     for (i = 0; i < 43; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1289,47 +1289,47 @@ winIVRCompositor_IVRCompositor_020 *create_winIVRCompositor_IVRCompositor_020_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_020_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_020_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_020_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_020_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_020_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_020_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_020_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_020_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_020_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_020_GetFrameTimings);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_020_GetFrameTimeRemaining);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_020_GetCumulativeStats);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_020_FadeToColor);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_020_GetCurrentFadeColor);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_020_FadeGrid);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_020_GetCurrentGridAlpha);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_020_SetSkyboxOverride);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_020_ClearSkyboxOverride);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_020_CompositorBringToFront);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_020_CompositorGoToBack);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_020_CompositorQuit);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_020_IsFullscreen);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_020_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_020_GetLastFrameRenderer);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_020_CanRenderScene);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_020_ShowMirrorWindow);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_020_HideMirrorWindow);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_020_IsMirrorWindowVisible);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_020_CompositorDumpImages);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_020_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_020_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_020_ForceReconnectProcess);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_020_SuspendRendering);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_020_GetMirrorTextureD3D11);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_020_ReleaseMirrorTextureD3D11);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_020_GetMirrorTextureGL);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_020_ReleaseSharedGLTexture);
-    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_020_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_020_UnlockGLSharedTextureForAccess);
-    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_020_GetVulkanInstanceExtensionsRequired);
-    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_020_GetVulkanDeviceExtensionsRequired);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_020_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_020_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_020_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_020_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_020_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_020_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_020_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_020_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_020_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_020_GetFrameTimings, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_020_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_020_GetCumulativeStats, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_020_FadeToColor, 6);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_020_GetCurrentFadeColor, 1);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_020_FadeGrid, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_020_GetCurrentGridAlpha, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_020_SetSkyboxOverride, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_020_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_020_CompositorBringToFront, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_020_CompositorGoToBack, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_020_CompositorQuit, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_020_IsFullscreen, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_020_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_020_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_020_CanRenderScene, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_020_ShowMirrorWindow, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_020_HideMirrorWindow, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_020_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_020_CompositorDumpImages, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_020_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_020_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_020_ForceReconnectProcess, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_020_SuspendRendering, 1);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_020_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_020_ReleaseMirrorTextureD3D11, 1);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_020_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_020_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_020_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_020_UnlockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_020_GetVulkanInstanceExtensionsRequired, 2);
+    init_thunk(&thunks[40], r, winIVRCompositor_IVRCompositor_020_GetVulkanDeviceExtensionsRequired, 3);
     for (i = 0; i < 41; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1712,46 +1712,46 @@ winIVRCompositor_IVRCompositor_019 *create_winIVRCompositor_IVRCompositor_019_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_019_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_019_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_019_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_019_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_019_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_019_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_019_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_019_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_019_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_019_GetFrameTimings);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_019_GetFrameTimeRemaining);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_019_GetCumulativeStats);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_019_FadeToColor);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_019_GetCurrentFadeColor);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_019_FadeGrid);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_019_GetCurrentGridAlpha);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_019_SetSkyboxOverride);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_019_ClearSkyboxOverride);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_019_CompositorBringToFront);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_019_CompositorGoToBack);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_019_CompositorQuit);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_019_IsFullscreen);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_019_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_019_GetLastFrameRenderer);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_019_CanRenderScene);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_019_ShowMirrorWindow);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_019_HideMirrorWindow);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_019_IsMirrorWindowVisible);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_019_CompositorDumpImages);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_019_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_019_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_019_ForceReconnectProcess);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_019_SuspendRendering);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_019_GetMirrorTextureD3D11);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_019_GetMirrorTextureGL);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_019_ReleaseSharedGLTexture);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_019_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_019_UnlockGLSharedTextureForAccess);
-    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_019_GetVulkanInstanceExtensionsRequired);
-    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_019_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_019_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_019_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_019_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_019_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_019_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_019_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_019_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_019_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_019_GetFrameTimings, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_019_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_019_GetCumulativeStats, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_019_FadeToColor, 6);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_019_GetCurrentFadeColor, 1);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_019_FadeGrid, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_019_GetCurrentGridAlpha, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_019_SetSkyboxOverride, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_019_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_019_CompositorBringToFront, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_019_CompositorGoToBack, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_019_CompositorQuit, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_019_IsFullscreen, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_019_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_019_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_019_CanRenderScene, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_019_ShowMirrorWindow, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_019_HideMirrorWindow, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_019_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_019_CompositorDumpImages, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_019_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_019_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_019_ForceReconnectProcess, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_019_SuspendRendering, 1);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_019_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_019_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_019_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_019_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_019_UnlockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[38], r, winIVRCompositor_IVRCompositor_019_GetVulkanInstanceExtensionsRequired, 2);
+    init_thunk(&thunks[39], r, winIVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired, 3);
     for (i = 0; i < 40; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2118,44 +2118,44 @@ winIVRCompositor_IVRCompositor_018 *create_winIVRCompositor_IVRCompositor_018_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_018_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_018_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_018_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_018_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_018_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_018_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_018_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_018_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_018_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_018_GetFrameTimings);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_018_GetFrameTimeRemaining);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_018_GetCumulativeStats);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_018_FadeToColor);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_018_GetCurrentFadeColor);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_018_FadeGrid);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_018_GetCurrentGridAlpha);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_018_SetSkyboxOverride);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_018_ClearSkyboxOverride);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_018_CompositorBringToFront);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_018_CompositorGoToBack);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_018_CompositorQuit);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_018_IsFullscreen);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_018_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_018_GetLastFrameRenderer);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_018_CanRenderScene);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_018_ShowMirrorWindow);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_018_HideMirrorWindow);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_018_IsMirrorWindowVisible);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_018_CompositorDumpImages);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_018_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_018_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_018_ForceReconnectProcess);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_018_SuspendRendering);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_018_GetMirrorTextureD3D11);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_018_GetMirrorTextureGL);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_018_ReleaseSharedGLTexture);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_018_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAccess);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_018_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_018_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_018_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_018_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_018_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_018_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_018_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_018_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_018_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_018_GetFrameTimings, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_018_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_018_GetCumulativeStats, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_018_FadeToColor, 6);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_018_GetCurrentFadeColor, 1);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_018_FadeGrid, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_018_GetCurrentGridAlpha, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_018_SetSkyboxOverride, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_018_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_018_CompositorBringToFront, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_018_CompositorGoToBack, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_018_CompositorQuit, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_018_IsFullscreen, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_018_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_018_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_018_CanRenderScene, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_018_ShowMirrorWindow, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_018_HideMirrorWindow, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_018_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_018_CompositorDumpImages, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_018_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_018_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_018_ForceReconnectProcess, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_018_SuspendRendering, 1);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_018_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_018_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_018_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_018_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[37], r, winIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAccess, 1);
     for (i = 0; i < 38; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2497,41 +2497,41 @@ winIVRCompositor_IVRCompositor_016 *create_winIVRCompositor_IVRCompositor_016_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_016_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_016_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_016_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_016_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_016_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_016_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_016_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_016_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_016_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_016_GetFrameTimeRemaining);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_016_GetCumulativeStats);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_016_FadeToColor);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_016_FadeGrid);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_016_SetSkyboxOverride);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_016_ClearSkyboxOverride);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_016_CompositorBringToFront);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_016_CompositorGoToBack);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_016_CompositorQuit);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_016_IsFullscreen);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_016_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_016_GetLastFrameRenderer);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_016_CanRenderScene);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_016_ShowMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_016_HideMirrorWindow);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_016_IsMirrorWindowVisible);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_016_CompositorDumpImages);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_016_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_016_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_016_ForceReconnectProcess);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_016_SuspendRendering);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_016_GetMirrorTextureD3D11);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_016_GetMirrorTextureGL);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_016_ReleaseSharedGLTexture);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_016_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAccess);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_016_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_016_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_016_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_016_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_016_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_016_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_016_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_016_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_016_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_016_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_016_GetCumulativeStats, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_016_FadeToColor, 6);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_016_FadeGrid, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_016_SetSkyboxOverride, 2);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_016_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_016_CompositorBringToFront, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_016_CompositorGoToBack, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_016_CompositorQuit, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_016_IsFullscreen, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_016_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_016_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_016_CanRenderScene, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_016_ShowMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_016_HideMirrorWindow, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_016_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_016_CompositorDumpImages, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_016_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_016_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_016_ForceReconnectProcess, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_016_SuspendRendering, 1);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_016_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_016_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_016_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_016_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAccess, 1);
     for (i = 0; i < 35; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2889,43 +2889,43 @@ winIVRCompositor_IVRCompositor_015 *create_winIVRCompositor_IVRCompositor_015_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_015_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_015_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_015_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_015_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_015_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_015_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_015_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_015_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_015_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_015_GetFrameTimeRemaining);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_015_GetCumulativeStats);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_015_FadeToColor);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_015_FadeGrid);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_015_SetSkyboxOverride);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_015_ClearSkyboxOverride);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_015_CompositorBringToFront);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_015_CompositorGoToBack);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_015_CompositorQuit);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_015_IsFullscreen);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_015_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_015_GetLastFrameRenderer);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_015_CanRenderScene);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_015_ShowMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_015_HideMirrorWindow);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_015_IsMirrorWindowVisible);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_015_CompositorDumpImages);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_015_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_015_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_015_ForceReconnectProcess);
-    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_015_SuspendRendering);
-    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_015_RequestScreenshot);
-    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_015_GetCurrentScreenshotType);
-    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_015_GetMirrorTextureD3D11);
-    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_015_GetMirrorTextureGL);
-    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_015_ReleaseSharedGLTexture);
-    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_015_LockGLSharedTextureForAccess);
-    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAccess);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_015_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_015_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_015_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_015_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_015_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_015_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_015_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_015_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_015_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_015_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_015_GetCumulativeStats, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_015_FadeToColor, 6);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_015_FadeGrid, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_015_SetSkyboxOverride, 2);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_015_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_015_CompositorBringToFront, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_015_CompositorGoToBack, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_015_CompositorQuit, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_015_IsFullscreen, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_015_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_015_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_015_CanRenderScene, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_015_ShowMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_015_HideMirrorWindow, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_015_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_015_CompositorDumpImages, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_015_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_015_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_015_ForceReconnectProcess, 0);
+    init_thunk(&thunks[29], r, winIVRCompositor_IVRCompositor_015_SuspendRendering, 1);
+    init_thunk(&thunks[30], r, winIVRCompositor_IVRCompositor_015_RequestScreenshot, 3);
+    init_thunk(&thunks[31], r, winIVRCompositor_IVRCompositor_015_GetCurrentScreenshotType, 0);
+    init_thunk(&thunks[32], r, winIVRCompositor_IVRCompositor_015_GetMirrorTextureD3D11, 3);
+    init_thunk(&thunks[33], r, winIVRCompositor_IVRCompositor_015_GetMirrorTextureGL, 3);
+    init_thunk(&thunks[34], r, winIVRCompositor_IVRCompositor_015_ReleaseSharedGLTexture, 2);
+    init_thunk(&thunks[35], r, winIVRCompositor_IVRCompositor_015_LockGLSharedTextureForAccess, 1);
+    init_thunk(&thunks[36], r, winIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAccess, 1);
     for (i = 0; i < 37; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3219,35 +3219,35 @@ winIVRCompositor_IVRCompositor_014 *create_winIVRCompositor_IVRCompositor_014_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_014_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_014_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_014_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_014_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_014_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_014_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_014_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_014_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_014_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_014_GetFrameTimeRemaining);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_014_FadeToColor);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_014_FadeGrid);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_014_SetSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_014_ClearSkyboxOverride);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_014_CompositorBringToFront);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_014_CompositorGoToBack);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_014_CompositorQuit);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_014_IsFullscreen);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_014_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_014_GetLastFrameRenderer);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_014_CanRenderScene);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_014_ShowMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_014_HideMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_014_IsMirrorWindowVisible);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_014_CompositorDumpImages);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_014_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_014_ForceInterleavedReprojectionOn);
-    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_014_ForceReconnectProcess);
-    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_014_SuspendRendering);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_014_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_014_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_014_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_014_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_014_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_014_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_014_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_014_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_014_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_014_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_014_FadeToColor, 6);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_014_FadeGrid, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_014_SetSkyboxOverride, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_014_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_014_CompositorBringToFront, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_014_CompositorGoToBack, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_014_CompositorQuit, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_014_IsFullscreen, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_014_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_014_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_014_CanRenderScene, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_014_ShowMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_014_HideMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_014_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_014_CompositorDumpImages, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_014_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_014_ForceInterleavedReprojectionOn, 1);
+    init_thunk(&thunks[27], r, winIVRCompositor_IVRCompositor_014_ForceReconnectProcess, 0);
+    init_thunk(&thunks[28], r, winIVRCompositor_IVRCompositor_014_SuspendRendering, 1);
     for (i = 0; i < 29; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3525,33 +3525,33 @@ winIVRCompositor_IVRCompositor_013 *create_winIVRCompositor_IVRCompositor_013_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_013_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_013_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_013_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_013_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_013_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_013_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_013_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_013_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_013_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_013_GetFrameTimeRemaining);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_013_FadeToColor);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_013_FadeGrid);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_013_SetSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_013_ClearSkyboxOverride);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_013_CompositorBringToFront);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_013_CompositorGoToBack);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_013_CompositorQuit);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_013_IsFullscreen);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_013_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_013_GetLastFrameRenderer);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_013_CanRenderScene);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_013_ShowMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_013_HideMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_013_IsMirrorWindowVisible);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_013_CompositorDumpImages);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_013_ShouldAppRenderWithLowResources);
-    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionOn);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_013_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_013_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_013_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_013_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_013_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_013_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_013_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_013_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_013_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_013_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_013_FadeToColor, 6);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_013_FadeGrid, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_013_SetSkyboxOverride, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_013_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_013_CompositorBringToFront, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_013_CompositorGoToBack, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_013_CompositorQuit, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_013_IsFullscreen, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_013_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_013_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_013_CanRenderScene, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_013_ShowMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_013_HideMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_013_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_013_CompositorDumpImages, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_013_ShouldAppRenderWithLowResources, 0);
+    init_thunk(&thunks[26], r, winIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionOn, 1);
     for (i = 0; i < 27; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3821,32 +3821,32 @@ winIVRCompositor_IVRCompositor_012 *create_winIVRCompositor_IVRCompositor_012_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_012_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_012_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_012_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_012_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_012_GetLastPoseForTrackedDeviceIndex);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_012_Submit);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_012_ClearLastSubmittedFrame);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_012_PostPresentHandoff);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_012_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_012_GetFrameTimeRemaining);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_012_FadeToColor);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_012_FadeGrid);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_012_SetSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_012_ClearSkyboxOverride);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_012_CompositorBringToFront);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_012_CompositorGoToBack);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_012_CompositorQuit);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_012_IsFullscreen);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_012_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_012_GetLastFrameRenderer);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_012_CanRenderScene);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_012_ShowMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_012_HideMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_012_IsMirrorWindowVisible);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_012_CompositorDumpImages);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResources);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_012_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_012_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_012_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_012_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_012_GetLastPoseForTrackedDeviceIndex, 3);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_012_Submit, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_012_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_012_PostPresentHandoff, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_012_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_012_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_012_FadeToColor, 6);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_012_FadeGrid, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_012_SetSkyboxOverride, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_012_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_012_CompositorBringToFront, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_012_CompositorGoToBack, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_012_CompositorQuit, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_012_IsFullscreen, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_012_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_012_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_012_CanRenderScene, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_012_ShowMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_012_HideMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_012_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_012_CompositorDumpImages, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResources, 0);
     for (i = 0; i < 26; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4100,30 +4100,30 @@ winIVRCompositor_IVRCompositor_011 *create_winIVRCompositor_IVRCompositor_011_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_011_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_011_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_011_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_011_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_011_Submit);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_011_ClearLastSubmittedFrame);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_011_PostPresentHandoff);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_011_GetFrameTiming);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_011_GetFrameTimeRemaining);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_011_FadeToColor);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_011_FadeGrid);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_011_SetSkyboxOverride);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_011_ClearSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_011_CompositorBringToFront);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_011_CompositorGoToBack);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_011_CompositorQuit);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_011_IsFullscreen);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_011_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_011_GetLastFrameRenderer);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_011_CanRenderScene);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_011_ShowMirrorWindow);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_011_HideMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_011_IsMirrorWindowVisible);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_011_CompositorDumpImages);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_011_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_011_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_011_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_011_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_011_Submit, 4);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_011_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_011_PostPresentHandoff, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_011_GetFrameTiming, 2);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_011_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_011_FadeToColor, 6);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_011_FadeGrid, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_011_SetSkyboxOverride, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_011_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_011_CompositorBringToFront, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_011_CompositorGoToBack, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_011_CompositorQuit, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_011_IsFullscreen, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_011_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_011_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_011_CanRenderScene, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_011_ShowMirrorWindow, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_011_HideMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_011_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_011_CompositorDumpImages, 0);
     for (i = 0; i < 24; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4377,30 +4377,30 @@ winIVRCompositor_IVRCompositor_010 *create_winIVRCompositor_IVRCompositor_010_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_010_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_010_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_010_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_010_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_010_Submit);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_010_ClearLastSubmittedFrame);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_010_PostPresentHandoff);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_010_GetFrameTiming);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_010_GetFrameTimeRemaining);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_010_FadeToColor);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_010_FadeGrid);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_010_SetSkyboxOverride);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_010_ClearSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_010_CompositorBringToFront);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_010_CompositorGoToBack);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_010_CompositorQuit);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_010_IsFullscreen);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_010_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_010_GetLastFrameRenderer);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_010_CanRenderScene);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_010_ShowMirrorWindow);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_010_HideMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_010_IsMirrorWindowVisible);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_010_CompositorDumpImages);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_010_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_010_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_010_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_010_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_010_Submit, 4);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_010_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_010_PostPresentHandoff, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_010_GetFrameTiming, 2);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_010_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_010_FadeToColor, 6);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_010_FadeGrid, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_010_SetSkyboxOverride, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_010_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_010_CompositorBringToFront, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_010_CompositorGoToBack, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_010_CompositorQuit, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_010_IsFullscreen, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_010_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_010_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_010_CanRenderScene, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_010_ShowMirrorWindow, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_010_HideMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_010_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_010_CompositorDumpImages, 0);
     for (i = 0; i < 24; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4654,30 +4654,30 @@ winIVRCompositor_IVRCompositor_009 *create_winIVRCompositor_IVRCompositor_009_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_009_SetTrackingSpace);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_009_GetTrackingSpace);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_009_WaitGetPoses);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_009_GetLastPoses);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_009_Submit);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_009_ClearLastSubmittedFrame);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_009_PostPresentHandoff);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_009_GetFrameTiming);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_009_GetFrameTimeRemaining);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_009_FadeToColor);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_009_FadeGrid);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_009_SetSkyboxOverride);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_009_ClearSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_009_CompositorBringToFront);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_009_CompositorGoToBack);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_009_CompositorQuit);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_009_IsFullscreen);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_009_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_009_GetLastFrameRenderer);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_009_CanRenderScene);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_009_ShowMirrorWindow);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_009_HideMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_009_IsMirrorWindowVisible);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_009_CompositorDumpImages);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_009_SetTrackingSpace, 1);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_009_GetTrackingSpace, 0);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_009_WaitGetPoses, 4);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_009_GetLastPoses, 4);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_009_Submit, 4);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_009_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_009_PostPresentHandoff, 0);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_009_GetFrameTiming, 2);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_009_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_009_FadeToColor, 6);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_009_FadeGrid, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_009_SetSkyboxOverride, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_009_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_009_CompositorBringToFront, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_009_CompositorGoToBack, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_009_CompositorQuit, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_009_IsFullscreen, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_009_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_009_GetLastFrameRenderer, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_009_CanRenderScene, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_009_ShowMirrorWindow, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_009_HideMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_009_IsMirrorWindowVisible, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_009_CompositorDumpImages, 0);
     for (i = 0; i < 24; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4947,32 +4947,32 @@ winIVRCompositor_IVRCompositor_008 *create_winIVRCompositor_IVRCompositor_008_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_008_GetLastError);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_008_SetVSync);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_008_GetVSync);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_008_SetGamma);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_008_GetGamma);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_008_WaitGetPoses);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_008_Submit);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_008_ClearLastSubmittedFrame);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_008_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_008_FadeToColor);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_008_FadeGrid);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_008_SetSkyboxOverride);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_008_ClearSkyboxOverride);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_008_CompositorBringToFront);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_008_CompositorGoToBack);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_008_CompositorQuit);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_008_IsFullscreen);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_008_SetTrackingSpace);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_008_GetTrackingSpace);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_008_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_008_CanRenderScene);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_008_ShowMirrorWindow);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_008_HideMirrorWindow);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_008_CompositorDumpImages);
-    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_008_GetFrameTimeRemaining);
-    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_008_GetLastFrameRenderer);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_008_GetLastError, 2);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_008_SetVSync, 1);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_008_GetVSync, 0);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_008_SetGamma, 1);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_008_GetGamma, 0);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_008_WaitGetPoses, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_008_Submit, 5);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_008_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_008_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_008_FadeToColor, 6);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_008_FadeGrid, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_008_SetSkyboxOverride, 7);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_008_ClearSkyboxOverride, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_008_CompositorBringToFront, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_008_CompositorGoToBack, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_008_CompositorQuit, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_008_IsFullscreen, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_008_SetTrackingSpace, 1);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_008_GetTrackingSpace, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_008_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_008_CanRenderScene, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_008_ShowMirrorWindow, 0);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_008_HideMirrorWindow, 0);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_008_CompositorDumpImages, 0);
+    init_thunk(&thunks[24], r, winIVRCompositor_IVRCompositor_008_GetFrameTimeRemaining, 0);
+    init_thunk(&thunks[25], r, winIVRCompositor_IVRCompositor_008_GetLastFrameRenderer, 0);
     for (i = 0; i < 26; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5186,25 +5186,25 @@ winIVRCompositor_IVRCompositor_007 *create_winIVRCompositor_IVRCompositor_007_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_007_GetLastError);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_007_SetVSync);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_007_GetVSync);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_007_SetGamma);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_007_GetGamma);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_007_WaitGetPoses);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_007_Submit);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_007_ClearLastSubmittedFrame);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_007_GetFrameTiming);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_007_FadeToColor);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_007_FadeGrid);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_007_CompositorBringToFront);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_007_CompositorGoToBack);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_007_CompositorQuit);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_007_IsFullscreen);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_007_SetTrackingSpace);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_007_GetTrackingSpace);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_007_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_007_CanRenderScene);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_007_GetLastError, 2);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_007_SetVSync, 1);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_007_GetVSync, 0);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_007_SetGamma, 1);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_007_GetGamma, 0);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_007_WaitGetPoses, 4);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_007_Submit, 4);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_007_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_007_GetFrameTiming, 2);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_007_FadeToColor, 6);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_007_FadeGrid, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_007_CompositorBringToFront, 0);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_007_CompositorGoToBack, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_007_CompositorQuit, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_007_IsFullscreen, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_007_SetTrackingSpace, 1);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_007_GetTrackingSpace, 0);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_007_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_007_CanRenderScene, 0);
     for (i = 0; i < 19; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5426,26 +5426,26 @@ winIVRCompositor_IVRCompositor_006 *create_winIVRCompositor_IVRCompositor_006_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_006_GetLastError);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_006_SetVSync);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_006_GetVSync);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_006_SetGamma);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_006_GetGamma);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_006_SetGraphicsDevice);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_006_WaitGetPoses);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_006_Submit);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_006_ClearLastSubmittedFrame);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_006_GetFrameTiming);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_006_FadeToColor);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_006_FadeGrid);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_006_CompositorBringToFront);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_006_CompositorGoToBack);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_006_CompositorQuit);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_006_IsFullscreen);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_006_SetTrackingSpace);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_006_GetTrackingSpace);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_006_GetCurrentSceneFocusProcess);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_006_CanRenderScene);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_006_GetLastError, 2);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_006_SetVSync, 1);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_006_GetVSync, 0);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_006_SetGamma, 1);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_006_GetGamma, 0);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_006_SetGraphicsDevice, 2);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_006_WaitGetPoses, 4);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_006_Submit, 3);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_006_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_006_GetFrameTiming, 2);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_006_FadeToColor, 6);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_006_FadeGrid, 2);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_006_CompositorBringToFront, 0);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_006_CompositorGoToBack, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_006_CompositorQuit, 0);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_006_IsFullscreen, 0);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_006_SetTrackingSpace, 1);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_006_GetTrackingSpace, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_006_GetCurrentSceneFocusProcess, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_006_CanRenderScene, 0);
     for (i = 0; i < 20; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5699,30 +5699,30 @@ winIVRCompositor_IVRCompositor_005 *create_winIVRCompositor_IVRCompositor_005_Fn
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_005_GetLastError);
-    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_005_SetVSync);
-    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_005_GetVSync);
-    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_005_SetGamma);
-    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_005_GetGamma);
-    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_005_SetGraphicsDevice);
-    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_005_WaitGetPoses);
-    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_005_Submit);
-    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_005_ClearLastSubmittedFrame);
-    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_005_GetOverlayDefaults);
-    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_005_SetOverlay);
-    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_005_SetOverlayRaw);
-    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_005_SetOverlayFromFile);
-    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_005_ClearOverlay);
-    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_005_GetFrameTiming);
-    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_005_FadeToColor);
-    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_005_FadeGrid);
-    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_005_CompositorBringToFront);
-    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_005_CompositorGoToBack);
-    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_005_CompositorQuit);
-    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_005_IsFullscreen);
-    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_005_ComputeOverlayIntersection);
-    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_005_SetTrackingSpace);
-    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_005_GetTrackingSpace);
+    init_thunk(&thunks[0], r, winIVRCompositor_IVRCompositor_005_GetLastError, 2);
+    init_thunk(&thunks[1], r, winIVRCompositor_IVRCompositor_005_SetVSync, 1);
+    init_thunk(&thunks[2], r, winIVRCompositor_IVRCompositor_005_GetVSync, 0);
+    init_thunk(&thunks[3], r, winIVRCompositor_IVRCompositor_005_SetGamma, 1);
+    init_thunk(&thunks[4], r, winIVRCompositor_IVRCompositor_005_GetGamma, 0);
+    init_thunk(&thunks[5], r, winIVRCompositor_IVRCompositor_005_SetGraphicsDevice, 2);
+    init_thunk(&thunks[6], r, winIVRCompositor_IVRCompositor_005_WaitGetPoses, 2);
+    init_thunk(&thunks[7], r, winIVRCompositor_IVRCompositor_005_Submit, 3);
+    init_thunk(&thunks[8], r, winIVRCompositor_IVRCompositor_005_ClearLastSubmittedFrame, 0);
+    init_thunk(&thunks[9], r, winIVRCompositor_IVRCompositor_005_GetOverlayDefaults, 1);
+    init_thunk(&thunks[10], r, winIVRCompositor_IVRCompositor_005_SetOverlay, 2);
+    init_thunk(&thunks[11], r, winIVRCompositor_IVRCompositor_005_SetOverlayRaw, 5);
+    init_thunk(&thunks[12], r, winIVRCompositor_IVRCompositor_005_SetOverlayFromFile, 2);
+    init_thunk(&thunks[13], r, winIVRCompositor_IVRCompositor_005_ClearOverlay, 0);
+    init_thunk(&thunks[14], r, winIVRCompositor_IVRCompositor_005_GetFrameTiming, 2);
+    init_thunk(&thunks[15], r, winIVRCompositor_IVRCompositor_005_FadeToColor, 6);
+    init_thunk(&thunks[16], r, winIVRCompositor_IVRCompositor_005_FadeGrid, 2);
+    init_thunk(&thunks[17], r, winIVRCompositor_IVRCompositor_005_CompositorBringToFront, 0);
+    init_thunk(&thunks[18], r, winIVRCompositor_IVRCompositor_005_CompositorGoToBack, 0);
+    init_thunk(&thunks[19], r, winIVRCompositor_IVRCompositor_005_CompositorQuit, 0);
+    init_thunk(&thunks[20], r, winIVRCompositor_IVRCompositor_005_IsFullscreen, 0);
+    init_thunk(&thunks[21], r, winIVRCompositor_IVRCompositor_005_ComputeOverlayIntersection, 7);
+    init_thunk(&thunks[22], r, winIVRCompositor_IVRCompositor_005_SetTrackingSpace, 1);
+    init_thunk(&thunks[23], r, winIVRCompositor_IVRCompositor_005_GetTrackingSpace, 0);
     for (i = 0; i < 24; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRDriverManager.c b/vrclient_x64/winIVRDriverManager.c
index 02bf968a..3c4ab4f8 100644
--- a/vrclient_x64/winIVRDriverManager.c
+++ b/vrclient_x64/winIVRDriverManager.c
@@ -83,9 +83,9 @@ winIVRDriverManager_IVRDriverManager_001 *create_winIVRDriverManager_IVRDriverMa
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRDriverManager_IVRDriverManager_001_GetDriverCount);
-    init_thunk(&thunks[1], r, winIVRDriverManager_IVRDriverManager_001_GetDriverName);
-    init_thunk(&thunks[2], r, winIVRDriverManager_IVRDriverManager_001_GetDriverHandle);
+    init_thunk(&thunks[0], r, winIVRDriverManager_IVRDriverManager_001_GetDriverCount, 0);
+    init_thunk(&thunks[1], r, winIVRDriverManager_IVRDriverManager_001_GetDriverName, 3);
+    init_thunk(&thunks[2], r, winIVRDriverManager_IVRDriverManager_001_GetDriverHandle, 1);
     for (i = 0; i < 3; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRExtendedDisplay.c b/vrclient_x64/winIVRExtendedDisplay.c
index f856566d..bb3ccdf7 100644
--- a/vrclient_x64/winIVRExtendedDisplay.c
+++ b/vrclient_x64/winIVRExtendedDisplay.c
@@ -83,9 +83,9 @@ winIVRExtendedDisplay_IVRExtendedDisplay_001 *create_winIVRExtendedDisplay_IVREx
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds);
-    init_thunk(&thunks[1], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetEyeOutputViewport);
-    init_thunk(&thunks[2], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo);
+    init_thunk(&thunks[0], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds, 4);
+    init_thunk(&thunks[1], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetEyeOutputViewport, 5);
+    init_thunk(&thunks[2], r, winIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo, 2);
     for (i = 0; i < 3; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRIOBuffer.c b/vrclient_x64/winIVRIOBuffer.c
index f9503a4c..6edce982 100644
--- a/vrclient_x64/winIVRIOBuffer.c
+++ b/vrclient_x64/winIVRIOBuffer.c
@@ -99,11 +99,11 @@ winIVRIOBuffer_IVRIOBuffer_001 *create_winIVRIOBuffer_IVRIOBuffer_001_FnTable(vo
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRIOBuffer_IVRIOBuffer_001_Open);
-    init_thunk(&thunks[1], r, winIVRIOBuffer_IVRIOBuffer_001_Close);
-    init_thunk(&thunks[2], r, winIVRIOBuffer_IVRIOBuffer_001_Read);
-    init_thunk(&thunks[3], r, winIVRIOBuffer_IVRIOBuffer_001_Write);
-    init_thunk(&thunks[4], r, winIVRIOBuffer_IVRIOBuffer_001_PropertyContainer);
+    init_thunk(&thunks[0], r, winIVRIOBuffer_IVRIOBuffer_001_Open, 5);
+    init_thunk(&thunks[1], r, winIVRIOBuffer_IVRIOBuffer_001_Close, 1);
+    init_thunk(&thunks[2], r, winIVRIOBuffer_IVRIOBuffer_001_Read, 4);
+    init_thunk(&thunks[3], r, winIVRIOBuffer_IVRIOBuffer_001_Write, 3);
+    init_thunk(&thunks[4], r, winIVRIOBuffer_IVRIOBuffer_001_PropertyContainer, 1);
     for (i = 0; i < 5; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRInput.c b/vrclient_x64/winIVRInput.c
index d18b97e7..3c860c2e 100644
--- a/vrclient_x64/winIVRInput.c
+++ b/vrclient_x64/winIVRInput.c
@@ -195,23 +195,23 @@ winIVRInput_IVRInput_003 *create_winIVRInput_IVRInput_003_FnTable(void *linux_si
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRInput_IVRInput_003_SetActionManifestPath);
-    init_thunk(&thunks[1], r, winIVRInput_IVRInput_003_GetActionSetHandle);
-    init_thunk(&thunks[2], r, winIVRInput_IVRInput_003_GetActionHandle);
-    init_thunk(&thunks[3], r, winIVRInput_IVRInput_003_GetInputSourceHandle);
-    init_thunk(&thunks[4], r, winIVRInput_IVRInput_003_UpdateActionState);
-    init_thunk(&thunks[5], r, winIVRInput_IVRInput_003_GetDigitalActionData);
-    init_thunk(&thunks[6], r, winIVRInput_IVRInput_003_GetAnalogActionData);
-    init_thunk(&thunks[7], r, winIVRInput_IVRInput_003_GetPoseActionData);
-    init_thunk(&thunks[8], r, winIVRInput_IVRInput_003_GetSkeletalActionData);
-    init_thunk(&thunks[9], r, winIVRInput_IVRInput_003_GetSkeletalActionDataCompressed);
-    init_thunk(&thunks[10], r, winIVRInput_IVRInput_003_UncompressSkeletalActionData);
-    init_thunk(&thunks[11], r, winIVRInput_IVRInput_003_TriggerHapticVibrationAction);
-    init_thunk(&thunks[12], r, winIVRInput_IVRInput_003_GetActionOrigins);
-    init_thunk(&thunks[13], r, winIVRInput_IVRInput_003_GetOriginLocalizedName);
-    init_thunk(&thunks[14], r, winIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo);
-    init_thunk(&thunks[15], r, winIVRInput_IVRInput_003_ShowActionOrigins);
-    init_thunk(&thunks[16], r, winIVRInput_IVRInput_003_ShowBindingsForActionSet);
+    init_thunk(&thunks[0], r, winIVRInput_IVRInput_003_SetActionManifestPath, 1);
+    init_thunk(&thunks[1], r, winIVRInput_IVRInput_003_GetActionSetHandle, 2);
+    init_thunk(&thunks[2], r, winIVRInput_IVRInput_003_GetActionHandle, 2);
+    init_thunk(&thunks[3], r, winIVRInput_IVRInput_003_GetInputSourceHandle, 2);
+    init_thunk(&thunks[4], r, winIVRInput_IVRInput_003_UpdateActionState, 3);
+    init_thunk(&thunks[5], r, winIVRInput_IVRInput_003_GetDigitalActionData, 3);
+    init_thunk(&thunks[6], r, winIVRInput_IVRInput_003_GetAnalogActionData, 3);
+    init_thunk(&thunks[7], r, winIVRInput_IVRInput_003_GetPoseActionData, 5);
+    init_thunk(&thunks[8], r, winIVRInput_IVRInput_003_GetSkeletalActionData, 7);
+    init_thunk(&thunks[9], r, winIVRInput_IVRInput_003_GetSkeletalActionDataCompressed, 6);
+    init_thunk(&thunks[10], r, winIVRInput_IVRInput_003_UncompressSkeletalActionData, 5);
+    init_thunk(&thunks[11], r, winIVRInput_IVRInput_003_TriggerHapticVibrationAction, 5);
+    init_thunk(&thunks[12], r, winIVRInput_IVRInput_003_GetActionOrigins, 4);
+    init_thunk(&thunks[13], r, winIVRInput_IVRInput_003_GetOriginLocalizedName, 3);
+    init_thunk(&thunks[14], r, winIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo, 3);
+    init_thunk(&thunks[15], r, winIVRInput_IVRInput_003_ShowActionOrigins, 2);
+    init_thunk(&thunks[16], r, winIVRInput_IVRInput_003_ShowBindingsForActionSet, 4);
     for (i = 0; i < 17; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRNotifications.c b/vrclient_x64/winIVRNotifications.c
index 5ea643b3..0cf3bdbc 100644
--- a/vrclient_x64/winIVRNotifications.c
+++ b/vrclient_x64/winIVRNotifications.c
@@ -75,8 +75,8 @@ winIVRNotifications_IVRNotifications_002 *create_winIVRNotifications_IVRNotifica
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRNotifications_IVRNotifications_002_CreateNotification);
-    init_thunk(&thunks[1], r, winIVRNotifications_IVRNotifications_002_RemoveNotification);
+    init_thunk(&thunks[0], r, winIVRNotifications_IVRNotifications_002_CreateNotification, 7);
+    init_thunk(&thunks[1], r, winIVRNotifications_IVRNotifications_002_RemoveNotification, 1);
     for (i = 0; i < 2; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -158,9 +158,9 @@ winIVRNotifications_IVRNotifications_001 *create_winIVRNotifications_IVRNotifica
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRNotifications_IVRNotifications_001_GetErrorString);
-    init_thunk(&thunks[1], r, winIVRNotifications_IVRNotifications_001_CreateNotification);
-    init_thunk(&thunks[2], r, winIVRNotifications_IVRNotifications_001_DismissNotification);
+    init_thunk(&thunks[0], r, winIVRNotifications_IVRNotifications_001_GetErrorString, 3);
+    init_thunk(&thunks[1], r, winIVRNotifications_IVRNotifications_001_CreateNotification, 7);
+    init_thunk(&thunks[2], r, winIVRNotifications_IVRNotifications_001_DismissNotification, 1);
     for (i = 0; i < 3; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVROverlay.c b/vrclient_x64/winIVROverlay.c
index c53e5cf2..4e0f7f1d 100644
--- a/vrclient_x64/winIVROverlay.c
+++ b/vrclient_x64/winIVROverlay.c
@@ -715,88 +715,88 @@ winIVROverlay_IVROverlay_018 *create_winIVROverlay_IVROverlay_018_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_018_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_018_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_018_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_018_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_018_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_018_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_018_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_018_SetOverlayName);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_018_GetOverlayImageData);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_018_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_018_SetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_018_GetOverlayRenderingPid);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_018_SetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_018_GetOverlayFlag);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_018_SetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_018_GetOverlayColor);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_018_SetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_018_GetOverlayAlpha);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_018_SetOverlayTexelAspect);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_018_GetOverlayTexelAspect);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_018_SetOverlaySortOrder);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_018_GetOverlaySortOrder);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_018_SetOverlayWidthInMeters);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_018_GetOverlayWidthInMeters);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_018_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_018_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_018_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_018_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_018_SetOverlayTextureBounds);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_018_GetOverlayTextureBounds);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_018_GetOverlayRenderModel);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_018_SetOverlayRenderModel);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_018_GetOverlayTransformType);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_018_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_018_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_018_GetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_018_SetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_018_ShowOverlay);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_018_HideOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_018_IsOverlayVisible);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_018_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_018_PollNextOverlayEvent);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_018_GetOverlayInputMethod);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_018_SetOverlayInputMethod);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_018_GetOverlayMouseScale);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_018_SetOverlayMouseScale);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_018_ComputeOverlayIntersection);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_018_IsHoverTargetOverlay);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_018_GetGamepadFocusOverlay);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_018_SetGamepadFocusOverlay);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_018_SetOverlayNeighbor);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_018_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_018_SetOverlayDualAnalogTransform);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_018_GetOverlayDualAnalogTransform);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_018_SetOverlayTexture);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_018_ClearOverlayTexture);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_018_SetOverlayRaw);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_018_SetOverlayFromFile);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_018_GetOverlayTexture);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_018_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_018_GetOverlayTextureSize);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_018_CreateDashboardOverlay);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_018_IsDashboardVisible);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_018_IsActiveDashboardOverlay);
-    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_018_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_018_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_018_ShowDashboard);
-    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_018_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_018_ShowKeyboard);
-    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_018_ShowKeyboardForOverlay);
-    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_018_GetKeyboardText);
-    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_018_HideKeyboard);
-    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_018_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_018_SetKeyboardPositionForOverlay);
-    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_018_SetOverlayIntersectionMask);
-    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_018_GetOverlayFlags);
-    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_018_ShowMessageOverlay);
-    init_thunk(&thunks[81], r, winIVROverlay_IVROverlay_018_CloseMessageOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_018_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_018_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_018_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_018_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_018_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_018_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_018_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_018_SetOverlayName, 2);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_018_GetOverlayImageData, 5);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_018_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_018_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_018_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_018_SetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_018_GetOverlayFlag, 3);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_018_SetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_018_GetOverlayColor, 4);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_018_SetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_018_GetOverlayAlpha, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_018_SetOverlayTexelAspect, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_018_GetOverlayTexelAspect, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_018_SetOverlaySortOrder, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_018_GetOverlaySortOrder, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_018_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_018_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_018_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_018_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_018_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_018_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_018_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_018_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_018_GetOverlayRenderModel, 5);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_018_SetOverlayRenderModel, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_018_GetOverlayTransformType, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_018_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_018_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_018_GetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_018_SetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_018_ShowOverlay, 1);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_018_HideOverlay, 1);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_018_IsOverlayVisible, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_018_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_018_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_018_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_018_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_018_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_018_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_018_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_018_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_018_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_018_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_018_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_018_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_018_SetOverlayDualAnalogTransform, 4);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_018_GetOverlayDualAnalogTransform, 4);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_018_SetOverlayTexture, 2);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_018_ClearOverlayTexture, 1);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_018_SetOverlayRaw, 5);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_018_SetOverlayFromFile, 2);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_018_GetOverlayTexture, 9);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_018_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_018_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_018_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_018_IsDashboardVisible, 0);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_018_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_018_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_018_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_018_ShowDashboard, 1);
+    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_018_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_018_ShowKeyboard, 7);
+    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_018_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_018_GetKeyboardText, 2);
+    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_018_HideKeyboard, 0);
+    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_018_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_018_SetKeyboardPositionForOverlay, 2);
+    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_018_SetOverlayIntersectionMask, 4);
+    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_018_GetOverlayFlags, 2);
+    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_018_ShowMessageOverlay, 6);
+    init_thunk(&thunks[81], r, winIVROverlay_IVROverlay_018_CloseMessageOverlay, 0);
     for (i = 0; i < 82; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1518,89 +1518,89 @@ winIVROverlay_IVROverlay_017 *create_winIVROverlay_IVROverlay_017_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_017_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_017_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_017_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_017_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_017_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_017_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_017_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_017_SetOverlayName);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_017_GetOverlayImageData);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_017_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_017_SetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_017_GetOverlayRenderingPid);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_017_SetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_017_GetOverlayFlag);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_017_SetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_017_GetOverlayColor);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_017_SetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_017_GetOverlayAlpha);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_017_SetOverlayTexelAspect);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_017_GetOverlayTexelAspect);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_017_SetOverlaySortOrder);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_017_GetOverlaySortOrder);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_017_SetOverlayWidthInMeters);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_017_GetOverlayWidthInMeters);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_017_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_017_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_017_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_017_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_017_SetOverlayTextureBounds);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_017_GetOverlayTextureBounds);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_017_GetOverlayRenderModel);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_017_SetOverlayRenderModel);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_017_GetOverlayTransformType);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_017_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_017_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_017_GetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_017_SetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_017_ShowOverlay);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_017_HideOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_017_IsOverlayVisible);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_017_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_017_PollNextOverlayEvent);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_017_GetOverlayInputMethod);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_017_SetOverlayInputMethod);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_017_GetOverlayMouseScale);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_017_SetOverlayMouseScale);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_017_ComputeOverlayIntersection);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_017_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_017_IsHoverTargetOverlay);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_017_GetGamepadFocusOverlay);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_017_SetGamepadFocusOverlay);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_017_SetOverlayNeighbor);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_017_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_017_SetOverlayDualAnalogTransform);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_017_GetOverlayDualAnalogTransform);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_017_SetOverlayTexture);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_017_ClearOverlayTexture);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_017_SetOverlayRaw);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_017_SetOverlayFromFile);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_017_GetOverlayTexture);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_017_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_017_GetOverlayTextureSize);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_017_CreateDashboardOverlay);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_017_IsDashboardVisible);
-    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_017_IsActiveDashboardOverlay);
-    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_017_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_017_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_017_ShowDashboard);
-    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_017_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_017_ShowKeyboard);
-    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_017_ShowKeyboardForOverlay);
-    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_017_GetKeyboardText);
-    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_017_HideKeyboard);
-    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_017_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_017_SetKeyboardPositionForOverlay);
-    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_017_SetOverlayIntersectionMask);
-    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_017_GetOverlayFlags);
-    init_thunk(&thunks[81], r, winIVROverlay_IVROverlay_017_ShowMessageOverlay);
-    init_thunk(&thunks[82], r, winIVROverlay_IVROverlay_017_CloseMessageOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_017_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_017_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_017_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_017_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_017_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_017_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_017_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_017_SetOverlayName, 2);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_017_GetOverlayImageData, 5);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_017_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_017_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_017_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_017_SetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_017_GetOverlayFlag, 3);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_017_SetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_017_GetOverlayColor, 4);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_017_SetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_017_GetOverlayAlpha, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_017_SetOverlayTexelAspect, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_017_GetOverlayTexelAspect, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_017_SetOverlaySortOrder, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_017_GetOverlaySortOrder, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_017_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_017_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_017_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_017_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_017_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_017_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_017_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_017_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_017_GetOverlayRenderModel, 5);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_017_SetOverlayRenderModel, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_017_GetOverlayTransformType, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_017_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_017_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_017_GetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_017_SetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_017_ShowOverlay, 1);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_017_HideOverlay, 1);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_017_IsOverlayVisible, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_017_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_017_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_017_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_017_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_017_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_017_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_017_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_017_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_017_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_017_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_017_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_017_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_017_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_017_SetOverlayDualAnalogTransform, 4);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_017_GetOverlayDualAnalogTransform, 4);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_017_SetOverlayTexture, 2);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_017_ClearOverlayTexture, 1);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_017_SetOverlayRaw, 5);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_017_SetOverlayFromFile, 2);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_017_GetOverlayTexture, 9);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_017_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_017_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_017_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_017_IsDashboardVisible, 0);
+    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_017_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_017_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_017_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_017_ShowDashboard, 1);
+    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_017_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_017_ShowKeyboard, 7);
+    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_017_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_017_GetKeyboardText, 2);
+    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_017_HideKeyboard, 0);
+    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_017_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_017_SetKeyboardPositionForOverlay, 2);
+    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_017_SetOverlayIntersectionMask, 4);
+    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_017_GetOverlayFlags, 2);
+    init_thunk(&thunks[81], r, winIVROverlay_IVROverlay_017_ShowMessageOverlay, 6);
+    init_thunk(&thunks[82], r, winIVROverlay_IVROverlay_017_CloseMessageOverlay, 0);
     for (i = 0; i < 83; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2306,87 +2306,87 @@ winIVROverlay_IVROverlay_016 *create_winIVROverlay_IVROverlay_016_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_016_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_016_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_016_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_016_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_016_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_016_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_016_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_016_SetOverlayName);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_016_GetOverlayImageData);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_016_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_016_SetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_016_GetOverlayRenderingPid);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_016_SetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_016_GetOverlayFlag);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_016_SetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_016_GetOverlayColor);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_016_SetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_016_GetOverlayAlpha);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_016_SetOverlayTexelAspect);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_016_GetOverlayTexelAspect);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_016_SetOverlaySortOrder);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_016_GetOverlaySortOrder);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_016_SetOverlayWidthInMeters);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_016_GetOverlayWidthInMeters);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_016_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_016_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_016_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_016_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_016_SetOverlayTextureBounds);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_016_GetOverlayTextureBounds);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_016_GetOverlayRenderModel);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_016_SetOverlayRenderModel);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_016_GetOverlayTransformType);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_016_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_016_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_016_GetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_016_SetOverlayTransformOverlayRelative);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_016_ShowOverlay);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_016_HideOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_016_IsOverlayVisible);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_016_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_016_PollNextOverlayEvent);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_016_GetOverlayInputMethod);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_016_SetOverlayInputMethod);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_016_GetOverlayMouseScale);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_016_SetOverlayMouseScale);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_016_ComputeOverlayIntersection);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_016_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_016_IsHoverTargetOverlay);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_016_GetGamepadFocusOverlay);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_016_SetGamepadFocusOverlay);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_016_SetOverlayNeighbor);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_016_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_016_SetOverlayTexture);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_016_ClearOverlayTexture);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_016_SetOverlayRaw);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_016_SetOverlayFromFile);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_016_GetOverlayTexture);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_016_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_016_GetOverlayTextureSize);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_016_CreateDashboardOverlay);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_016_IsDashboardVisible);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_016_IsActiveDashboardOverlay);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_016_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_016_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_016_ShowDashboard);
-    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_016_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_016_ShowKeyboard);
-    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_016_ShowKeyboardForOverlay);
-    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_016_GetKeyboardText);
-    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_016_HideKeyboard);
-    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_016_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_016_SetKeyboardPositionForOverlay);
-    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_016_SetOverlayIntersectionMask);
-    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_016_GetOverlayFlags);
-    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_016_ShowMessageOverlay);
-    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_016_CloseMessageOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_016_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_016_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_016_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_016_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_016_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_016_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_016_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_016_SetOverlayName, 2);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_016_GetOverlayImageData, 5);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_016_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_016_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_016_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_016_SetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_016_GetOverlayFlag, 3);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_016_SetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_016_GetOverlayColor, 4);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_016_SetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_016_GetOverlayAlpha, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_016_SetOverlayTexelAspect, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_016_GetOverlayTexelAspect, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_016_SetOverlaySortOrder, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_016_GetOverlaySortOrder, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_016_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_016_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_016_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_016_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_016_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_016_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_016_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_016_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_016_GetOverlayRenderModel, 5);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_016_SetOverlayRenderModel, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_016_GetOverlayTransformType, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_016_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_016_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_016_GetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_016_SetOverlayTransformOverlayRelative, 3);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_016_ShowOverlay, 1);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_016_HideOverlay, 1);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_016_IsOverlayVisible, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_016_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_016_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_016_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_016_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_016_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_016_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_016_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_016_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_016_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_016_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_016_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_016_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_016_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_016_SetOverlayTexture, 2);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_016_ClearOverlayTexture, 1);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_016_SetOverlayRaw, 5);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_016_SetOverlayFromFile, 2);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_016_GetOverlayTexture, 9);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_016_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_016_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_016_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_016_IsDashboardVisible, 0);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_016_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_016_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_016_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_016_ShowDashboard, 1);
+    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_016_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_016_ShowKeyboard, 7);
+    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_016_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_016_GetKeyboardText, 2);
+    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_016_HideKeyboard, 0);
+    init_thunk(&thunks[75], r, winIVROverlay_IVROverlay_016_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[76], r, winIVROverlay_IVROverlay_016_SetKeyboardPositionForOverlay, 2);
+    init_thunk(&thunks[77], r, winIVROverlay_IVROverlay_016_SetOverlayIntersectionMask, 4);
+    init_thunk(&thunks[78], r, winIVROverlay_IVROverlay_016_GetOverlayFlags, 2);
+    init_thunk(&thunks[79], r, winIVROverlay_IVROverlay_016_ShowMessageOverlay, 6);
+    init_thunk(&thunks[80], r, winIVROverlay_IVROverlay_016_CloseMessageOverlay, 0);
     for (i = 0; i < 81; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3044,81 +3044,81 @@ winIVROverlay_IVROverlay_014 *create_winIVROverlay_IVROverlay_014_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_014_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_014_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_014_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_014_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_014_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_014_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_014_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_014_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_014_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_014_SetOverlayRenderingPid);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_014_GetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_014_SetOverlayFlag);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_014_GetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_014_SetOverlayColor);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_014_GetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_014_SetOverlayAlpha);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_014_GetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_014_SetOverlayTexelAspect);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_014_GetOverlayTexelAspect);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_014_SetOverlaySortOrder);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_014_GetOverlaySortOrder);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_014_SetOverlayWidthInMeters);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_014_GetOverlayWidthInMeters);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_014_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_014_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_014_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_014_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_014_SetOverlayTextureBounds);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_014_GetOverlayTextureBounds);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_014_GetOverlayTransformType);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_014_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_014_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_014_ShowOverlay);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_014_HideOverlay);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_014_IsOverlayVisible);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_014_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_014_PollNextOverlayEvent);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_014_GetOverlayInputMethod);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_014_SetOverlayInputMethod);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_014_GetOverlayMouseScale);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_014_SetOverlayMouseScale);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_014_ComputeOverlayIntersection);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_014_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_014_IsHoverTargetOverlay);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_014_GetGamepadFocusOverlay);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_014_SetGamepadFocusOverlay);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_014_SetOverlayNeighbor);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_014_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_014_SetOverlayTexture);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_014_ClearOverlayTexture);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_014_SetOverlayRaw);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_014_SetOverlayFromFile);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_014_GetOverlayTexture);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_014_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_014_GetOverlayTextureSize);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_014_CreateDashboardOverlay);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_014_IsDashboardVisible);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_014_IsActiveDashboardOverlay);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_014_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_014_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_014_ShowDashboard);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_014_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_014_ShowKeyboard);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_014_ShowKeyboardForOverlay);
-    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_014_GetKeyboardText);
-    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_014_HideKeyboard);
-    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_014_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_014_SetKeyboardPositionForOverlay);
-    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_014_SetOverlayIntersectionMask);
-    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_014_GetOverlayFlags);
-    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_014_ShowMessageOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_014_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_014_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_014_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_014_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_014_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_014_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_014_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_014_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_014_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_014_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_014_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_014_SetOverlayFlag, 3);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_014_GetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_014_SetOverlayColor, 4);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_014_GetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_014_SetOverlayAlpha, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_014_GetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_014_SetOverlayTexelAspect, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_014_GetOverlayTexelAspect, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_014_SetOverlaySortOrder, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_014_GetOverlaySortOrder, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_014_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_014_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_014_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_014_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_014_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_014_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_014_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_014_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_014_GetOverlayTransformType, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_014_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_014_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_014_ShowOverlay, 1);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_014_HideOverlay, 1);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_014_IsOverlayVisible, 1);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_014_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_014_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_014_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_014_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_014_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_014_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_014_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_014_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_014_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_014_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_014_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_014_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_014_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_014_SetOverlayTexture, 2);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_014_ClearOverlayTexture, 1);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_014_SetOverlayRaw, 5);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_014_SetOverlayFromFile, 2);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_014_GetOverlayTexture, 9);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_014_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_014_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_014_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_014_IsDashboardVisible, 0);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_014_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_014_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_014_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_014_ShowDashboard, 1);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_014_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_014_ShowKeyboard, 7);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_014_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_014_GetKeyboardText, 2);
+    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_014_HideKeyboard, 0);
+    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_014_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_014_SetKeyboardPositionForOverlay, 2);
+    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_014_SetOverlayIntersectionMask, 4);
+    init_thunk(&thunks[73], r, winIVROverlay_IVROverlay_014_GetOverlayFlags, 2);
+    init_thunk(&thunks[74], r, winIVROverlay_IVROverlay_014_ShowMessageOverlay, 6);
     for (i = 0; i < 75; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3760,79 +3760,79 @@ winIVROverlay_IVROverlay_013 *create_winIVROverlay_IVROverlay_013_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_013_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_013_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_013_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_013_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_013_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_013_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_013_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_013_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_013_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_013_SetOverlayRenderingPid);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_013_GetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_013_SetOverlayFlag);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_013_GetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_013_SetOverlayColor);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_013_GetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_013_SetOverlayAlpha);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_013_GetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_013_SetOverlayTexelAspect);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_013_GetOverlayTexelAspect);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_013_SetOverlaySortOrder);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_013_GetOverlaySortOrder);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_013_SetOverlayWidthInMeters);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_013_GetOverlayWidthInMeters);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_013_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_013_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_013_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_013_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_013_SetOverlayTextureBounds);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_013_GetOverlayTextureBounds);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_013_GetOverlayTransformType);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_013_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_013_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_013_ShowOverlay);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_013_HideOverlay);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_013_IsOverlayVisible);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_013_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_013_PollNextOverlayEvent);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_013_GetOverlayInputMethod);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_013_SetOverlayInputMethod);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_013_GetOverlayMouseScale);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_013_SetOverlayMouseScale);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_013_ComputeOverlayIntersection);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_013_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_013_IsHoverTargetOverlay);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_013_GetGamepadFocusOverlay);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_013_SetGamepadFocusOverlay);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_013_SetOverlayNeighbor);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_013_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_013_SetOverlayTexture);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_013_ClearOverlayTexture);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_013_SetOverlayRaw);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_013_SetOverlayFromFile);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_013_GetOverlayTexture);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_013_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_013_GetOverlayTextureSize);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_013_CreateDashboardOverlay);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_013_IsDashboardVisible);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_013_IsActiveDashboardOverlay);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_013_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_013_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_013_ShowDashboard);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_013_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_013_ShowKeyboard);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_013_ShowKeyboardForOverlay);
-    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_013_GetKeyboardText);
-    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_013_HideKeyboard);
-    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_013_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_013_SetKeyboardPositionForOverlay);
-    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_013_SetOverlayIntersectionMask);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_013_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_013_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_013_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_013_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_013_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_013_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_013_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_013_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_013_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_013_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_013_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_013_SetOverlayFlag, 3);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_013_GetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_013_SetOverlayColor, 4);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_013_GetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_013_SetOverlayAlpha, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_013_GetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_013_SetOverlayTexelAspect, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_013_GetOverlayTexelAspect, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_013_SetOverlaySortOrder, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_013_GetOverlaySortOrder, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_013_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_013_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_013_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_013_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_013_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_013_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_013_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_013_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_013_GetOverlayTransformType, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_013_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_013_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_013_ShowOverlay, 1);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_013_HideOverlay, 1);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_013_IsOverlayVisible, 1);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_013_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_013_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_013_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_013_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_013_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_013_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_013_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_013_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_013_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_013_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_013_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_013_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_013_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_013_SetOverlayTexture, 2);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_013_ClearOverlayTexture, 1);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_013_SetOverlayRaw, 5);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_013_SetOverlayFromFile, 2);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_013_GetOverlayTexture, 8);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_013_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_013_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_013_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_013_IsDashboardVisible, 0);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_013_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_013_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_013_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_013_ShowDashboard, 1);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_013_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_013_ShowKeyboard, 7);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_013_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[68], r, winIVROverlay_IVROverlay_013_GetKeyboardText, 2);
+    init_thunk(&thunks[69], r, winIVROverlay_IVROverlay_013_HideKeyboard, 0);
+    init_thunk(&thunks[70], r, winIVROverlay_IVROverlay_013_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[71], r, winIVROverlay_IVROverlay_013_SetKeyboardPositionForOverlay, 2);
+    init_thunk(&thunks[72], r, winIVROverlay_IVROverlay_013_SetOverlayIntersectionMask, 4);
     for (i = 0; i < 73; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4434,74 +4434,74 @@ winIVROverlay_IVROverlay_012 *create_winIVROverlay_IVROverlay_012_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_012_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_012_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_012_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_012_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_012_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_012_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_012_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_012_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_012_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_012_SetOverlayRenderingPid);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_012_GetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_012_SetOverlayFlag);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_012_GetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_012_SetOverlayColor);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_012_GetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_012_SetOverlayAlpha);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_012_GetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_012_SetOverlayWidthInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_012_GetOverlayWidthInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_012_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_012_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_012_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_012_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_012_SetOverlayTextureBounds);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_012_GetOverlayTextureBounds);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_012_GetOverlayTransformType);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_012_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_012_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_012_ShowOverlay);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_012_HideOverlay);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_012_IsOverlayVisible);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_012_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_012_PollNextOverlayEvent);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_012_GetOverlayInputMethod);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_012_SetOverlayInputMethod);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_012_GetOverlayMouseScale);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_012_SetOverlayMouseScale);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_012_ComputeOverlayIntersection);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_012_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_012_IsHoverTargetOverlay);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_012_GetGamepadFocusOverlay);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_012_SetGamepadFocusOverlay);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_012_SetOverlayNeighbor);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_012_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_012_SetOverlayTexture);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_012_ClearOverlayTexture);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_012_SetOverlayRaw);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_012_SetOverlayFromFile);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_012_GetOverlayTexture);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_012_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_012_GetOverlayTextureSize);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_012_CreateDashboardOverlay);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_012_IsDashboardVisible);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_012_IsActiveDashboardOverlay);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_012_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_012_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_012_ShowDashboard);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_012_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_012_ShowKeyboard);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_012_ShowKeyboardForOverlay);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_012_GetKeyboardText);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_012_HideKeyboard);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_012_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_012_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_012_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_012_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_012_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_012_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_012_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_012_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_012_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_012_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_012_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_012_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_012_SetOverlayFlag, 3);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_012_GetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_012_SetOverlayColor, 4);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_012_GetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_012_SetOverlayAlpha, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_012_GetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_012_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_012_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_012_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_012_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_012_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_012_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_012_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_012_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_012_GetOverlayTransformType, 2);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_012_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_012_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_012_ShowOverlay, 1);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_012_HideOverlay, 1);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_012_IsOverlayVisible, 1);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_012_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_012_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_012_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_012_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_012_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_012_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_012_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_012_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_012_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_012_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_012_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_012_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_012_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_012_SetOverlayTexture, 2);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_012_ClearOverlayTexture, 1);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_012_SetOverlayRaw, 5);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_012_SetOverlayFromFile, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_012_GetOverlayTexture, 8);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_012_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_012_GetOverlayTextureSize, 3);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_012_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_012_IsDashboardVisible, 0);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_012_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_012_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_012_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_012_ShowDashboard, 1);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_012_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_012_ShowKeyboard, 7);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_012_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_012_GetKeyboardText, 2);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_012_HideKeyboard, 0);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_012_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[67], r, winIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay, 2);
     for (i = 0; i < 68; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5095,73 +5095,73 @@ winIVROverlay_IVROverlay_011 *create_winIVROverlay_IVROverlay_011_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_011_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_011_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_011_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_011_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_011_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_011_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_011_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_011_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_011_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_011_SetOverlayRenderingPid);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_011_GetOverlayRenderingPid);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_011_SetOverlayFlag);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_011_GetOverlayFlag);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_011_SetOverlayColor);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_011_GetOverlayColor);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_011_SetOverlayAlpha);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_011_GetOverlayAlpha);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_011_SetOverlayWidthInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_011_GetOverlayWidthInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_011_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_011_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_011_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_011_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_011_SetOverlayTextureBounds);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_011_GetOverlayTextureBounds);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_011_GetOverlayTransformType);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_011_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_011_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_011_ShowOverlay);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_011_HideOverlay);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_011_IsOverlayVisible);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_011_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_011_PollNextOverlayEvent);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_011_GetOverlayInputMethod);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_011_SetOverlayInputMethod);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_011_GetOverlayMouseScale);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_011_SetOverlayMouseScale);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_011_ComputeOverlayIntersection);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_011_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_011_IsHoverTargetOverlay);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_011_GetGamepadFocusOverlay);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_011_SetGamepadFocusOverlay);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_011_SetOverlayNeighbor);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_011_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_011_SetOverlayTexture);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_011_ClearOverlayTexture);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_011_SetOverlayRaw);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_011_SetOverlayFromFile);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_011_GetOverlayTexture);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_011_ReleaseNativeOverlayHandle);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_011_CreateDashboardOverlay);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_011_IsDashboardVisible);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_011_IsActiveDashboardOverlay);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_011_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_011_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_011_ShowDashboard);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_011_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_011_ShowKeyboard);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_011_ShowKeyboardForOverlay);
-    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_011_GetKeyboardText);
-    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_011_HideKeyboard);
-    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_011_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_011_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_011_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_011_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_011_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_011_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_011_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_011_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_011_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_011_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_011_SetOverlayRenderingPid, 2);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_011_GetOverlayRenderingPid, 1);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_011_SetOverlayFlag, 3);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_011_GetOverlayFlag, 3);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_011_SetOverlayColor, 4);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_011_GetOverlayColor, 4);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_011_SetOverlayAlpha, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_011_GetOverlayAlpha, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_011_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_011_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_011_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_011_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_011_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_011_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_011_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_011_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_011_GetOverlayTransformType, 2);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_011_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_011_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_011_ShowOverlay, 1);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_011_HideOverlay, 1);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_011_IsOverlayVisible, 1);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_011_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_011_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_011_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_011_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_011_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_011_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_011_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_011_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_011_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_011_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_011_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_011_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_011_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_011_SetOverlayTexture, 2);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_011_ClearOverlayTexture, 1);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_011_SetOverlayRaw, 5);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_011_SetOverlayFromFile, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_011_GetOverlayTexture, 8);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_011_ReleaseNativeOverlayHandle, 2);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_011_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_011_IsDashboardVisible, 0);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_011_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_011_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_011_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_011_ShowDashboard, 1);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_011_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_011_ShowKeyboard, 7);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_011_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[63], r, winIVROverlay_IVROverlay_011_GetKeyboardText, 2);
+    init_thunk(&thunks[64], r, winIVROverlay_IVROverlay_011_HideKeyboard, 0);
+    init_thunk(&thunks[65], r, winIVROverlay_IVROverlay_011_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[66], r, winIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay, 2);
     for (i = 0; i < 67; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5723,69 +5723,69 @@ winIVROverlay_IVROverlay_010 *create_winIVROverlay_IVROverlay_010_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_010_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_010_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_010_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_010_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_010_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_010_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_010_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_010_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_010_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_010_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_010_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_010_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_010_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_010_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_010_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_010_SetOverlayWidthInMeters);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_010_GetOverlayWidthInMeters);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_010_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_010_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_010_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_010_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_010_SetOverlayTextureBounds);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_010_GetOverlayTextureBounds);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_010_GetOverlayTransformType);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_010_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_010_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceComponent);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_010_ShowOverlay);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_010_HideOverlay);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_010_IsOverlayVisible);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_010_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_010_PollNextOverlayEvent);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_010_GetOverlayInputMethod);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_010_SetOverlayInputMethod);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_010_GetOverlayMouseScale);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_010_SetOverlayMouseScale);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_010_ComputeOverlayIntersection);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_010_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_010_IsHoverTargetOverlay);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_010_GetGamepadFocusOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_010_SetGamepadFocusOverlay);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_010_SetOverlayNeighbor);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_010_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_010_SetOverlayTexture);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_010_ClearOverlayTexture);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_010_SetOverlayRaw);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_010_SetOverlayFromFile);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_010_CreateDashboardOverlay);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_010_IsDashboardVisible);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_010_IsActiveDashboardOverlay);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_010_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_010_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_010_ShowDashboard);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_010_GetPrimaryDashboardDevice);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_010_ShowKeyboard);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_010_ShowKeyboardForOverlay);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_010_GetKeyboardText);
-    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_010_HideKeyboard);
-    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_010_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_010_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_010_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_010_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_010_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_010_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_010_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_010_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_010_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_010_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_010_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_010_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_010_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_010_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_010_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_010_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_010_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_010_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_010_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_010_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_010_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_010_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_010_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_010_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_010_GetOverlayTransformType, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_010_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_010_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceComponent, 3);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceComponent, 4);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_010_ShowOverlay, 1);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_010_HideOverlay, 1);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_010_IsOverlayVisible, 1);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_010_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_010_PollNextOverlayEvent, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_010_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_010_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_010_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_010_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_010_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_010_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_010_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_010_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_010_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_010_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_010_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_010_SetOverlayTexture, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_010_ClearOverlayTexture, 1);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_010_SetOverlayRaw, 5);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_010_SetOverlayFromFile, 2);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_010_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_010_IsDashboardVisible, 0);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_010_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_010_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_010_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_010_ShowDashboard, 1);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_010_GetPrimaryDashboardDevice, 0);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_010_ShowKeyboard, 7);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_010_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_010_GetKeyboardText, 2);
+    init_thunk(&thunks[60], r, winIVROverlay_IVROverlay_010_HideKeyboard, 0);
+    init_thunk(&thunks[61], r, winIVROverlay_IVROverlay_010_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[62], r, winIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay, 2);
     for (i = 0; i < 63; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -6323,66 +6323,66 @@ winIVROverlay_IVROverlay_008 *create_winIVROverlay_IVROverlay_008_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_008_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_008_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_008_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_008_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_008_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_008_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_008_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_008_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_008_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_008_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_008_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_008_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_008_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_008_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_008_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_008_SetOverlayWidthInMeters);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_008_GetOverlayWidthInMeters);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_008_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_008_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_008_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_008_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_008_SetOverlayTextureBounds);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_008_GetOverlayTextureBounds);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_008_GetOverlayTransformType);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_008_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_008_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_008_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_008_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_008_ShowOverlay);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_008_HideOverlay);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_008_IsOverlayVisible);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_008_PollNextOverlayEvent);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_008_GetOverlayInputMethod);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_008_SetOverlayInputMethod);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_008_GetOverlayMouseScale);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_008_SetOverlayMouseScale);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_008_ComputeOverlayIntersection);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_008_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_008_IsHoverTargetOverlay);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_008_GetGamepadFocusOverlay);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_008_SetGamepadFocusOverlay);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_008_SetOverlayNeighbor);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_008_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_008_SetOverlayTexture);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_008_ClearOverlayTexture);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_008_SetOverlayRaw);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_008_SetOverlayFromFile);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_008_CreateDashboardOverlay);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_008_IsDashboardVisible);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_008_IsActiveDashboardOverlay);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_008_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_008_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_008_ShowDashboard);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_008_ShowKeyboard);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_008_ShowKeyboardForOverlay);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_008_GetKeyboardText);
-    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_008_HideKeyboard);
-    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_008_SetKeyboardTransformAbsolute);
-    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_008_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_008_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_008_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_008_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_008_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_008_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_008_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_008_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_008_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_008_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_008_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_008_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_008_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_008_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_008_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_008_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_008_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_008_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_008_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_008_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_008_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_008_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_008_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_008_GetOverlayTransformType, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_008_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_008_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_008_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_008_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_008_ShowOverlay, 1);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_008_HideOverlay, 1);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_008_IsOverlayVisible, 1);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates, 4);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_008_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_008_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_008_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_008_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_008_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_008_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_008_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_008_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_008_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_008_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_008_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_008_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_008_SetOverlayTexture, 2);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_008_ClearOverlayTexture, 1);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_008_SetOverlayRaw, 5);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_008_SetOverlayFromFile, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_008_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_008_IsDashboardVisible, 0);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_008_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_008_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_008_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_008_ShowDashboard, 1);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_008_ShowKeyboard, 7);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_008_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_008_GetKeyboardText, 2);
+    init_thunk(&thunks[57], r, winIVROverlay_IVROverlay_008_HideKeyboard, 0);
+    init_thunk(&thunks[58], r, winIVROverlay_IVROverlay_008_SetKeyboardTransformAbsolute, 2);
+    init_thunk(&thunks[59], r, winIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay, 2);
     for (i = 0; i < 60; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -6896,63 +6896,63 @@ winIVROverlay_IVROverlay_007 *create_winIVROverlay_IVROverlay_007_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_007_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_007_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_007_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_007_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_007_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_007_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_007_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_007_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_007_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_007_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_007_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_007_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_007_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_007_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_007_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_007_SetOverlayWidthInMeters);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_007_GetOverlayWidthInMeters);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_007_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_007_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_007_SetOverlayTextureColorSpace);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_007_GetOverlayTextureColorSpace);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_007_SetOverlayTextureBounds);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_007_GetOverlayTextureBounds);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_007_GetOverlayTransformType);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_007_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_007_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_007_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_007_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_007_ShowOverlay);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_007_HideOverlay);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_007_IsOverlayVisible);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_007_PollNextOverlayEvent);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_007_GetOverlayInputMethod);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_007_SetOverlayInputMethod);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_007_GetOverlayMouseScale);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_007_SetOverlayMouseScale);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_007_ComputeOverlayIntersection);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_007_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_007_IsHoverTargetOverlay);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_007_GetGamepadFocusOverlay);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_007_SetGamepadFocusOverlay);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_007_SetOverlayNeighbor);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_007_MoveGamepadFocusToNeighbor);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_007_SetOverlayTexture);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_007_ClearOverlayTexture);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_007_SetOverlayRaw);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_007_SetOverlayFromFile);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_007_CreateDashboardOverlay);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_007_IsDashboardVisible);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_007_IsActiveDashboardOverlay);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_007_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_007_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_007_ShowDashboard);
-    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_007_ShowKeyboard);
-    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_007_ShowKeyboardForOverlay);
-    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_007_GetKeyboardText);
-    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_007_HideKeyboard);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_007_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_007_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_007_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_007_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_007_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_007_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_007_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_007_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_007_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_007_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_007_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_007_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_007_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_007_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_007_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_007_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_007_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_007_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_007_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_007_SetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_007_GetOverlayTextureColorSpace, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_007_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_007_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_007_GetOverlayTransformType, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_007_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_007_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_007_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_007_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_007_ShowOverlay, 1);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_007_HideOverlay, 1);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_007_IsOverlayVisible, 1);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_007_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_007_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_007_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_007_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_007_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_007_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_007_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_007_IsHoverTargetOverlay, 1);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_007_GetGamepadFocusOverlay, 0);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_007_SetGamepadFocusOverlay, 1);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_007_SetOverlayNeighbor, 3);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_007_MoveGamepadFocusToNeighbor, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_007_SetOverlayTexture, 2);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_007_ClearOverlayTexture, 1);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_007_SetOverlayRaw, 5);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_007_SetOverlayFromFile, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_007_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_007_IsDashboardVisible, 0);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_007_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_007_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_007_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[52], r, winIVROverlay_IVROverlay_007_ShowDashboard, 1);
+    init_thunk(&thunks[53], r, winIVROverlay_IVROverlay_007_ShowKeyboard, 7);
+    init_thunk(&thunks[54], r, winIVROverlay_IVROverlay_007_ShowKeyboardForOverlay, 8);
+    init_thunk(&thunks[55], r, winIVROverlay_IVROverlay_007_GetKeyboardText, 2);
+    init_thunk(&thunks[56], r, winIVROverlay_IVROverlay_007_HideKeyboard, 0);
     for (i = 0; i < 57; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -7426,58 +7426,58 @@ winIVROverlay_IVROverlay_005 *create_winIVROverlay_IVROverlay_005_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_005_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_005_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_005_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_005_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_005_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_005_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_005_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_005_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_005_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_005_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_005_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_005_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_005_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_005_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_005_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_005_SetOverlayGamma);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_005_GetOverlayGamma);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_005_SetOverlayWidthInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_005_GetOverlayWidthInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_005_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_005_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_005_SetOverlayTextureBounds);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_005_GetOverlayTextureBounds);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_005_GetOverlayTransformType);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_005_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_005_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_005_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_005_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_005_ShowOverlay);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_005_HideOverlay);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_005_IsOverlayVisible);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_005_PollNextOverlayEvent);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_005_GetOverlayInputMethod);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_005_SetOverlayInputMethod);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_005_GetOverlayMouseScale);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_005_SetOverlayMouseScale);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_005_ComputeOverlayIntersection);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_005_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_005_IsFocusOverlay);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_005_SetOverlayTexture);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_005_ClearOverlayTexture);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_005_SetOverlayRaw);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_005_SetOverlayFromFile);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_005_CreateDashboardOverlay);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_005_IsDashboardVisible);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_005_IsActiveDashboardOverlay);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_005_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_005_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_005_ShowDashboard);
-    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_005_ShowKeyboard);
-    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_005_GetKeyboardText);
-    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_005_HideKeyboard);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_005_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_005_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_005_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_005_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_005_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_005_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_005_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_005_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_005_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_005_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_005_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_005_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_005_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_005_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_005_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_005_SetOverlayGamma, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_005_GetOverlayGamma, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_005_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_005_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_005_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_005_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_005_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_005_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_005_GetOverlayTransformType, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_005_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_005_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_005_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_005_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_005_ShowOverlay, 1);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_005_HideOverlay, 1);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_005_IsOverlayVisible, 1);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_005_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_005_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_005_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_005_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_005_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_005_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_005_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_005_IsFocusOverlay, 1);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_005_SetOverlayTexture, 3);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_005_ClearOverlayTexture, 1);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_005_SetOverlayRaw, 5);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_005_SetOverlayFromFile, 2);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_005_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_005_IsDashboardVisible, 0);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_005_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_005_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_005_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[48], r, winIVROverlay_IVROverlay_005_ShowDashboard, 1);
+    init_thunk(&thunks[49], r, winIVROverlay_IVROverlay_005_ShowKeyboard, 6);
+    init_thunk(&thunks[50], r, winIVROverlay_IVROverlay_005_GetKeyboardText, 2);
+    init_thunk(&thunks[51], r, winIVROverlay_IVROverlay_005_HideKeyboard, 0);
     for (i = 0; i < 52; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -7919,54 +7919,54 @@ winIVROverlay_IVROverlay_004 *create_winIVROverlay_IVROverlay_004_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_004_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_004_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_004_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_004_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_004_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_004_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_004_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_004_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_004_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_004_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_004_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_004_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_004_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_004_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_004_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_004_SetOverlayGamma);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_004_GetOverlayGamma);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_004_SetOverlayWidthInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_004_GetOverlayWidthInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_004_SetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_004_GetOverlayAutoCurveDistanceRangeInMeters);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_004_SetOverlayTextureBounds);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_004_GetOverlayTextureBounds);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_004_GetOverlayTransformType);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_004_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_004_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_004_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_004_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_004_ShowOverlay);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_004_HideOverlay);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_004_IsOverlayVisible);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_004_PollNextOverlayEvent);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_004_GetOverlayInputMethod);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_004_SetOverlayInputMethod);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_004_GetOverlayMouseScale);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_004_SetOverlayMouseScale);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_004_ComputeOverlayIntersection);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_004_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_004_SetOverlayTexture);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_004_ClearOverlayTexture);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_004_SetOverlayRaw);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_004_SetOverlayFromFile);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_004_CreateDashboardOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_004_IsDashboardVisible);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_004_IsActiveDashboardOverlay);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_004_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_004_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_004_ShowDashboard);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_004_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_004_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_004_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_004_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_004_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_004_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_004_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_004_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_004_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_004_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_004_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_004_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_004_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_004_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_004_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_004_SetOverlayGamma, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_004_GetOverlayGamma, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_004_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_004_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_004_SetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_004_GetOverlayAutoCurveDistanceRangeInMeters, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_004_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_004_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_004_GetOverlayTransformType, 2);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_004_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_004_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_004_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_004_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_004_ShowOverlay, 1);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_004_HideOverlay, 1);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_004_IsOverlayVisible, 1);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_004_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_004_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_004_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_004_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_004_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_004_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_004_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_004_SetOverlayTexture, 3);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_004_ClearOverlayTexture, 1);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_004_SetOverlayRaw, 5);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_004_SetOverlayFromFile, 2);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_004_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_004_IsDashboardVisible, 0);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_004_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_004_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[46], r, winIVROverlay_IVROverlay_004_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[47], r, winIVROverlay_IVROverlay_004_ShowDashboard, 1);
     for (i = 0; i < 48; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -8392,52 +8392,52 @@ winIVROverlay_IVROverlay_003 *create_winIVROverlay_IVROverlay_003_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_003_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_003_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_003_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_003_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_003_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_003_GetOverlayKey);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_003_GetOverlayName);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_003_GetOverlayImageData);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_003_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_003_SetOverlayFlag);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_003_GetOverlayFlag);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_003_SetOverlayColor);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_003_GetOverlayColor);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_003_SetOverlayAlpha);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_003_GetOverlayAlpha);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_003_SetOverlayGamma);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_003_GetOverlayGamma);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_003_SetOverlayWidthInMeters);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_003_GetOverlayWidthInMeters);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_003_SetOverlayTextureBounds);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_003_GetOverlayTextureBounds);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_003_GetOverlayTransformType);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_003_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_003_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_003_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_003_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_003_ShowOverlay);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_003_HideOverlay);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_003_IsOverlayVisible);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_003_PollNextOverlayEvent);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_003_GetOverlayInputMethod);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_003_SetOverlayInputMethod);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_003_GetOverlayMouseScale);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_003_SetOverlayMouseScale);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_003_ComputeOverlayIntersection);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_003_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_003_SetOverlayTexture);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_003_ClearOverlayTexture);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_003_SetOverlayRaw);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_003_SetOverlayFromFile);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_003_CreateDashboardOverlay);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_003_IsDashboardVisible);
-    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_003_IsActiveDashboardOverlay);
-    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_003_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_003_GetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_003_ShowDashboard);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_003_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_003_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_003_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_003_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_003_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_003_GetOverlayKey, 4);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_003_GetOverlayName, 4);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_003_GetOverlayImageData, 5);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_003_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_003_SetOverlayFlag, 3);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_003_GetOverlayFlag, 3);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_003_SetOverlayColor, 4);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_003_GetOverlayColor, 4);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_003_SetOverlayAlpha, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_003_GetOverlayAlpha, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_003_SetOverlayGamma, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_003_GetOverlayGamma, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_003_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_003_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_003_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_003_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_003_GetOverlayTransformType, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_003_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_003_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_003_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_003_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_003_ShowOverlay, 1);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_003_HideOverlay, 1);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_003_IsOverlayVisible, 1);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_003_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_003_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_003_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_003_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_003_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_003_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_003_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_003_SetOverlayTexture, 3);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_003_ClearOverlayTexture, 1);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_003_SetOverlayRaw, 5);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_003_SetOverlayFromFile, 2);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_003_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_003_IsDashboardVisible, 0);
+    init_thunk(&thunks[42], r, winIVROverlay_IVROverlay_003_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[43], r, winIVROverlay_IVROverlay_003_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[44], r, winIVROverlay_IVROverlay_003_GetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[45], r, winIVROverlay_IVROverlay_003_ShowDashboard, 1);
     for (i = 0; i < 46; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -8831,48 +8831,48 @@ winIVROverlay_IVROverlay_002 *create_winIVROverlay_IVROverlay_002_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_002_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_002_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_002_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_002_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_002_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_002_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_002_SetOverlayFlag);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_002_GetOverlayFlag);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_002_SetOverlayColor);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_002_GetOverlayColor);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_002_SetOverlayAlpha);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_002_GetOverlayAlpha);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_002_SetOverlayGamma);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_002_GetOverlayGamma);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_002_SetOverlayWidthInMeters);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_002_GetOverlayWidthInMeters);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_002_SetOverlayTextureBounds);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_002_GetOverlayTextureBounds);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_002_GetOverlayTransformType);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_002_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_002_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_002_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_002_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_002_ShowOverlay);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_002_HideOverlay);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_002_IsOverlayVisible);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_002_PollNextOverlayEvent);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_002_GetOverlayInputMethod);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_002_SetOverlayInputMethod);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_002_GetOverlayMouseScale);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_002_SetOverlayMouseScale);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_002_ComputeOverlayIntersection);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_002_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_002_SetOverlayTexture);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_002_ClearOverlayTexture);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_002_SetOverlayRaw);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_002_SetOverlayFromFile);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_002_CreateDashboardOverlay);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_002_IsDashboardVisible);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_002_IsActiveDashboardOverlay);
-    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_002_SetDashboardOverlaySceneProcess);
-    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_002_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_002_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_002_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_002_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_002_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_002_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_002_SetOverlayFlag, 3);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_002_GetOverlayFlag, 3);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_002_SetOverlayColor, 4);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_002_GetOverlayColor, 4);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_002_SetOverlayAlpha, 2);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_002_GetOverlayAlpha, 2);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_002_SetOverlayGamma, 2);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_002_GetOverlayGamma, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_002_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_002_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_002_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_002_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_002_GetOverlayTransformType, 2);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_002_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_002_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_002_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_002_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_002_ShowOverlay, 1);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_002_HideOverlay, 1);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_002_IsOverlayVisible, 1);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_002_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_002_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_002_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_002_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_002_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_002_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_002_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_002_SetOverlayTexture, 3);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_002_ClearOverlayTexture, 1);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_002_SetOverlayRaw, 5);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_002_SetOverlayFromFile, 2);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_002_CreateDashboardOverlay, 4);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_002_IsDashboardVisible, 0);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_002_IsActiveDashboardOverlay, 1);
+    init_thunk(&thunks[40], r, winIVROverlay_IVROverlay_002_SetDashboardOverlaySceneProcess, 2);
+    init_thunk(&thunks[41], r, winIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess, 2);
     for (i = 0; i < 42; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -9250,46 +9250,46 @@ winIVROverlay_IVROverlay_001 *create_winIVROverlay_IVROverlay_001_FnTable(void *
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_001_FindOverlay);
-    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_001_CreateOverlay);
-    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_001_DestroyOverlay);
-    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_001_SetHighQualityOverlay);
-    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_001_GetHighQualityOverlay);
-    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_001_GetOverlayErrorNameFromEnum);
-    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_001_SetOverlayFlag);
-    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_001_GetOverlayFlag);
-    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_001_SetOverlayAlpha);
-    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_001_GetOverlayAlpha);
-    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_001_SetOverlayGamma);
-    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_001_GetOverlayGamma);
-    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_001_SetOverlayWidthInMeters);
-    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_001_GetOverlayWidthInMeters);
-    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_001_SetOverlayTextureBounds);
-    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_001_GetOverlayTextureBounds);
-    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_001_GetOverlayTransformType);
-    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_001_SetOverlayTransformAbsolute);
-    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_001_GetOverlayTransformAbsolute);
-    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_001_SetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_001_GetOverlayTransformTrackedDeviceRelative);
-    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_001_GetOverlayVisibility);
-    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_001_SetOverlayVisibility);
-    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_001_ShowOverlay);
-    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_001_HideOverlay);
-    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_001_IsOverlayVisible);
-    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_001_PollNextOverlayEvent);
-    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_001_GetOverlayInputMethod);
-    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_001_SetOverlayInputMethod);
-    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_001_GetOverlayMouseScale);
-    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_001_SetOverlayMouseScale);
-    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_001_ComputeOverlayIntersection);
-    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_001_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_001_SetOverlayTexture);
-    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_001_SetOverlayRaw);
-    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_001_SetOverlayFromFile);
-    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_001_IsSystemOverlayVisible);
-    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_001_IsActiveSystemOverlay);
-    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_001_SetSystemOverlaySceneProcess);
-    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess);
+    init_thunk(&thunks[0], r, winIVROverlay_IVROverlay_001_FindOverlay, 2);
+    init_thunk(&thunks[1], r, winIVROverlay_IVROverlay_001_CreateOverlay, 3);
+    init_thunk(&thunks[2], r, winIVROverlay_IVROverlay_001_DestroyOverlay, 1);
+    init_thunk(&thunks[3], r, winIVROverlay_IVROverlay_001_SetHighQualityOverlay, 1);
+    init_thunk(&thunks[4], r, winIVROverlay_IVROverlay_001_GetHighQualityOverlay, 0);
+    init_thunk(&thunks[5], r, winIVROverlay_IVROverlay_001_GetOverlayErrorNameFromEnum, 1);
+    init_thunk(&thunks[6], r, winIVROverlay_IVROverlay_001_SetOverlayFlag, 3);
+    init_thunk(&thunks[7], r, winIVROverlay_IVROverlay_001_GetOverlayFlag, 3);
+    init_thunk(&thunks[8], r, winIVROverlay_IVROverlay_001_SetOverlayAlpha, 2);
+    init_thunk(&thunks[9], r, winIVROverlay_IVROverlay_001_GetOverlayAlpha, 2);
+    init_thunk(&thunks[10], r, winIVROverlay_IVROverlay_001_SetOverlayGamma, 2);
+    init_thunk(&thunks[11], r, winIVROverlay_IVROverlay_001_GetOverlayGamma, 2);
+    init_thunk(&thunks[12], r, winIVROverlay_IVROverlay_001_SetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[13], r, winIVROverlay_IVROverlay_001_GetOverlayWidthInMeters, 2);
+    init_thunk(&thunks[14], r, winIVROverlay_IVROverlay_001_SetOverlayTextureBounds, 2);
+    init_thunk(&thunks[15], r, winIVROverlay_IVROverlay_001_GetOverlayTextureBounds, 2);
+    init_thunk(&thunks[16], r, winIVROverlay_IVROverlay_001_GetOverlayTransformType, 2);
+    init_thunk(&thunks[17], r, winIVROverlay_IVROverlay_001_SetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[18], r, winIVROverlay_IVROverlay_001_GetOverlayTransformAbsolute, 3);
+    init_thunk(&thunks[19], r, winIVROverlay_IVROverlay_001_SetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[20], r, winIVROverlay_IVROverlay_001_GetOverlayTransformTrackedDeviceRelative, 3);
+    init_thunk(&thunks[21], r, winIVROverlay_IVROverlay_001_GetOverlayVisibility, 2);
+    init_thunk(&thunks[22], r, winIVROverlay_IVROverlay_001_SetOverlayVisibility, 2);
+    init_thunk(&thunks[23], r, winIVROverlay_IVROverlay_001_ShowOverlay, 1);
+    init_thunk(&thunks[24], r, winIVROverlay_IVROverlay_001_HideOverlay, 1);
+    init_thunk(&thunks[25], r, winIVROverlay_IVROverlay_001_IsOverlayVisible, 1);
+    init_thunk(&thunks[26], r, winIVROverlay_IVROverlay_001_PollNextOverlayEvent, 2);
+    init_thunk(&thunks[27], r, winIVROverlay_IVROverlay_001_GetOverlayInputMethod, 2);
+    init_thunk(&thunks[28], r, winIVROverlay_IVROverlay_001_SetOverlayInputMethod, 2);
+    init_thunk(&thunks[29], r, winIVROverlay_IVROverlay_001_GetOverlayMouseScale, 2);
+    init_thunk(&thunks[30], r, winIVROverlay_IVROverlay_001_SetOverlayMouseScale, 2);
+    init_thunk(&thunks[31], r, winIVROverlay_IVROverlay_001_ComputeOverlayIntersection, 3);
+    init_thunk(&thunks[32], r, winIVROverlay_IVROverlay_001_HandleControllerOverlayInteractionAsMouse, 2);
+    init_thunk(&thunks[33], r, winIVROverlay_IVROverlay_001_SetOverlayTexture, 2);
+    init_thunk(&thunks[34], r, winIVROverlay_IVROverlay_001_SetOverlayRaw, 5);
+    init_thunk(&thunks[35], r, winIVROverlay_IVROverlay_001_SetOverlayFromFile, 2);
+    init_thunk(&thunks[36], r, winIVROverlay_IVROverlay_001_IsSystemOverlayVisible, 0);
+    init_thunk(&thunks[37], r, winIVROverlay_IVROverlay_001_IsActiveSystemOverlay, 1);
+    init_thunk(&thunks[38], r, winIVROverlay_IVROverlay_001_SetSystemOverlaySceneProcess, 2);
+    init_thunk(&thunks[39], r, winIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess, 2);
     for (i = 0; i < 40; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRRenderModels.c b/vrclient_x64/winIVRRenderModels.c
index 145377d0..fe0a332b 100644
--- a/vrclient_x64/winIVRRenderModels.c
+++ b/vrclient_x64/winIVRRenderModels.c
@@ -203,24 +203,24 @@ winIVRRenderModels_IVRRenderModels_005 *create_winIVRRenderModels_IVRRenderModel
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async);
-    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_005_FreeRenderModel);
-    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_005_LoadTexture_Async);
-    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_005_FreeTexture);
-    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_005_LoadTextureD3D11_Async);
-    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async);
-    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_005_FreeTextureD3D11);
-    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelName);
-    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelCount);
-    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_005_GetComponentCount);
-    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_005_GetComponentName);
-    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_005_GetComponentButtonMask);
-    init_thunk(&thunks[12], r, winIVRRenderModels_IVRRenderModels_005_GetComponentRenderModelName);
-    init_thunk(&thunks[13], r, winIVRRenderModels_IVRRenderModels_005_GetComponentState);
-    init_thunk(&thunks[14], r, winIVRRenderModels_IVRRenderModels_005_RenderModelHasComponent);
-    init_thunk(&thunks[15], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelThumbnailURL);
-    init_thunk(&thunks[16], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelOriginalPath);
-    init_thunk(&thunks[17], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelErrorNameFromEnum);
+    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async, 2);
+    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_005_FreeRenderModel, 1);
+    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_005_LoadTexture_Async, 2);
+    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_005_FreeTexture, 1);
+    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_005_LoadTextureD3D11_Async, 3);
+    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async, 2);
+    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_005_FreeTextureD3D11, 1);
+    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelName, 3);
+    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelCount, 0);
+    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_005_GetComponentCount, 1);
+    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_005_GetComponentName, 4);
+    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_005_GetComponentButtonMask, 2);
+    init_thunk(&thunks[12], r, winIVRRenderModels_IVRRenderModels_005_GetComponentRenderModelName, 4);
+    init_thunk(&thunks[13], r, winIVRRenderModels_IVRRenderModels_005_GetComponentState, 5);
+    init_thunk(&thunks[14], r, winIVRRenderModels_IVRRenderModels_005_RenderModelHasComponent, 2);
+    init_thunk(&thunks[15], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelThumbnailURL, 4);
+    init_thunk(&thunks[16], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelOriginalPath, 4);
+    init_thunk(&thunks[17], r, winIVRRenderModels_IVRRenderModels_005_GetRenderModelErrorNameFromEnum, 1);
     for (i = 0; i < 18; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -390,20 +390,20 @@ winIVRRenderModels_IVRRenderModels_004 *create_winIVRRenderModels_IVRRenderModel
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async);
-    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_004_FreeRenderModel);
-    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_004_LoadTexture_Async);
-    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_004_FreeTexture);
-    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_004_LoadTextureD3D11_Async);
-    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_004_FreeTextureD3D11);
-    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_004_GetRenderModelName);
-    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_004_GetRenderModelCount);
-    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_004_GetComponentCount);
-    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_004_GetComponentName);
-    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_004_GetComponentButtonMask);
-    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_004_GetComponentRenderModelName);
-    init_thunk(&thunks[12], r, winIVRRenderModels_IVRRenderModels_004_GetComponentState);
-    init_thunk(&thunks[13], r, winIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent);
+    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async, 2);
+    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_004_FreeRenderModel, 1);
+    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_004_LoadTexture_Async, 2);
+    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_004_FreeTexture, 1);
+    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_004_LoadTextureD3D11_Async, 3);
+    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_004_FreeTextureD3D11, 1);
+    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_004_GetRenderModelName, 3);
+    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_004_GetRenderModelCount, 0);
+    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_004_GetComponentCount, 1);
+    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_004_GetComponentName, 4);
+    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_004_GetComponentButtonMask, 2);
+    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_004_GetComponentRenderModelName, 4);
+    init_thunk(&thunks[12], r, winIVRRenderModels_IVRRenderModels_004_GetComponentState, 5);
+    init_thunk(&thunks[13], r, winIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent, 2);
     for (i = 0; i < 14; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -557,18 +557,18 @@ winIVRRenderModels_IVRRenderModels_002 *create_winIVRRenderModels_IVRRenderModel
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_002_LoadRenderModel);
-    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_002_FreeRenderModel);
-    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_002_LoadTexture);
-    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_002_FreeTexture);
-    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_002_GetRenderModelName);
-    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_002_GetRenderModelCount);
-    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_002_GetComponentCount);
-    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_002_GetComponentName);
-    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_002_GetComponentButtonMask);
-    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_002_GetComponentRenderModelName);
-    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_002_GetComponentState);
-    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent);
+    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_002_LoadRenderModel, 2);
+    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_002_FreeRenderModel, 1);
+    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_002_LoadTexture, 2);
+    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_002_FreeTexture, 1);
+    init_thunk(&thunks[4], r, winIVRRenderModels_IVRRenderModels_002_GetRenderModelName, 3);
+    init_thunk(&thunks[5], r, winIVRRenderModels_IVRRenderModels_002_GetRenderModelCount, 0);
+    init_thunk(&thunks[6], r, winIVRRenderModels_IVRRenderModels_002_GetComponentCount, 1);
+    init_thunk(&thunks[7], r, winIVRRenderModels_IVRRenderModels_002_GetComponentName, 4);
+    init_thunk(&thunks[8], r, winIVRRenderModels_IVRRenderModels_002_GetComponentButtonMask, 2);
+    init_thunk(&thunks[9], r, winIVRRenderModels_IVRRenderModels_002_GetComponentRenderModelName, 4);
+    init_thunk(&thunks[10], r, winIVRRenderModels_IVRRenderModels_002_GetComponentState, 4);
+    init_thunk(&thunks[11], r, winIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent, 2);
     for (i = 0; i < 12; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -658,10 +658,10 @@ winIVRRenderModels_IVRRenderModels_001 *create_winIVRRenderModels_IVRRenderModel
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_001_LoadRenderModel);
-    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_001_FreeRenderModel);
-    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_001_GetRenderModelName);
-    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_001_GetRenderModelCount);
+    init_thunk(&thunks[0], r, winIVRRenderModels_IVRRenderModels_001_LoadRenderModel, 2);
+    init_thunk(&thunks[1], r, winIVRRenderModels_IVRRenderModels_001_FreeRenderModel, 1);
+    init_thunk(&thunks[2], r, winIVRRenderModels_IVRRenderModels_001_GetRenderModelName, 3);
+    init_thunk(&thunks[3], r, winIVRRenderModels_IVRRenderModels_001_GetRenderModelCount, 0);
     for (i = 0; i < 4; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRResources.c b/vrclient_x64/winIVRResources.c
index 333007ac..14053f31 100644
--- a/vrclient_x64/winIVRResources.c
+++ b/vrclient_x64/winIVRResources.c
@@ -75,8 +75,8 @@ winIVRResources_IVRResources_001 *create_winIVRResources_IVRResources_001_FnTabl
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRResources_IVRResources_001_LoadSharedResource);
-    init_thunk(&thunks[1], r, winIVRResources_IVRResources_001_GetResourceFullPath);
+    init_thunk(&thunks[0], r, winIVRResources_IVRResources_001_LoadSharedResource, 3);
+    init_thunk(&thunks[1], r, winIVRResources_IVRResources_001_GetResourceFullPath, 4);
     for (i = 0; i < 2; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/winIVRScreenshots.c
index 33d59860..9a39c6e8 100644
--- a/vrclient_x64/winIVRScreenshots.c
+++ b/vrclient_x64/winIVRScreenshots.c
@@ -115,13 +115,13 @@ winIVRScreenshots_IVRScreenshots_001 *create_winIVRScreenshots_IVRScreenshots_00
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRScreenshots_IVRScreenshots_001_RequestScreenshot);
-    init_thunk(&thunks[1], r, winIVRScreenshots_IVRScreenshots_001_HookScreenshot);
-    init_thunk(&thunks[2], r, winIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyType);
-    init_thunk(&thunks[3], r, winIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyFilename);
-    init_thunk(&thunks[4], r, winIVRScreenshots_IVRScreenshots_001_UpdateScreenshotProgress);
-    init_thunk(&thunks[5], r, winIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot);
-    init_thunk(&thunks[6], r, winIVRScreenshots_IVRScreenshots_001_SubmitScreenshot);
+    init_thunk(&thunks[0], r, winIVRScreenshots_IVRScreenshots_001_RequestScreenshot, 4);
+    init_thunk(&thunks[1], r, winIVRScreenshots_IVRScreenshots_001_HookScreenshot, 2);
+    init_thunk(&thunks[2], r, winIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyType, 2);
+    init_thunk(&thunks[3], r, winIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyFilename, 5);
+    init_thunk(&thunks[4], r, winIVRScreenshots_IVRScreenshots_001_UpdateScreenshotProgress, 2);
+    init_thunk(&thunks[5], r, winIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot, 3);
+    init_thunk(&thunks[6], r, winIVRScreenshots_IVRScreenshots_001_SubmitScreenshot, 4);
     for (i = 0; i < 7; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRSettings.c b/vrclient_x64/winIVRSettings.c
index f2b82006..a1044a5b 100644
--- a/vrclient_x64/winIVRSettings.c
+++ b/vrclient_x64/winIVRSettings.c
@@ -155,18 +155,18 @@ winIVRSettings_IVRSettings_002 *create_winIVRSettings_IVRSettings_002_FnTable(vo
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum);
-    init_thunk(&thunks[1], r, winIVRSettings_IVRSettings_002_Sync);
-    init_thunk(&thunks[2], r, winIVRSettings_IVRSettings_002_SetBool);
-    init_thunk(&thunks[3], r, winIVRSettings_IVRSettings_002_SetInt32);
-    init_thunk(&thunks[4], r, winIVRSettings_IVRSettings_002_SetFloat);
-    init_thunk(&thunks[5], r, winIVRSettings_IVRSettings_002_SetString);
-    init_thunk(&thunks[6], r, winIVRSettings_IVRSettings_002_GetBool);
-    init_thunk(&thunks[7], r, winIVRSettings_IVRSettings_002_GetInt32);
-    init_thunk(&thunks[8], r, winIVRSettings_IVRSettings_002_GetFloat);
-    init_thunk(&thunks[9], r, winIVRSettings_IVRSettings_002_GetString);
-    init_thunk(&thunks[10], r, winIVRSettings_IVRSettings_002_RemoveSection);
-    init_thunk(&thunks[11], r, winIVRSettings_IVRSettings_002_RemoveKeyInSection);
+    init_thunk(&thunks[0], r, winIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum, 1);
+    init_thunk(&thunks[1], r, winIVRSettings_IVRSettings_002_Sync, 2);
+    init_thunk(&thunks[2], r, winIVRSettings_IVRSettings_002_SetBool, 4);
+    init_thunk(&thunks[3], r, winIVRSettings_IVRSettings_002_SetInt32, 4);
+    init_thunk(&thunks[4], r, winIVRSettings_IVRSettings_002_SetFloat, 4);
+    init_thunk(&thunks[5], r, winIVRSettings_IVRSettings_002_SetString, 4);
+    init_thunk(&thunks[6], r, winIVRSettings_IVRSettings_002_GetBool, 3);
+    init_thunk(&thunks[7], r, winIVRSettings_IVRSettings_002_GetInt32, 3);
+    init_thunk(&thunks[8], r, winIVRSettings_IVRSettings_002_GetFloat, 3);
+    init_thunk(&thunks[9], r, winIVRSettings_IVRSettings_002_GetString, 5);
+    init_thunk(&thunks[10], r, winIVRSettings_IVRSettings_002_RemoveSection, 2);
+    init_thunk(&thunks[11], r, winIVRSettings_IVRSettings_002_RemoveKeyInSection, 3);
     for (i = 0; i < 12; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -320,18 +320,18 @@ winIVRSettings_IVRSettings_001 *create_winIVRSettings_IVRSettings_001_FnTable(vo
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum);
-    init_thunk(&thunks[1], r, winIVRSettings_IVRSettings_001_Sync);
-    init_thunk(&thunks[2], r, winIVRSettings_IVRSettings_001_GetBool);
-    init_thunk(&thunks[3], r, winIVRSettings_IVRSettings_001_SetBool);
-    init_thunk(&thunks[4], r, winIVRSettings_IVRSettings_001_GetInt32);
-    init_thunk(&thunks[5], r, winIVRSettings_IVRSettings_001_SetInt32);
-    init_thunk(&thunks[6], r, winIVRSettings_IVRSettings_001_GetFloat);
-    init_thunk(&thunks[7], r, winIVRSettings_IVRSettings_001_SetFloat);
-    init_thunk(&thunks[8], r, winIVRSettings_IVRSettings_001_GetString);
-    init_thunk(&thunks[9], r, winIVRSettings_IVRSettings_001_SetString);
-    init_thunk(&thunks[10], r, winIVRSettings_IVRSettings_001_RemoveSection);
-    init_thunk(&thunks[11], r, winIVRSettings_IVRSettings_001_RemoveKeyInSection);
+    init_thunk(&thunks[0], r, winIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum, 1);
+    init_thunk(&thunks[1], r, winIVRSettings_IVRSettings_001_Sync, 2);
+    init_thunk(&thunks[2], r, winIVRSettings_IVRSettings_001_GetBool, 4);
+    init_thunk(&thunks[3], r, winIVRSettings_IVRSettings_001_SetBool, 4);
+    init_thunk(&thunks[4], r, winIVRSettings_IVRSettings_001_GetInt32, 4);
+    init_thunk(&thunks[5], r, winIVRSettings_IVRSettings_001_SetInt32, 4);
+    init_thunk(&thunks[6], r, winIVRSettings_IVRSettings_001_GetFloat, 4);
+    init_thunk(&thunks[7], r, winIVRSettings_IVRSettings_001_SetFloat, 4);
+    init_thunk(&thunks[8], r, winIVRSettings_IVRSettings_001_GetString, 6);
+    init_thunk(&thunks[9], r, winIVRSettings_IVRSettings_001_SetString, 4);
+    init_thunk(&thunks[10], r, winIVRSettings_IVRSettings_001_RemoveSection, 2);
+    init_thunk(&thunks[11], r, winIVRSettings_IVRSettings_001_RemoveKeyInSection, 3);
     for (i = 0; i < 12; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRSystem.c b/vrclient_x64/winIVRSystem.c
index b031fd11..04cf7d5c 100644
--- a/vrclient_x64/winIVRSystem.c
+++ b/vrclient_x64/winIVRSystem.c
@@ -441,53 +441,53 @@ winIVRSystem_IVRSystem_019 *create_winIVRSystem_IVRSystem_019_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_019_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_019_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_019_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_019_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_019_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_019_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_019_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_019_GetOutputDevice);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_019_IsDisplayOnDesktop);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_019_SetDisplayVisibility);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_019_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_019_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_019_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_019_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_019_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_019_ApplyTransform);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_019_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceClass);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_019_IsTrackedDeviceConnected);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_019_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_019_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_019_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_019_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_019_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_019_GetArrayTrackedDeviceProperty);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_019_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_019_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_019_PollNextEvent);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_019_PollNextEventWithPose);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_019_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_019_GetHiddenAreaMesh);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_019_GetControllerState);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_019_GetControllerStateWithPose);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_019_TriggerHapticPulse);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_019_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_019_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_019_IsInputAvailable);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_019_IsSteamVRDrawingControllers);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_019_ShouldApplicationPause);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_019_ShouldApplicationReduceRenderingWork);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_019_DriverDebugRequest);
-    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_019_PerformFirmwareUpdate);
-    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_019_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[46], r, winIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_019_GetProjectionMatrix, 3);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_019_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_019_ComputeDistortion, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_019_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_019_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_019_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_019_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_019_GetOutputDevice, 3);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_019_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_019_SetDisplayVisibility, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_019_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_019_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_019_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_019_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_019_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_019_ApplyTransform, 3);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_019_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_019_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_019_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_019_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_019_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_019_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_019_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_019_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_019_GetArrayTrackedDeviceProperty, 6);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_019_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_019_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_019_PollNextEvent, 2);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_019_PollNextEventWithPose, 4);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_019_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_019_GetHiddenAreaMesh, 2);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_019_GetControllerState, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_019_GetControllerStateWithPose, 5);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_019_TriggerHapticPulse, 3);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_019_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_019_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_019_IsInputAvailable, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_019_IsSteamVRDrawingControllers, 0);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_019_ShouldApplicationPause, 0);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_019_ShouldApplicationReduceRenderingWork, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_019_DriverDebugRequest, 4);
+    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_019_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_019_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[46], r, winIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 47; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -911,51 +911,51 @@ winIVRSystem_IVRSystem_017 *create_winIVRSystem_IVRSystem_017_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_017_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_017_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_017_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_017_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_017_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_017_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_017_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_017_GetOutputDevice);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_017_IsDisplayOnDesktop);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_017_SetDisplayVisibility);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_017_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_017_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_017_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_017_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_017_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_017_ApplyTransform);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_017_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceClass);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_017_IsTrackedDeviceConnected);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_017_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_017_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_017_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_017_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_017_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_017_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_017_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_017_PollNextEvent);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_017_PollNextEventWithPose);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_017_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_017_GetHiddenAreaMesh);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_017_GetControllerState);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_017_GetControllerStateWithPose);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_017_TriggerHapticPulse);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_017_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_017_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_017_CaptureInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_017_ReleaseInputFocus);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_017_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_017_DriverDebugRequest);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_017_PerformFirmwareUpdate);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_017_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_017_GetProjectionMatrix, 3);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_017_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_017_ComputeDistortion, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_017_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_017_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_017_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_017_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_017_GetOutputDevice, 3);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_017_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_017_SetDisplayVisibility, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_017_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_017_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_017_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_017_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_017_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_017_ApplyTransform, 3);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_017_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_017_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_017_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_017_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_017_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_017_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_017_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_017_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_017_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_017_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_017_PollNextEvent, 2);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_017_PollNextEventWithPose, 4);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_017_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_017_GetHiddenAreaMesh, 2);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_017_GetControllerState, 3);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_017_GetControllerStateWithPose, 5);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_017_TriggerHapticPulse, 3);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_017_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_017_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_017_CaptureInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_017_ReleaseInputFocus, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_017_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_017_DriverDebugRequest, 4);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_017_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_017_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 45; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1379,51 +1379,51 @@ winIVRSystem_IVRSystem_016 *create_winIVRSystem_IVRSystem_016_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_016_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_016_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_016_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_016_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_016_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_016_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_016_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_016_GetOutputDevice);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_016_IsDisplayOnDesktop);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_016_SetDisplayVisibility);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_016_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_016_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_016_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_016_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_016_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_016_ApplyTransform);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_016_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceClass);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_016_IsTrackedDeviceConnected);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_016_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_016_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_016_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_016_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_016_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_016_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_016_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_016_PollNextEvent);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_016_PollNextEventWithPose);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_016_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_016_GetHiddenAreaMesh);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_016_GetControllerState);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_016_GetControllerStateWithPose);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_016_TriggerHapticPulse);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_016_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_016_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_016_CaptureInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_016_ReleaseInputFocus);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_016_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_016_DriverDebugRequest);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_016_PerformFirmwareUpdate);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_016_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_016_GetProjectionMatrix, 3);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_016_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_016_ComputeDistortion, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_016_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_016_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_016_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_016_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_016_GetOutputDevice, 2);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_016_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_016_SetDisplayVisibility, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_016_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_016_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_016_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_016_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_016_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_016_ApplyTransform, 3);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_016_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_016_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_016_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_016_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_016_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_016_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_016_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_016_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_016_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_016_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_016_PollNextEvent, 2);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_016_PollNextEventWithPose, 4);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_016_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_016_GetHiddenAreaMesh, 2);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_016_GetControllerState, 3);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_016_GetControllerStateWithPose, 5);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_016_TriggerHapticPulse, 3);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_016_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_016_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_016_CaptureInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_016_ReleaseInputFocus, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_016_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_016_DriverDebugRequest, 4);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_016_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_016_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 45; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -1839,50 +1839,50 @@ winIVRSystem_IVRSystem_015 *create_winIVRSystem_IVRSystem_015_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_015_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_015_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_015_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_015_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_015_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_015_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_015_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_015_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_015_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_015_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_015_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_015_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_015_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_015_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_015_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_015_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceClass);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_015_IsTrackedDeviceConnected);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_015_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_015_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_015_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_015_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_015_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_015_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_015_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_015_PollNextEvent);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_015_PollNextEventWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_015_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_015_GetHiddenAreaMesh);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_015_GetControllerState);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_015_GetControllerStateWithPose);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_015_TriggerHapticPulse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_015_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_015_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_015_CaptureInputFocus);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_015_ReleaseInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_015_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_015_DriverDebugRequest);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_015_PerformFirmwareUpdate);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_015_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_015_GetProjectionMatrix, 3);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_015_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_015_ComputeDistortion, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_015_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_015_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_015_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_015_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_015_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_015_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_015_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_015_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_015_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_015_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_015_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_015_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_015_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_015_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_015_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_015_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_015_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_015_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_015_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_015_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_015_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_015_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_015_PollNextEvent, 2);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_015_PollNextEventWithPose, 4);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_015_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_015_GetHiddenAreaMesh, 2);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_015_GetControllerState, 3);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_015_GetControllerStateWithPose, 5);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_015_TriggerHapticPulse, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_015_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_015_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_015_CaptureInputFocus, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_015_ReleaseInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_015_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_015_DriverDebugRequest, 4);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_015_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_015_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 44; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2298,50 +2298,50 @@ winIVRSystem_IVRSystem_014 *create_winIVRSystem_IVRSystem_014_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_014_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_014_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_014_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_014_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_014_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_014_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_014_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_014_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_014_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_014_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_014_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_014_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_014_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_014_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_014_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_014_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceClass);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_014_IsTrackedDeviceConnected);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_014_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_014_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_014_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_014_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_014_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_014_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_014_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_014_PollNextEvent);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_014_PollNextEventWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_014_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_014_GetHiddenAreaMesh);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_014_GetControllerState);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_014_GetControllerStateWithPose);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_014_TriggerHapticPulse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_014_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_014_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_014_CaptureInputFocus);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_014_ReleaseInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_014_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_014_DriverDebugRequest);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_014_PerformFirmwareUpdate);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_014_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_014_GetProjectionMatrix, 4);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_014_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_014_ComputeDistortion, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_014_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_014_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_014_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_014_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_014_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_014_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_014_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_014_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_014_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_014_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_014_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_014_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_014_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_014_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_014_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_014_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_014_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_014_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_014_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_014_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_014_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_014_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_014_PollNextEvent, 2);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_014_PollNextEventWithPose, 4);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_014_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_014_GetHiddenAreaMesh, 2);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_014_GetControllerState, 3);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_014_GetControllerStateWithPose, 5);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_014_TriggerHapticPulse, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_014_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_014_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_014_CaptureInputFocus, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_014_ReleaseInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_014_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_014_DriverDebugRequest, 4);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_014_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_014_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 44; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -2758,50 +2758,50 @@ winIVRSystem_IVRSystem_012 *create_winIVRSystem_IVRSystem_012_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_012_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_012_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_012_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_012_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_012_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_012_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_012_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_012_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_012_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_012_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_012_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_012_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_012_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_012_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_012_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_012_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceClass);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_012_IsTrackedDeviceConnected);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_012_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_012_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_012_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_012_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_012_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_012_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_012_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_012_PollNextEvent);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_012_PollNextEventWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_012_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_012_GetHiddenAreaMesh);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_012_GetControllerState);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_012_GetControllerStateWithPose);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_012_TriggerHapticPulse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_012_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_012_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_012_CaptureInputFocus);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_012_ReleaseInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_012_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_012_DriverDebugRequest);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_012_PerformFirmwareUpdate);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_012_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_012_GetProjectionMatrix, 4);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_012_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_012_ComputeDistortion, 3);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_012_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_012_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_012_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_012_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_012_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_012_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_012_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_012_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_012_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_012_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_012_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_012_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_012_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_012_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_012_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_012_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_012_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_012_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_012_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_012_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_012_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_012_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_012_PollNextEvent, 2);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_012_PollNextEventWithPose, 4);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_012_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_012_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_012_GetControllerState, 2);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_012_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_012_TriggerHapticPulse, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_012_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_012_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_012_CaptureInputFocus, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_012_ReleaseInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_012_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_012_DriverDebugRequest, 4);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_012_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_012_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 44; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3234,52 +3234,52 @@ winIVRSystem_IVRSystem_011 *create_winIVRSystem_IVRSystem_011_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_011_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_011_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_011_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_011_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_011_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_011_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_011_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_011_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_011_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_011_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_011_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_011_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_011_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_011_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_011_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_011_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceClass);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_011_IsTrackedDeviceConnected);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_011_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_011_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_011_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_011_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_011_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_011_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_011_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_011_PollNextEvent);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_011_PollNextEventWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_011_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_011_GetHiddenAreaMesh);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_011_GetControllerState);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_011_GetControllerStateWithPose);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_011_TriggerHapticPulse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_011_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_011_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_011_CaptureInputFocus);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_011_ReleaseInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_011_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_011_DriverDebugRequest);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_011_PerformFirmwareUpdate);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_011_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_011_AcknowledgeQuit_UserPrompt);
-    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_011_PerformanceTestEnableCapture);
-    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_011_GetProjectionMatrix, 4);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_011_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_011_ComputeDistortion, 3);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_011_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_011_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_011_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_011_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_011_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_011_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_011_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_011_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_011_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_011_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_011_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_011_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_011_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_011_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_011_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_011_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_011_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_011_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_011_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_011_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_011_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_011_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_011_PollNextEvent, 2);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_011_PollNextEventWithPose, 4);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_011_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_011_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_011_GetControllerState, 2);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_011_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_011_TriggerHapticPulse, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_011_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_011_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_011_CaptureInputFocus, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_011_ReleaseInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_011_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_011_DriverDebugRequest, 4);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_011_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_011_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_011_AcknowledgeQuit_UserPrompt, 0);
+    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_011_PerformanceTestEnableCapture, 1);
+    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange, 1);
     for (i = 0; i < 46; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -3712,52 +3712,52 @@ winIVRSystem_IVRSystem_010 *create_winIVRSystem_IVRSystem_010_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_010_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_010_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_010_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_010_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_010_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_010_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_010_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_010_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_010_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_010_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_010_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_010_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_010_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_010_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_010_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceIndexForControllerRole);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_010_GetControllerRoleForTrackedDeviceIndex);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceClass);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_010_IsTrackedDeviceConnected);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_010_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_010_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_010_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_010_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_010_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_010_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_010_PollNextEvent);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_010_PollNextEventWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_010_GetHiddenAreaMesh);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_010_GetControllerState);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_010_GetControllerStateWithPose);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_010_TriggerHapticPulse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_010_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_010_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_010_CaptureInputFocus);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_010_ReleaseInputFocus);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_010_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_010_DriverDebugRequest);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_010_PerformFirmwareUpdate);
-    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_010_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_010_AcknowledgeQuit_UserPrompt);
-    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_010_PerformanceTestEnableCapture);
-    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_010_GetProjectionMatrix, 4);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_010_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_010_ComputeDistortion, 3);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_010_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_010_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_010_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_010_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_010_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_010_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_010_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_010_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_010_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_010_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_010_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_010_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceIndexForControllerRole, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_010_GetControllerRoleForTrackedDeviceIndex, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_010_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_010_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_010_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_010_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_010_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_010_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_010_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_010_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_010_PollNextEvent, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_010_PollNextEventWithPose, 3);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_010_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_010_GetControllerState, 2);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_010_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_010_TriggerHapticPulse, 3);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_010_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_010_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_010_CaptureInputFocus, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_010_ReleaseInputFocus, 0);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_010_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_010_DriverDebugRequest, 4);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_010_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[42], r, winIVRSystem_IVRSystem_010_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[43], r, winIVRSystem_IVRSystem_010_AcknowledgeQuit_UserPrompt, 0);
+    init_thunk(&thunks[44], r, winIVRSystem_IVRSystem_010_PerformanceTestEnableCapture, 1);
+    init_thunk(&thunks[45], r, winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange, 1);
     for (i = 0; i < 46; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4158,48 +4158,48 @@ winIVRSystem_IVRSystem_009 *create_winIVRSystem_IVRSystem_009_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_009_GetProjectionMatrix);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_009_GetProjectionRaw);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_009_ComputeDistortion);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_009_GetEyeToHeadTransform);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_009_GetTimeSinceLastVsync);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_009_GetD3D9AdapterIndex);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_009_GetDXGIOutputInfo);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_009_IsDisplayOnDesktop);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_009_SetDisplayVisibility);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_009_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_009_ResetSeatedZeroPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_009_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_009_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_009_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_009_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_009_ApplyTransform);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_009_GetTrackedDeviceClass);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_009_IsTrackedDeviceConnected);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_009_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_009_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_009_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_009_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_009_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_009_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_009_PollNextEvent);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_009_PollNextEventWithPose);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_009_GetHiddenAreaMesh);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_009_GetControllerState);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_009_GetControllerStateWithPose);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_009_TriggerHapticPulse);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_009_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_009_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_009_CaptureInputFocus);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_009_ReleaseInputFocus);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_009_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_009_DriverDebugRequest);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_009_PerformFirmwareUpdate);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_009_AcknowledgeQuit_Exiting);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_009_GetProjectionMatrix, 4);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_009_GetProjectionRaw, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_009_ComputeDistortion, 3);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_009_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_009_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_009_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_009_GetDXGIOutputInfo, 1);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_009_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_009_SetDisplayVisibility, 1);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_009_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_009_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_009_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_009_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_009_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_009_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_009_ApplyTransform, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_009_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_009_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_009_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_009_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_009_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_009_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_009_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_009_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_009_PollNextEvent, 1);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_009_PollNextEventWithPose, 3);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_009_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_009_GetControllerState, 2);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_009_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_009_TriggerHapticPulse, 3);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_009_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_009_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_009_CaptureInputFocus, 0);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_009_ReleaseInputFocus, 0);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_009_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_009_DriverDebugRequest, 4);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_009_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_009_AcknowledgeQuit_Exiting, 0);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt, 0);
     for (i = 0; i < 42; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -4600,48 +4600,48 @@ winIVRSystem_IVRSystem_006 *create_winIVRSystem_IVRSystem_006_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_006_GetWindowBounds);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_006_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_006_GetEyeOutputViewport);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_006_GetProjectionMatrix);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_006_GetProjectionRaw);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_006_ComputeDistortion);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_006_GetEyeToHeadTransform);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_006_GetTimeSinceLastVsync);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_006_GetD3D9AdapterIndex);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_006_GetDXGIOutputInfo);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_006_AttachToWindow);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_006_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_006_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_006_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_006_GetRawZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_006_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_006_GetTrackedDeviceActivityLevel);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_006_GetTrackedDeviceClass);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_006_IsTrackedDeviceConnected);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_006_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_006_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_006_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_006_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_006_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_006_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_006_PollNextEvent);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_006_PollNextEventWithPose);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_006_GetHiddenAreaMesh);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_006_GetControllerState);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_006_GetControllerStateWithPose);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_006_TriggerHapticPulse);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_006_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_006_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_006_CaptureInputFocus);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_006_ReleaseInputFocus);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_006_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_006_DriverDebugRequest);
-    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_006_PerformFirmwareUpdate);
-    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_006_IsDisplayOnDesktop);
-    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_006_SetDisplayVisibility);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_006_GetWindowBounds, 4);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_006_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_006_GetEyeOutputViewport, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_006_GetProjectionMatrix, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_006_GetProjectionRaw, 5);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_006_ComputeDistortion, 3);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_006_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_006_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_006_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_006_GetDXGIOutputInfo, 2);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_006_AttachToWindow, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_006_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_006_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_006_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_006_GetRawZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_006_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_006_GetTrackedDeviceActivityLevel, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_006_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_006_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_006_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_006_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_006_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_006_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_006_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_006_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_006_PollNextEvent, 1);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_006_PollNextEventWithPose, 3);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_006_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_006_GetControllerState, 2);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_006_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_006_TriggerHapticPulse, 3);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_006_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_006_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_006_CaptureInputFocus, 0);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_006_ReleaseInputFocus, 0);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_006_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[38], r, winIVRSystem_IVRSystem_006_DriverDebugRequest, 4);
+    init_thunk(&thunks[39], r, winIVRSystem_IVRSystem_006_PerformFirmwareUpdate, 1);
+    init_thunk(&thunks[40], r, winIVRSystem_IVRSystem_006_IsDisplayOnDesktop, 0);
+    init_thunk(&thunks[41], r, winIVRSystem_IVRSystem_006_SetDisplayVisibility, 1);
     for (i = 0; i < 42; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5001,43 +5001,43 @@ winIVRSystem_IVRSystem_005 *create_winIVRSystem_IVRSystem_005_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_005_GetWindowBounds);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_005_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_005_GetEyeOutputViewport);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_005_GetProjectionMatrix);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_005_GetProjectionRaw);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_005_ComputeDistortion);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_005_GetEyeToHeadTransform);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_005_GetTimeSinceLastVsync);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_005_GetD3D9AdapterIndex);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_005_GetDXGIOutputInfo);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_005_AttachToWindow);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_005_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_005_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_005_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_005_GetSortedTrackedDeviceIndicesOfClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_005_GetTrackedDeviceClass);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_005_IsTrackedDeviceConnected);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_005_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_005_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_005_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_005_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_005_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_005_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_005_PollNextEvent);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_005_PollNextEventWithPose);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_005_GetHiddenAreaMesh);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_005_GetControllerState);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_005_GetControllerStateWithPose);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_005_TriggerHapticPulse);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_005_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_005_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_005_CaptureInputFocus);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_005_ReleaseInputFocus);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_005_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_005_DriverDebugRequest);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_005_GetWindowBounds, 4);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_005_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_005_GetEyeOutputViewport, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_005_GetProjectionMatrix, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_005_GetProjectionRaw, 5);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_005_ComputeDistortion, 3);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_005_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_005_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_005_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_005_GetDXGIOutputInfo, 2);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_005_AttachToWindow, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_005_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_005_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_005_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_005_GetSortedTrackedDeviceIndicesOfClass, 4);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_005_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_005_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_005_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_005_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_005_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_005_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_005_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_005_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_005_PollNextEvent, 1);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_005_PollNextEventWithPose, 3);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_005_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_005_GetControllerState, 2);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_005_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_005_TriggerHapticPulse, 3);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_005_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_005_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_005_CaptureInputFocus, 0);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_005_ReleaseInputFocus, 0);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_005_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_005_DriverDebugRequest, 4);
     for (i = 0; i < 37; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5389,42 +5389,42 @@ winIVRSystem_IVRSystem_004 *create_winIVRSystem_IVRSystem_004_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_004_GetWindowBounds);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_004_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_004_GetEyeOutputViewport);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_004_GetProjectionMatrix);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_004_GetProjectionRaw);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_004_ComputeDistortion);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_004_GetEyeToHeadTransform);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_004_GetTimeSinceLastVsync);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_004_GetD3D9AdapterIndex);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_004_GetDXGIOutputInfo);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_004_AttachToWindow);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_004_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_004_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_004_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_004_GetTrackedDeviceClass);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_004_IsTrackedDeviceConnected);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_004_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_004_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_004_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_004_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_004_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_004_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_004_PollNextEvent);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_004_PollNextEventWithPose);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_004_GetHiddenAreaMesh);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_004_GetControllerState);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_004_GetControllerStateWithPose);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_004_TriggerHapticPulse);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_004_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_004_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_004_CaptureInputFocus);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_004_ReleaseInputFocus);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_004_IsInputFocusCapturedByAnotherProcess);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_004_DriverDebugRequest);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_004_GetWindowBounds, 4);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_004_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_004_GetEyeOutputViewport, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_004_GetProjectionMatrix, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_004_GetProjectionRaw, 5);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_004_ComputeDistortion, 3);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_004_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_004_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_004_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_004_GetDXGIOutputInfo, 2);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_004_AttachToWindow, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_004_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_004_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_004_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_004_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_004_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_004_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_004_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_004_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_004_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_004_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_004_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_004_PollNextEvent, 1);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_004_PollNextEventWithPose, 3);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_004_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_004_GetControllerState, 2);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_004_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_004_TriggerHapticPulse, 3);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_004_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_004_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_004_CaptureInputFocus, 0);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_004_ReleaseInputFocus, 0);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_004_IsInputFocusCapturedByAnotherProcess, 0);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_004_DriverDebugRequest, 4);
     for (i = 0; i < 36; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -5792,44 +5792,44 @@ winIVRSystem_IVRSystem_003 *create_winIVRSystem_IVRSystem_003_FnTable(void *linu
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_003_GetWindowBounds);
-    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_003_GetRecommendedRenderTargetSize);
-    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_003_GetEyeOutputViewport);
-    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_003_GetProjectionMatrix);
-    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_003_GetProjectionRaw);
-    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_003_ComputeDistortion);
-    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_003_GetEyeToHeadTransform);
-    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_003_GetTimeSinceLastVsync);
-    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_003_GetD3D9AdapterIndex);
-    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_003_GetDXGIOutputInfo);
-    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_003_AttachToWindow);
-    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_003_GetDeviceToAbsoluteTrackingPose);
-    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_003_ResetSeatedZeroPose);
-    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_003_GetSeatedZeroPoseToStandingAbsoluteTrackingPose);
-    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_003_LoadRenderModel);
-    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_003_FreeRenderModel);
-    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_003_GetTrackedDeviceClass);
-    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_003_IsTrackedDeviceConnected);
-    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_003_GetBoolTrackedDeviceProperty);
-    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_003_GetFloatTrackedDeviceProperty);
-    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_003_GetInt32TrackedDeviceProperty);
-    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_003_GetUint64TrackedDeviceProperty);
-    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_003_GetMatrix34TrackedDeviceProperty);
-    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_003_GetStringTrackedDeviceProperty);
-    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum);
-    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_003_PollNextEvent);
-    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_003_PollNextEventWithPose);
-    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum);
-    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_003_GetHiddenAreaMesh);
-    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_003_GetControllerState);
-    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_003_GetControllerStateWithPose);
-    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_003_TriggerHapticPulse);
-    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_003_GetButtonIdNameFromEnum);
-    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_003_GetControllerAxisTypeNameFromEnum);
-    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_003_HandleControllerOverlayInteractionAsMouse);
-    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_003_CaptureInputFocus);
-    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_003_ReleaseInputFocus);
-    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess);
+    init_thunk(&thunks[0], r, winIVRSystem_IVRSystem_003_GetWindowBounds, 4);
+    init_thunk(&thunks[1], r, winIVRSystem_IVRSystem_003_GetRecommendedRenderTargetSize, 2);
+    init_thunk(&thunks[2], r, winIVRSystem_IVRSystem_003_GetEyeOutputViewport, 5);
+    init_thunk(&thunks[3], r, winIVRSystem_IVRSystem_003_GetProjectionMatrix, 4);
+    init_thunk(&thunks[4], r, winIVRSystem_IVRSystem_003_GetProjectionRaw, 5);
+    init_thunk(&thunks[5], r, winIVRSystem_IVRSystem_003_ComputeDistortion, 3);
+    init_thunk(&thunks[6], r, winIVRSystem_IVRSystem_003_GetEyeToHeadTransform, 1);
+    init_thunk(&thunks[7], r, winIVRSystem_IVRSystem_003_GetTimeSinceLastVsync, 2);
+    init_thunk(&thunks[8], r, winIVRSystem_IVRSystem_003_GetD3D9AdapterIndex, 0);
+    init_thunk(&thunks[9], r, winIVRSystem_IVRSystem_003_GetDXGIOutputInfo, 2);
+    init_thunk(&thunks[10], r, winIVRSystem_IVRSystem_003_AttachToWindow, 1);
+    init_thunk(&thunks[11], r, winIVRSystem_IVRSystem_003_GetDeviceToAbsoluteTrackingPose, 4);
+    init_thunk(&thunks[12], r, winIVRSystem_IVRSystem_003_ResetSeatedZeroPose, 0);
+    init_thunk(&thunks[13], r, winIVRSystem_IVRSystem_003_GetSeatedZeroPoseToStandingAbsoluteTrackingPose, 0);
+    init_thunk(&thunks[14], r, winIVRSystem_IVRSystem_003_LoadRenderModel, 2);
+    init_thunk(&thunks[15], r, winIVRSystem_IVRSystem_003_FreeRenderModel, 1);
+    init_thunk(&thunks[16], r, winIVRSystem_IVRSystem_003_GetTrackedDeviceClass, 1);
+    init_thunk(&thunks[17], r, winIVRSystem_IVRSystem_003_IsTrackedDeviceConnected, 1);
+    init_thunk(&thunks[18], r, winIVRSystem_IVRSystem_003_GetBoolTrackedDeviceProperty, 3);
+    init_thunk(&thunks[19], r, winIVRSystem_IVRSystem_003_GetFloatTrackedDeviceProperty, 3);
+    init_thunk(&thunks[20], r, winIVRSystem_IVRSystem_003_GetInt32TrackedDeviceProperty, 3);
+    init_thunk(&thunks[21], r, winIVRSystem_IVRSystem_003_GetUint64TrackedDeviceProperty, 3);
+    init_thunk(&thunks[22], r, winIVRSystem_IVRSystem_003_GetMatrix34TrackedDeviceProperty, 3);
+    init_thunk(&thunks[23], r, winIVRSystem_IVRSystem_003_GetStringTrackedDeviceProperty, 5);
+    init_thunk(&thunks[24], r, winIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum, 1);
+    init_thunk(&thunks[25], r, winIVRSystem_IVRSystem_003_PollNextEvent, 1);
+    init_thunk(&thunks[26], r, winIVRSystem_IVRSystem_003_PollNextEventWithPose, 3);
+    init_thunk(&thunks[27], r, winIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum, 1);
+    init_thunk(&thunks[28], r, winIVRSystem_IVRSystem_003_GetHiddenAreaMesh, 1);
+    init_thunk(&thunks[29], r, winIVRSystem_IVRSystem_003_GetControllerState, 2);
+    init_thunk(&thunks[30], r, winIVRSystem_IVRSystem_003_GetControllerStateWithPose, 4);
+    init_thunk(&thunks[31], r, winIVRSystem_IVRSystem_003_TriggerHapticPulse, 3);
+    init_thunk(&thunks[32], r, winIVRSystem_IVRSystem_003_GetButtonIdNameFromEnum, 1);
+    init_thunk(&thunks[33], r, winIVRSystem_IVRSystem_003_GetControllerAxisTypeNameFromEnum, 1);
+    init_thunk(&thunks[34], r, winIVRSystem_IVRSystem_003_HandleControllerOverlayInteractionAsMouse, 5);
+    init_thunk(&thunks[35], r, winIVRSystem_IVRSystem_003_CaptureInputFocus, 0);
+    init_thunk(&thunks[36], r, winIVRSystem_IVRSystem_003_ReleaseInputFocus, 0);
+    init_thunk(&thunks[37], r, winIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess, 0);
     for (i = 0; i < 38; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
diff --git a/vrclient_x64/winIVRTrackedCamera.c b/vrclient_x64/winIVRTrackedCamera.c
index a5cfa5a8..d0890152 100644
--- a/vrclient_x64/winIVRTrackedCamera.c
+++ b/vrclient_x64/winIVRTrackedCamera.c
@@ -155,18 +155,18 @@ winIVRTrackedCamera_IVRTrackedCamera_003 *create_winIVRTrackedCamera_IVRTrackedC
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum);
-    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_003_HasCamera);
-    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraFrameSize);
-    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraIntrinsics);
-    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraProjection);
-    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_003_AcquireVideoStreamingService);
-    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamingService);
-    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamFrameBuffer);
-    init_thunk(&thunks[8], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureSize);
-    init_thunk(&thunks[9], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureD3D11);
-    init_thunk(&thunks[10], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureGL);
-    init_thunk(&thunks[11], r, winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamTextureGL);
+    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum, 1);
+    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_003_HasCamera, 2);
+    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraFrameSize, 5);
+    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraIntrinsics, 4);
+    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraProjection, 5);
+    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_003_AcquireVideoStreamingService, 2);
+    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamingService, 1);
+    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamFrameBuffer, 6);
+    init_thunk(&thunks[8], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureSize, 5);
+    init_thunk(&thunks[9], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureD3D11, 6);
+    init_thunk(&thunks[10], r, winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureGL, 5);
+    init_thunk(&thunks[11], r, winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamTextureGL, 2);
     for (i = 0; i < 12; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -288,14 +288,14 @@ winIVRTrackedCamera_IVRTrackedCamera_002 *create_winIVRTrackedCamera_IVRTrackedC
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum);
-    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_002_HasCamera);
-    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraFrameSize);
-    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraIntrinisics);
-    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraProjection);
-    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_002_AcquireVideoStreamingService);
-    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_002_ReleaseVideoStreamingService);
-    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrameBuffer);
+    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum, 1);
+    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_002_HasCamera, 2);
+    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraFrameSize, 5);
+    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraIntrinisics, 4);
+    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraProjection, 5);
+    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_002_AcquireVideoStreamingService, 2);
+    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_002_ReleaseVideoStreamingService, 1);
+    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrameBuffer, 6);
     for (i = 0; i < 8; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;
@@ -497,24 +497,24 @@ winIVRTrackedCamera_IVRTrackedCamera_001 *create_winIVRTrackedCamera_IVRTrackedC
     int i;
 
     TRACE("-> %p, vtable %p, thunks %p\n", r, vtable, thunks);
-    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_001_HasCamera);
-    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFirmwareDescription);
-    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFrameDimensions);
-    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_001_SetCameraVideoStreamFormat);
-    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraVideoStreamFormat);
-    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_001_EnableCameraForStreaming);
-    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_001_StartVideoStream);
-    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_001_StopVideoStream);
-    init_thunk(&thunks[8], r, winIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamActive);
-    init_thunk(&thunks[9], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamElapsedTime);
-    init_thunk(&thunks[10], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamFrame);
-    init_thunk(&thunks[11], r, winIVRTrackedCamera_IVRTrackedCamera_001_ReleaseVideoStreamFrame);
-    init_thunk(&thunks[12], r, winIVRTrackedCamera_IVRTrackedCamera_001_SetAutoExposure);
-    init_thunk(&thunks[13], r, winIVRTrackedCamera_IVRTrackedCamera_001_PauseVideoStream);
-    init_thunk(&thunks[14], r, winIVRTrackedCamera_IVRTrackedCamera_001_ResumeVideoStream);
-    init_thunk(&thunks[15], r, winIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamPaused);
-    init_thunk(&thunks[16], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraDistortion);
-    init_thunk(&thunks[17], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection);
+    init_thunk(&thunks[0], r, winIVRTrackedCamera_IVRTrackedCamera_001_HasCamera, 1);
+    init_thunk(&thunks[1], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFirmwareDescription, 3);
+    init_thunk(&thunks[2], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFrameDimensions, 4);
+    init_thunk(&thunks[3], r, winIVRTrackedCamera_IVRTrackedCamera_001_SetCameraVideoStreamFormat, 2);
+    init_thunk(&thunks[4], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraVideoStreamFormat, 1);
+    init_thunk(&thunks[5], r, winIVRTrackedCamera_IVRTrackedCamera_001_EnableCameraForStreaming, 2);
+    init_thunk(&thunks[6], r, winIVRTrackedCamera_IVRTrackedCamera_001_StartVideoStream, 1);
+    init_thunk(&thunks[7], r, winIVRTrackedCamera_IVRTrackedCamera_001_StopVideoStream, 1);
+    init_thunk(&thunks[8], r, winIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamActive, 1);
+    init_thunk(&thunks[9], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamElapsedTime, 1);
+    init_thunk(&thunks[10], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamFrame, 1);
+    init_thunk(&thunks[11], r, winIVRTrackedCamera_IVRTrackedCamera_001_ReleaseVideoStreamFrame, 2);
+    init_thunk(&thunks[12], r, winIVRTrackedCamera_IVRTrackedCamera_001_SetAutoExposure, 2);
+    init_thunk(&thunks[13], r, winIVRTrackedCamera_IVRTrackedCamera_001_PauseVideoStream, 1);
+    init_thunk(&thunks[14], r, winIVRTrackedCamera_IVRTrackedCamera_001_ResumeVideoStream, 1);
+    init_thunk(&thunks[15], r, winIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamPaused, 1);
+    init_thunk(&thunks[16], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraDistortion, 5);
+    init_thunk(&thunks[17], r, winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection, 6);
     for (i = 0; i < 18; i++)
         vtable[i] = &thunks[i];
     r->linux_side = linux_side;