lsteamclient: Place vtables for some interfaces in native steamclient.dll data.

CW-Bug-Id: #20869

40 files changed, 227 insertions, 194 deletions

diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index fda38876..b3f48899 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -985,7 +985,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
     else:
         cfile.write(f"    {winclassname} *r = alloc_mem_for_iface(sizeof({winclassname}), \"{iface_version}\");\n")
     cfile.write("    TRACE(\"-> %p\\n\", r);\n")
-    cfile.write(f"    r->vtable = &{winclassname}_vtable;\n")
+    cfile.write(f"    r->vtable = alloc_vtable(&{winclassname}_vtable, {len(methods)}, \"{iface_version}\");\n")
     cfile.write("    r->linux_side = linux_side;\n")
     cfile.write("    return r;\n}\n\n")
 
diff --git a/lsteamclient/steamclient_main.c b/lsteamclient/steamclient_main.c
index 941113dc..0a360ac3 100644
--- a/lsteamclient/steamclient_main.c
+++ b/lsteamclient/steamclient_main.c
@@ -266,17 +266,18 @@ static BOOL allocated_from_steamclient_dll( void *ptr )
     return (BYTE *)ptr >= alloc_start && (BYTE *)ptr < alloc_end;
 }
 
-static void *get_mem_from_steamclient_dll(size_t size, unsigned int version)
+static void *get_mem_from_steamclient_dll(size_t size, unsigned int version, void *vtbl)
 {
     static BYTE * const error_ptr = (BYTE *)~(ULONG_PTR)0;
     static const unsigned int magic = 0x53ba947a;
     static struct
     {
         unsigned int version;
+        void *vtbl;
         size_t size;
         void *ptr;
     }
-    allocated[32];
+    allocated[256];
     static unsigned int allocated_count;
     static BYTE *alloc_base;
     unsigned int i;
@@ -296,7 +297,7 @@ static void *get_mem_from_steamclient_dll(size_t size, unsigned int version)
 
     for (i = 0; i < allocated_count; ++i)
     {
-        if (allocated[i].version == version)
+        if ((vtbl && allocated[i].vtbl == vtbl) || (!vtbl && allocated[i].version == version))
         {
             if (allocated[i].size != size)
             {
@@ -365,6 +366,7 @@ static void *get_mem_from_steamclient_dll(size_t size, unsigned int version)
         return NULL;
     }
     allocated[allocated_count].version = version;
+    allocated[allocated_count].vtbl = vtbl;
     allocated[allocated_count].size = size;
     allocated[allocated_count].ptr = alloc_base;
     alloc_base += size;
@@ -390,13 +392,43 @@ void *alloc_mem_for_iface(size_t size, const char *iface_version)
         goto fallback;
     }
 
-    if ((ret = get_mem_from_steamclient_dll(size, version)))
+    if ((ret = get_mem_from_steamclient_dll(size, version, NULL)))
         return ret;
 
 fallback:
     return HeapAlloc(GetProcessHeap(), 0, size);
 }
 
+void *alloc_vtable(void *vtable, unsigned int method_count, const char *iface_version)
+{
+    static const char *iface_names[] =
+    {
+        "SteamUser",
+        "SteamFriends",
+        "SteamUtils",
+        "STEAMUSERSTATS",
+        "STEAMAPPS",
+        "SteamNetworking",
+    };
+    unsigned int i;
+    char *ret;
+
+    for (i = 0; i < ARRAY_SIZE(iface_names); ++i)
+        if (!strncmp(iface_version, iface_names[i], strlen(iface_names[i]) - 1))
+            break;
+
+    if (i == ARRAY_SIZE(iface_names))
+        return vtable;
+
+    if (!(ret = get_mem_from_steamclient_dll(method_count * sizeof(void *), 0, vtable)))
+        return vtable;
+
+    TRACE("iface %s, method_count %d, allocating from module.\n", iface_version, method_count);
+
+    memcpy(ret, vtable, method_count * sizeof(void *));
+    return ret;
+}
+
 #ifdef __linux__
 static const uint32 vk_to_xkeysym[0xFF] = {
     0, /* 0x0  Undefined */
diff --git a/lsteamclient/steamclient_private.h b/lsteamclient/steamclient_private.h
index d12e770c..2dc5799e 100644
--- a/lsteamclient/steamclient_private.h
+++ b/lsteamclient/steamclient_private.h
@@ -68,6 +68,7 @@ typedef uint64 SteamAPICall_t; //for ancient SDKs
 bool do_cb_wrap(HSteamPipe pipe, void *linux_side, bool (*cpp_func)(void *, SteamAPICall_t, void *, int, int, bool *), SteamAPICall_t call, void *callback, int callback_len, int cb_expected, bool *failed);
 
 void *alloc_mem_for_iface(size_t size, const char *iface_version);
+void *alloc_vtable(void *vtable, unsigned int method_count, const char *iface_version);
 
 enum callback_type
 {
diff --git a/lsteamclient/winISteamAppList.c b/lsteamclient/winISteamAppList.c
index 5a28fefa..d16c2bf2 100644
--- a/lsteamclient/winISteamAppList.c
+++ b/lsteamclient/winISteamAppList.c
@@ -80,7 +80,7 @@ winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *create_winISteamAppList_STEA
 {
     winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001), "STEAMAPPLIST_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_vtable, 5, "STEAMAPPLIST_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamAppTicket.c b/lsteamclient/winISteamAppTicket.c
index 983dea71..394f03f4 100644
--- a/lsteamclient/winISteamAppTicket.c
+++ b/lsteamclient/winISteamAppTicket.c
@@ -45,7 +45,7 @@ winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *create_winISteamAppTicke
 {
     winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001), "STEAMAPPTICKET_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_vtable, 1, "STEAMAPPTICKET_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamApps.c b/lsteamclient/winISteamApps.c
index 81c9af81..3f1f1ae4 100644
--- a/lsteamclient/winISteamApps.c
+++ b/lsteamclient/winISteamApps.c
@@ -276,7 +276,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION008 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION008), "STEAMAPPS_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION008_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION008_vtable, 29, "STEAMAPPS_INTERFACE_VERSION008");
     r->linux_side = linux_side;
     return r;
 }
@@ -499,7 +499,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION007 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION007), "STEAMAPPS_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION007_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION007_vtable, 24, "STEAMAPPS_INTERFACE_VERSION007");
     r->linux_side = linux_side;
     return r;
 }
@@ -706,7 +706,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION006 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION006), "STEAMAPPS_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION006_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION006_vtable, 22, "STEAMAPPS_INTERFACE_VERSION006");
     r->linux_side = linux_side;
     return r;
 }
@@ -896,7 +896,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION005 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION005), "STEAMAPPS_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION005_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION005_vtable, 20, "STEAMAPPS_INTERFACE_VERSION005");
     r->linux_side = linux_side;
     return r;
 }
@@ -1035,7 +1035,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION004 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION004), "STEAMAPPS_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION004_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION004_vtable, 14, "STEAMAPPS_INTERFACE_VERSION004");
     r->linux_side = linux_side;
     return r;
 }
@@ -1126,7 +1126,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION003 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION003), "STEAMAPPS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION003_vtable, 8, "STEAMAPPS_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -1209,7 +1209,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION002 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION002), "STEAMAPPS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION002_vtable, 7, "STEAMAPPS_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -1244,7 +1244,7 @@ winISteamApps_STEAMAPPS_INTERFACE_VERSION001 *create_winISteamApps_STEAMAPPS_INT
 {
     winISteamApps_STEAMAPPS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION001), "STEAMAPPS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamApps_STEAMAPPS_INTERFACE_VERSION001_vtable, 1, "STEAMAPPS_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c
index 1bbcefb0..b6a2d3c4 100644
--- a/lsteamclient/winISteamClient.c
+++ b/lsteamclient/winISteamClient.c
@@ -400,7 +400,7 @@ winISteamClient_SteamClient020 *create_winISteamClient_SteamClient020(void *linu
 {
     winISteamClient_SteamClient020 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient020), "SteamClient020");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient020_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient020_vtable, 42, "SteamClient020");
     r->linux_side = linux_side;
     return r;
 }
@@ -782,7 +782,7 @@ winISteamClient_SteamClient019 *create_winISteamClient_SteamClient019(void *linu
 {
     winISteamClient_SteamClient019 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient019), "SteamClient019");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient019_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient019_vtable, 41, "SteamClient019");
     r->linux_side = linux_side;
     return r;
 }
@@ -1155,7 +1155,7 @@ winISteamClient_SteamClient018 *create_winISteamClient_SteamClient018(void *linu
 {
     winISteamClient_SteamClient018 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient018), "SteamClient018");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient018_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient018_vtable, 40, "SteamClient018");
     r->linux_side = linux_side;
     return r;
 }
