From d4cefca096aa3460592e8f004e820fccec14b885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 20 Sep 2023 17:27:42 +0200
Subject: [PATCH] vrclient: Introduce new Struct generator class.

CW-Bug-Id: #22729
---
 vrclient_x64/gen_wrapper.py                   | 316 ++++++++++++++----
 .../vrclient_x64/cppIVRInput_IVRInput_003.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_003.h   |   2 +-
 .../vrclient_x64/cppIVRInput_IVRInput_004.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_004.h   |   2 +-
 .../vrclient_x64/cppIVRInput_IVRInput_005.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_005.h   |   2 +-
 .../vrclient_x64/cppIVRInput_IVRInput_006.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_006.h   |   2 +-
 .../vrclient_x64/cppIVRInput_IVRInput_007.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_007.h   |   2 +-
 .../vrclient_x64/cppIVRInput_IVRInput_010.cpp |   9 +-
 .../vrclient_x64/cppIVRInput_IVRInput_010.h   |   2 +-
 .../cppIVROverlayView_IVROverlayView_003.cpp  |  14 +-
 .../cppIVROverlayView_IVROverlayView_003.h    |   4 +-
 .../cppIVROverlay_IVROverlay_001.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_001.h            |   2 +-
 .../cppIVROverlay_IVROverlay_002.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_002.h            |   2 +-
 .../cppIVROverlay_IVROverlay_003.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_003.h            |   2 +-
 .../cppIVROverlay_IVROverlay_004.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_004.h            |   2 +-
 .../cppIVROverlay_IVROverlay_005.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_005.h            |   2 +-
 .../cppIVROverlay_IVROverlay_007.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_007.h            |   2 +-
 .../cppIVROverlay_IVROverlay_008.cpp          |   7 +-
 .../cppIVROverlay_IVROverlay_008.h            |   2 +-
 .../cppIVRSystem_IVRSystem_003.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_003.h |   4 +-
 .../cppIVRSystem_IVRSystem_004.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_004.h |   4 +-
 .../cppIVRSystem_IVRSystem_005.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_005.h |   4 +-
 .../cppIVRSystem_IVRSystem_006.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_006.h |   4 +-
 .../cppIVRSystem_IVRSystem_009.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_009.h |   4 +-
 .../cppIVRSystem_IVRSystem_010.cpp            |  14 +-
 .../vrclient_x64/cppIVRSystem_IVRSystem_010.h |   4 +-
 vrclient_x64/vrclient_x64/struct_converters.h | 219 ++++++++++++
 .../vrclient_x64/struct_converters_090.cpp    |  29 ++
 .../vrclient_x64/struct_converters_091.cpp    |  29 ++
 .../vrclient_x64/struct_converters_0910.cpp   |  29 ++
 .../vrclient_x64/struct_converters_0912.cpp   |  29 ++
 .../vrclient_x64/struct_converters_0913.cpp   |  29 ++
 .../vrclient_x64/struct_converters_0914.cpp   |  29 ++
 .../vrclient_x64/struct_converters_092.cpp    |  29 ++
 .../vrclient_x64/struct_converters_093.cpp    |  29 ++
 .../vrclient_x64/struct_converters_094.cpp    |  29 ++
 .../vrclient_x64/struct_converters_096.cpp    |  29 ++
 .../vrclient_x64/struct_converters_097.cpp    |  29 ++
 .../vrclient_x64/struct_converters_098.cpp    |  29 ++
 .../vrclient_x64/struct_converters_099.cpp    |  29 ++
 .../vrclient_x64/struct_converters_1015.cpp   |  26 ++
 .../vrclient_x64/struct_converters_1016.cpp   |  43 +++
 .../vrclient_x64/struct_converters_1017.cpp   |  43 +++
 .../vrclient_x64/struct_converters_11030.cpp  |  86 +++++
 .../vrclient_x64/struct_converters_11111.cpp  |  86 +++++
 .../vrclient_x64/struct_converters_1125.cpp   |  86 +++++
 .../vrclient_x64/struct_converters_11310.cpp  |  86 +++++
 .../vrclient_x64/struct_converters_113b.cpp   |  43 +++
 .../vrclient_x64/struct_converters_11415.cpp  |  86 +++++
 .../vrclient_x64/struct_converters_1168.cpp   |  86 +++++
 .../vrclient_x64/struct_converters_1210.cpp   |  43 +++
 .../vrclient_x64/struct_converters_1237.cpp   |  86 +++++
 .../vrclient_x64/struct_converters_1267.cpp   |  86 +++++
 .../vrclient_x64/struct_converters_1322.cpp   |  43 +++
 .../vrclient_x64/struct_converters_1418.cpp   |  43 +++
 .../vrclient_x64/struct_converters_1517.cpp   |  60 ++++
 .../vrclient_x64/struct_converters_1610.cpp   |  60 ++++
 .../vrclient_x64/struct_converters_1715.cpp   |  60 ++++
 .../vrclient_x64/struct_converters_1819.cpp   |  60 ++++
 .../vrclient_x64/struct_converters_1916.cpp   |  60 ++++
 vrclient_x64/vrclient_x64/winIVRInput.c       |  12 +-
 vrclient_x64/vrclient_x64/winIVROverlay.c     |  14 +-
 vrclient_x64/vrclient_x64/winIVROverlayView.c |   4 +-
 vrclient_x64/vrclient_x64/winIVRSystem.c      |  24 +-
 79 files changed, 2332 insertions(+), 161 deletions(-)

diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 6b1571a4..1a0621c5 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -108,6 +108,44 @@ SDK_CLASSES = {klass: source for source, value in SDK_SOURCES.items()
 SDK_STRUCTS = {klass: source for source, value in SDK_SOURCES.items()
                for klass in value[1]}
 
+# these structs are manually confirmed to be equivalent
+EXEMPT_STRUCTS = {
+    "HmdColor_t",
+    "HmdMatrix33_t",
+    "HmdMatrix34_t",
+    "HmdMatrix44_t",
+    "HmdQuad_t",
+    "HmdQuaternion_t",
+    "HmdQuaternionf_t",
+    "HmdVector2_t",
+    "HmdVector3_t",
+    "HmdVector3d_t",
+    "HmdVector4_t",
+}
+
+# structs for which the size is important, either because of arrays or size parameters
+SIZED_STRUCTS = {
+    "CameraVideoStreamFrameHeader_t",
+    "Compositor_BenchmarkResults",
+    "Compositor_CumulativeStats",
+    "Compositor_StageRenderSettings",
+    "InputAnalogActionData_t",
+    "InputBindingInfo_t",
+    "InputDigitalActionData_t",
+    "InputOriginInfo_t",
+    "InputPoseActionData_t",
+    "InputSkeletalActionData_t",
+    "InputSkeletonActionData_t",
+    "Texture_t",
+    "TrackedDevicePose_t",
+    "VRActiveActionSet_t",
+    "VRBoneTransform_t",
+    "VRControllerState001_t",
+    "VREvent_t",
+    "VROverlayIntersectionMaskPrimitive_t",
+    "VROverlayView_t",
+}
+
 STRUCTS_NEXT_IS_SIZE = [
     "VREvent_t",
     "VRControllerState001_t",
@@ -204,7 +242,7 @@ MANUAL_METHODS = {
 def is_manual_method(klass, method, abi):
     version = re.search(r'(\d+)$', klass.version)
 
-    key = f'{klass.spelling}_{method.name}'
+    key = f'{klass.name}_{method.name}'
     needs_manual = MANUAL_METHODS.get(key, False)
 
     if callable(needs_manual) and version:
@@ -212,6 +250,103 @@ def is_manual_method(klass, method, abi):
     return needs_manual
 
 
+class Padding:
+    def __init__(self, offset, size):
+        self.offset = offset
+        self.size = size
+
+
+class Field:
+    def __init__(self, cursor, struct, type, offset, name=None):
+        self._cursor = cursor
+        self._type = type
+
+        self.name = cursor.spelling if not name else name
+        self.type = cursor.type
+        self.size = self.type.get_size()
+        self.offset = offset
+
+    def needs_conversion(self, other):
+        return self._type.needs_conversion(other._type)
+
+
+class BasicType:
+    def __init__(self, type, abi):
+        self._type = type.get_canonical()
+        self._abi = abi
+
+    def needs_conversion(self, other):
+        return False
+
+
+class Struct:
+    def __init__(self, sdkver, abi, cursor):
+        self._cursor = cursor
+        self._sdkver = sdkver
+        self._abi = abi
+        self._fields = None
+
+        self.name = canonical_typename(self._cursor)
+        self.name = self.name.removeprefix("vr::")
+        self.type = self._cursor.type.get_canonical()
+        self.size = self.type.get_size()
+        self.align = self.type.get_align()
+
+    @property
+    def padded_fields(self):
+        if self._fields: return self._fields
+
+        size, self._fields = 0, []
+        for cursor in self._cursor.get_children():
+            if cursor.kind == CursorKind.CXX_BASE_SPECIFIER \
+               and len(list(cursor.type.get_fields())) > 0:
+                base_type = Type(cursor.type, self._sdkver, self._abi)
+                self._fields += base_type.padded_fields
+                size = cursor.type.get_size()
+            break
+
+        for cursor in self.type.get_fields():
+            assert not cursor.is_bitfield()
+            offset = self.type.get_offset(cursor.spelling)
+            assert offset % 8 == 0
+            offset = offset // 8
+            # assert offset >= size or type(self) is Union
+
+            if size < offset: self._fields.append(Padding(size, offset - size))
+            field_type = Type(cursor.type, self._sdkver, self._abi)
+            self._fields.append(Field(cursor, self, field_type, offset))
+            size = max(size, offset + cursor.type.get_size())
+
+        if size < self.size: self._fields.append(Padding(size, self.size - size))
+        return self._fields
+
+    @property
+    def fields(self):
+        return [f for f in self.padded_fields if type(f) is not Padding]
+
+    def needs_conversion(self, other):
+        if self.name in SIZED_STRUCTS and self.size != other.size:
+            return True
+        if len(self.fields) != len(other.fields):
+            return True
+        if any([a.offset != b.offset or a.needs_conversion(b)
+               for a, b in zip(self.fields, other.fields)]):
+            return True
+
+        return False
+
+    def get_children(self):
+        return self._cursor.get_children()
+
+
+class Union(Struct):
+    def __init__(self, sdkver, abi, cursor):
+        super().__init__(sdkver, abi, cursor)
+
+    def needs_conversion(self, other):
+        return False # FIXME
+
+
 class Method:
     def __init__(self, sdkver, abi, cursor, index, override):
         self._sdkver = sdkver
@@ -248,17 +383,18 @@ class Destructor(Method):
 
 class Class:
     def __init__(self, sdkver, abi, cursor):
+        self._cursor = cursor
         self._sdkver = sdkver
         self._abi = abi
-
-        self._cursor = cursor
-
-        self.spelling = cursor.spelling
-        self.filename = SDK_CLASSES[self.spelling]
-        self.version = all_versions[sdkver][self.spelling]
-
         self._methods = None
 
+        self.name = cursor.spelling
+        self.filename = SDK_CLASSES.get(self.name, None)
+        versions = all_versions[sdkver]
+        self.version = versions.get(self.name, "")
+
+        self.type = self._cursor.type.get_canonical()
+
     @property
     def methods(self):
         if self._methods:
@@ -281,7 +417,12 @@ class Class:
 
     @property
     def full_name(self):
-        return f'{self.spelling}_{self.version}'
+        if len(self.version) == 0:
+            return self.name
+        return f'{self.name}_{self.version}'
+
+    def needs_conversion(self, other):
+        return self._abi[0] != other._abi[0]
 
     def write_definition(self, out, prefix):
         out(f'struct {prefix}{self.full_name}\n')
@@ -302,6 +443,25 @@ class Class:
         return self._cursor.get_children()
 
 
+def Record(sdkver, abi, cursor):
+    if cursor.type.get_declaration().kind == CursorKind.UNION_DECL:
+        return Union(sdkver, abi, cursor)
+
+    method_kinds = (CursorKind.CXX_METHOD, CursorKind.DESTRUCTOR)
+    is_method = lambda c: c.kind in method_kinds and c.is_virtual_method()
+    for _ in filter(is_method, cursor.get_children()):
+        return Class(sdkver, abi, cursor)
+
+    return Struct(sdkver, abi, cursor)
+
+
+def Type(decl, sdkver, abi):
+    name = strip_ns(canonical_typename(decl))
+    if name not in all_structs:
+        return BasicType(decl, abi)
+    return all_structs[name][sdkver][abi]
+
+
 def display_sdkver(s):
     if s.startswith("v"):
         s = s[1:]
@@ -441,6 +601,24 @@ def handle_method_cpp(method, classname, cppname, out):
     out(u'{\n')
     out(f'    struct {cppname} *iface = (struct {cppname} *)params->linux_side;\n')
 
+    params = list(zip(names[1:], method.get_arguments()))
+    for i, (name, param) in enumerate(params[:-1]):
+        if underlying_type(param).kind != TypeKind.RECORD:
+            continue
+        next_name, next_param = params[i + 1]
+        if not any(w in next_name.lower() for w in ('count', 'len', 'size', 'num')):
+            continue
+        assert strip_ns(underlying_typename(param)) in SIZED_STRUCTS | EXEMPT_STRUCTS
+
+    for i, (name, param) in enumerate(params[1:]):
+        if underlying_type(param).kind != TypeKind.RECORD:
+            continue
+        prev_name, prev_param = params[i - 1]
+        if not any(w in prev_name.lower() for w in ('count', 'len', 'size', 'num')):
+            continue
+        if strip_ns(underlying_typename(param)) not in SIZED_STRUCTS | EXEMPT_STRUCTS:
+            print('Warning:', strip_ns(underlying_typename(param)), name, 'following', prev_name)
+
     need_unwrap = {}
     need_output = {}
 
@@ -532,7 +710,7 @@ def handle_thiscall_wrapper(klass, method, out):
     size = 4 + sum(param_stack_size(p) for p in method.get_arguments())
     if returns_record: size += 4
 
-    name = f'win{klass.spelling}_{klass.version}_{method.name}'
+    name = f'win{klass.full_name}_{method.name}'
     out(f'DEFINE_THISCALL_WRAPPER({name}, {size})\n')
 
 
@@ -568,8 +746,8 @@ def handle_method_c(klass, method, winclassname, cppname, out):
         out(f'        .{name} = {name},\n')
     out(u'    };\n')
 
-    path_conv_utow = PATH_CONV_METHODS_UTOW.get(f'{klass.spelling}_{method.spelling}', {})
-    path_conv_wtou = PATH_CONV_METHODS_WTOU.get(f'{klass.spelling}_{method.spelling}', {})
+    path_conv_utow = PATH_CONV_METHODS_UTOW.get(f'{klass.name}_{method.spelling}', {})
+    path_conv_wtou = PATH_CONV_METHODS_WTOU.get(f'{klass.name}_{method.spelling}', {})
 
     for name in filter(lambda x: x in names, sorted(path_conv_wtou)):
         out(f'    params.{name} = vrclient_dos_to_unix_path( {name} );\n')
@@ -611,7 +789,7 @@ def get_capi_thunk_params(method):
 
 
 def handle_class(klass):
-    cppname = f"cpp{klass.spelling}_{klass.version}"
+    cppname = f"cpp{klass.full_name}"
 
     with open(f"vrclient_x64/{cppname}.h", "w") as file:
         out = file.write
@@ -654,14 +832,14 @@ def handle_class(klass):
         for method in klass.methods:
             if type(method) is Destructor:
                 continue
-            handle_method_cpp(method, klass.spelling, cppname, out)
+            handle_method_cpp(method, klass.name, cppname, out)
 
         out(u'#ifdef __cplusplus\n')
         out(u'}\n')
         out(u'#endif\n')
 
-    winclassname = f'win{klass.spelling}_{klass.version}'
-    with open(f'vrclient_x64/win{klass.spelling}.c', 'a') as file:
+    winclassname = f'win{klass.full_name}'
+    with open(f'vrclient_x64/win{klass.name}.c', 'a') as file:
         out = file.write
 
         out(f'#include "{cppname}.h"\n\n')
@@ -744,7 +922,7 @@ def handle_class(klass):
 
 
 def canonical_typename(cursor):
-    if type(cursor) is Cursor:
+    if type(cursor) in (Cursor, Struct):
         return canonical_typename(cursor.type)
 
     name = cursor.get_canonical().spelling
@@ -756,11 +934,13 @@ def underlying_typename(decl):
 
 
 def find_struct_abis(name):
-    records = all_records[sdkver]
-    missing = [name not in records[abi] for abi in ABIS]
-    assert all(missing) or not any(missing)
-    if any(missing): return None
-    return {abi: records[abi][name].type for abi in ABIS}
+    name = strip_ns(name)
+    if not name in all_structs:
+        return None
+    structs = all_structs[name]
+    if not sdkver in structs:
+        return None
+    return structs[sdkver]
 
 
 def struct_needs_conversion_nocache(struct):
@@ -769,35 +949,16 @@ def struct_needs_conversion_nocache(struct):
     abis = find_struct_abis(name)
     if abis is None:
         return False, False
-
-    names = {a: [f.spelling for f in abis[a].get_fields()]
-             for a in ABIS}
-    assert names['u32'] == names['u64']
-    assert names['u32'] == names['w32']
-    assert names['u32'] == names['w64']
-
-    offsets = {a: {f: abis[a].get_offset(f) for f in names[a]}
-               for a in ABIS}
-    if offsets['u32'] != offsets['w32']:
+    if abis['w32'].needs_conversion(abis['u32']):
         return True, False
-    if offsets['u64'] != offsets['w64']:
+    if abis['w64'].needs_conversion(abis['u64']):
         return True, False
 
-    types = {a: [f.type.get_canonical() for f in abis[a].get_fields()]
-             for a in ABIS}
-    if any(t.kind == TypeKind.RECORD and struct_needs_conversion(t)
-           for t in types['u32']):
-        return True, False
-    if any(t.kind == TypeKind.RECORD and struct_needs_conversion(t)
-           for t in types['u64']):
-        return True, False
-
-    assert abis['u32'].get_size() <= abis['w32'].get_size()
-    if abis['u32'].get_size() < abis['w32'].get_size():
+    assert abis['u32'].size <= abis['w32'].size
+    if abis['u32'].size < abis['w32'].size:
         return False, True
-
-    assert abis['u64'].get_size() <= abis['w64'].get_size()
-    if abis['u64'].get_size() < abis['w64'].get_size():
+    assert abis['u64'].size <= abis['w64'].size
+    if abis['u64'].size < abis['w64'].size:
         return False, True
 
     return False, False
@@ -805,6 +966,8 @@ def struct_needs_conversion_nocache(struct):
 
 def struct_needs_conversion(struct):
     name = canonical_typename(struct)
+    if name in EXEMPT_STRUCTS:
+        return False
 
     if not sdkver in struct_conversion_cache:
         struct_conversion_cache[sdkver] = {}
@@ -827,8 +990,9 @@ def get_field_attribute_str(field):
         return ""
     name = canonical_typename(ftype)
     abis = find_struct_abis(name)
-    align = abis['w32'].get_align()
-    return " __attribute__((aligned(" + str(align) + ")))"
+    if not abis:
+        return " __attribute__((aligned(8)))"
+    return f" __attribute__((aligned({abis['w32'].align})))"
 
 generated_struct_handlers = []
 cpp_files_need_close_brace = []
@@ -841,7 +1005,7 @@ WRAPPERS=3
 #need to convert these structs from their linux layout to the win32
 #layout.
 def handle_struct(sdkver, struct):
-    handler_name = "%s_%s" % (struct.displayname, display_sdkver(sdkver))
+    handler_name = "%s_%s" % (struct.name, display_sdkver(sdkver))
 
     if handler_name in generated_struct_handlers:
         # we already have a handler for the struct struct of this size
@@ -853,7 +1017,7 @@ def handle_struct(sdkver, struct):
         which.add(LIN_TO_WIN)
         which.add(WIN_TO_LIN)
 
-    if strip_ns(struct.displayname) in SDK_STRUCTS:
+    if strip_ns(struct.name) in SDK_STRUCTS:
         which.add(WRAPPERS)
 
     if len(which) == 0:
@@ -895,7 +1059,7 @@ def handle_struct(sdkver, struct):
                     cppfile.write("    %s %s" % (m.type.spelling, m.displayname))
             cppfile.write(get_field_attribute_str(m) + ";\n")
     if WRAPPERS in which:
-        cppfile.write("\n    %s *linux_side;\n" % struct.displayname)
+        cppfile.write("\n    %s *linux_side;\n" % struct.name)
     cppfile.write("}  __attribute__ ((ms_struct));\n")
     cppfile.write("#pragma pack(pop)\n\n")
 
@@ -910,8 +1074,8 @@ def handle_struct(sdkver, struct):
                         struct_needs_conversion(m.type.get_canonical()):
                     cppfile.write("    struct_" + strip_ns(m.type.spelling) + "_" + display_sdkver(sdkver) + "_" + src + "_to_" + dst + \
                             "(&" + src + "->" + m.displayname + ", &" + dst + "->" + m.displayname + ");\n")
-                elif struct.displayname in STRUCTS_SIZE_FIELD and \
-                    m.displayname in STRUCTS_SIZE_FIELD[struct.displayname]:
+                elif struct.name in STRUCTS_SIZE_FIELD and \
+                    m.displayname in STRUCTS_SIZE_FIELD[struct.name]:
                         cppfile.write("    " + dst + "->" + m.displayname + " = sizeof(*" + dst + ");\n")
                 elif size and strip_ns(m.type.get_canonical().spelling) == "VREvent_Data_t":
                     #truncate variable-length data struct at the end of the parent struct
@@ -920,7 +1084,7 @@ def handle_struct(sdkver, struct):
                 else:
                     cppfile.write("    " + dst + "->" + m.displayname + " = " + src + "->" + m.displayname + ";\n")
 
-    if strip_ns(struct.displayname) in STRUCTS_NEXT_IS_SIZE:
+    if strip_ns(struct.name) in STRUCTS_NEXT_IS_SIZE:
         size_arg = "sz"
         size_arg_type = ", uint32_t sz"
     else:
@@ -931,7 +1095,7 @@ def handle_struct(sdkver, struct):
         hfile.write("extern void struct_%s_lin_to_win(void *l, void *w%s);\n" % (handler_name, size_arg_type))
         cppfile.write("void struct_%s_lin_to_win(void *l, void *w%s)\n{\n" % (handler_name, size_arg_type))
         cppfile.write("    struct win%s *win = (struct win%s *)w;\n" % (handler_name, handler_name))
-        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.displayname, struct.displayname))
+        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.name, struct.name))
         dump_converter("lin", "win", size_arg)
         cppfile.write("}\n\n")
 
@@ -940,7 +1104,7 @@ def handle_struct(sdkver, struct):
         hfile.write("extern void struct_%s_win_to_lin(const void *w, void *l);\n" % handler_name)
         cppfile.write("void struct_%s_win_to_lin(const void *w, void *l)\n{\n" % handler_name)
         cppfile.write("    struct win%s *win = (struct win%s *)w;\n" % (handler_name, handler_name))
-        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.displayname, struct.displayname))
+        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.name, struct.name))
         dump_converter("win", "lin", None)
         cppfile.write("}\n\n")
 
@@ -949,7 +1113,7 @@ def handle_struct(sdkver, struct):
 
         cppfile.write("struct win%s *struct_%s_wrap(void *l)\n{\n" % (handler_name, handler_name))
         cppfile.write("    struct win%s *win = (struct win%s *)malloc(sizeof(*win));\n" % (handler_name, handler_name))
-        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.displayname, struct.displayname))
+        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.name, struct.name))
 
         dump_converter("lin", "win", None)
 
@@ -958,10 +1122,10 @@ def handle_struct(sdkver, struct):
 
         cppfile.write("}\n\n")
 
-        hfile.write("extern %s *struct_%s_unwrap(win%s *w);\n" % (struct.displayname, handler_name, handler_name))
+        hfile.write("extern %s *struct_%s_unwrap(win%s *w);\n" % (struct.name, handler_name, handler_name))
 
-        cppfile.write("struct %s *struct_%s_unwrap(win%s *w)\n{\n" % (struct.displayname, handler_name, handler_name))
-        cppfile.write("    %s *ret = w->linux_side;\n" % struct.displayname)
+        cppfile.write("struct %s *struct_%s_unwrap(win%s *w)\n{\n" % (struct.name, handler_name, handler_name))
+        cppfile.write("    %s *ret = w->linux_side;\n" % struct.name)
         cppfile.write("    free(w);\n")
         cppfile.write("    return ret;\n")
         cppfile.write("}\n\n")