@@ -1501,7 +1501,7 @@ winISteamClient_SteamClient017 *create_winISteamClient_SteamClient017(void *linu
 {
     winISteamClient_SteamClient017 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient017), "SteamClient017");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient017_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient017_vtable, 37, "SteamClient017");
     r->linux_side = linux_side;
     return r;
 }
@@ -1821,7 +1821,7 @@ winISteamClient_SteamClient016 *create_winISteamClient_SteamClient016(void *linu
 {
     winISteamClient_SteamClient016 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient016), "SteamClient016");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient016_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient016_vtable, 34, "SteamClient016");
     r->linux_side = linux_side;
     return r;
 }
@@ -2108,7 +2108,7 @@ winISteamClient_SteamClient015 *create_winISteamClient_SteamClient015(void *linu
 {
     winISteamClient_SteamClient015 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient015), "SteamClient015");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient015_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient015_vtable, 30, "SteamClient015");
     r->linux_side = linux_side;
     return r;
 }
@@ -2386,7 +2386,7 @@ winISteamClient_SteamClient014 *create_winISteamClient_SteamClient014(void *linu
 {
     winISteamClient_SteamClient014 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient014), "SteamClient014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient014_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient014_vtable, 29, "SteamClient014");
     r->linux_side = linux_side;
     return r;
 }
@@ -2671,7 +2671,7 @@ winISteamClient_SteamClient013 *create_winISteamClient_SteamClient013(void *linu
 {
     winISteamClient_SteamClient013 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient013), "SteamClient013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient013_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient013_vtable, 30, "SteamClient013");
     r->linux_side = linux_side;
     return r;
 }
@@ -2931,7 +2931,7 @@ winISteamClient_SteamClient012 *create_winISteamClient_SteamClient012(void *linu
 {
     winISteamClient_SteamClient012 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient012), "SteamClient012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient012_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient012_vtable, 27, "SteamClient012");
     r->linux_side = linux_side;
     return r;
 }
@@ -3173,7 +3173,7 @@ winISteamClient_SteamClient011 *create_winISteamClient_SteamClient011(void *linu
 {
     winISteamClient_SteamClient011 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient011), "SteamClient011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient011_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient011_vtable, 25, "SteamClient011");
     r->linux_side = linux_side;
     return r;
 }
@@ -3406,7 +3406,7 @@ winISteamClient_SteamClient010 *create_winISteamClient_SteamClient010(void *linu
 {
     winISteamClient_SteamClient010 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient010), "SteamClient010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient010_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient010_vtable, 24, "SteamClient010");
     r->linux_side = linux_side;
     return r;
 }
@@ -3622,7 +3622,7 @@ winISteamClient_SteamClient009 *create_winISteamClient_SteamClient009(void *linu
 {
     winISteamClient_SteamClient009 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient009), "SteamClient009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient009_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient009_vtable, 22, "SteamClient009");
     r->linux_side = linux_side;
     return r;
 }
@@ -3829,7 +3829,7 @@ winISteamClient_SteamClient008 *create_winISteamClient_SteamClient008(void *linu
 {
     winISteamClient_SteamClient008 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient008), "SteamClient008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient008_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient008_vtable, 21, "SteamClient008");
     r->linux_side = linux_side;
     return r;
 }
@@ -4045,7 +4045,7 @@ winISteamClient_SteamClient007 *create_winISteamClient_SteamClient007(void *linu
 {
     winISteamClient_SteamClient007 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient007), "SteamClient007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient007_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient007_vtable, 22, "SteamClient007");
     r->linux_side = linux_side;
     return r;
 }
@@ -4249,7 +4249,7 @@ winISteamClient_SteamClient006 *create_winISteamClient_SteamClient006(void *linu
 {
     winISteamClient_SteamClient006 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient006), "SteamClient006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamClient_SteamClient006_vtable;
+    r->vtable = alloc_vtable(&winISteamClient_SteamClient006_vtable, 21, "SteamClient006");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamController.c b/lsteamclient/winISteamController.c
index 4e73910b..ab53db90 100644
--- a/lsteamclient/winISteamController.c
+++ b/lsteamclient/winISteamController.c
@@ -312,7 +312,7 @@ winISteamController_SteamController008 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController008 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController008), "SteamController008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController008_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController008_vtable, 34, "SteamController008");
     r->linux_side = linux_side;
     return r;
 }
@@ -614,7 +614,7 @@ winISteamController_SteamController007 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController007 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController007), "SteamController007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController007_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController007_vtable, 34, "SteamController007");
     r->linux_side = linux_side;
     return r;
 }
@@ -892,7 +892,7 @@ winISteamController_SteamController006 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController006 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController006), "SteamController006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController006_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController006_vtable, 31, "SteamController006");
     r->linux_side = linux_side;
     return r;
 }
@@ -1130,7 +1130,7 @@ winISteamController_SteamController005 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController005 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController005), "SteamController005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController005_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController005_vtable, 26, "SteamController005");
     r->linux_side = linux_side;
     return r;
 }
@@ -1336,7 +1336,7 @@ winISteamController_SteamController004 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController004 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController004), "SteamController004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController004_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController004_vtable, 22, "SteamController004");
     r->linux_side = linux_side;
     return r;
 }
@@ -1501,7 +1501,7 @@ winISteamController_SteamController003 *create_winISteamController_SteamControll
 {
     winISteamController_SteamController003 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController003), "SteamController003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_SteamController003_vtable;
+    r->vtable = alloc_vtable(&winISteamController_SteamController003_vtable, 17, "SteamController003");
     r->linux_side = linux_side;
     return r;
 }
@@ -1578,7 +1578,7 @@ winISteamController_STEAMCONTROLLER_INTERFACE_VERSION *create_winISteamControlle
 {
     winISteamController_STEAMCONTROLLER_INTERFACE_VERSION *r = alloc_mem_for_iface(sizeof(winISteamController_STEAMCONTROLLER_INTERFACE_VERSION), "STEAMCONTROLLER_INTERFACE_VERSION");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamController_STEAMCONTROLLER_INTERFACE_VERSION_vtable;
+    r->vtable = alloc_vtable(&winISteamController_STEAMCONTROLLER_INTERFACE_VERSION_vtable, 6, "STEAMCONTROLLER_INTERFACE_VERSION");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamFriends.c b/lsteamclient/winISteamFriends.c
index 1da48ef0..b3ec3681 100644
--- a/lsteamclient/winISteamFriends.c
+++ b/lsteamclient/winISteamFriends.c
@@ -652,7 +652,7 @@ winISteamFriends_SteamFriends017 *create_winISteamFriends_SteamFriends017(void *
 {
     winISteamFriends_SteamFriends017 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends017), "SteamFriends017");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends017_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends017_vtable, 76, "SteamFriends017");
     r->linux_side = linux_side;
     return r;
 }
@@ -1262,7 +1262,7 @@ winISteamFriends_SteamFriends015 *create_winISteamFriends_SteamFriends015(void *
 {
     winISteamFriends_SteamFriends015 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends015), "SteamFriends015");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends015_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends015_vtable, 72, "SteamFriends015");
     r->linux_side = linux_side;
     return r;
 }
@@ -1808,7 +1808,7 @@ winISteamFriends_SteamFriends014 *create_winISteamFriends_SteamFriends014(void *
 {
     winISteamFriends_SteamFriends014 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends014), "SteamFriends014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends014_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends014_vtable, 64, "SteamFriends014");
     r->linux_side = linux_side;
     return r;
 }
@@ -2346,7 +2346,7 @@ winISteamFriends_SteamFriends013 *create_winISteamFriends_SteamFriends013(void *
 {
     winISteamFriends_SteamFriends013 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends013), "SteamFriends013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends013_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends013_vtable, 63, "SteamFriends013");
     r->linux_side = linux_side;
     return r;
 }
@@ -2884,7 +2884,7 @@ winISteamFriends_SteamFriends012 *create_winISteamFriends_SteamFriends012(void *
 {
     winISteamFriends_SteamFriends012 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends012), "SteamFriends012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends012_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends012_vtable, 63, "SteamFriends012");
     r->linux_side = linux_side;
     return r;
 }
@@ -3422,7 +3422,7 @@ winISteamFriends_SteamFriends011 *create_winISteamFriends_SteamFriends011(void *
 {
     winISteamFriends_SteamFriends011 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends011), "SteamFriends011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends011_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends011_vtable, 63, "SteamFriends011");
     r->linux_side = linux_side;
     return r;
 }
@@ -3928,7 +3928,7 @@ winISteamFriends_SteamFriends010 *create_winISteamFriends_SteamFriends010(void *
 {
     winISteamFriends_SteamFriends010 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends010), "SteamFriends010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends010_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends010_vtable, 59, "SteamFriends010");
     r->linux_side = linux_side;
     return r;
 }
@@ -4313,7 +4313,7 @@ winISteamFriends_SteamFriends009 *create_winISteamFriends_SteamFriends009(void *
 {
     winISteamFriends_SteamFriends009 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends009), "SteamFriends009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends009_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends009_vtable, 44, "SteamFriends009");
     r->linux_side = linux_side;
     return r;
 }
@@ -4617,7 +4617,7 @@ winISteamFriends_SteamFriends008 *create_winISteamFriends_SteamFriends008(void *
 {
     winISteamFriends_SteamFriends008 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends008), "SteamFriends008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends008_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends008_vtable, 34, "SteamFriends008");
     r->linux_side = linux_side;
     return r;
 }
@@ -4871,7 +4871,7 @@ winISteamFriends_SteamFriends007 *create_winISteamFriends_SteamFriends007(void *
 {
     winISteamFriends_SteamFriends007 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends007), "SteamFriends007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends007_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends007_vtable, 28, "SteamFriends007");
     r->linux_side = linux_side;
     return r;
 }
@@ -5109,7 +5109,7 @@ winISteamFriends_SteamFriends006 *create_winISteamFriends_SteamFriends006(void *
 {
     winISteamFriends_SteamFriends006 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends006), "SteamFriends006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends006_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends006_vtable, 26, "SteamFriends006");
     r->linux_side = linux_side;
     return r;
 }
@@ -5331,7 +5331,7 @@ winISteamFriends_SteamFriends005 *create_winISteamFriends_SteamFriends005(void *
 {
     winISteamFriends_SteamFriends005 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends005), "SteamFriends005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends005_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends005_vtable, 24, "SteamFriends005");
     r->linux_side = linux_side;
     return r;
 }
@@ -5521,7 +5521,7 @@ winISteamFriends_SteamFriends004 *create_winISteamFriends_SteamFriends004(void *
 {
     winISteamFriends_SteamFriends004 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends004), "SteamFriends004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends004_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends004_vtable, 20, "SteamFriends004");
     r->linux_side = linux_side;
     return r;
 }
@@ -5711,7 +5711,7 @@ winISteamFriends_SteamFriends003 *create_winISteamFriends_SteamFriends003(void *
 {
     winISteamFriends_SteamFriends003 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends003), "SteamFriends003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends003_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends003_vtable, 20, "SteamFriends003");
     r->linux_side = linux_side;
     return r;
 }
@@ -5981,7 +5981,7 @@ winISteamFriends_SteamFriends002 *create_winISteamFriends_SteamFriends002(void *
 {
     winISteamFriends_SteamFriends002 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends002), "SteamFriends002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends002_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends002_vtable, 30, "SteamFriends002");
     r->linux_side = linux_side;
     return r;
 }
@@ -6225,7 +6225,7 @@ winISteamFriends_SteamFriends001 *create_winISteamFriends_SteamFriends001(void *
 {
     winISteamFriends_SteamFriends001 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends001), "SteamFriends001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamFriends_SteamFriends001_vtable;
+    r->vtable = alloc_vtable(&winISteamFriends_SteamFriends001_vtable, 27, "SteamFriends001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamGameCoordinator.c b/lsteamclient/winISteamGameCoordinator.c
index 7db6e00d..eeed0c5e 100644
--- a/lsteamclient/winISteamGameCoordinator.c
+++ b/lsteamclient/winISteamGameCoordinator.c
@@ -61,7 +61,7 @@ winISteamGameCoordinator_SteamGameCoordinator001 *create_winISteamGameCoordinato
 {
     winISteamGameCoordinator_SteamGameCoordinator001 *r = alloc_mem_for_iface(sizeof(winISteamGameCoordinator_SteamGameCoordinator001), "SteamGameCoordinator001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameCoordinator_SteamGameCoordinator001_vtable;
+    r->vtable = alloc_vtable(&winISteamGameCoordinator_SteamGameCoordinator001_vtable, 3, "SteamGameCoordinator001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamGameSearch.c b/lsteamclient/winISteamGameSearch.c
index edbae8ad..27403212 100644
--- a/lsteamclient/winISteamGameSearch.c
+++ b/lsteamclient/winISteamGameSearch.c
@@ -149,7 +149,7 @@ winISteamGameSearch_SteamMatchGameSearch001 *create_winISteamGameSearch_SteamMat
 {
     winISteamGameSearch_SteamMatchGameSearch001 *r = alloc_mem_for_iface(sizeof(winISteamGameSearch_SteamMatchGameSearch001), "SteamMatchGameSearch001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameSearch_SteamMatchGameSearch001_vtable;
+    r->vtable = alloc_vtable(&winISteamGameSearch_SteamMatchGameSearch001_vtable, 14, "SteamMatchGameSearch001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamGameServer.c b/lsteamclient/winISteamGameServer.c
index 402aed86..9246f543 100644
--- a/lsteamclient/winISteamGameServer.c
+++ b/lsteamclient/winISteamGameServer.c
@@ -392,7 +392,7 @@ winISteamGameServer_SteamGameServer014 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer014 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer014), "SteamGameServer014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer014_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer014_vtable, 44, "SteamGameServer014");
     r->linux_side = linux_side;
     return r;
 }
@@ -774,7 +774,7 @@ winISteamGameServer_SteamGameServer013 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer013 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer013), "SteamGameServer013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer013_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer013_vtable, 44, "SteamGameServer013");
     r->linux_side = linux_side;
     return r;
 }
@@ -1155,7 +1155,7 @@ winISteamGameServer_SteamGameServer012 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer012 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer012), "SteamGameServer012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer012_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer012_vtable, 44, "SteamGameServer012");
     r->linux_side = linux_side;
     return r;
 }
@@ -1536,7 +1536,7 @@ winISteamGameServer_SteamGameServer011 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer011 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer011), "SteamGameServer011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer011_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer011_vtable, 44, "SteamGameServer011");
     r->linux_side = linux_side;
     return r;
 }
@@ -1749,7 +1749,7 @@ winISteamGameServer_SteamGameServer010 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer010 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer010), "SteamGameServer010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer010_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer010_vtable, 23, "SteamGameServer010");
     r->linux_side = linux_side;
     return r;
 }
@@ -1930,7 +1930,7 @@ winISteamGameServer_SteamGameServer009 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer009 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer009), "SteamGameServer009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer009_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer009_vtable, 19, "SteamGameServer009");
     r->linux_side = linux_side;
     return r;
 }
@@ -2095,7 +2095,7 @@ winISteamGameServer_SteamGameServer008 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer008 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer008), "SteamGameServer008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer008_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer008_vtable, 17, "SteamGameServer008");
     r->linux_side = linux_side;
     return r;
 }
@@ -2236,7 +2236,7 @@ winISteamGameServer_SteamGameServer005 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer005 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer005), "SteamGameServer005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer005_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer005_vtable, 14, "SteamGameServer005");
     r->linux_side = linux_side;
     return r;
 }
@@ -2377,7 +2377,7 @@ winISteamGameServer_SteamGameServer004 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer004 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer004), "SteamGameServer004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer004_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer004_vtable, 14, "SteamGameServer004");
     r->linux_side = linux_side;
     return r;
 }
@@ -2541,7 +2541,7 @@ winISteamGameServer_SteamGameServer003 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer003 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer003), "SteamGameServer003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer003_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer003_vtable, 17, "SteamGameServer003");
     r->linux_side = linux_side;
     return r;
 }
@@ -2737,7 +2737,7 @@ winISteamGameServer_SteamGameServer002 *create_winISteamGameServer_SteamGameServ
 {
     winISteamGameServer_SteamGameServer002 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer002), "SteamGameServer002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServer_SteamGameServer002_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServer_SteamGameServer002_vtable, 21, "SteamGameServer002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamGameServerStats.c b/lsteamclient/winISteamGameServerStats.c