@@ -1347,13 +1511,16 @@ with concurrent.futures.ThreadPoolExecutor() as executor:
         sdkver, abi, build = result
         if sdkver not in all_records: all_records[sdkver] = {}
         if sdkver not in tmp_classes: tmp_classes[sdkver] = {}
-        if sdkver not in all_structs: all_structs[sdkver] = {}
 
         versions = all_versions[sdkver]
 
-        records = enumerate_structs(build.cursor)
-        # reverse the order to favor definitions over declarations
-        records = dict(reversed([(c.type.spelling, c) for c in records]))
+        structs = enumerate_structs(build.cursor, vr_only=True)
+        structs = filter(lambda c: c.is_definition(), structs)
+        structs = filter(lambda c: c.type.get_canonical().kind == TypeKind.RECORD, structs)
+        structs = filter(lambda c: c.kind != CursorKind.TYPEDEF_DECL, structs)
+        structs = filter(lambda c: c.spelling not in SDK_CLASSES, structs)
+        structs = [Record(sdkver, abi, c) for c in structs]
+        structs = {c.name: c for c in structs}
 
         classes = enumerate_structs(build.cursor, vr_only=True)
         classes = filter(lambda c: c.is_definition(), classes)
@@ -1363,14 +1530,15 @@ with concurrent.futures.ThreadPoolExecutor() as executor:
         classes = [Class(sdkver, abi, c) for c in classes]
         classes = {c.version: c for c in classes}
 
-        structs = enumerate_structs(build.cursor, vr_only=True)
-        struct_kinds = (CursorKind.STRUCT_DECL, CursorKind.CLASS_DECL)
-        structs = filter(lambda c: c.kind in struct_kinds, structs)
-        structs = {c.spelling: c for c in structs}
-
-        all_records[sdkver][abi] = records
+        all_records[sdkver][abi] = structs
         tmp_classes[sdkver][abi] = classes
-        all_structs[sdkver][abi] = structs
+
+        for name, struct in structs.items():
+            if name not in all_structs:
+                all_structs[name] = {}
+            if sdkver not in all_structs[name]:
+                all_structs[name][sdkver] = {}
+            all_structs[name][sdkver][abi] = struct
 
 for i, sdkver in enumerate(reversed(SDK_VERSIONS)):
     all_classes.update(tmp_classes[sdkver]['u32'])
@@ -1379,7 +1547,7 @@ print('parsing SDKs... 100%')
 
 
 for klass in all_classes.values():
-    with open(f"vrclient_x64/win{klass.spelling}.c", "w") as file:
+    with open(f"vrclient_x64/win{klass.name}.c", "w") as file:
         out = file.write
 
         out(u'/* This file is auto-generated, do not edit. */\n')
@@ -1408,7 +1576,7 @@ for _, klass in sorted(all_classes.items()):
 
 
 for sdkver in SDK_VERSIONS:
-    generate(sdkver, all_structs[sdkver])
+    generate(sdkver, all_records[sdkver])
 
 
 for f in cpp_files_need_close_brace:
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
index cb3bf4f0..b7e8a5f4 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
@@ -143,8 +143,13 @@ void cppIVRInput_IVRInput_003_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1015_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1015_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_003_ShowActionOrigins( struct cppIVRInput_IVRInput_003_ShowActionOrigins_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
index bc7e3481..4e847570 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
@@ -156,7 +156,7 @@ struct cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1015 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
index 1224f2aa..549d0272 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
@@ -151,8 +151,13 @@ void cppIVRInput_IVRInput_004_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1017_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1017_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_004_ShowActionOrigins( struct cppIVRInput_IVRInput_004_ShowActionOrigins_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
index 1132e526..bfe92f03 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
@@ -171,7 +171,7 @@ struct cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1017 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
index f9874866..10fadb3d 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
@@ -194,8 +194,13 @@ void cppIVRInput_IVRInput_005_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1322_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1322_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_005_ShowActionOrigins( struct cppIVRInput_IVRInput_005_ShowActionOrigins_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
index cf8aa9f1..8b0c247b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
@@ -228,7 +228,7 @@ struct cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1322 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
index 1da5d781..2bf02463 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
@@ -207,8 +207,13 @@ void cppIVRInput_IVRInput_006_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1418_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1418_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_006_ShowActionOrigins( struct cppIVRInput_IVRInput_006_ShowActionOrigins_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
index d4df201f..9b22d384 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
@@ -241,7 +241,7 @@ struct cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1418 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
index 123f5c52..c05cee53 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
@@ -209,8 +209,13 @@ void cppIVRInput_IVRInput_007_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1916_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1916_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_007_GetActionBindingInfo( struct cppIVRInput_IVRInput_007_GetActionBindingInfo_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
index 6577fd25..bac0827e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
@@ -241,7 +241,7 @@ struct cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1916 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
index c5e2fd18..43086a24 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
@@ -225,8 +225,13 @@ void cppIVRInput_IVRInput_010_GetOriginLocalizedName( struct cppIVRInput_IVRInpu
 void cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo_params *params )
 {
     struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
-    uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
+    InputOriginInfo_t lin_pOriginInfo;
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1267_win_to_lin( params->pOriginInfo, &lin_pOriginInfo );
+    uint32_t lin_unOriginInfoSize = params->unOriginInfoSize ? sizeof(lin_pOriginInfo) : 0;
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo ? &lin_pOriginInfo : nullptr, lin_unOriginInfoSize );
+    if (params->pOriginInfo)
+        struct_InputOriginInfo_t_1267_lin_to_win( &lin_pOriginInfo, params->pOriginInfo, params->unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_010_GetActionBindingInfo( struct cppIVRInput_IVRInput_010_GetActionBindingInfo_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
index 05369d12..e9af3346 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
@@ -257,7 +257,7 @@ struct cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo_params
     void *linux_side;
     uint32_t _ret;
     uint64_t origin;
-    InputOriginInfo_t *pOriginInfo;
+    winInputOriginInfo_t_1267 *pOriginInfo;
     uint32_t unOriginInfoSize;
 };
 extern void cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
index 6f509f24..24cbe52b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
@@ -23,13 +23,23 @@ struct cppIVROverlayView_IVROverlayView_003
 void cppIVROverlayView_IVROverlayView_003_AcquireOverlayView( struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params *params )
 {
     struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
-    params->_ret = iface->AcquireOverlayView( params->ulOverlayHandle, params->pNativeDevice, params->pOverlayView, params->unOverlayViewSize );
+    VROverlayView_t lin_pOverlayView;
+    if (params->pOverlayView)
+        struct_VROverlayView_t_1267_win_to_lin( params->pOverlayView, &lin_pOverlayView );
+    params->_ret = iface->AcquireOverlayView( params->ulOverlayHandle, params->pNativeDevice, params->pOverlayView ? &lin_pOverlayView : nullptr, params->unOverlayViewSize );
+    if (params->pOverlayView)
+        struct_VROverlayView_t_1267_lin_to_win( &lin_pOverlayView, params->pOverlayView );
 }
 
 void cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView( struct cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView_params *params )
 {
     struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
-    params->_ret = iface->ReleaseOverlayView( params->pOverlayView );
+    VROverlayView_t lin_pOverlayView;
+    if (params->pOverlayView)
+        struct_VROverlayView_t_1267_win_to_lin( params->pOverlayView, &lin_pOverlayView );
+    params->_ret = iface->ReleaseOverlayView( params->pOverlayView ? &lin_pOverlayView : nullptr );
+    if (params->pOverlayView)
+        struct_VROverlayView_t_1267_lin_to_win( &lin_pOverlayView, params->pOverlayView );
 }
 
 void cppIVROverlayView_IVROverlayView_003_PostOverlayEvent( struct cppIVROverlayView_IVROverlayView_003_PostOverlayEvent_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
index a4961674..ed581bd8 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
@@ -8,7 +8,7 @@ struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params
     uint32_t _ret;
     uint64_t ulOverlayHandle;
     VRNativeDevice_t *pNativeDevice;
-    VROverlayView_t *pOverlayView;
+    winVROverlayView_t_1267 *pOverlayView;
     uint32_t unOverlayViewSize;
 };
 extern void cppIVROverlayView_IVROverlayView_003_AcquireOverlayView( struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params *params );
@@ -17,7 +17,7 @@ struct cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView_params
 {
     void *linux_side;
     uint32_t _ret;
-    VROverlayView_t *pOverlayView;
+    winVROverlayView_t_1267 *pOverlayView;
 };
 extern void cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView( struct cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
index 4688710f..bb978a22 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
@@ -215,7 +215,12 @@ void cppIVROverlay_IVROverlay_001_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_001_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_001_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_092_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_092_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_001_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
index 925f5e59..e12cd14e 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
@@ -240,7 +240,7 @@ struct cppIVROverlay_IVROverlay_001_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_092 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_001_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_001_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
index 06bd5f4e..b86a68ba 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
@@ -217,7 +217,12 @@ void cppIVROverlay_IVROverlay_002_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_002_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_002_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_094_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_094_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_002_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
index bda210e0..4f5e94d8 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
@@ -244,7 +244,7 @@ struct cppIVROverlay_IVROverlay_002_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_094 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_002_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_002_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
index f3f5fac0..ec232af0 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
@@ -239,7 +239,12 @@ void cppIVROverlay_IVROverlay_003_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_003_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_003_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_097_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_097_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_003_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
index 1250b516..4dfae376 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
@@ -278,7 +278,7 @@ struct cppIVROverlay_IVROverlay_003_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_097 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_003_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_003_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
index e3f55e6a..e62f7184 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
@@ -253,7 +253,12 @@ void cppIVROverlay_IVROverlay_004_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_004_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_004_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_098_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_098_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_004_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
index 6e083bee..0980a808 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
@@ -298,7 +298,7 @@ struct cppIVROverlay_IVROverlay_004_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_098 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_004_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_004_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
index 13797021..9918cca1 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
@@ -257,7 +257,12 @@ void cppIVROverlay_IVROverlay_005_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_005_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_005_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0910_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0910_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_005_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
index 392edc2b..3348886c 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
@@ -298,7 +298,7 @@ struct cppIVROverlay_IVROverlay_005_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_0910 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_005_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_005_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
index a2ea5d02..6ae36a9e 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
@@ -262,7 +262,12 @@ void cppIVROverlay_IVROverlay_007_IsOverlayVisible( struct cppIVROverlay_IVROver
 void cppIVROverlay_IVROverlay_007_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_007_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0912_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0912_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_007_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
index 275f4dd8..3e5b27e9 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
@@ -298,7 +298,7 @@ struct cppIVROverlay_IVROverlay_007_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_0912 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_007_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_007_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
index 05d3b6c2..14dc1a62 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
@@ -271,7 +271,12 @@ void cppIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates( struct cppI
 void cppIVROverlay_IVROverlay_008_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_008_PollNextOverlayEvent_params *params )
 {
     struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
-    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0914_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0914_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_008_GetOverlayInputMethod_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
index bb134ab7..1e1b13db 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
@@ -309,7 +309,7 @@ struct cppIVROverlay_IVROverlay_008_PollNextOverlayEvent_params
     void *linux_side;
     bool _ret;
     uint64_t ulOverlayHandle;
-    VREvent_t *pEvent;
+    winVREvent_t_0914 *pEvent;
 };
 extern void cppIVROverlay_IVROverlay_008_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_008_PollNextOverlayEvent_params *params );
 
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
index 0b03368d..bf795805 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
@@ -207,13 +207,23 @@ void cppIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_003_PollNextEvent( struct cppIVRSystem_IVRSystem_003_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_091_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_091_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_003_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_003_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_091_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_091_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
index 5698db53..fe5de260 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
@@ -232,7 +232,7 @@ struct cppIVRSystem_IVRSystem_003_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_091 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_003_PollNextEvent( struct cppIVRSystem_IVRSystem_003_PollNextEvent_params *params );
 
@@ -241,7 +241,7 @@ struct cppIVRSystem_IVRSystem_003_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_091 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_003_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_003_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
index 15bc0077..be008e66 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
@@ -193,13 +193,23 @@ void cppIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_004_PollNextEvent( struct cppIVRSystem_IVRSystem_004_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_092_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_092_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_004_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_004_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_092_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_092_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
index 415af0fa..cef1e108 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
@@ -216,7 +216,7 @@ struct cppIVRSystem_IVRSystem_004_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_092 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_004_PollNextEvent( struct cppIVRSystem_IVRSystem_004_PollNextEvent_params *params );
 
@@ -225,7 +225,7 @@ struct cppIVRSystem_IVRSystem_004_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_092 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_004_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_004_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
index a93c59c9..b0506e5e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
@@ -200,13 +200,23 @@ void cppIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_005_PollNextEvent( struct cppIVRSystem_IVRSystem_005_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_098_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_098_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_005_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_005_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_098_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_098_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
index 53938d7b..6abb852e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
@@ -227,7 +227,7 @@ struct cppIVRSystem_IVRSystem_005_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_098 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_005_PollNextEvent( struct cppIVRSystem_IVRSystem_005_PollNextEvent_params *params );
 
@@ -236,7 +236,7 @@ struct cppIVRSystem_IVRSystem_005_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_098 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_005_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_005_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
index 84f7e58f..296cd534 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
@@ -217,13 +217,23 @@ void cppIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_006_PollNextEvent( struct cppIVRSystem_IVRSystem_006_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0910_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0910_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_006_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_006_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0910_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_0910_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
index 2c5382d1..7f013794 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
@@ -242,7 +242,7 @@ struct cppIVRSystem_IVRSystem_006_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_0910 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_006_PollNextEvent( struct cppIVRSystem_IVRSystem_006_PollNextEvent_params *params );
 
@@ -251,7 +251,7 @@ struct cppIVRSystem_IVRSystem_006_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_0910 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_006_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_006_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
index 38b1b914..4ac471a9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
@@ -217,13 +217,23 @@ void cppIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_009_PollNextEvent( struct cppIVRSystem_IVRSystem_009_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0912_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0912_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_009_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_009_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0912_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_0912_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
index 8dda4d98..46ad04e2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
@@ -236,7 +236,7 @@ struct cppIVRSystem_IVRSystem_009_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_0912 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_009_PollNextEvent( struct cppIVRSystem_IVRSystem_009_PollNextEvent_params *params );
 
@@ -245,7 +245,7 @@ struct cppIVRSystem_IVRSystem_009_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_0912 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_009_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_009_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
index af8e8c7f..bbf7e670 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
@@ -233,13 +233,23 @@ void cppIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum( struct cppIVRSystem_IV
 void cppIVRSystem_IVRSystem_010_PollNextEvent( struct cppIVRSystem_IVRSystem_010_PollNextEvent_params *params )
 {
     struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
-    params->_ret = iface->PollNextEvent( params->pEvent );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0914_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr );
+    if (params->pEvent)
+        struct_VREvent_t_0914_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_010_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_010_PollNextEventWithPose_params *params )
 {
     struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
-    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
+    VREvent_t lin_pEvent;
+    if (params->pEvent)
+        struct_VREvent_t_0914_win_to_lin( params->pEvent, &lin_pEvent );
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, params->pTrackedDevicePose );
+    if (params->pEvent)
+        struct_VREvent_t_0914_lin_to_win( &lin_pEvent, params->pEvent, -1 );
 }
 
 void cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum_params *params )
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
index a66401c9..7fc5a013 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
@@ -252,7 +252,7 @@ struct cppIVRSystem_IVRSystem_010_PollNextEvent_params
 {
     void *linux_side;
     bool _ret;
-    VREvent_t *pEvent;
+    winVREvent_t_0914 *pEvent;
 };
 extern void cppIVRSystem_IVRSystem_010_PollNextEvent( struct cppIVRSystem_IVRSystem_010_PollNextEvent_params *params );
 
@@ -261,7 +261,7 @@ struct cppIVRSystem_IVRSystem_010_PollNextEventWithPose_params
     void *linux_side;
     bool _ret;
     uint32_t eOrigin;
-    VREvent_t *pEvent;
+    winVREvent_t_0914 *pEvent;
     TrackedDevicePose_t *pTrackedDevicePose;
 };
 extern void cppIVRSystem_IVRSystem_010_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_010_PollNextEventWithPose_params *params );
diff --git a/vrclient_x64/vrclient_x64/struct_converters.h b/vrclient_x64/vrclient_x64/struct_converters.h
index 88369c76..6896f96c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters.h
+++ b/vrclient_x64/vrclient_x64/struct_converters.h
@@ -10,6 +10,9 @@ extern void struct_VRControllerState001_t_1267_win_to_lin(const void *w, void *l
 typedef struct winCameraVideoStreamFrameHeader_t_1267 winCameraVideoStreamFrameHeader_t_1267;
 extern void struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_1267 winVROverlayView_t_1267;
+extern void struct_VROverlayView_t_1267_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_1267_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_1267 winRenderModel_TextureMap_t_1267;
 extern void struct_RenderModel_TextureMap_t_1267_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_1267_win_to_lin(const void *w, void *l);
@@ -32,6 +35,15 @@ extern void struct_InputPoseActionData_t_1267_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1267 winInputSkeletalActionData_t_1267;
 extern void struct_InputSkeletalActionData_t_1267_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1267_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1267 winInputOriginInfo_t_1267;
+extern void struct_InputOriginInfo_t_1267_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1267_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1267 winIVRSpatialAnchors_1267;
+extern void struct_IVRSpatialAnchors_1267_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1267_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1267 winIVRDebug_1267;
+extern void struct_IVRDebug_1267_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1267_win_to_lin(const void *w, void *l);
 typedef struct winVRVulkanTextureArrayData_t_1237 winVRVulkanTextureArrayData_t_1237;
 extern void struct_VRVulkanTextureArrayData_t_1237_lin_to_win(void *l, void *w);
 extern void struct_VRVulkanTextureArrayData_t_1237_win_to_lin(const void *w, void *l);
@@ -44,6 +56,9 @@ extern void struct_VRControllerState001_t_1237_win_to_lin(const void *w, void *l
 typedef struct winCameraVideoStreamFrameHeader_t_1237 winCameraVideoStreamFrameHeader_t_1237;
 extern void struct_CameraVideoStreamFrameHeader_t_1237_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_1237_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_1237 winVROverlayView_t_1237;
+extern void struct_VROverlayView_t_1237_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_1237_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_1237 winRenderModel_TextureMap_t_1237;
 extern void struct_RenderModel_TextureMap_t_1237_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_1237_win_to_lin(const void *w, void *l);
@@ -66,6 +81,15 @@ extern void struct_InputPoseActionData_t_1237_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1237 winInputSkeletalActionData_t_1237;
 extern void struct_InputSkeletalActionData_t_1237_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1237_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1237 winInputOriginInfo_t_1237;
+extern void struct_InputOriginInfo_t_1237_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1237_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1237 winIVRSpatialAnchors_1237;
+extern void struct_IVRSpatialAnchors_1237_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1237_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1237 winIVRDebug_1237;
+extern void struct_IVRDebug_1237_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1237_win_to_lin(const void *w, void *l);
 typedef struct winVRVulkanTextureArrayData_t_1168 winVRVulkanTextureArrayData_t_1168;
 extern void struct_VRVulkanTextureArrayData_t_1168_lin_to_win(void *l, void *w);
 extern void struct_VRVulkanTextureArrayData_t_1168_win_to_lin(const void *w, void *l);
@@ -78,6 +102,9 @@ extern void struct_VRControllerState001_t_1168_win_to_lin(const void *w, void *l
 typedef struct winCameraVideoStreamFrameHeader_t_1168 winCameraVideoStreamFrameHeader_t_1168;
 extern void struct_CameraVideoStreamFrameHeader_t_1168_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_1168_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_1168 winVROverlayView_t_1168;
+extern void struct_VROverlayView_t_1168_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_1168_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_1168 winRenderModel_TextureMap_t_1168;
 extern void struct_RenderModel_TextureMap_t_1168_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_1168_win_to_lin(const void *w, void *l);
@@ -100,6 +127,15 @@ extern void struct_InputPoseActionData_t_1168_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1168 winInputSkeletalActionData_t_1168;
 extern void struct_InputSkeletalActionData_t_1168_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1168_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1168 winInputOriginInfo_t_1168;
+extern void struct_InputOriginInfo_t_1168_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1168_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1168 winIVRSpatialAnchors_1168;
+extern void struct_IVRSpatialAnchors_1168_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1168_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1168 winIVRDebug_1168;
+extern void struct_IVRDebug_1168_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1168_win_to_lin(const void *w, void *l);
 typedef struct winVRVulkanTextureArrayData_t_11415 winVRVulkanTextureArrayData_t_11415;
 extern void struct_VRVulkanTextureArrayData_t_11415_lin_to_win(void *l, void *w);
 extern void struct_VRVulkanTextureArrayData_t_11415_win_to_lin(const void *w, void *l);
@@ -112,6 +148,9 @@ extern void struct_VRControllerState001_t_11415_win_to_lin(const void *w, void *
 typedef struct winCameraVideoStreamFrameHeader_t_11415 winCameraVideoStreamFrameHeader_t_11415;
 extern void struct_CameraVideoStreamFrameHeader_t_11415_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_11415_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_11415 winVROverlayView_t_11415;
+extern void struct_VROverlayView_t_11415_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_11415_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_11415 winRenderModel_TextureMap_t_11415;
 extern void struct_RenderModel_TextureMap_t_11415_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_11415_win_to_lin(const void *w, void *l);
@@ -134,6 +173,15 @@ extern void struct_InputPoseActionData_t_11415_win_to_lin(const void *w, void *l
 typedef struct winInputSkeletalActionData_t_11415 winInputSkeletalActionData_t_11415;
 extern void struct_InputSkeletalActionData_t_11415_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_11415_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_11415 winInputOriginInfo_t_11415;
+extern void struct_InputOriginInfo_t_11415_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_11415_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_11415 winIVRSpatialAnchors_11415;
+extern void struct_IVRSpatialAnchors_11415_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_11415_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_11415 winIVRDebug_11415;
+extern void struct_IVRDebug_11415_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_11415_win_to_lin(const void *w, void *l);
 typedef struct winVRVulkanTextureArrayData_t_11310 winVRVulkanTextureArrayData_t_11310;
 extern void struct_VRVulkanTextureArrayData_t_11310_lin_to_win(void *l, void *w);
 extern void struct_VRVulkanTextureArrayData_t_11310_win_to_lin(const void *w, void *l);
@@ -146,6 +194,9 @@ extern void struct_VRControllerState001_t_11310_win_to_lin(const void *w, void *
 typedef struct winCameraVideoStreamFrameHeader_t_11310 winCameraVideoStreamFrameHeader_t_11310;
 extern void struct_CameraVideoStreamFrameHeader_t_11310_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_11310_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_11310 winVROverlayView_t_11310;
+extern void struct_VROverlayView_t_11310_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_11310_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_11310 winRenderModel_TextureMap_t_11310;
 extern void struct_RenderModel_TextureMap_t_11310_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_11310_win_to_lin(const void *w, void *l);
@@ -168,6 +219,15 @@ extern void struct_InputPoseActionData_t_11310_win_to_lin(const void *w, void *l
 typedef struct winInputSkeletalActionData_t_11310 winInputSkeletalActionData_t_11310;
 extern void struct_InputSkeletalActionData_t_11310_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_11310_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_11310 winInputOriginInfo_t_11310;
+extern void struct_InputOriginInfo_t_11310_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_11310_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_11310 winIVRSpatialAnchors_11310;
+extern void struct_IVRSpatialAnchors_11310_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_11310_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_11310 winIVRDebug_11310;
+extern void struct_IVRDebug_11310_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_11310_win_to_lin(const void *w, void *l);
 typedef struct winVRVulkanTextureArrayData_t_1125 winVRVulkanTextureArrayData_t_1125;
 extern void struct_VRVulkanTextureArrayData_t_1125_lin_to_win(void *l, void *w);
 extern void struct_VRVulkanTextureArrayData_t_1125_win_to_lin(const void *w, void *l);
@@ -180,6 +240,9 @@ extern void struct_VRControllerState001_t_1125_win_to_lin(const void *w, void *l
 typedef struct winCameraVideoStreamFrameHeader_t_1125 winCameraVideoStreamFrameHeader_t_1125;
 extern void struct_CameraVideoStreamFrameHeader_t_1125_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_1125_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_1125 winVROverlayView_t_1125;
+extern void struct_VROverlayView_t_1125_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_1125_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_1125 winRenderModel_TextureMap_t_1125;
 extern void struct_RenderModel_TextureMap_t_1125_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_1125_win_to_lin(const void *w, void *l);
@@ -202,6 +265,15 @@ extern void struct_InputPoseActionData_t_1125_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1125 winInputSkeletalActionData_t_1125;
 extern void struct_InputSkeletalActionData_t_1125_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1125_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1125 winInputOriginInfo_t_1125;
+extern void struct_InputOriginInfo_t_1125_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1125_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1125 winIVRSpatialAnchors_1125;
+extern void struct_IVRSpatialAnchors_1125_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1125_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1125 winIVRDebug_1125;
+extern void struct_IVRDebug_1125_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1125_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_11111 winVREvent_t_11111;
 extern void struct_VREvent_t_11111_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_11111_win_to_lin(const void *w, void *l);
@@ -211,6 +283,9 @@ extern void struct_VRControllerState001_t_11111_win_to_lin(const void *w, void *
 typedef struct winCameraVideoStreamFrameHeader_t_11111 winCameraVideoStreamFrameHeader_t_11111;
 extern void struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_11111 winVROverlayView_t_11111;
+extern void struct_VROverlayView_t_11111_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_11111_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_11111 winRenderModel_TextureMap_t_11111;
 extern void struct_RenderModel_TextureMap_t_11111_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_11111_win_to_lin(const void *w, void *l);
@@ -233,6 +308,15 @@ extern void struct_InputPoseActionData_t_11111_win_to_lin(const void *w, void *l
 typedef struct winInputSkeletalActionData_t_11111 winInputSkeletalActionData_t_11111;
 extern void struct_InputSkeletalActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_11111_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_11111 winInputOriginInfo_t_11111;
+extern void struct_InputOriginInfo_t_11111_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_11111_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_11111 winIVRSpatialAnchors_11111;
+extern void struct_IVRSpatialAnchors_11111_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_11111_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_11111 winIVRDebug_11111;
+extern void struct_IVRDebug_11111_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_11111_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_11030 winVREvent_t_11030;
 extern void struct_VREvent_t_11030_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_11030_win_to_lin(const void *w, void *l);
@@ -242,6 +326,9 @@ extern void struct_VRControllerState001_t_11030_win_to_lin(const void *w, void *
 typedef struct winCameraVideoStreamFrameHeader_t_11030 winCameraVideoStreamFrameHeader_t_11030;
 extern void struct_CameraVideoStreamFrameHeader_t_11030_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_CameraVideoStreamFrameHeader_t_11030_win_to_lin(const void *w, void *l);
+typedef struct winVROverlayView_t_11030 winVROverlayView_t_11030;
+extern void struct_VROverlayView_t_11030_lin_to_win(void *l, void *w);
+extern void struct_VROverlayView_t_11030_win_to_lin(const void *w, void *l);
 typedef struct winRenderModel_TextureMap_t_11030 winRenderModel_TextureMap_t_11030;
 extern void struct_RenderModel_TextureMap_t_11030_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_TextureMap_t_11030_win_to_lin(const void *w, void *l);
@@ -264,6 +351,15 @@ extern void struct_InputPoseActionData_t_11030_win_to_lin(const void *w, void *l
 typedef struct winInputSkeletalActionData_t_11030 winInputSkeletalActionData_t_11030;
 extern void struct_InputSkeletalActionData_t_11030_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_11030_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_11030 winInputOriginInfo_t_11030;
+extern void struct_InputOriginInfo_t_11030_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_11030_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_11030 winIVRSpatialAnchors_11030;
+extern void struct_IVRSpatialAnchors_11030_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_11030_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_11030 winIVRDebug_11030;
+extern void struct_IVRDebug_11030_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_11030_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1916 winVREvent_t_1916;
 extern void struct_VREvent_t_1916_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1916_win_to_lin(const void *w, void *l);
@@ -295,6 +391,15 @@ extern void struct_InputPoseActionData_t_1916_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1916 winInputSkeletalActionData_t_1916;
 extern void struct_InputSkeletalActionData_t_1916_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1916_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1916 winInputOriginInfo_t_1916;
+extern void struct_InputOriginInfo_t_1916_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1916_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1916 winIVRSpatialAnchors_1916;
+extern void struct_IVRSpatialAnchors_1916_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1916_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1916 winIVRDebug_1916;
+extern void struct_IVRDebug_1916_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1916_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1819 winVREvent_t_1819;
 extern void struct_VREvent_t_1819_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1819_win_to_lin(const void *w, void *l);
@@ -326,6 +431,15 @@ extern void struct_InputPoseActionData_t_1819_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1819 winInputSkeletalActionData_t_1819;
 extern void struct_InputSkeletalActionData_t_1819_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1819_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1819 winInputOriginInfo_t_1819;
+extern void struct_InputOriginInfo_t_1819_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1819_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1819 winIVRSpatialAnchors_1819;
+extern void struct_IVRSpatialAnchors_1819_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1819_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1819 winIVRDebug_1819;
+extern void struct_IVRDebug_1819_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1819_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1715 winVREvent_t_1715;
 extern void struct_VREvent_t_1715_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1715_win_to_lin(const void *w, void *l);
@@ -357,6 +471,15 @@ extern void struct_InputPoseActionData_t_1715_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1715 winInputSkeletalActionData_t_1715;
 extern void struct_InputSkeletalActionData_t_1715_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1715_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1715 winInputOriginInfo_t_1715;
+extern void struct_InputOriginInfo_t_1715_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1715_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1715 winIVRSpatialAnchors_1715;
+extern void struct_IVRSpatialAnchors_1715_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1715_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1715 winIVRDebug_1715;
+extern void struct_IVRDebug_1715_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1715_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1610 winVREvent_t_1610;
 extern void struct_VREvent_t_1610_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1610_win_to_lin(const void *w, void *l);
@@ -388,6 +511,15 @@ extern void struct_InputPoseActionData_t_1610_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1610 winInputSkeletalActionData_t_1610;
 extern void struct_InputSkeletalActionData_t_1610_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1610_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1610 winInputOriginInfo_t_1610;
+extern void struct_InputOriginInfo_t_1610_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1610_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1610 winIVRSpatialAnchors_1610;
+extern void struct_IVRSpatialAnchors_1610_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1610_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1610 winIVRDebug_1610;
+extern void struct_IVRDebug_1610_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1610_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1517 winVREvent_t_1517;
 extern void struct_VREvent_t_1517_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1517_win_to_lin(const void *w, void *l);
@@ -419,6 +551,15 @@ extern void struct_InputPoseActionData_t_1517_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1517 winInputSkeletalActionData_t_1517;
 extern void struct_InputSkeletalActionData_t_1517_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1517_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1517 winInputOriginInfo_t_1517;
+extern void struct_InputOriginInfo_t_1517_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1517_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1517 winIVRSpatialAnchors_1517;
+extern void struct_IVRSpatialAnchors_1517_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1517_win_to_lin(const void *w, void *l);
+typedef struct winIVRDebug_1517 winIVRDebug_1517;
+extern void struct_IVRDebug_1517_lin_to_win(void *l, void *w);
+extern void struct_IVRDebug_1517_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1418 winVREvent_t_1418;
 extern void struct_VREvent_t_1418_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1418_win_to_lin(const void *w, void *l);
@@ -450,6 +591,12 @@ extern void struct_InputPoseActionData_t_1418_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1418 winInputSkeletalActionData_t_1418;
 extern void struct_InputSkeletalActionData_t_1418_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1418_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1418 winInputOriginInfo_t_1418;
+extern void struct_InputOriginInfo_t_1418_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1418_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1418 winIVRSpatialAnchors_1418;
+extern void struct_IVRSpatialAnchors_1418_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1418_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1322 winVREvent_t_1322;
 extern void struct_VREvent_t_1322_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1322_win_to_lin(const void *w, void *l);
@@ -481,6 +628,12 @@ extern void struct_InputPoseActionData_t_1322_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1322 winInputSkeletalActionData_t_1322;
 extern void struct_InputSkeletalActionData_t_1322_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1322_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1322 winInputOriginInfo_t_1322;
+extern void struct_InputOriginInfo_t_1322_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1322_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1322 winIVRSpatialAnchors_1322;
+extern void struct_IVRSpatialAnchors_1322_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1322_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1210 winVREvent_t_1210;
 extern void struct_VREvent_t_1210_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1210_win_to_lin(const void *w, void *l);
@@ -512,6 +665,12 @@ extern void struct_InputPoseActionData_t_1210_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1210 winInputSkeletalActionData_t_1210;
 extern void struct_InputSkeletalActionData_t_1210_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1210_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1210 winInputOriginInfo_t_1210;
+extern void struct_InputOriginInfo_t_1210_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1210_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1210 winIVRSpatialAnchors_1210;
+extern void struct_IVRSpatialAnchors_1210_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1210_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_113b winVREvent_t_113b;
 extern void struct_VREvent_t_113b_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_113b_win_to_lin(const void *w, void *l);
@@ -543,6 +702,12 @@ extern void struct_InputPoseActionData_t_113b_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_113b winInputSkeletalActionData_t_113b;
 extern void struct_InputSkeletalActionData_t_113b_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_113b_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_113b winInputOriginInfo_t_113b;
+extern void struct_InputOriginInfo_t_113b_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_113b_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_113b winIVRSpatialAnchors_113b;
+extern void struct_IVRSpatialAnchors_113b_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_113b_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1017 winVREvent_t_1017;
 extern void struct_VREvent_t_1017_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1017_win_to_lin(const void *w, void *l);
@@ -574,6 +739,12 @@ extern void struct_InputPoseActionData_t_1017_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1017 winInputSkeletalActionData_t_1017;
 extern void struct_InputSkeletalActionData_t_1017_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1017_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1017 winInputOriginInfo_t_1017;
+extern void struct_InputOriginInfo_t_1017_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1017_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1017 winIVRSpatialAnchors_1017;
+extern void struct_IVRSpatialAnchors_1017_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1017_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1016 winVREvent_t_1016;
 extern void struct_VREvent_t_1016_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1016_win_to_lin(const void *w, void *l);
@@ -602,6 +773,12 @@ extern void struct_InputPoseActionData_t_1016_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletalActionData_t_1016 winInputSkeletalActionData_t_1016;
 extern void struct_InputSkeletalActionData_t_1016_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_InputSkeletalActionData_t_1016_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1016 winInputOriginInfo_t_1016;
+extern void struct_InputOriginInfo_t_1016_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1016_win_to_lin(const void *w, void *l);
+typedef struct winIVRSpatialAnchors_1016 winIVRSpatialAnchors_1016;
+extern void struct_IVRSpatialAnchors_1016_lin_to_win(void *l, void *w);
+extern void struct_IVRSpatialAnchors_1016_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1015 winVREvent_t_1015;
 extern void struct_VREvent_t_1015_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1015_win_to_lin(const void *w, void *l);
@@ -630,6 +807,9 @@ extern void struct_InputPoseActionData_t_1015_win_to_lin(const void *w, void *l)
 typedef struct winInputSkeletonActionData_t_1015 winInputSkeletonActionData_t_1015;
 extern void struct_InputSkeletonActionData_t_1015_lin_to_win(void *l, void *w);
 extern void struct_InputSkeletonActionData_t_1015_win_to_lin(const void *w, void *l);
+typedef struct winInputOriginInfo_t_1015 winInputOriginInfo_t_1015;
+extern void struct_InputOriginInfo_t_1015_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_InputOriginInfo_t_1015_win_to_lin(const void *w, void *l);
 typedef struct winVREvent_t_1014 winVREvent_t_1014;
 extern void struct_VREvent_t_1014_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VREvent_t_1014_win_to_lin(const void *w, void *l);
@@ -988,6 +1168,9 @@ extern void struct_RenderModel_t_0915_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_0915_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_0915 *struct_RenderModel_t_0915_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_0915_unwrap(winRenderModel_t_0915 *w);
+typedef struct winVREvent_t_0914 winVREvent_t_0914;
+extern void struct_VREvent_t_0914_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_0914_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_0914 winVRControllerState001_t_0914;
 extern void struct_VRControllerState001_t_0914_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_0914_win_to_lin(const void *w, void *l);
@@ -1007,6 +1190,9 @@ extern void struct_RenderModel_t_0914_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_0914_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_0914 *struct_RenderModel_t_0914_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_0914_unwrap(winRenderModel_t_0914 *w);
+typedef struct winVREvent_t_0913 winVREvent_t_0913;
+extern void struct_VREvent_t_0913_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_0913_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_0913 winVRControllerState001_t_0913;
 extern void struct_VRControllerState001_t_0913_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_0913_win_to_lin(const void *w, void *l);
@@ -1026,6 +1212,9 @@ extern void struct_RenderModel_t_0913_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_0913_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_0913 *struct_RenderModel_t_0913_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_0913_unwrap(winRenderModel_t_0913 *w);
+typedef struct winVREvent_t_0912 winVREvent_t_0912;
+extern void struct_VREvent_t_0912_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_0912_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_0912 winVRControllerState001_t_0912;
 extern void struct_VRControllerState001_t_0912_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_0912_win_to_lin(const void *w, void *l);
@@ -1055,6 +1244,9 @@ extern void struct_RenderModel_t_0910_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_0910_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_0910 *struct_RenderModel_t_0910_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_0910_unwrap(winRenderModel_t_0910 *w);
+typedef struct winVREvent_t_0910 winVREvent_t_0910;
+extern void struct_VREvent_t_0910_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_0910_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_0910 winVRControllerState001_t_0910;
 extern void struct_VRControllerState001_t_0910_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_0910_win_to_lin(const void *w, void *l);
@@ -1071,6 +1263,9 @@ extern void struct_RenderModel_t_099_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_099_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_099 *struct_RenderModel_t_099_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_099_unwrap(winRenderModel_t_099 *w);
+typedef struct winVREvent_t_099 winVREvent_t_099;
+extern void struct_VREvent_t_099_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_099_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_099 winVRControllerState001_t_099;
 extern void struct_VRControllerState001_t_099_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_099_win_to_lin(const void *w, void *l);
@@ -1087,6 +1282,9 @@ extern void struct_RenderModel_t_098_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_098_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_098 *struct_RenderModel_t_098_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_098_unwrap(winRenderModel_t_098 *w);
+typedef struct winVREvent_t_098 winVREvent_t_098;
+extern void struct_VREvent_t_098_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_098_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_098 winVRControllerState001_t_098;
 extern void struct_VRControllerState001_t_098_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_098_win_to_lin(const void *w, void *l);
@@ -1103,6 +1301,9 @@ extern void struct_RenderModel_t_097_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_097_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_097 *struct_RenderModel_t_097_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_097_unwrap(winRenderModel_t_097 *w);
+typedef struct winVREvent_t_097 winVREvent_t_097;
+extern void struct_VREvent_t_097_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_097_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_097 winVRControllerState001_t_097;
 extern void struct_VRControllerState001_t_097_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_097_win_to_lin(const void *w, void *l);
@@ -1119,6 +1320,9 @@ extern void struct_RenderModel_t_096_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_096_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_096 *struct_RenderModel_t_096_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_096_unwrap(winRenderModel_t_096 *w);
+typedef struct winVREvent_t_096 winVREvent_t_096;
+extern void struct_VREvent_t_096_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_096_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_096 winVRControllerState001_t_096;
 extern void struct_VRControllerState001_t_096_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_096_win_to_lin(const void *w, void *l);
@@ -1135,6 +1339,9 @@ extern void struct_RenderModel_t_094_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_094_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_094 *struct_RenderModel_t_094_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_094_unwrap(winRenderModel_t_094 *w);
+typedef struct winVREvent_t_094 winVREvent_t_094;
+extern void struct_VREvent_t_094_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_094_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_094 winVRControllerState001_t_094;
 extern void struct_VRControllerState001_t_094_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_094_win_to_lin(const void *w, void *l);
@@ -1151,6 +1358,9 @@ extern void struct_RenderModel_t_093_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_093_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_093 *struct_RenderModel_t_093_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_093_unwrap(winRenderModel_t_093 *w);
+typedef struct winVREvent_t_093 winVREvent_t_093;
+extern void struct_VREvent_t_093_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_093_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_093 winVRControllerState001_t_093;
 extern void struct_VRControllerState001_t_093_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_093_win_to_lin(const void *w, void *l);
@@ -1167,6 +1377,9 @@ extern void struct_RenderModel_t_092_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_092_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_092 *struct_RenderModel_t_092_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_092_unwrap(winRenderModel_t_092 *w);
+typedef struct winVREvent_t_092 winVREvent_t_092;
+extern void struct_VREvent_t_092_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_092_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_092 winVRControllerState001_t_092;
 extern void struct_VRControllerState001_t_092_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_092_win_to_lin(const void *w, void *l);
@@ -1183,6 +1396,9 @@ extern void struct_RenderModel_t_091_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_091_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_091 *struct_RenderModel_t_091_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_091_unwrap(winRenderModel_t_091 *w);
+typedef struct winVREvent_t_091 winVREvent_t_091;
+extern void struct_VREvent_t_091_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_091_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_091 winVRControllerState001_t_091;
 extern void struct_VRControllerState001_t_091_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_091_win_to_lin(const void *w, void *l);
@@ -1199,6 +1415,9 @@ extern void struct_RenderModel_t_090_lin_to_win(void *l, void *w);
 extern void struct_RenderModel_t_090_win_to_lin(const void *w, void *l);
 extern struct winRenderModel_t_090 *struct_RenderModel_t_090_wrap(void *l);
 extern RenderModel_t *struct_RenderModel_t_090_unwrap(winRenderModel_t_090 *w);
+typedef struct winVREvent_t_090 winVREvent_t_090;
+extern void struct_VREvent_t_090_lin_to_win(void *l, void *w, uint32_t sz);
+extern void struct_VREvent_t_090_win_to_lin(const void *w, void *l);
 typedef struct winVRControllerState001_t_090 winVRControllerState001_t_090;
 extern void struct_VRControllerState001_t_090_lin_to_win(void *l, void *w, uint32_t sz);
 extern void struct_VRControllerState001_t_090_win_to_lin(const void *w, void *l);
diff --git a/vrclient_x64/vrclient_x64/struct_converters_090.cpp b/vrclient_x64/vrclient_x64/struct_converters_090.cpp
index 2dfeac0b..e7a739f5 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_090.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_090.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_090_unwrap(winRenderModel_t_090 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_090 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_090_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_090 *win = (struct winVREvent_t_090 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_090_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_090 *win = (struct winVREvent_t_090 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_090 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_091.cpp b/vrclient_x64/vrclient_x64/struct_converters_091.cpp
index c4865b3c..d2e8bc2e 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_091.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_091.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_091_unwrap(winRenderModel_t_091 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_091 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_091_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_091 *win = (struct winVREvent_t_091 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_091_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_091 *win = (struct winVREvent_t_091 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_091 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
index d6e4b337..6fe23963 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_0910_unwrap(winRenderModel_t_0910 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_0910 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_0910_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_0910 *win = (struct winVREvent_t_0910 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_0910_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_0910 *win = (struct winVREvent_t_0910 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_0910 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
index 625d4ada..15564684 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
@@ -6,6 +6,35 @@
 using namespace vr;
 extern "C" {
 #include "struct_converters.h"
+#pragma pack(push, 8)
+struct winVREvent_t_0912 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_0912_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_0912 *win = (struct winVREvent_t_0912 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_0912_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_0912 *win = (struct winVREvent_t_0912 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_0912 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
index 88cdf200..27c001ef 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
@@ -6,6 +6,35 @@
 using namespace vr;
 extern "C" {
 #include "struct_converters.h"
+#pragma pack(push, 8)
+struct winVREvent_t_0913 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_0913_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_0913 *win = (struct winVREvent_t_0913 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_0913_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_0913 *win = (struct winVREvent_t_0913 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_0913 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
index 4f7f3049..e9727a4c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
@@ -6,6 +6,35 @@
 using namespace vr;
 extern "C" {
 #include "struct_converters.h"
+#pragma pack(push, 8)
+struct winVREvent_t_0914 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_0914_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_0914 *win = (struct winVREvent_t_0914 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_0914_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_0914 *win = (struct winVREvent_t_0914 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_0914 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_092.cpp b/vrclient_x64/vrclient_x64/struct_converters_092.cpp
index 763d1a99..c3ebe415 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_092.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_092.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_092_unwrap(winRenderModel_t_092 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_092 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_092_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_092 *win = (struct winVREvent_t_092 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_092_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_092 *win = (struct winVREvent_t_092 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_092 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_093.cpp b/vrclient_x64/vrclient_x64/struct_converters_093.cpp
index 1dc91cc1..a82238f7 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_093.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_093.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_093_unwrap(winRenderModel_t_093 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_093 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_093_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_093 *win = (struct winVREvent_t_093 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_093_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_093 *win = (struct winVREvent_t_093 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_093 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_094.cpp b/vrclient_x64/vrclient_x64/struct_converters_094.cpp
index 567cce57..e26cc6c6 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_094.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_094.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_094_unwrap(winRenderModel_t_094 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_094 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_094_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_094 *win = (struct winVREvent_t_094 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_094_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_094 *win = (struct winVREvent_t_094 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_094 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_096.cpp b/vrclient_x64/vrclient_x64/struct_converters_096.cpp
index 6201f052..27d64a68 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_096.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_096.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_096_unwrap(winRenderModel_t_096 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_096 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_096_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_096 *win = (struct winVREvent_t_096 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_096_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_096 *win = (struct winVREvent_t_096 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_096 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_097.cpp b/vrclient_x64/vrclient_x64/struct_converters_097.cpp
index 891780f5..dc2bbd72 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_097.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_097.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_097_unwrap(winRenderModel_t_097 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_097 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_097_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_097 *win = (struct winVREvent_t_097 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_097_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_097 *win = (struct winVREvent_t_097 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_097 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_098.cpp b/vrclient_x64/vrclient_x64/struct_converters_098.cpp
index 1bfd7e6d..fcef0865 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_098.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_098.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_098_unwrap(winRenderModel_t_098 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_098 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_098_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_098 *win = (struct winVREvent_t_098 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_098_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_098 *win = (struct winVREvent_t_098 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_098 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_099.cpp b/vrclient_x64/vrclient_x64/struct_converters_099.cpp
index 7e462dfc..728d3c97 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_099.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_099.cpp
@@ -110,6 +110,35 @@ struct RenderModel_t *struct_RenderModel_t_099_unwrap(winRenderModel_t_099 *w)
     return ret;
 }
 
+#pragma pack(push, 8)
+struct winVREvent_t_099 {
+    vr::EVREventType eventType;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
+    float eventAgeSeconds;
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VREvent_t_099_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winVREvent_t_099 *win = (struct winVREvent_t_099 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    win->eventType = lin->eventType;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win)));
+    win->eventAgeSeconds = lin->eventAgeSeconds;
+}
+
+void struct_VREvent_t_099_win_to_lin(const void *w, void *l)
+{
+    struct winVREvent_t_099 *win = (struct winVREvent_t_099 *)w;
+    VREvent_t *lin = (VREvent_t *)l;
+    lin->eventType = win->eventType;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    lin->data = win->data;
+    lin->eventAgeSeconds = win->eventAgeSeconds;
+}
+
 #pragma pack(push, 8)
 struct winVRControllerState001_t_099 {
     uint32_t unPacketNum;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1015.cpp b/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
index cf4d54e0..b827de45 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
@@ -289,5 +289,31 @@ void struct_InputSkeletonActionData_t_1015_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1015 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1015_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1015 *win = (struct winInputOriginInfo_t_1015 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1015_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1015 *win = (struct winInputOriginInfo_t_1015 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1016.cpp b/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
index 8a9971df..7d4ecaa2 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
@@ -292,5 +292,48 @@ void struct_InputSkeletalActionData_t_1016_win_to_lin(const void *w, void *l)
     lin->boneCount = win->boneCount;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1016 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1016_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1016 *win = (struct winInputOriginInfo_t_1016 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1016_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1016 *win = (struct winInputOriginInfo_t_1016 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1016 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1016_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1016 *win = (struct winIVRSpatialAnchors_1016 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1016_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1016 *win = (struct winIVRSpatialAnchors_1016 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1017.cpp b/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
index 2b3a7262..a0ff3dc8 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
@@ -330,5 +330,48 @@ void struct_InputSkeletalActionData_t_1017_win_to_lin(const void *w, void *l)
     lin->boneCount = win->boneCount;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1017 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1017_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1017 *win = (struct winInputOriginInfo_t_1017 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1017_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1017 *win = (struct winInputOriginInfo_t_1017 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1017 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1017_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1017 *win = (struct winIVRSpatialAnchors_1017 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1017_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1017 *win = (struct winIVRSpatialAnchors_1017 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_11030.cpp b/vrclient_x64/vrclient_x64/struct_converters_11030.cpp
index c01ffb32..22d05710 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_11030.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_11030.cpp
@@ -102,6 +102,32 @@ void struct_CameraVideoStreamFrameHeader_t_11030_win_to_lin(const void *w, void
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_11030 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_11030_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_11030 *win = (struct winVROverlayView_t_11030 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_11030_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_11030 *win = (struct winVROverlayView_t_11030 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_11030 {
     uint16_t unWidth;
@@ -327,5 +353,65 @@ void struct_InputSkeletalActionData_t_11030_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_11030 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_11030_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_11030 *win = (struct winInputOriginInfo_t_11030 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_11030_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_11030 *win = (struct winInputOriginInfo_t_11030 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_11030 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_11030_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_11030 *win = (struct winIVRSpatialAnchors_11030 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_11030_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_11030 *win = (struct winIVRSpatialAnchors_11030 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_11030 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_11030_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_11030 *win = (struct winIVRDebug_11030 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_11030_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_11030 *win = (struct winIVRDebug_11030 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_11111.cpp b/vrclient_x64/vrclient_x64/struct_converters_11111.cpp
index 39963a0e..f9b8f843 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_11111.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_11111.cpp
@@ -102,6 +102,32 @@ void struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(const void *w, void
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_11111 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_11111_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_11111 *win = (struct winVROverlayView_t_11111 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_11111_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_11111 *win = (struct winVROverlayView_t_11111 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_11111 {
     uint16_t unWidth;
@@ -331,5 +357,65 @@ void struct_InputSkeletalActionData_t_11111_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_11111 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_11111_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_11111 *win = (struct winInputOriginInfo_t_11111 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_11111_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_11111 *win = (struct winInputOriginInfo_t_11111 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_11111 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_11111_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_11111 *win = (struct winIVRSpatialAnchors_11111 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_11111_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_11111 *win = (struct winIVRSpatialAnchors_11111 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_11111 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_11111_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_11111 *win = (struct winIVRDebug_11111 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_11111_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_11111 *win = (struct winIVRDebug_11111 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1125.cpp b/vrclient_x64/vrclient_x64/struct_converters_1125.cpp
index 32e511f4..4fae3d53 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1125.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1125.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_1125_win_to_lin(const void *w, void *
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_1125 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_1125_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_1125 *win = (struct winVROverlayView_t_1125 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_1125_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_1125 *win = (struct winVROverlayView_t_1125 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_1125 {
     uint16_t unWidth;
@@ -354,5 +380,65 @@ void struct_InputSkeletalActionData_t_1125_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1125 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1125_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1125 *win = (struct winInputOriginInfo_t_1125 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1125_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1125 *win = (struct winInputOriginInfo_t_1125 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1125 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1125_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1125 *win = (struct winIVRSpatialAnchors_1125 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1125_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1125 *win = (struct winIVRSpatialAnchors_1125 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1125 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1125_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1125 *win = (struct winIVRDebug_1125 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1125_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1125 *win = (struct winIVRDebug_1125 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_11310.cpp b/vrclient_x64/vrclient_x64/struct_converters_11310.cpp
index 6f3a4768..250001ca 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_11310.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_11310.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_11310_win_to_lin(const void *w, void
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_11310 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_11310_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_11310 *win = (struct winVROverlayView_t_11310 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_11310_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_11310 *win = (struct winVROverlayView_t_11310 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_11310 {
     uint16_t unWidth;
@@ -354,5 +380,65 @@ void struct_InputSkeletalActionData_t_11310_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_11310 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_11310_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_11310 *win = (struct winInputOriginInfo_t_11310 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_11310_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_11310 *win = (struct winInputOriginInfo_t_11310 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_11310 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_11310_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_11310 *win = (struct winIVRSpatialAnchors_11310 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_11310_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_11310 *win = (struct winIVRSpatialAnchors_11310 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_11310 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_11310_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_11310 *win = (struct winIVRDebug_11310 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_11310_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_11310 *win = (struct winIVRDebug_11310 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_113b.cpp b/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
index e3da7626..794abd33 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
@@ -327,5 +327,48 @@ void struct_InputSkeletalActionData_t_113b_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_113b {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_113b_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_113b *win = (struct winInputOriginInfo_t_113b *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_113b_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_113b *win = (struct winInputOriginInfo_t_113b *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_113b {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_113b_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_113b *win = (struct winIVRSpatialAnchors_113b *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_113b_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_113b *win = (struct winIVRSpatialAnchors_113b *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_11415.cpp b/vrclient_x64/vrclient_x64/struct_converters_11415.cpp
index 791e7bbe..9038246c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_11415.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_11415.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_11415_win_to_lin(const void *w, void
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_11415 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_11415_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_11415 *win = (struct winVROverlayView_t_11415 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_11415_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_11415 *win = (struct winVROverlayView_t_11415 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_11415 {
     uint16_t unWidth;
@@ -354,5 +380,65 @@ void struct_InputSkeletalActionData_t_11415_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_11415 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_11415_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_11415 *win = (struct winInputOriginInfo_t_11415 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_11415_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_11415 *win = (struct winInputOriginInfo_t_11415 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_11415 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_11415_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_11415 *win = (struct winIVRSpatialAnchors_11415 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_11415_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_11415 *win = (struct winIVRSpatialAnchors_11415 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_11415 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_11415_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_11415 *win = (struct winIVRDebug_11415 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_11415_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_11415 *win = (struct winIVRDebug_11415 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1168.cpp b/vrclient_x64/vrclient_x64/struct_converters_1168.cpp
index 845aa5b0..4aaebb70 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1168.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1168.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_1168_win_to_lin(const void *w, void *
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_1168 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_1168_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_1168 *win = (struct winVROverlayView_t_1168 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_1168_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_1168 *win = (struct winVROverlayView_t_1168 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_1168 {
     uint16_t unWidth;
@@ -354,5 +380,65 @@ void struct_InputSkeletalActionData_t_1168_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1168 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1168_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1168 *win = (struct winInputOriginInfo_t_1168 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1168_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1168 *win = (struct winInputOriginInfo_t_1168 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1168 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1168_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1168 *win = (struct winIVRSpatialAnchors_1168 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1168_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1168 *win = (struct winIVRSpatialAnchors_1168 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1168 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1168_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1168 *win = (struct winIVRDebug_1168 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1168_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1168 *win = (struct winIVRDebug_1168 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1210.cpp b/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
index eb921918..95361eba 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
@@ -327,5 +327,48 @@ void struct_InputSkeletalActionData_t_1210_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1210 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1210_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1210 *win = (struct winInputOriginInfo_t_1210 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1210_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1210 *win = (struct winInputOriginInfo_t_1210 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1210 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1210_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1210 *win = (struct winIVRSpatialAnchors_1210 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1210_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1210 *win = (struct winIVRSpatialAnchors_1210 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1237.cpp b/vrclient_x64/vrclient_x64/struct_converters_1237.cpp
index fd363e23..634d2849 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1237.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1237.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_1237_win_to_lin(const void *w, void *
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_1237 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_1237_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_1237 *win = (struct winVROverlayView_t_1237 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_1237_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_1237 *win = (struct winVROverlayView_t_1237 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_1237 {
     uint16_t unWidth;
@@ -358,5 +384,65 @@ void struct_InputSkeletalActionData_t_1237_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1237 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1237_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1237 *win = (struct winInputOriginInfo_t_1237 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1237_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1237 *win = (struct winInputOriginInfo_t_1237 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1237 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1237_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1237 *win = (struct winIVRSpatialAnchors_1237 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1237_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1237 *win = (struct winIVRSpatialAnchors_1237 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1237 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1237_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1237 *win = (struct winIVRDebug_1237 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1237_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1237 *win = (struct winIVRDebug_1237 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1267.cpp b/vrclient_x64/vrclient_x64/struct_converters_1267.cpp
index 17fe58c8..59545614 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1267.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1267.cpp
@@ -125,6 +125,32 @@ void struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(const void *w, void *
     lin->ulFrameExposureTime = win->ulFrameExposureTime;
 }
 
+#pragma pack(push, 8)
+struct winVROverlayView_t_1267 {
+    vr::VROverlayHandle_t overlayHandle;
+    vr::Texture_t texture __attribute__((aligned(4)));
+    vr::VRTextureBounds_t textureBounds __attribute__((aligned(4)));
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_VROverlayView_t_1267_lin_to_win(void *l, void *w)
+{
+    struct winVROverlayView_t_1267 *win = (struct winVROverlayView_t_1267 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    win->overlayHandle = lin->overlayHandle;
+    win->texture = lin->texture;
+    win->textureBounds = lin->textureBounds;
+}
+
+void struct_VROverlayView_t_1267_win_to_lin(const void *w, void *l)
+{
+    struct winVROverlayView_t_1267 *win = (struct winVROverlayView_t_1267 *)w;
+    VROverlayView_t *lin = (VROverlayView_t *)l;
+    lin->overlayHandle = win->overlayHandle;
+    lin->texture = win->texture;
+    lin->textureBounds = win->textureBounds;
+}
+
 #pragma pack(push, 8)
 struct winRenderModel_TextureMap_t_1267 {
     uint16_t unWidth;
@@ -358,5 +384,65 @@ void struct_InputSkeletalActionData_t_1267_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1267 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1267_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1267 *win = (struct winInputOriginInfo_t_1267 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1267_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1267 *win = (struct winInputOriginInfo_t_1267 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1267 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1267_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1267 *win = (struct winIVRSpatialAnchors_1267 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1267_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1267 *win = (struct winIVRSpatialAnchors_1267 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1267 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1267_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1267 *win = (struct winIVRDebug_1267 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1267_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1267 *win = (struct winIVRDebug_1267 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1322.cpp b/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
index 10c7dd95..f2f86169 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
@@ -327,5 +327,48 @@ void struct_InputSkeletalActionData_t_1322_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1322 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1322_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1322 *win = (struct winInputOriginInfo_t_1322 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1322_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1322 *win = (struct winInputOriginInfo_t_1322 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1322 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1322_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1322 *win = (struct winIVRSpatialAnchors_1322 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1322_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1322 *win = (struct winIVRSpatialAnchors_1322 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1418.cpp b/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
index b5d93aad..8596c434 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
@@ -327,5 +327,48 @@ void struct_InputSkeletalActionData_t_1418_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1418 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1418_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1418 *win = (struct winInputOriginInfo_t_1418 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1418_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1418 *win = (struct winInputOriginInfo_t_1418 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1418 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1418_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1418 *win = (struct winIVRSpatialAnchors_1418 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1418_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1418 *win = (struct winIVRSpatialAnchors_1418 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1517.cpp b/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
index 808e491e..c536bf7c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
@@ -327,5 +327,65 @@ void struct_InputSkeletalActionData_t_1517_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1517 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1517_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1517 *win = (struct winInputOriginInfo_t_1517 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1517_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1517 *win = (struct winInputOriginInfo_t_1517 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1517 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1517_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1517 *win = (struct winIVRSpatialAnchors_1517 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1517_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1517 *win = (struct winIVRSpatialAnchors_1517 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1517 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1517_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1517 *win = (struct winIVRDebug_1517 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1517_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1517 *win = (struct winIVRDebug_1517 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1610.cpp b/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
index 596b714a..3342c1fc 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
@@ -327,5 +327,65 @@ void struct_InputSkeletalActionData_t_1610_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1610 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1610_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1610 *win = (struct winInputOriginInfo_t_1610 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1610_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1610 *win = (struct winInputOriginInfo_t_1610 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1610 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1610_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1610 *win = (struct winIVRSpatialAnchors_1610 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1610_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1610 *win = (struct winIVRSpatialAnchors_1610 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1610 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1610_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1610 *win = (struct winIVRDebug_1610 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1610_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1610 *win = (struct winIVRDebug_1610 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1715.cpp b/vrclient_x64/vrclient_x64/struct_converters_1715.cpp
index 251cdbac..4a0fae5c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1715.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1715.cpp
@@ -327,5 +327,65 @@ void struct_InputSkeletalActionData_t_1715_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1715 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1715_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1715 *win = (struct winInputOriginInfo_t_1715 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1715_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1715 *win = (struct winInputOriginInfo_t_1715 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1715 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1715_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1715 *win = (struct winIVRSpatialAnchors_1715 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1715_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1715 *win = (struct winIVRSpatialAnchors_1715 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1715 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1715_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1715 *win = (struct winIVRDebug_1715 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1715_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1715 *win = (struct winIVRDebug_1715 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1819.cpp b/vrclient_x64/vrclient_x64/struct_converters_1819.cpp
index c87db12e..276c0b35 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1819.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1819.cpp
@@ -327,5 +327,65 @@ void struct_InputSkeletalActionData_t_1819_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1819 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1819_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1819 *win = (struct winInputOriginInfo_t_1819 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1819_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1819 *win = (struct winInputOriginInfo_t_1819 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1819 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1819_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1819 *win = (struct winIVRSpatialAnchors_1819 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1819_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1819 *win = (struct winIVRSpatialAnchors_1819 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1819 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1819_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1819 *win = (struct winIVRDebug_1819 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1819_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1819 *win = (struct winIVRDebug_1819 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1916.cpp b/vrclient_x64/vrclient_x64/struct_converters_1916.cpp
index 4cc57757..3b081ca2 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1916.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1916.cpp
@@ -327,5 +327,65 @@ void struct_InputSkeletalActionData_t_1916_win_to_lin(const void *w, void *l)
     lin->activeOrigin = win->activeOrigin;
 }
 
+#pragma pack(push, 8)
+struct winInputOriginInfo_t_1916 {
+    vr::VRInputValueHandle_t devicePath;
+    vr::TrackedDeviceIndex_t trackedDeviceIndex;
+    char rchRenderModelComponentName[128];
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_InputOriginInfo_t_1916_lin_to_win(void *l, void *w, uint32_t sz)
+{
+    struct winInputOriginInfo_t_1916 *win = (struct winInputOriginInfo_t_1916 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    win->devicePath = lin->devicePath;
+    win->trackedDeviceIndex = lin->trackedDeviceIndex;
+    memcpy(win->rchRenderModelComponentName, lin->rchRenderModelComponentName, sizeof(win->rchRenderModelComponentName));
+}
+
+void struct_InputOriginInfo_t_1916_win_to_lin(const void *w, void *l)
+{
+    struct winInputOriginInfo_t_1916 *win = (struct winInputOriginInfo_t_1916 *)w;
+    InputOriginInfo_t *lin = (InputOriginInfo_t *)l;
+    lin->devicePath = win->devicePath;
+    lin->trackedDeviceIndex = win->trackedDeviceIndex;
+    memcpy(lin->rchRenderModelComponentName, win->rchRenderModelComponentName, sizeof(lin->rchRenderModelComponentName));
+}
+
+#pragma pack(push, 8)
+struct winIVRSpatialAnchors_1916 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRSpatialAnchors_1916_lin_to_win(void *l, void *w)
+{
+    struct winIVRSpatialAnchors_1916 *win = (struct winIVRSpatialAnchors_1916 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+void struct_IVRSpatialAnchors_1916_win_to_lin(const void *w, void *l)
+{
+    struct winIVRSpatialAnchors_1916 *win = (struct winIVRSpatialAnchors_1916 *)w;
+    IVRSpatialAnchors *lin = (IVRSpatialAnchors *)l;
+}
+
+#pragma pack(push, 8)
+struct winIVRDebug_1916 {
+}  __attribute__ ((ms_struct));
+#pragma pack(pop)
+
+void struct_IVRDebug_1916_lin_to_win(void *l, void *w)
+{
+    struct winIVRDebug_1916 *win = (struct winIVRDebug_1916 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
+void struct_IVRDebug_1916_win_to_lin(const void *w, void *l)
+{
+    struct winIVRDebug_1916 *win = (struct winIVRDebug_1916 *)w;
+    IVRDebug *lin = (IVRDebug *)l;
+}
+
 
 }
diff --git a/vrclient_x64/vrclient_x64/winIVRInput.c b/vrclient_x64/vrclient_x64/winIVRInput.c
index 735871bc..c6d48b5c 100644
--- a/vrclient_x64/vrclient_x64/winIVRInput.c
+++ b/vrclient_x64/vrclient_x64/winIVRInput.c
@@ -243,7 +243,7 @@ uint32_t __thiscall winIVRInput_IVRInput_003_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1015 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo_params params =
     {
@@ -602,7 +602,7 @@ uint32_t __thiscall winIVRInput_IVRInput_004_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1017 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo_params params =
     {
@@ -1051,7 +1051,7 @@ uint32_t __thiscall winIVRInput_IVRInput_005_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1322 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo_params params =
     {
@@ -1543,7 +1543,7 @@ uint32_t __thiscall winIVRInput_IVRInput_006_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1418 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo_params params =
     {
@@ -2039,7 +2039,7 @@ uint32_t __thiscall winIVRInput_IVRInput_007_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1916 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo_params params =
     {
@@ -2598,7 +2598,7 @@ uint32_t __thiscall winIVRInput_IVRInput_010_GetOriginLocalizedName(struct w_ste
     return params._ret;
 }
 
-uint32_t __thiscall winIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
+uint32_t __thiscall winIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo(struct w_steam_iface *_this, uint64_t origin, winInputOriginInfo_t_1267 *pOriginInfo, uint32_t unOriginInfoSize)
 {
     struct cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo_params params =
     {
diff --git a/vrclient_x64/vrclient_x64/winIVROverlay.c b/vrclient_x64/vrclient_x64/winIVROverlay.c
index 56478977..283f97a7 100644
--- a/vrclient_x64/vrclient_x64/winIVROverlay.c
+++ b/vrclient_x64/vrclient_x64/winIVROverlay.c
@@ -396,7 +396,7 @@ bool __thiscall winIVROverlay_IVROverlay_001_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_001_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_001_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_092 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_001_PollNextOverlayEvent_params params =
     {
@@ -1085,7 +1085,7 @@ bool __thiscall winIVROverlay_IVROverlay_002_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_002_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_002_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_094 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_002_PollNextOverlayEvent_params params =
     {
@@ -1855,7 +1855,7 @@ bool __thiscall winIVROverlay_IVROverlay_003_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_003_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_003_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_097 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_003_PollNextOverlayEvent_params params =
     {
@@ -2674,7 +2674,7 @@ bool __thiscall winIVROverlay_IVROverlay_004_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_004_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_004_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_098 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_004_PollNextOverlayEvent_params params =
     {
@@ -3501,7 +3501,7 @@ bool __thiscall winIVROverlay_IVROverlay_005_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_005_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_005_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_0910 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_005_PollNextOverlayEvent_params params =
     {
@@ -4393,7 +4393,7 @@ bool __thiscall winIVROverlay_IVROverlay_007_IsOverlayVisible(struct w_steam_ifa
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_007_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_007_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_0912 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_007_PollNextOverlayEvent_params params =
     {
@@ -5383,7 +5383,7 @@ uint32_t __thiscall winIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinat
     return params._ret;
 }
 
-bool __thiscall winIVROverlay_IVROverlay_008_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VREvent_t *pEvent)
+bool __thiscall winIVROverlay_IVROverlay_008_PollNextOverlayEvent(struct w_steam_iface *_this, uint64_t ulOverlayHandle, winVREvent_t_0914 *pEvent)
 {
     struct cppIVROverlay_IVROverlay_008_PollNextOverlayEvent_params params =
     {
diff --git a/vrclient_x64/vrclient_x64/winIVROverlayView.c b/vrclient_x64/vrclient_x64/winIVROverlayView.c
index 1a0e1262..de8f7d36 100644
--- a/vrclient_x64/vrclient_x64/winIVROverlayView.c
+++ b/vrclient_x64/vrclient_x64/winIVROverlayView.c
@@ -23,7 +23,7 @@ DEFINE_THISCALL_WRAPPER(winIVROverlayView_IVROverlayView_003_ReleaseOverlayView,
 DEFINE_THISCALL_WRAPPER(winIVROverlayView_IVROverlayView_003_PostOverlayEvent, 16)
 DEFINE_THISCALL_WRAPPER(winIVROverlayView_IVROverlayView_003_IsViewingPermitted, 12)
 
-uint32_t __thiscall winIVROverlayView_IVROverlayView_003_AcquireOverlayView(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VRNativeDevice_t *pNativeDevice, VROverlayView_t *pOverlayView, uint32_t unOverlayViewSize)
+uint32_t __thiscall winIVROverlayView_IVROverlayView_003_AcquireOverlayView(struct w_steam_iface *_this, uint64_t ulOverlayHandle, VRNativeDevice_t *pNativeDevice, winVROverlayView_t_1267 *pOverlayView, uint32_t unOverlayViewSize)
 {
     struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params params =
     {
@@ -38,7 +38,7 @@ uint32_t __thiscall winIVROverlayView_IVROverlayView_003_AcquireOverlayView(stru
     return params._ret;
 }
 
-uint32_t __thiscall winIVROverlayView_IVROverlayView_003_ReleaseOverlayView(struct w_steam_iface *_this, VROverlayView_t *pOverlayView)
+uint32_t __thiscall winIVROverlayView_IVROverlayView_003_ReleaseOverlayView(struct w_steam_iface *_this, winVROverlayView_t_1267 *pOverlayView)
 {
     struct cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView_params params =
     {
diff --git a/vrclient_x64/vrclient_x64/winIVRSystem.c b/vrclient_x64/vrclient_x64/winIVRSystem.c
index a4760bbf..6398399c 100644
--- a/vrclient_x64/vrclient_x64/winIVRSystem.c
+++ b/vrclient_x64/vrclient_x64/winIVRSystem.c
@@ -378,7 +378,7 @@ const char * __thiscall winIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_003_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_003_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_091 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_003_PollNextEvent_params params =
     {
@@ -390,7 +390,7 @@ bool __thiscall winIVRSystem_IVRSystem_003_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_003_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_003_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_091 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_003_PollNextEventWithPose_params params =
     {
@@ -1003,7 +1003,7 @@ const char * __thiscall winIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_004_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_004_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_092 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_004_PollNextEvent_params params =
     {
@@ -1015,7 +1015,7 @@ bool __thiscall winIVRSystem_IVRSystem_004_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_004_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_004_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_092 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_004_PollNextEventWithPose_params params =
     {
@@ -1639,7 +1639,7 @@ const char * __thiscall winIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_005_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_005_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_098 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_005_PollNextEvent_params params =
     {
@@ -1651,7 +1651,7 @@ bool __thiscall winIVRSystem_IVRSystem_005_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_005_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_005_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_098 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_005_PollNextEventWithPose_params params =
     {
@@ -2306,7 +2306,7 @@ const char * __thiscall winIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_006_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_006_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_0910 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_006_PollNextEvent_params params =
     {
@@ -2318,7 +2318,7 @@ bool __thiscall winIVRSystem_IVRSystem_006_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_006_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_006_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_0910 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_006_PollNextEventWithPose_params params =
     {
@@ -3013,7 +3013,7 @@ const char * __thiscall winIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_009_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_009_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_0912 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_009_PollNextEvent_params params =
     {
@@ -3025,7 +3025,7 @@ bool __thiscall winIVRSystem_IVRSystem_009_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_009_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_009_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_0912 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_009_PollNextEventWithPose_params params =
     {
@@ -3745,7 +3745,7 @@ const char * __thiscall winIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum(stru
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_010_PollNextEvent(struct w_steam_iface *_this, VREvent_t *pEvent)
+bool __thiscall winIVRSystem_IVRSystem_010_PollNextEvent(struct w_steam_iface *_this, winVREvent_t_0914 *pEvent)
 {
     struct cppIVRSystem_IVRSystem_010_PollNextEvent_params params =
     {
@@ -3757,7 +3757,7 @@ bool __thiscall winIVRSystem_IVRSystem_010_PollNextEvent(struct w_steam_iface *_
     return params._ret;
 }
 
-bool __thiscall winIVRSystem_IVRSystem_010_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, VREvent_t *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
+bool __thiscall winIVRSystem_IVRSystem_010_PollNextEventWithPose(struct w_steam_iface *_this, uint32_t eOrigin, winVREvent_t_0914 *pEvent, TrackedDevicePose_t *pTrackedDevicePose)
 {
     struct cppIVRSystem_IVRSystem_010_PollNextEventWithPose_params params =
     {