index d83a2d90..f06b9cb3 100644
--- a/lsteamclient/winISteamGameServerStats.c
+++ b/lsteamclient/winISteamGameServerStats.c
@@ -117,7 +117,7 @@ winISteamGameServerStats_SteamGameServerStats001 *create_winISteamGameServerStat
 {
     winISteamGameServerStats_SteamGameServerStats001 *r = alloc_mem_for_iface(sizeof(winISteamGameServerStats_SteamGameServerStats001), "SteamGameServerStats001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameServerStats_SteamGameServerStats001_vtable;
+    r->vtable = alloc_vtable(&winISteamGameServerStats_SteamGameServerStats001_vtable, 10, "SteamGameServerStats001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamGameStats.c b/lsteamclient/winISteamGameStats.c
index eb342f20..c45f567c 100644
--- a/lsteamclient/winISteamGameStats.c
+++ b/lsteamclient/winISteamGameStats.c
@@ -141,7 +141,7 @@ winISteamGameStats_SteamGameStats001 *create_winISteamGameStats_SteamGameStats00
 {
     winISteamGameStats_SteamGameStats001 *r = alloc_mem_for_iface(sizeof(winISteamGameStats_SteamGameStats001), "SteamGameStats001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamGameStats_SteamGameStats001_vtable;
+    r->vtable = alloc_vtable(&winISteamGameStats_SteamGameStats001_vtable, 13, "SteamGameStats001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamHTMLSurface.c b/lsteamclient/winISteamHTMLSurface.c
index 3b21520c..3d92a933 100644
--- a/lsteamclient/winISteamHTMLSurface.c
+++ b/lsteamclient/winISteamHTMLSurface.c
@@ -342,7 +342,7 @@ winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005 *create_winISteamHTM
 {
     winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005), "STEAMHTMLSURFACE_INTERFACE_VERSION_005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_vtable;
+    r->vtable = alloc_vtable(&winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_vtable, 38, "STEAMHTMLSURFACE_INTERFACE_VERSION_005");
     r->linux_side = linux_side;
     return r;
 }
@@ -666,7 +666,7 @@ winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004 *create_winISteamHTM
 {
     winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004), "STEAMHTMLSURFACE_INTERFACE_VERSION_004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_vtable;
+    r->vtable = alloc_vtable(&winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_vtable, 37, "STEAMHTMLSURFACE_INTERFACE_VERSION_004");
     r->linux_side = linux_side;
     return r;
 }
@@ -982,7 +982,7 @@ winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003 *create_winISteamHTM
 {
     winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003), "STEAMHTMLSURFACE_INTERFACE_VERSION_003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_vtable;
+    r->vtable = alloc_vtable(&winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_vtable, 36, "STEAMHTMLSURFACE_INTERFACE_VERSION_003");
     r->linux_side = linux_side;
     return r;
 }
@@ -1290,7 +1290,7 @@ winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002 *create_winISteamHTM
 {
     winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002), "STEAMHTMLSURFACE_INTERFACE_VERSION_002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_vtable;
+    r->vtable = alloc_vtable(&winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_vtable, 35, "STEAMHTMLSURFACE_INTERFACE_VERSION_002");
     r->linux_side = linux_side;
     return r;
 }
@@ -1582,7 +1582,7 @@ winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001 *create_winISteamHTM
 {
     winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001), "STEAMHTMLSURFACE_INTERFACE_VERSION_001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_vtable;
+    r->vtable = alloc_vtable(&winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_vtable, 33, "STEAMHTMLSURFACE_INTERFACE_VERSION_001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamHTTP.c b/lsteamclient/winISteamHTTP.c
index 8458a813..4078ce07 100644
--- a/lsteamclient/winISteamHTTP.c
+++ b/lsteamclient/winISteamHTTP.c
@@ -237,7 +237,7 @@ winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003 *create_winISteamHTTP_STEAMHTTP_INT
 {
     winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003), "STEAMHTTP_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_vtable, 25, "STEAMHTTP_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -464,7 +464,7 @@ winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002 *create_winISteamHTTP_STEAMHTTP_INT
 {
     winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002), "STEAMHTTP_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_vtable, 25, "STEAMHTTP_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -611,7 +611,7 @@ winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001 *create_winISteamHTTP_STEAMHTTP_INT
 {
     winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001), "STEAMHTTP_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_vtable, 15, "STEAMHTTP_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamInput.c b/lsteamclient/winISteamInput.c
index 239e7ef9..3c1e350c 100644
--- a/lsteamclient/winISteamInput.c
+++ b/lsteamclient/winISteamInput.c
@@ -418,7 +418,7 @@ winISteamInput_SteamInput006 *create_winISteamInput_SteamInput006(void *linux_si
 {
     winISteamInput_SteamInput006 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput006), "SteamInput006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInput_SteamInput006_vtable;
+    r->vtable = alloc_vtable(&winISteamInput_SteamInput006_vtable, 47, "SteamInput006");
     r->linux_side = linux_side;
     return r;
 }
@@ -826,7 +826,7 @@ winISteamInput_SteamInput005 *create_winISteamInput_SteamInput005(void *linux_si
 {
     winISteamInput_SteamInput005 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput005), "SteamInput005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInput_SteamInput005_vtable;
+    r->vtable = alloc_vtable(&winISteamInput_SteamInput005_vtable, 47, "SteamInput005");
     r->linux_side = linux_side;
     return r;
 }
@@ -1136,7 +1136,7 @@ winISteamInput_SteamInput002 *create_winISteamInput_SteamInput002(void *linux_si
 {
     winISteamInput_SteamInput002 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput002), "SteamInput002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInput_SteamInput002_vtable;
+    r->vtable = alloc_vtable(&winISteamInput_SteamInput002_vtable, 35, "SteamInput002");
     r->linux_side = linux_side;
     return r;
 }
@@ -1446,7 +1446,7 @@ winISteamInput_SteamInput001 *create_winISteamInput_SteamInput001(void *linux_si
 {
     winISteamInput_SteamInput001 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput001), "SteamInput001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInput_SteamInput001_vtable;
+    r->vtable = alloc_vtable(&winISteamInput_SteamInput001_vtable, 35, "SteamInput001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamInventory.c b/lsteamclient/winISteamInventory.c
index 0d2e6c32..ac7a4c74 100644
--- a/lsteamclient/winISteamInventory.c
+++ b/lsteamclient/winISteamInventory.c
@@ -341,7 +341,7 @@ winISteamInventory_STEAMINVENTORY_INTERFACE_V003 *create_winISteamInventory_STEA
 {
     winISteamInventory_STEAMINVENTORY_INTERFACE_V003 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V003), "STEAMINVENTORY_INTERFACE_V003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V003_vtable;
+    r->vtable = alloc_vtable(&winISteamInventory_STEAMINVENTORY_INTERFACE_V003_vtable, 38, "STEAMINVENTORY_INTERFACE_V003");
     r->linux_side = linux_side;
     return r;
 }
@@ -664,7 +664,7 @@ winISteamInventory_STEAMINVENTORY_INTERFACE_V002 *create_winISteamInventory_STEA
 {
     winISteamInventory_STEAMINVENTORY_INTERFACE_V002 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V002), "STEAMINVENTORY_INTERFACE_V002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V002_vtable;
+    r->vtable = alloc_vtable(&winISteamInventory_STEAMINVENTORY_INTERFACE_V002_vtable, 37, "STEAMINVENTORY_INTERFACE_V002");
     r->linux_side = linux_side;
     return r;
 }
@@ -883,7 +883,7 @@ winISteamInventory_STEAMINVENTORY_INTERFACE_V001 *create_winISteamInventory_STEA
 {
     winISteamInventory_STEAMINVENTORY_INTERFACE_V001 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V001), "STEAMINVENTORY_INTERFACE_V001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V001_vtable;
+    r->vtable = alloc_vtable(&winISteamInventory_STEAMINVENTORY_INTERFACE_V001_vtable, 24, "STEAMINVENTORY_INTERFACE_V001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamMasterServerUpdater.c b/lsteamclient/winISteamMasterServerUpdater.c
index 1f298c02..ae658dad 100644
--- a/lsteamclient/winISteamMasterServerUpdater.c
+++ b/lsteamclient/winISteamMasterServerUpdater.c
@@ -149,7 +149,7 @@ winISteamMasterServerUpdater_SteamMasterServerUpdater001 *create_winISteamMaster
 {
     winISteamMasterServerUpdater_SteamMasterServerUpdater001 *r = alloc_mem_for_iface(sizeof(winISteamMasterServerUpdater_SteamMasterServerUpdater001), "SteamMasterServerUpdater001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMasterServerUpdater_SteamMasterServerUpdater001_vtable;
+    r->vtable = alloc_vtable(&winISteamMasterServerUpdater_SteamMasterServerUpdater001_vtable, 14, "SteamMasterServerUpdater001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamMatchmaking.c b/lsteamclient/winISteamMatchmaking.c
index 1126f68d..84bccb5e 100644
--- a/lsteamclient/winISteamMatchmaking.c
+++ b/lsteamclient/winISteamMatchmaking.c
@@ -344,7 +344,7 @@ winISteamMatchmaking_SteamMatchMaking009 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking009 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking009), "SteamMatchMaking009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking009_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking009_vtable, 38, "SteamMatchMaking009");
     r->linux_side = linux_side;
     return r;
 }
@@ -662,7 +662,7 @@ winISteamMatchmaking_SteamMatchMaking008 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking008 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking008), "SteamMatchMaking008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking008_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking008_vtable, 36, "SteamMatchMaking008");
     r->linux_side = linux_side;
     return r;
 }
@@ -964,7 +964,7 @@ winISteamMatchmaking_SteamMatchMaking007 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking007 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking007), "SteamMatchMaking007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking007_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking007_vtable, 34, "SteamMatchMaking007");
     r->linux_side = linux_side;
     return r;
 }
@@ -1218,7 +1218,7 @@ winISteamMatchmaking_SteamMatchMaking006 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking006 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking006), "SteamMatchMaking006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking006_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking006_vtable, 28, "SteamMatchMaking006");
     r->linux_side = linux_side;
     return r;
 }
@@ -1496,7 +1496,7 @@ winISteamMatchmaking_SteamMatchMaking005 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking005 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking005), "SteamMatchMaking005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking005_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking005_vtable, 31, "SteamMatchMaking005");
     r->linux_side = linux_side;
     return r;
 }
@@ -1741,7 +1741,7 @@ winISteamMatchmaking_SteamMatchMaking004 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking004 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking004), "SteamMatchMaking004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking004_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking004_vtable, 27, "SteamMatchMaking004");
     r->linux_side = linux_side;
     return r;
 }
@@ -1994,7 +1994,7 @@ winISteamMatchmaking_SteamMatchMaking003 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking003 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking003), "SteamMatchMaking003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking003_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking003_vtable, 28, "SteamMatchMaking003");
     r->linux_side = linux_side;
     return r;
 }
@@ -2183,7 +2183,7 @@ winISteamMatchmaking_SteamMatchMaking002 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking002 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking002), "SteamMatchMaking002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking002_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking002_vtable, 20, "SteamMatchMaking002");
     r->linux_side = linux_side;
     return r;
 }
@@ -2388,7 +2388,7 @@ winISteamMatchmaking_SteamMatchMaking001 *create_winISteamMatchmaking_SteamMatch
 {
     winISteamMatchmaking_SteamMatchMaking001 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking001), "SteamMatchMaking001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmaking_SteamMatchMaking001_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmaking_SteamMatchMaking001_vtable, 22, "SteamMatchMaking001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamMatchmakingServers.c b/lsteamclient/winISteamMatchmakingServers.c
index ae28668f..91e8bf83 100644
--- a/lsteamclient/winISteamMatchmakingServers.c
+++ b/lsteamclient/winISteamMatchmakingServers.c
@@ -173,7 +173,7 @@ winISteamMatchmakingServers_SteamMatchMakingServers002 *create_winISteamMatchmak
 {
     winISteamMatchmakingServers_SteamMatchMakingServers002 *r = alloc_mem_for_iface(sizeof(winISteamMatchmakingServers_SteamMatchMakingServers002), "SteamMatchMakingServers002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmakingServers_SteamMatchMakingServers002_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmakingServers_SteamMatchMakingServers002_vtable, 17, "SteamMatchMakingServers002");
     r->linux_side = linux_side;
     return r;
 }
@@ -328,7 +328,7 @@ winISteamMatchmakingServers_SteamMatchMakingServers001 *create_winISteamMatchmak
 {
     winISteamMatchmakingServers_SteamMatchMakingServers001 *r = alloc_mem_for_iface(sizeof(winISteamMatchmakingServers_SteamMatchMakingServers001), "SteamMatchMakingServers001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMatchmakingServers_SteamMatchMakingServers001_vtable;
+    r->vtable = alloc_vtable(&winISteamMatchmakingServers_SteamMatchMakingServers001_vtable, 16, "SteamMatchMakingServers001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamMusic.c b/lsteamclient/winISteamMusic.c
index 44c96abc..87374567 100644
--- a/lsteamclient/winISteamMusic.c
+++ b/lsteamclient/winISteamMusic.c
@@ -109,7 +109,7 @@ winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001 *create_winISteamMusic_STEAMMUSIC
 {
     winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001), "STEAMMUSIC_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_vtable, 9, "STEAMMUSIC_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamMusicRemote.c b/lsteamclient/winISteamMusicRemote.c
index 7adc4066..795d5730 100644
--- a/lsteamclient/winISteamMusicRemote.c
+++ b/lsteamclient/winISteamMusicRemote.c
@@ -293,7 +293,7 @@ winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001 *create_winISteamMusi
 {
     winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001), "STEAMMUSICREMOTE_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_vtable, 32, "STEAMMUSICREMOTE_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworking.c b/lsteamclient/winISteamNetworking.c
index 089bb30a..8c9acef5 100644
--- a/lsteamclient/winISteamNetworking.c
+++ b/lsteamclient/winISteamNetworking.c
@@ -213,7 +213,7 @@ winISteamNetworking_SteamNetworking006 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking006 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking006), "SteamNetworking006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking006_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking006_vtable, 22, "SteamNetworking006");
     r->linux_side = linux_side;
     return r;
 }
@@ -416,7 +416,7 @@ winISteamNetworking_SteamNetworking005 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking005 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking005), "SteamNetworking005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking005_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking005_vtable, 22, "SteamNetworking005");
     r->linux_side = linux_side;
     return r;
 }
@@ -603,7 +603,7 @@ winISteamNetworking_SteamNetworking004 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking004 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking004), "SteamNetworking004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking004_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking004_vtable, 20, "SteamNetworking004");
     r->linux_side = linux_side;
     return r;
 }
@@ -790,7 +790,7 @@ winISteamNetworking_SteamNetworking003 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking003 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking003), "SteamNetworking003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking003_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking003_vtable, 20, "SteamNetworking003");
     r->linux_side = linux_side;
     return r;
 }
@@ -929,7 +929,7 @@ winISteamNetworking_SteamNetworking002 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking002 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking002), "SteamNetworking002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking002_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking002_vtable, 14, "SteamNetworking002");
     r->linux_side = linux_side;
     return r;
 }
@@ -1052,7 +1052,7 @@ winISteamNetworking_SteamNetworking001 *create_winISteamNetworking_SteamNetworki
 {
     winISteamNetworking_SteamNetworking001 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking001), "SteamNetworking001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworking_SteamNetworking001_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworking_SteamNetworking001_vtable, 12, "SteamNetworking001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworkingFakeUDPPort.c b/lsteamclient/winISteamNetworkingFakeUDPPort.c
index 48fe0198..14611bc5 100644
--- a/lsteamclient/winISteamNetworkingFakeUDPPort.c
+++ b/lsteamclient/winISteamNetworkingFakeUDPPort.c
@@ -69,7 +69,7 @@ winISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001 *create_winISteamNe
 {
     winISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001));
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingFakeUDPPort_SteamNetworkingFakeUDPPort001_vtable, 4, "SteamNetworkingFakeUDPPort001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworkingMessages.c b/lsteamclient/winISteamNetworkingMessages.c
index 06fba6c7..84e3c314 100644
--- a/lsteamclient/winISteamNetworkingMessages.c
+++ b/lsteamclient/winISteamNetworkingMessages.c
@@ -85,7 +85,7 @@ winISteamNetworkingMessages_SteamNetworkingMessages002 *create_winISteamNetworki
 {
     winISteamNetworkingMessages_SteamNetworkingMessages002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingMessages_SteamNetworkingMessages002), "SteamNetworkingMessages002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingMessages_SteamNetworkingMessages002_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingMessages_SteamNetworkingMessages002_vtable, 6, "SteamNetworkingMessages002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworkingSockets.c b/lsteamclient/winISteamNetworkingSockets.c
index 94436174..d0e34850 100644
--- a/lsteamclient/winISteamNetworkingSockets.c
+++ b/lsteamclient/winISteamNetworkingSockets.c
@@ -418,7 +418,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets012 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets012 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets012), "SteamNetworkingSockets012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets012_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets012_vtable, 48, "SteamNetworkingSockets012");
     r->linux_side = linux_side;
     return r;
 }
@@ -770,7 +770,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets009 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets009 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets009), "SteamNetworkingSockets009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets009_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets009_vtable, 41, "SteamNetworkingSockets009");
     r->linux_side = linux_side;
     return r;
 }
@@ -1114,7 +1114,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets008 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets008 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets008), "SteamNetworkingSockets008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets008_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets008_vtable, 40, "SteamNetworkingSockets008");
     r->linux_side = linux_side;
     return r;
 }
@@ -1418,7 +1418,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets006 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets006 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets006), "SteamNetworkingSockets006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets006_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets006_vtable, 35, "SteamNetworkingSockets006");
     r->linux_side = linux_side;
     return r;
 }
@@ -1698,7 +1698,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets004 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets004 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets004), "SteamNetworkingSockets004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets004_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets004_vtable, 32, "SteamNetworkingSockets004");
     r->linux_side = linux_side;
     return r;
 }
@@ -1954,7 +1954,7 @@ winISteamNetworkingSockets_SteamNetworkingSockets002 *create_winISteamNetworking
 {
     winISteamNetworkingSockets_SteamNetworkingSockets002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets002), "SteamNetworkingSockets002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets002_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSockets_SteamNetworkingSockets002_vtable, 29, "SteamNetworkingSockets002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworkingSocketsSerialized.c b/lsteamclient/winISteamNetworkingSocketsSerialized.c
index 36d5ddac..d330945c 100644
--- a/lsteamclient/winISteamNetworkingSocketsSerialized.c
+++ b/lsteamclient/winISteamNetworkingSocketsSerialized.c
@@ -101,7 +101,7 @@ winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003 *create
 {
     winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003), "SteamNetworkingSocketsSerialized003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_vtable, 8, "SteamNetworkingSocketsSerialized003");
     r->linux_side = linux_side;
     return r;
 }
@@ -192,7 +192,7 @@ winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002 *create
 {
     winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002), "SteamNetworkingSocketsSerialized002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_vtable, 8, "SteamNetworkingSocketsSerialized002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamNetworkingUtils.c b/lsteamclient/winISteamNetworkingUtils.c
index 00a8787f..8869d3ce 100644
--- a/lsteamclient/winISteamNetworkingUtils.c
+++ b/lsteamclient/winISteamNetworkingUtils.c
@@ -242,7 +242,7 @@ winISteamNetworkingUtils_SteamNetworkingUtils004 *create_winISteamNetworkingUtil
 {
     winISteamNetworkingUtils_SteamNetworkingUtils004 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils004), "SteamNetworkingUtils004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils004_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingUtils_SteamNetworkingUtils004_vtable, 26, "SteamNetworkingUtils004");
     r->linux_side = linux_side;
     return r;
 }
@@ -450,7 +450,7 @@ winISteamNetworkingUtils_SteamNetworkingUtils003 *create_winISteamNetworkingUtil
 {
     winISteamNetworkingUtils_SteamNetworkingUtils003 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils003), "SteamNetworkingUtils003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils003_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingUtils_SteamNetworkingUtils003_vtable, 23, "SteamNetworkingUtils003");
     r->linux_side = linux_side;
     return r;
 }
@@ -650,7 +650,7 @@ winISteamNetworkingUtils_SteamNetworkingUtils002 *create_winISteamNetworkingUtil
 {
     winISteamNetworkingUtils_SteamNetworkingUtils002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils002), "SteamNetworkingUtils002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils002_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingUtils_SteamNetworkingUtils002_vtable, 22, "SteamNetworkingUtils002");
     r->linux_side = linux_side;
     return r;
 }
@@ -850,7 +850,7 @@ winISteamNetworkingUtils_SteamNetworkingUtils001 *create_winISteamNetworkingUtil
 {
     winISteamNetworkingUtils_SteamNetworkingUtils001 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils001), "SteamNetworkingUtils001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils001_vtable;
+    r->vtable = alloc_vtable(&winISteamNetworkingUtils_SteamNetworkingUtils001_vtable, 22, "SteamNetworkingUtils001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamParentalSettings.c b/lsteamclient/winISteamParentalSettings.c
index a9f9a545..f51a960a 100644
--- a/lsteamclient/winISteamParentalSettings.c
+++ b/lsteamclient/winISteamParentalSettings.c
@@ -85,7 +85,7 @@ winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001 *create_win
 {
     winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001), "STEAMPARENTALSETTINGS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_vtable, 6, "STEAMPARENTALSETTINGS_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamParties.c b/lsteamclient/winISteamParties.c
index 85a977b1..e1992a90 100644
--- a/lsteamclient/winISteamParties.c
+++ b/lsteamclient/winISteamParties.c
@@ -133,7 +133,7 @@ winISteamParties_SteamParties002 *create_winISteamParties_SteamParties002(void *
 {
     winISteamParties_SteamParties002 *r = alloc_mem_for_iface(sizeof(winISteamParties_SteamParties002), "SteamParties002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamParties_SteamParties002_vtable;
+    r->vtable = alloc_vtable(&winISteamParties_SteamParties002_vtable, 12, "SteamParties002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamRemotePlay.c b/lsteamclient/winISteamRemotePlay.c
index c87e38fc..4527b6ee 100644
--- a/lsteamclient/winISteamRemotePlay.c
+++ b/lsteamclient/winISteamRemotePlay.c
@@ -94,7 +94,7 @@ winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001 *create_winISteamRemote
 {
     winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001), "STEAMREMOTEPLAY_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001_vtable, 7, "STEAMREMOTEPLAY_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamRemoteStorage.c b/lsteamclient/winISteamRemoteStorage.c
index e63b9309..30154624 100644
--- a/lsteamclient/winISteamRemoteStorage.c
+++ b/lsteamclient/winISteamRemoteStorage.c
@@ -521,7 +521,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016), "STEAMREMOTESTORAGE_INTERFACE_VERSION016");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016_vtable, 59, "STEAMREMOTESTORAGE_INTERFACE_VERSION016");
     r->linux_side = linux_side;
     return r;
 }
@@ -1000,7 +1000,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014), "STEAMREMOTESTORAGE_INTERFACE_VERSION014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_vtable, 55, "STEAMREMOTESTORAGE_INTERFACE_VERSION014");
     r->linux_side = linux_side;
     return r;
 }
@@ -1479,7 +1479,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013), "STEAMREMOTESTORAGE_INTERFACE_VERSION013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_vtable, 55, "STEAMREMOTESTORAGE_INTERFACE_VERSION013");
     r->linux_side = linux_side;
     return r;
 }
@@ -1934,7 +1934,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012), "STEAMREMOTESTORAGE_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_vtable, 52, "STEAMREMOTESTORAGE_INTERFACE_VERSION012");
     r->linux_side = linux_side;
     return r;
 }
@@ -2389,7 +2389,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011), "STEAMREMOTESTORAGE_INTERFACE_VERSION011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_vtable, 52, "STEAMREMOTESTORAGE_INTERFACE_VERSION011");
     r->linux_side = linux_side;
     return r;
 }
@@ -2844,7 +2844,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010), "STEAMREMOTESTORAGE_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_vtable, 52, "STEAMREMOTESTORAGE_INTERFACE_VERSION010");
     r->linux_side = linux_side;
     return r;
 }
@@ -3289,7 +3289,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009), "STEAMREMOTESTORAGE_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_vtable, 51, "STEAMREMOTESTORAGE_INTERFACE_VERSION009");
     r->linux_side = linux_side;
     return r;
 }
@@ -3734,7 +3734,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008), "STEAMREMOTESTORAGE_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_vtable, 51, "STEAMREMOTESTORAGE_INTERFACE_VERSION008");
     r->linux_side = linux_side;
     return r;
 }
@@ -4147,7 +4147,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007), "STEAMREMOTESTORAGE_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_vtable, 47, "STEAMREMOTESTORAGE_INTERFACE_VERSION007");
     r->linux_side = linux_side;
     return r;
 }
@@ -4560,7 +4560,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006), "STEAMREMOTESTORAGE_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_vtable, 47, "STEAMREMOTESTORAGE_INTERFACE_VERSION006");
     r->linux_side = linux_side;
     return r;
 }
@@ -4839,7 +4839,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005), "STEAMREMOTESTORAGE_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_vtable, 31, "STEAMREMOTESTORAGE_INTERFACE_VERSION005");
     r->linux_side = linux_side;
     return r;
 }
@@ -5042,7 +5042,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004), "STEAMREMOTESTORAGE_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_vtable, 22, "STEAMREMOTESTORAGE_INTERFACE_VERSION004");
     r->linux_side = linux_side;
     return r;
 }
@@ -5229,7 +5229,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003), "STEAMREMOTESTORAGE_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_vtable, 20, "STEAMREMOTESTORAGE_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -5312,7 +5312,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002), "STEAMREMOTESTORAGE_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_vtable, 7, "STEAMREMOTESTORAGE_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -5403,7 +5403,7 @@ winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001 *create_winISteam
 {
     winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001), "STEAMREMOTESTORAGE_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_vtable, 8, "STEAMREMOTESTORAGE_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamScreenshots.c b/lsteamclient/winISteamScreenshots.c
index d0f21f74..73369dfe 100644
--- a/lsteamclient/winISteamScreenshots.c
+++ b/lsteamclient/winISteamScreenshots.c
@@ -117,7 +117,7 @@ winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003 *create_winISteamScre
 {
     winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003), "STEAMSCREENSHOTS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_vtable, 9, "STEAMSCREENSHOTS_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -204,7 +204,7 @@ winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002 *create_winISteamScre
 {
     winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002), "STEAMSCREENSHOTS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_vtable, 7, "STEAMSCREENSHOTS_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -283,7 +283,7 @@ winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001 *create_winISteamScre
 {
     winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001), "STEAMSCREENSHOTS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_vtable, 6, "STEAMSCREENSHOTS_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamUGC.c b/lsteamclient/winISteamUGC.c
index b1690c14..a03fede5 100644
--- a/lsteamclient/winISteamUGC.c
+++ b/lsteamclient/winISteamUGC.c
@@ -741,7 +741,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION016 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION016 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION016), "STEAMUGC_INTERFACE_VERSION016");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION016_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION016_vtable, 86, "STEAMUGC_INTERFACE_VERSION016");
     r->linux_side = linux_side;
     return r;
 }
@@ -1456,7 +1456,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION015 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION015 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION015), "STEAMUGC_INTERFACE_VERSION015");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION015_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION015_vtable, 84, "STEAMUGC_INTERFACE_VERSION015");
     r->linux_side = linux_side;
     return r;
 }
@@ -2131,7 +2131,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION014 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION014 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION014), "STEAMUGC_INTERFACE_VERSION014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION014_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION014_vtable, 79, "STEAMUGC_INTERFACE_VERSION014");
     r->linux_side = linux_side;
     return r;
 }
@@ -2798,7 +2798,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION013 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION013 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION013), "STEAMUGC_INTERFACE_VERSION013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION013_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION013_vtable, 78, "STEAMUGC_INTERFACE_VERSION013");
     r->linux_side = linux_side;
     return r;
 }
@@ -3449,7 +3449,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION012), "STEAMUGC_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION012_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION012_vtable, 76, "STEAMUGC_INTERFACE_VERSION012");
     r->linux_side = linux_side;
     return r;
 }
@@ -4084,7 +4084,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION010), "STEAMUGC_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION010_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION010_vtable, 74, "STEAMUGC_INTERFACE_VERSION010");
     r->linux_side = linux_side;
     return r;
 }
@@ -4663,7 +4663,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION009), "STEAMUGC_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION009_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION009_vtable, 67, "STEAMUGC_INTERFACE_VERSION009");
     r->linux_side = linux_side;
     return r;
 }
@@ -5210,7 +5210,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION008), "STEAMUGC_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION008_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION008_vtable, 63, "STEAMUGC_INTERFACE_VERSION008");
     r->linux_side = linux_side;
     return r;
 }
@@ -5713,7 +5713,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION007), "STEAMUGC_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION007_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION007_vtable, 58, "STEAMUGC_INTERFACE_VERSION007");
     r->linux_side = linux_side;
     return r;
 }
@@ -6150,7 +6150,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION006), "STEAMUGC_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION006_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION006_vtable, 50, "STEAMUGC_INTERFACE_VERSION006");
     r->linux_side = linux_side;
     return r;
 }
@@ -6555,7 +6555,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION005), "STEAMUGC_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION005_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION005_vtable, 46, "STEAMUGC_INTERFACE_VERSION005");
     r->linux_side = linux_side;
     return r;
 }
@@ -6853,7 +6853,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION004), "STEAMUGC_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION004_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION004_vtable, 33, "STEAMUGC_INTERFACE_VERSION004");
     r->linux_side = linux_side;
     return r;
 }
@@ -7135,7 +7135,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION003), "STEAMUGC_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION003_vtable, 31, "STEAMUGC_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -7417,7 +7417,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION002), "STEAMUGC_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION002_vtable, 31, "STEAMUGC_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -7556,7 +7556,7 @@ winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *create_winISteamUGC_STEAMUGC_INTERFA
 {
     winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION001), "STEAMUGC_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamUGC_STEAMUGC_INTERFACE_VERSION001_vtable, 14, "STEAMUGC_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamUnifiedMessages.c b/lsteamclient/winISteamUnifiedMessages.c
index 70500206..82377b85 100644
--- a/lsteamclient/winISteamUnifiedMessages.c
+++ b/lsteamclient/winISteamUnifiedMessages.c
@@ -77,7 +77,7 @@ winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001 *create_winIS
 {
     winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001), "STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_vtable, 5, "STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamUser.c b/lsteamclient/winISteamUser.c
index 80e2af7c..299d4364 100644
--- a/lsteamclient/winISteamUser.c
+++ b/lsteamclient/winISteamUser.c
@@ -297,7 +297,7 @@ winISteamUser_SteamUser021 *create_winISteamUser_SteamUser021(void *linux_side)
 {
     winISteamUser_SteamUser021 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser021), "SteamUser021");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser021_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser021_vtable, 32, "SteamUser021");
     r->linux_side = linux_side;
     return r;
 }
@@ -576,7 +576,7 @@ winISteamUser_SteamUser020 *create_winISteamUser_SteamUser020(void *linux_side)
 {
     winISteamUser_SteamUser020 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser020), "SteamUser020");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser020_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser020_vtable, 31, "SteamUser020");
     r->linux_side = linux_side;
     return r;
 }
@@ -839,7 +839,7 @@ winISteamUser_SteamUser019 *create_winISteamUser_SteamUser019(void *linux_side)
 {
     winISteamUser_SteamUser019 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser019), "SteamUser019");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser019_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser019_vtable, 29, "SteamUser019");
     r->linux_side = linux_side;
     return r;
 }
@@ -1070,7 +1070,7 @@ winISteamUser_SteamUser018 *create_winISteamUser_SteamUser018(void *linux_side)
 {
     winISteamUser_SteamUser018 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser018), "SteamUser018");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser018_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser018_vtable, 25, "SteamUser018");
     r->linux_side = linux_side;
     return r;
 }
@@ -1293,7 +1293,7 @@ winISteamUser_SteamUser017 *create_winISteamUser_SteamUser017(void *linux_side)
 {
     winISteamUser_SteamUser017 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser017), "SteamUser017");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser017_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser017_vtable, 24, "SteamUser017");
     r->linux_side = linux_side;
     return r;
 }
@@ -1500,7 +1500,7 @@ winISteamUser_SteamUser016 *create_winISteamUser_SteamUser016(void *linux_side)
 {
     winISteamUser_SteamUser016 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser016), "SteamUser016");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser016_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser016_vtable, 22, "SteamUser016");
     r->linux_side = linux_side;
     return r;
 }
@@ -1707,7 +1707,7 @@ winISteamUser_SteamUser015 *create_winISteamUser_SteamUser015(void *linux_side)
 {
     winISteamUser_SteamUser015 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser015), "SteamUser015");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser015_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser015_vtable, 22, "SteamUser015");
     r->linux_side = linux_side;
     return r;
 }
@@ -1906,7 +1906,7 @@ winISteamUser_SteamUser014 *create_winISteamUser_SteamUser014(void *linux_side)
 {
     winISteamUser_SteamUser014 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser014), "SteamUser014");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser014_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser014_vtable, 21, "SteamUser014");
     r->linux_side = linux_side;
     return r;
 }
@@ -2073,7 +2073,7 @@ winISteamUser_SteamUser013 *create_winISteamUser_SteamUser013(void *linux_side)
 {
     winISteamUser_SteamUser013 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser013), "SteamUser013");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser013_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser013_vtable, 17, "SteamUser013");
     r->linux_side = linux_side;
     return r;
 }
@@ -2232,7 +2232,7 @@ winISteamUser_SteamUser012 *create_winISteamUser_SteamUser012(void *linux_side)
 {
     winISteamUser_SteamUser012 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser012), "SteamUser012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser012_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser012_vtable, 16, "SteamUser012");
     r->linux_side = linux_side;
     return r;
 }
@@ -2351,7 +2351,7 @@ winISteamUser_SteamUser011 *create_winISteamUser_SteamUser011(void *linux_side)
 {
     winISteamUser_SteamUser011 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser011), "SteamUser011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser011_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser011_vtable, 11, "SteamUser011");
     r->linux_side = linux_side;
     return r;
 }
@@ -2427,7 +2427,7 @@ winISteamUser_SteamUser010 *create_winISteamUser_SteamUser010(void *linux_side)
 {
     winISteamUser_SteamUser010 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser010), "SteamUser010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser010_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser010_vtable, 6, "SteamUser010");
     r->linux_side = linux_side;
     return r;
 }
@@ -2511,7 +2511,7 @@ winISteamUser_SteamUser009 *create_winISteamUser_SteamUser009(void *linux_side)
 {
     winISteamUser_SteamUser009 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser009), "SteamUser009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser009_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser009_vtable, 7, "SteamUser009");
     r->linux_side = linux_side;
     return r;
 }
@@ -2595,7 +2595,7 @@ winISteamUser_SteamUser008 *create_winISteamUser_SteamUser008(void *linux_side)
 {
     winISteamUser_SteamUser008 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser008), "SteamUser008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser008_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser008_vtable, 7, "SteamUser008");
     r->linux_side = linux_side;
     return r;
 }
@@ -2727,7 +2727,7 @@ winISteamUser_SteamUser007 *create_winISteamUser_SteamUser007(void *linux_side)
 {
     winISteamUser_SteamUser007 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser007), "SteamUser007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser007_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser007_vtable, 13, "SteamUser007");
     r->linux_side = linux_side;
     return r;
 }
@@ -2851,7 +2851,7 @@ winISteamUser_SteamUser006 *create_winISteamUser_SteamUser006(void *linux_side)
 {
     winISteamUser_SteamUser006 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser006), "SteamUser006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser006_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser006_vtable, 12, "SteamUser006");
     r->linux_side = linux_side;
     return r;
 }
@@ -3191,7 +3191,7 @@ winISteamUser_SteamUser005 *create_winISteamUser_SteamUser005(void *linux_side)
 {
     winISteamUser_SteamUser005 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser005), "SteamUser005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser005_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser005_vtable, 39, "SteamUser005");
     r->linux_side = linux_side;
     return r;
 }
@@ -3427,7 +3427,7 @@ winISteamUser_SteamUser004 *create_winISteamUser_SteamUser004(void *linux_side)
 {
     winISteamUser_SteamUser004 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser004), "SteamUser004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUser_SteamUser004_vtable;
+    r->vtable = alloc_vtable(&winISteamUser_SteamUser004_vtable, 26, "SteamUser004");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamUserStats.c b/lsteamclient/winISteamUserStats.c
index 349645ce..59d73222 100644
--- a/lsteamclient/winISteamUserStats.c
+++ b/lsteamclient/winISteamUserStats.c
@@ -397,7 +397,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012), "STEAMUSERSTATS_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012_vtable, 45, "STEAMUSERSTATS_INTERFACE_VERSION012");
     r->linux_side = linux_side;
     return r;
 }
@@ -768,7 +768,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011), "STEAMUSERSTATS_INTERFACE_VERSION011");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_vtable, 43, "STEAMUSERSTATS_INTERFACE_VERSION011");
     r->linux_side = linux_side;
     return r;
 }
@@ -1123,7 +1123,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010), "STEAMUSERSTATS_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_vtable, 41, "STEAMUSERSTATS_INTERFACE_VERSION010");
     r->linux_side = linux_side;
     return r;
 }
@@ -1406,7 +1406,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009), "STEAMUSERSTATS_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_vtable, 32, "STEAMUSERSTATS_INTERFACE_VERSION009");
     r->linux_side = linux_side;
     return r;
 }
@@ -1681,7 +1681,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008), "STEAMUSERSTATS_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_vtable, 31, "STEAMUSERSTATS_INTERFACE_VERSION008");
     r->linux_side = linux_side;
     return r;
 }
@@ -1948,7 +1948,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007), "STEAMUSERSTATS_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_vtable, 30, "STEAMUSERSTATS_INTERFACE_VERSION007");
     r->linux_side = linux_side;
     return r;
 }
@@ -2199,7 +2199,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006), "STEAMUSERSTATS_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_vtable, 28, "STEAMUSERSTATS_INTERFACE_VERSION006");
     r->linux_side = linux_side;
     return r;
 }
@@ -2442,7 +2442,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005), "STEAMUSERSTATS_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_vtable, 27, "STEAMUSERSTATS_INTERFACE_VERSION005");
     r->linux_side = linux_side;
     return r;
 }
@@ -2605,7 +2605,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004), "STEAMUSERSTATS_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_vtable, 17, "STEAMUSERSTATS_INTERFACE_VERSION004");
     r->linux_side = linux_side;
     return r;
 }
@@ -2736,7 +2736,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003), "STEAMUSERSTATS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_vtable, 13, "STEAMUSERSTATS_INTERFACE_VERSION003");
     r->linux_side = linux_side;
     return r;
 }
@@ -2907,7 +2907,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002), "STEAMUSERSTATS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_vtable, 18, "STEAMUSERSTATS_INTERFACE_VERSION002");
     r->linux_side = linux_side;
     return r;
 }
@@ -3110,7 +3110,7 @@ winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001 *create_winISteamUserStat
 {
     winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001), "STEAMUSERSTATS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_vtable;
+    r->vtable = alloc_vtable(&winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_vtable, 22, "STEAMUSERSTATS_INTERFACE_VERSION001");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamUtils.c b/lsteamclient/winISteamUtils.c
index 6e73b936..01c0415a 100644
--- a/lsteamclient/winISteamUtils.c
+++ b/lsteamclient/winISteamUtils.c
@@ -343,7 +343,7 @@ winISteamUtils_SteamUtils010 *create_winISteamUtils_SteamUtils010(void *linux_si
 {
     winISteamUtils_SteamUtils010 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils010), "SteamUtils010");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils010_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils010_vtable, 38, "SteamUtils010");
     r->linux_side = linux_side;
     return r;
 }
@@ -644,7 +644,7 @@ winISteamUtils_SteamUtils009 *create_winISteamUtils_SteamUtils009(void *linux_si
 {
     winISteamUtils_SteamUtils009 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils009), "SteamUtils009");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils009_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils009_vtable, 34, "SteamUtils009");
     r->linux_side = linux_side;
     return r;
 }
@@ -897,7 +897,7 @@ winISteamUtils_SteamUtils008 *create_winISteamUtils_SteamUtils008(void *linux_si
 {
     winISteamUtils_SteamUtils008 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils008), "SteamUtils008");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils008_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils008_vtable, 28, "SteamUtils008");
     r->linux_side = linux_side;
     return r;
 }
@@ -1134,7 +1134,7 @@ winISteamUtils_SteamUtils007 *create_winISteamUtils_SteamUtils007(void *linux_si
 {
     winISteamUtils_SteamUtils007 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils007), "SteamUtils007");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils007_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils007_vtable, 26, "SteamUtils007");
     r->linux_side = linux_side;
     return r;
 }
@@ -1363,7 +1363,7 @@ winISteamUtils_SteamUtils006 *create_winISteamUtils_SteamUtils006(void *linux_si
 {
     winISteamUtils_SteamUtils006 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils006), "SteamUtils006");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils006_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils006_vtable, 25, "SteamUtils006");
     r->linux_side = linux_side;
     return r;
 }
@@ -1576,7 +1576,7 @@ winISteamUtils_SteamUtils005 *create_winISteamUtils_SteamUtils005(void *linux_si
 {
     winISteamUtils_SteamUtils005 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils005), "SteamUtils005");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils005_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils005_vtable, 23, "SteamUtils005");
     r->linux_side = linux_side;
     return r;
 }
@@ -1747,7 +1747,7 @@ winISteamUtils_SteamUtils004 *create_winISteamUtils_SteamUtils004(void *linux_si
 {
     winISteamUtils_SteamUtils004 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils004), "SteamUtils004");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils004_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils004_vtable, 18, "SteamUtils004");
     r->linux_side = linux_side;
     return r;
 }
@@ -1886,7 +1886,7 @@ winISteamUtils_SteamUtils002 *create_winISteamUtils_SteamUtils002(void *linux_si
 {
     winISteamUtils_SteamUtils002 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils002), "SteamUtils002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamUtils_SteamUtils002_vtable;
+    r->vtable = alloc_vtable(&winISteamUtils_SteamUtils002_vtable, 14, "SteamUtils002");
     r->linux_side = linux_side;
     return r;
 }
diff --git a/lsteamclient/winISteamVideo.c b/lsteamclient/winISteamVideo.c
index 49e60200..65f37f32 100644
--- a/lsteamclient/winISteamVideo.c
+++ b/lsteamclient/winISteamVideo.c
@@ -69,7 +69,7 @@ winISteamVideo_STEAMVIDEO_INTERFACE_V002 *create_winISteamVideo_STEAMVIDEO_INTER
 {
     winISteamVideo_STEAMVIDEO_INTERFACE_V002 *r = alloc_mem_for_iface(sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V002), "STEAMVIDEO_INTERFACE_V002");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamVideo_STEAMVIDEO_INTERFACE_V002_vtable;
+    r->vtable = alloc_vtable(&winISteamVideo_STEAMVIDEO_INTERFACE_V002_vtable, 4, "STEAMVIDEO_INTERFACE_V002");
     r->linux_side = linux_side;
     return r;
 }
@@ -112,7 +112,7 @@ winISteamVideo_STEAMVIDEO_INTERFACE_V001 *create_winISteamVideo_STEAMVIDEO_INTER
 {
     winISteamVideo_STEAMVIDEO_INTERFACE_V001 *r = alloc_mem_for_iface(sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V001), "STEAMVIDEO_INTERFACE_V001");
     TRACE("-> %p\n", r);
-    r->vtable = &winISteamVideo_STEAMVIDEO_INTERFACE_V001_vtable;
+    r->vtable = alloc_vtable(&winISteamVideo_STEAMVIDEO_INTERFACE_V001_vtable, 2, "STEAMVIDEO_INTERFACE_V001");
     r->linux_side = linux_side;
     return r;
 }