From 99e5c542c07cd72b7f4449d21085d105387d3e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 19 Sep 2023 21:24:23 +0200
Subject: [PATCH] lsteamclient: Generate functions with calling convention.

CW-Bug-Id: #22729
---
 .../cppISteamClient_SteamClient007.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient007.h |  2 +-
 .../cppISteamClient_SteamClient008.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient008.h |  2 +-
 .../cppISteamClient_SteamClient009.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient009.h |  2 +-
 .../cppISteamClient_SteamClient010.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient010.h |  2 +-
 .../cppISteamClient_SteamClient011.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient011.h |  2 +-
 .../cppISteamClient_SteamClient012.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient012.h |  2 +-
 .../cppISteamClient_SteamClient013.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient013.h |  2 +-
 .../cppISteamClient_SteamClient014.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient014.h |  2 +-
 .../cppISteamClient_SteamClient015.cpp        |  4 +-
 lsteamclient/cppISteamClient_SteamClient015.h |  2 +-
 .../cppISteamClient_SteamClient016.cpp        |  8 +--
 lsteamclient/cppISteamClient_SteamClient016.h |  8 +--
 .../cppISteamClient_SteamClient017.cpp        |  8 +--
 lsteamclient/cppISteamClient_SteamClient017.h |  8 +--
 .../cppISteamClient_SteamClient018.cpp        |  8 +--
 lsteamclient/cppISteamClient_SteamClient018.h |  8 +--
 .../cppISteamClient_SteamClient019.cpp        |  8 +--
 lsteamclient/cppISteamClient_SteamClient019.h |  8 +--
 .../cppISteamClient_SteamClient020.cpp        |  8 +--
 lsteamclient/cppISteamClient_SteamClient020.h |  8 +--
 ...STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp |  8 +--
 ...STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp |  8 +--
 ...STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp |  8 +--
 ...STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp |  8 +--
 ...STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp |  8 +--
 lsteamclient/cppISteamInput_SteamInput005.h   |  2 +-
 lsteamclient/cppISteamInput_SteamInput006.h   |  2 +-
 ...etworkingUtils_SteamNetworkingUtils001.cpp |  4 +-
 ...mNetworkingUtils_SteamNetworkingUtils001.h |  2 +-
 ...etworkingUtils_SteamNetworkingUtils002.cpp |  4 +-
 ...mNetworkingUtils_SteamNetworkingUtils002.h |  2 +-
 ...etworkingUtils_SteamNetworkingUtils003.cpp |  4 +-
 ...mNetworkingUtils_SteamNetworkingUtils003.h |  2 +-
 ...etworkingUtils_SteamNetworkingUtils004.cpp |  4 +-
 ...mNetworkingUtils_SteamNetworkingUtils004.h |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils004.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils004.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils005.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils005.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils006.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils006.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils007.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils007.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils008.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils008.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils009.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils009.h   |  2 +-
 lsteamclient/cppISteamUtils_SteamUtils010.cpp |  4 +-
 lsteamclient/cppISteamUtils_SteamUtils010.h   |  2 +-
 lsteamclient/gen_wrapper.py                   | 39 ++++++++++++-
 lsteamclient/winISteamClient.c                | 58 +++++++++----------
 lsteamclient/winISteamInput.c                 |  4 +-
 lsteamclient/winISteamNetworkingUtils.c       |  8 +--
 lsteamclient/winISteamUtils.c                 | 14 ++---
 62 files changed, 200 insertions(+), 167 deletions(-)

diff --git a/lsteamclient/cppISteamClient_SteamClient007.cpp b/lsteamclient/cppISteamClient_SteamClient007.cpp
index 21f89008..20c3a738 100644
--- a/lsteamclient/cppISteamClient_SteamClient007.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient007.cpp
@@ -114,8 +114,8 @@ void cppISteamClient_SteamClient007_GetISteamNetworking( struct cppISteamClient_
 
 void cppISteamClient_SteamClient007_SetWarningMessageHook( struct cppISteamClient_SteamClient007_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient007_GetISteamRemoteStorage( struct cppISteamClient_SteamClient007_GetISteamRemoteStorage_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient007.h b/lsteamclient/cppISteamClient_SteamClient007.h
index ca4b22cb..80b52e40 100644
--- a/lsteamclient/cppISteamClient_SteamClient007.h
+++ b/lsteamclient/cppISteamClient_SteamClient007.h
@@ -180,7 +180,7 @@ extern void cppISteamClient_SteamClient007_GetISteamNetworking( struct cppISteam
 struct cppISteamClient_SteamClient007_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient007_SetWarningMessageHook( struct cppISteamClient_SteamClient007_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient008.cpp b/lsteamclient/cppISteamClient_SteamClient008.cpp
index 13f71167..e6347cfc 100644
--- a/lsteamclient/cppISteamClient_SteamClient008.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient008.cpp
@@ -114,8 +114,8 @@ void cppISteamClient_SteamClient008_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient008_SetWarningMessageHook( struct cppISteamClient_SteamClient008_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 #ifdef __cplusplus
diff --git a/lsteamclient/cppISteamClient_SteamClient008.h b/lsteamclient/cppISteamClient_SteamClient008.h
index 6e119ec4..cb220e94 100644
--- a/lsteamclient/cppISteamClient_SteamClient008.h
+++ b/lsteamclient/cppISteamClient_SteamClient008.h
@@ -181,7 +181,7 @@ extern void cppISteamClient_SteamClient008_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient008_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient008_SetWarningMessageHook( struct cppISteamClient_SteamClient008_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient009.cpp b/lsteamclient/cppISteamClient_SteamClient009.cpp
index 4d65c338..1970eb22 100644
--- a/lsteamclient/cppISteamClient_SteamClient009.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient009.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient009_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient009_SetWarningMessageHook( struct cppISteamClient_SteamClient009_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 #ifdef __cplusplus
diff --git a/lsteamclient/cppISteamClient_SteamClient009.h b/lsteamclient/cppISteamClient_SteamClient009.h
index 24478d13..92511697 100644
--- a/lsteamclient/cppISteamClient_SteamClient009.h
+++ b/lsteamclient/cppISteamClient_SteamClient009.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient009_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient009_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient009_SetWarningMessageHook( struct cppISteamClient_SteamClient009_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient010.cpp b/lsteamclient/cppISteamClient_SteamClient010.cpp
index fc27c7f3..e6b9d20e 100644
--- a/lsteamclient/cppISteamClient_SteamClient010.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient010.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient010_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient010_SetWarningMessageHook( struct cppISteamClient_SteamClient010_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient010.h b/lsteamclient/cppISteamClient_SteamClient010.h
index 869725e1..7abd3c51 100644
--- a/lsteamclient/cppISteamClient_SteamClient010.h
+++ b/lsteamclient/cppISteamClient_SteamClient010.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient010_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient010_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient010_SetWarningMessageHook( struct cppISteamClient_SteamClient010_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient011.cpp b/lsteamclient/cppISteamClient_SteamClient011.cpp
index b0fbcf5b..a0d8945e 100644
--- a/lsteamclient/cppISteamClient_SteamClient011.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient011.cpp
@@ -124,8 +124,8 @@ void cppISteamClient_SteamClient011_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient011_SetWarningMessageHook( struct cppISteamClient_SteamClient011_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient011_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient011_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient011.h b/lsteamclient/cppISteamClient_SteamClient011.h
index 29e08318..8bdd352d 100644
--- a/lsteamclient/cppISteamClient_SteamClient011.h
+++ b/lsteamclient/cppISteamClient_SteamClient011.h
@@ -201,7 +201,7 @@ extern void cppISteamClient_SteamClient011_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient011_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient011_SetWarningMessageHook( struct cppISteamClient_SteamClient011_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient012.cpp b/lsteamclient/cppISteamClient_SteamClient012.cpp
index eb248691..1b44485c 100644
--- a/lsteamclient/cppISteamClient_SteamClient012.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient012.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient012_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient012_SetWarningMessageHook( struct cppISteamClient_SteamClient012_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient012_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient012_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient012.h b/lsteamclient/cppISteamClient_SteamClient012.h
index e438fed7..331b74ea 100644
--- a/lsteamclient/cppISteamClient_SteamClient012.h
+++ b/lsteamclient/cppISteamClient_SteamClient012.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient012_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient012_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient012_SetWarningMessageHook( struct cppISteamClient_SteamClient012_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient013.cpp b/lsteamclient/cppISteamClient_SteamClient013.cpp
index d1093e4e..6fec636c 100644
--- a/lsteamclient/cppISteamClient_SteamClient013.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient013.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient013_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient013_SetWarningMessageHook( struct cppISteamClient_SteamClient013_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient013_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient013_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient013.h b/lsteamclient/cppISteamClient_SteamClient013.h
index 5f9311f0..94aedc02 100644
--- a/lsteamclient/cppISteamClient_SteamClient013.h
+++ b/lsteamclient/cppISteamClient_SteamClient013.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient013_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient013_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient013_SetWarningMessageHook( struct cppISteamClient_SteamClient013_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient014.cpp b/lsteamclient/cppISteamClient_SteamClient014.cpp
index c3b5fe66..16d4ab74 100644
--- a/lsteamclient/cppISteamClient_SteamClient014.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient014.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient014_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient014_SetWarningMessageHook( struct cppISteamClient_SteamClient014_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient014_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient014_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient014.h b/lsteamclient/cppISteamClient_SteamClient014.h
index f8808ec3..9c56fbd7 100644
--- a/lsteamclient/cppISteamClient_SteamClient014.h
+++ b/lsteamclient/cppISteamClient_SteamClient014.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient014_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient014_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient014_SetWarningMessageHook( struct cppISteamClient_SteamClient014_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient015.cpp b/lsteamclient/cppISteamClient_SteamClient015.cpp
index 8fbf5a0e..1ba6b2fe 100644
--- a/lsteamclient/cppISteamClient_SteamClient015.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient015.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient015_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient015_SetWarningMessageHook( struct cppISteamClient_SteamClient015_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient015_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient015_BShutdownIfAllPipesClosed_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient015.h b/lsteamclient/cppISteamClient_SteamClient015.h
index 26c6236e..6643743a 100644
--- a/lsteamclient/cppISteamClient_SteamClient015.h
+++ b/lsteamclient/cppISteamClient_SteamClient015.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient015_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient015_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient015_SetWarningMessageHook( struct cppISteamClient_SteamClient015_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient016.cpp b/lsteamclient/cppISteamClient_SteamClient016.cpp
index 76afb481..9e684273 100644
--- a/lsteamclient/cppISteamClient_SteamClient016.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient016.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient016_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient016_SetWarningMessageHook( struct cppISteamClient_SteamClient016_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient016_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient016_BShutdownIfAllPipesClosed_params *params )
@@ -181,8 +181,8 @@ void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( str
 
 void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params )
 {
-    params->func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
-    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( (SteamAPI_CheckCallbackRegistered_t)params->func );
+    SteamAPI_CheckCallbackRegistered_t lin_func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
+    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func );
 }
 
 #ifdef __cplusplus
diff --git a/lsteamclient/cppISteamClient_SteamClient016.h b/lsteamclient/cppISteamClient_SteamClient016.h
index 272ca385..5abc3ce8 100644
--- a/lsteamclient/cppISteamClient_SteamClient016.h
+++ b/lsteamclient/cppISteamClient_SteamClient016.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient016_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient016_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient016_SetWarningMessageHook( struct cppISteamClient_SteamClient016_SetWarningMessageHook_params *params );
 
@@ -285,21 +285,21 @@ extern void cppISteamClient_SteamClient016_GetISteamHTMLSurface( struct cppIStea
 struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    SteamAPI_PostAPIResultInProcess_t func;
+    void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t);
 };
 extern void cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    SteamAPI_PostAPIResultInProcess_t func;
+    void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t);
 };
 extern void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     void *linux_side;
-    SteamAPI_CheckCallbackRegistered_t func;
+    uint32_t (*__stdcall func)(int32_t);
 };
 extern void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient017.cpp b/lsteamclient/cppISteamClient_SteamClient017.cpp
index 63b72f8c..c6d48947 100644
--- a/lsteamclient/cppISteamClient_SteamClient017.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient017.cpp
@@ -119,8 +119,8 @@ void cppISteamClient_SteamClient017_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient017_SetWarningMessageHook( struct cppISteamClient_SteamClient017_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient017_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient017_BShutdownIfAllPipesClosed_params *params )
@@ -181,8 +181,8 @@ void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
 
 void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params )
 {
-    params->func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
-    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( (SteamAPI_CheckCallbackRegistered_t)params->func );
+    SteamAPI_CheckCallbackRegistered_t lin_func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
+    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func );
 }
 
 void cppISteamClient_SteamClient017_GetISteamInventory( struct cppISteamClient_SteamClient017_GetISteamInventory_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient017.h b/lsteamclient/cppISteamClient_SteamClient017.h
index 08a50511..4af934d7 100644
--- a/lsteamclient/cppISteamClient_SteamClient017.h
+++ b/lsteamclient/cppISteamClient_SteamClient017.h
@@ -191,7 +191,7 @@ extern void cppISteamClient_SteamClient017_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient017_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient017_SetWarningMessageHook( struct cppISteamClient_SteamClient017_SetWarningMessageHook_params *params );
 
@@ -285,21 +285,21 @@ extern void cppISteamClient_SteamClient017_GetISteamHTMLSurface( struct cppIStea
 struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     void *linux_side;
-    SteamAPI_CheckCallbackRegistered_t func;
+    uint32_t (*__stdcall func)(int32_t);
 };
 extern void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient018.cpp b/lsteamclient/cppISteamClient_SteamClient018.cpp
index 9de6af64..8435361a 100644
--- a/lsteamclient/cppISteamClient_SteamClient018.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient018.cpp
@@ -125,8 +125,8 @@ void cppISteamClient_SteamClient018_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient018_SetWarningMessageHook( struct cppISteamClient_SteamClient018_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient018_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient018_BShutdownIfAllPipesClosed_params *params )
@@ -187,8 +187,8 @@ void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
 
 void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params )
 {
-    params->func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
-    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( (SteamAPI_CheckCallbackRegistered_t)params->func );
+    SteamAPI_CheckCallbackRegistered_t lin_func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
+    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func );
 }
 
 void cppISteamClient_SteamClient018_GetISteamInventory( struct cppISteamClient_SteamClient018_GetISteamInventory_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient018.h b/lsteamclient/cppISteamClient_SteamClient018.h
index d5c1c108..d39a3631 100644
--- a/lsteamclient/cppISteamClient_SteamClient018.h
+++ b/lsteamclient/cppISteamClient_SteamClient018.h
@@ -201,7 +201,7 @@ extern void cppISteamClient_SteamClient018_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient018_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient018_SetWarningMessageHook( struct cppISteamClient_SteamClient018_SetWarningMessageHook_params *params );
 
@@ -295,21 +295,21 @@ extern void cppISteamClient_SteamClient018_GetISteamHTMLSurface( struct cppIStea
 struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     void *linux_side;
-    SteamAPI_CheckCallbackRegistered_t func;
+    uint32_t (*__stdcall func)(int32_t);
 };
 extern void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient019.cpp b/lsteamclient/cppISteamClient_SteamClient019.cpp
index 4d1cc5b5..5dad83ab 100644
--- a/lsteamclient/cppISteamClient_SteamClient019.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient019.cpp
@@ -125,8 +125,8 @@ void cppISteamClient_SteamClient019_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient019_SetWarningMessageHook( struct cppISteamClient_SteamClient019_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient019_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient019_BShutdownIfAllPipesClosed_params *params )
@@ -187,8 +187,8 @@ void cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
 
 void cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params )
 {
-    params->func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
-    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( (SteamAPI_CheckCallbackRegistered_t)params->func );
+    SteamAPI_CheckCallbackRegistered_t lin_func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
+    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func );
 }
 
 void cppISteamClient_SteamClient019_GetISteamInventory( struct cppISteamClient_SteamClient019_GetISteamInventory_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient019.h b/lsteamclient/cppISteamClient_SteamClient019.h
index 3b7e3866..265a57f1 100644
--- a/lsteamclient/cppISteamClient_SteamClient019.h
+++ b/lsteamclient/cppISteamClient_SteamClient019.h
@@ -201,7 +201,7 @@ extern void cppISteamClient_SteamClient019_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient019_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient019_SetWarningMessageHook( struct cppISteamClient_SteamClient019_SetWarningMessageHook_params *params );
 
@@ -295,21 +295,21 @@ extern void cppISteamClient_SteamClient019_GetISteamHTMLSurface( struct cppIStea
 struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     void *linux_side;
-    SteamAPI_CheckCallbackRegistered_t func;
+    uint32_t (*__stdcall func)(int32_t);
 };
 extern void cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params );
 
diff --git a/lsteamclient/cppISteamClient_SteamClient020.cpp b/lsteamclient/cppISteamClient_SteamClient020.cpp
index 7009e4eb..078ea0f3 100644
--- a/lsteamclient/cppISteamClient_SteamClient020.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient020.cpp
@@ -125,8 +125,8 @@ void cppISteamClient_SteamClient020_GetIPCCallCount( struct cppISteamClient_Stea
 
 void cppISteamClient_SteamClient020_SetWarningMessageHook( struct cppISteamClient_SteamClient020_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamClient*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamClient_SteamClient020_BShutdownIfAllPipesClosed( struct cppISteamClient_SteamClient020_BShutdownIfAllPipesClosed_params *params )
@@ -187,8 +187,8 @@ void cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
 
 void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params )
 {
-    params->func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
-    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( (SteamAPI_CheckCallbackRegistered_t)params->func );
+    SteamAPI_CheckCallbackRegistered_t lin_func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func );
+    ((ISteamClient*)params->linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func );
 }
 
 void cppISteamClient_SteamClient020_GetISteamInventory( struct cppISteamClient_SteamClient020_GetISteamInventory_params *params )
diff --git a/lsteamclient/cppISteamClient_SteamClient020.h b/lsteamclient/cppISteamClient_SteamClient020.h
index 69acaea2..dacd276d 100644
--- a/lsteamclient/cppISteamClient_SteamClient020.h
+++ b/lsteamclient/cppISteamClient_SteamClient020.h
@@ -201,7 +201,7 @@ extern void cppISteamClient_SteamClient020_GetIPCCallCount( struct cppISteamClie
 struct cppISteamClient_SteamClient020_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamClient_SteamClient020_SetWarningMessageHook( struct cppISteamClient_SteamClient020_SetWarningMessageHook_params *params );
 
@@ -295,21 +295,21 @@ extern void cppISteamClient_SteamClient020_GetISteamHTMLSurface( struct cppIStea
 struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     void *linux_side;
-    void *_a;
+    void (*__stdcall _a)(void);
 };
 extern void cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params );
 
 struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     void *linux_side;
-    SteamAPI_CheckCallbackRegistered_t func;
+    uint32_t (*__cdecl func)(int32_t);
 };
 extern void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params );
 
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
index d000a4bb..d08c5d5c 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
@@ -98,14 +98,14 @@ void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_MouseWheel( str
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyDown( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyDown_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyUp( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyUp_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyChar( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_KeyChar_params *params )
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
index f4cc9d87..6804a8bb 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
@@ -98,14 +98,14 @@ void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_MouseWheel( str
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyDown( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyDown_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyUp( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyUp_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyChar( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_KeyChar_params *params )
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
index fbf26445..76f8a3ad 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
@@ -98,14 +98,14 @@ void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_MouseWheel( str
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyDown( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyDown_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyUp( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyUp_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyChar( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_KeyChar_params *params )
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
index dc299113..40d2e3ac 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
@@ -98,14 +98,14 @@ void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_MouseWheel( str
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyDown( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyDown_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyUp( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyUp_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyChar( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_KeyChar_params *params )
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
index cded5589..546b7d4a 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
@@ -99,14 +99,14 @@ void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_MouseWheel( str
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyDown( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyDown_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers, (bool)params->bIsSystemKey );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyDown( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers, (bool)params->bIsSystemKey );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyUp( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyUp_params *params )
 {
-    params->nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
-    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, (uint32)params->nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
+    uint32 lin_nNativeKeyCode = manual_convert_nNativeKeyCode( params->nNativeKeyCode );
+    ((ISteamHTMLSurface*)params->linux_side)->KeyUp( (HHTMLBrowser)params->unBrowserHandle, lin_nNativeKeyCode, (ISteamHTMLSurface::EHTMLKeyModifiers)params->eHTMLKeyModifiers );
 }
 
 void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyChar( struct cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_KeyChar_params *params )
diff --git a/lsteamclient/cppISteamInput_SteamInput005.h b/lsteamclient/cppISteamInput_SteamInput005.h
index 1ddd88ee..f3df8bf1 100644
--- a/lsteamclient/cppISteamInput_SteamInput005.h
+++ b/lsteamclient/cppISteamInput_SteamInput005.h
@@ -61,7 +61,7 @@ extern void cppISteamInput_SteamInput005_EnableDeviceCallbacks( struct cppISteam
 struct cppISteamInput_SteamInput005_EnableActionEventCallbacks_params
 {
     void *linux_side;
-    SteamInputActionEventCallbackPointer pCallback;
+    void (*__stdcall pCallback)(SteamInputActionEvent_t *);
 };
 extern void cppISteamInput_SteamInput005_EnableActionEventCallbacks( struct cppISteamInput_SteamInput005_EnableActionEventCallbacks_params *params );
 
diff --git a/lsteamclient/cppISteamInput_SteamInput006.h b/lsteamclient/cppISteamInput_SteamInput006.h
index fdbf3b76..2e41781f 100644
--- a/lsteamclient/cppISteamInput_SteamInput006.h
+++ b/lsteamclient/cppISteamInput_SteamInput006.h
@@ -61,7 +61,7 @@ extern void cppISteamInput_SteamInput006_EnableDeviceCallbacks( struct cppISteam
 struct cppISteamInput_SteamInput006_EnableActionEventCallbacks_params
 {
     void *linux_side;
-    SteamInputActionEventCallbackPointer pCallback;
+    void (*__stdcall pCallback)(SteamInputActionEvent_t *);
 };
 extern void cppISteamInput_SteamInput006_EnableActionEventCallbacks( struct cppISteamInput_SteamInput006_EnableActionEventCallbacks_params *params );
 
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
index 87d526e6..5d4cd500 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
@@ -75,8 +75,8 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils001_GetLocalTimestamp( struct
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params *params )
 {
-    params->pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
-    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, (FSteamNetworkingSocketsDebugOutput)params->pfnFunc );
+    FSteamNetworkingSocketsDebugOutput lin_pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
+    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, lin_pfnFunc );
 }
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils001_SetConfigValue( struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetConfigValue_params *params )
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h
index b4951fb5..063b780d 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h
@@ -100,7 +100,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_p
 {
     void *linux_side;
     uint32_t eDetailLevel;
-    FSteamNetworkingSocketsDebugOutput pfnFunc;
+    void (*__stdcall pfnFunc)(uint32_t, const char *);
 };
 extern void cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params *params );
 
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
index 18fa77eb..f87b5194 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
@@ -75,8 +75,8 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils002_GetLocalTimestamp( struct
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *params )
 {
-    params->pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
-    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, (FSteamNetworkingSocketsDebugOutput)params->pfnFunc );
+    FSteamNetworkingSocketsDebugOutput lin_pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
+    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, lin_pfnFunc );
 }
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils002_SetConfigValue( struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetConfigValue_params *params )
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h
index f6b23491..9b7fc00d 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h
@@ -101,7 +101,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_p
 {
     void *linux_side;
     uint32_t eDetailLevel;
-    FSteamNetworkingSocketsDebugOutput pfnFunc;
+    void (*__stdcall pfnFunc)(uint32_t, const char *);
 };
 extern void cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *params );
 
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
index d244280f..90f1db72 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
@@ -75,8 +75,8 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils003_GetLocalTimestamp( struct
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *params )
 {
-    params->pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
-    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, (FSteamNetworkingSocketsDebugOutput)params->pfnFunc );
+    FSteamNetworkingSocketsDebugOutput lin_pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
+    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, lin_pfnFunc );
 }
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils003_GetConfigValue( struct cppISteamNetworkingUtils_SteamNetworkingUtils003_GetConfigValue_params *params )
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h
index a003ac1f..4aeeb423 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h
@@ -109,7 +109,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_p
 {
     void *linux_side;
     uint32_t eDetailLevel;
-    FSteamNetworkingSocketsDebugOutput pfnFunc;
+    void (*__stdcall pfnFunc)(uint32_t, const char *);
 };
 extern void cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *params );
 
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
index 1ff9f3be..dbea730f 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
@@ -75,8 +75,8 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils004_GetLocalTimestamp( struct
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *params )
 {
-    params->pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
-    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, (FSteamNetworkingSocketsDebugOutput)params->pfnFunc );
+    FSteamNetworkingSocketsDebugOutput lin_pfnFunc = (FSteamNetworkingSocketsDebugOutput)manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc );
+    ((ISteamNetworkingUtils*)params->linux_side)->SetDebugOutputFunction( (ESteamNetworkingSocketsDebugOutputType)params->eDetailLevel, lin_pfnFunc );
 }
 
 void cppISteamNetworkingUtils_SteamNetworkingUtils004_GetIPv4FakeIPType( struct cppISteamNetworkingUtils_SteamNetworkingUtils004_GetIPv4FakeIPType_params *params )
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h
index a7b84e37..8bc9fe46 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h
@@ -109,7 +109,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_p
 {
     void *linux_side;
     uint32_t eDetailLevel;
-    FSteamNetworkingSocketsDebugOutput pfnFunc;
+    void (*__stdcall pfnFunc)(uint32_t, const char *);
 };
 extern void cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.cpp b/lsteamclient/cppISteamUtils_SteamUtils004.cpp
index ef48cfd8..35dafedc 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils004.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils004.cpp
@@ -93,8 +93,8 @@ void cppISteamUtils_SteamUtils004_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils004_SetWarningMessageHook( struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils004_IsOverlayEnabled( struct cppISteamUtils_SteamUtils004_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.h b/lsteamclient/cppISteamUtils_SteamUtils004.h
index 9331fc7a..d7b88792 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils004.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils004.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils004_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils004_SetWarningMessageHook( struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils005.cpp b/lsteamclient/cppISteamUtils_SteamUtils005.cpp
index d5ec3567..e88b071d 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils005.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils005.cpp
@@ -93,8 +93,8 @@ void cppISteamUtils_SteamUtils005_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils005_SetWarningMessageHook( struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils005_IsOverlayEnabled( struct cppISteamUtils_SteamUtils005_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils005.h b/lsteamclient/cppISteamUtils_SteamUtils005.h
index 872a6608..91cda6e6 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils005.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils005.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils005_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils005_SetWarningMessageHook( struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils006.cpp b/lsteamclient/cppISteamUtils_SteamUtils006.cpp
index e40436a4..b4218f51 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils006.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils006.cpp
@@ -93,8 +93,8 @@ void cppISteamUtils_SteamUtils006_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils006_SetWarningMessageHook( struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils006_IsOverlayEnabled( struct cppISteamUtils_SteamUtils006_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils006.h b/lsteamclient/cppISteamUtils_SteamUtils006.h
index d7d632cc..7048cf17 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils006.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils006.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils006_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils006_SetWarningMessageHook( struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils007.cpp b/lsteamclient/cppISteamUtils_SteamUtils007.cpp
index 4035f368..5b95c446 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils007.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils007.cpp
@@ -93,8 +93,8 @@ void cppISteamUtils_SteamUtils007_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils007_SetWarningMessageHook( struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils007_IsOverlayEnabled( struct cppISteamUtils_SteamUtils007_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils007.h b/lsteamclient/cppISteamUtils_SteamUtils007.h
index b0beec33..cfe2596f 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils007.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils007.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils007_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils007_SetWarningMessageHook( struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils008.cpp b/lsteamclient/cppISteamUtils_SteamUtils008.cpp
index 5334d836..7792a10c 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils008.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils008.cpp
@@ -93,8 +93,8 @@ void cppISteamUtils_SteamUtils008_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils008_SetWarningMessageHook( struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils008_IsOverlayEnabled( struct cppISteamUtils_SteamUtils008_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils008.h b/lsteamclient/cppISteamUtils_SteamUtils008.h
index 1aebb665..3e0d6e91 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils008.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils008.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils008_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils008_SetWarningMessageHook( struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils009.cpp b/lsteamclient/cppISteamUtils_SteamUtils009.cpp
index 7dd54e39..74a7e97b 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils009.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils009.cpp
@@ -94,8 +94,8 @@ void cppISteamUtils_SteamUtils009_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils009_SetWarningMessageHook( struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils009_IsOverlayEnabled( struct cppISteamUtils_SteamUtils009_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils009.h b/lsteamclient/cppISteamUtils_SteamUtils009.h
index a2858c7b..ebd7f44b 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils009.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils009.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils009_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils009_SetWarningMessageHook( struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/cppISteamUtils_SteamUtils010.cpp b/lsteamclient/cppISteamUtils_SteamUtils010.cpp
index e6510f0d..30fa4827 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils010.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils010.cpp
@@ -94,8 +94,8 @@ void cppISteamUtils_SteamUtils010_GetIPCCallCount( struct cppISteamUtils_SteamUt
 
 void cppISteamUtils_SteamUtils010_SetWarningMessageHook( struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params *params )
 {
-    params->pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
-    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( (SteamAPIWarningMessageHook_t)params->pFunction );
+    SteamAPIWarningMessageHook_t lin_pFunction = (SteamAPIWarningMessageHook_t)manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction );
+    ((ISteamUtils*)params->linux_side)->SetWarningMessageHook( lin_pFunction );
 }
 
 void cppISteamUtils_SteamUtils010_IsOverlayEnabled( struct cppISteamUtils_SteamUtils010_IsOverlayEnabled_params *params )
diff --git a/lsteamclient/cppISteamUtils_SteamUtils010.h b/lsteamclient/cppISteamUtils_SteamUtils010.h
index 57a914e4..7145a808 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils010.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils010.h
@@ -128,7 +128,7 @@ extern void cppISteamUtils_SteamUtils010_GetIPCCallCount( struct cppISteamUtils_
 struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params
 {
     void *linux_side;
-    SteamAPIWarningMessageHook_t pFunction;
+    void (*__cdecl pFunction)(int32_t, const char *);
 };
 extern void cppISteamUtils_SteamUtils010_SetWarningMessageHook( struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params *params );
 
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 58d3ddd4..26efd871 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -558,14 +558,46 @@ def param_needs_conversion(decl):
            struct_needs_conversion(decl)
 
 
+def callconv(cursor):
+    if type(cursor) is not Cursor:
+        return ''
+    canon = cursor.type.get_canonical()
+    if canon.kind != TypeKind.POINTER:
+        return ''
+    canon = canon.get_pointee()
+    if canon.kind != TypeKind.FUNCTIONPROTO:
+        return ''
+    if cursor.type.kind == TypeKind.TYPEDEF:
+        cursor = cursor.type.get_declaration()
+
+    tokens = cursor.get_tokens()
+    while next(tokens).spelling != '(': pass
+    token = f'{next(tokens).spelling} '
+    return token.replace('*', '__stdcall') \
+                .replace('S_CALLTYPE', '__cdecl')
+
+
+def declspec_func(decl, name):
+    ret = declspec(decl.get_result(), "")
+    params = [declspec(a, "") for a in decl.argument_types()]
+    params = ", ".join(params) if len(params) else "void"
+    return f'{ret} ({name})({params})'
+
+
 def declspec(decl, name):
+    call = callconv(decl)
     if type(decl) is Cursor:
         decl = decl.type
+    canon = decl.get_canonical()
+
+    if canon.kind == TypeKind.POINTER and canon.get_pointee().kind == TypeKind.FUNCTIONPROTO:
+        canon = canon.get_pointee()
+        return declspec_func(canon, f"*{call}{name}")
 
     const = 'const ' if decl.is_const_qualified() else ''
     if decl.kind in (TypeKind.POINTER, TypeKind.LVALUEREFERENCE):
         decl = decl.get_pointee()
-        return declspec(decl, f"*{const}{name}")
+        return declspec(decl, f"*{call}{const}{name}")
     if decl.kind == TypeKind.CONSTANTARRAY:
         decl, count = decl.element_type, decl.element_count
         return declspec(decl, f"({const}{name})[{count}]")
@@ -658,9 +690,9 @@ def handle_method_cpp(method, classname, cppname, out):
 
     for name, param in sorted(manual_convert.items()):
         if name in MANUAL_PARAMS:
-            out(f'    params->{name} = manual_convert_{name}( params->{name} );\n')
+            out(f'    {param.type.spelling} lin_{name} = manual_convert_{name}( params->{name} );\n')
         else:
-            out(f'    params->{name} = ({param.type.spelling})manual_convert_{param.type.spelling}( (void *)params->{name} );\n')
+            out(f'    {param.type.spelling} lin_{name} = ({param.type.spelling})manual_convert_{param.type.spelling}( (void *)params->{name} );\n')
 
     if returns_void:
         out(u'    ')
@@ -672,6 +704,7 @@ def handle_method_cpp(method, classname, cppname, out):
     def param_call(name, param):
         pfx = '&' if param.type.kind == TypeKind.POINTER else ''
         if name in need_convert: return f"{pfx}lin_{name}"
+        if name in manual_convert: return f"lin_{name}"
         if param.type.kind == TypeKind.LVALUEREFERENCE: return f'*params->{name}'
         return f"({param.type.spelling})params->{name}"
 
diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c
index f39bf07b..6ad7afdc 100644
--- a/lsteamclient/winISteamClient.c
+++ b/lsteamclient/winISteamClient.c
@@ -650,7 +650,7 @@ void /*ISteamNetworking*/ * __thiscall winISteamClient_SteamClient007_GetISteamN
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient007_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient007_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient007_SetWarningMessageHook_params params =
     {
@@ -1014,7 +1014,7 @@ uint32_t __thiscall winISteamClient_SteamClient008_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient008_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient008_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient008_SetWarningMessageHook_params params =
     {
@@ -1378,7 +1378,7 @@ uint32_t __thiscall winISteamClient_SteamClient009_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient009_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient009_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient009_SetWarningMessageHook_params params =
     {
@@ -1745,7 +1745,7 @@ uint32_t __thiscall winISteamClient_SteamClient010_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient010_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient010_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient010_SetWarningMessageHook_params params =
     {
@@ -2156,7 +2156,7 @@ uint32_t __thiscall winISteamClient_SteamClient011_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient011_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient011_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient011_SetWarningMessageHook_params params =
     {
@@ -2555,7 +2555,7 @@ uint32_t __thiscall winISteamClient_SteamClient012_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient012_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient012_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient012_SetWarningMessageHook_params params =
     {
@@ -3004,7 +3004,7 @@ uint32_t __thiscall winISteamClient_SteamClient013_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient013_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient013_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient013_SetWarningMessageHook_params params =
     {
@@ -3498,7 +3498,7 @@ uint32_t __thiscall winISteamClient_SteamClient014_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient014_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient014_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient014_SetWarningMessageHook_params params =
     {
@@ -3979,7 +3979,7 @@ uint32_t __thiscall winISteamClient_SteamClient015_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient015_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient015_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient015_SetWarningMessageHook_params params =
     {
@@ -4480,7 +4480,7 @@ uint32_t __thiscall winISteamClient_SteamClient016_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient016_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient016_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient016_SetWarningMessageHook_params params =
     {
@@ -4622,7 +4622,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient016_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, SteamAPI_PostAPIResultInProcess_t func)
+void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t))
 {
     struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -4633,7 +4633,7 @@ void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProc
     cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, SteamAPI_PostAPIResultInProcess_t func)
+void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t))
 {
     struct cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -4644,7 +4644,7 @@ void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInP
     cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, SteamAPI_CheckCallbackRegistered_t func)
+void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t))
 {
     struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -5036,7 +5036,7 @@ uint32_t __thiscall winISteamClient_SteamClient017_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient017_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient017_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient017_SetWarningMessageHook_params params =
     {
@@ -5177,7 +5177,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient017_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5188,7 +5188,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIR
     cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5199,7 +5199,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostA
     cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, SteamAPI_CheckCallbackRegistered_t func)
+void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t))
 {
     struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -5657,7 +5657,7 @@ uint32_t __thiscall winISteamClient_SteamClient018_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient018_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient018_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient018_SetWarningMessageHook_params params =
     {
@@ -5798,7 +5798,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient018_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5809,7 +5809,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIR
     cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5820,7 +5820,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostA
     cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, SteamAPI_CheckCallbackRegistered_t func)
+void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t))
 {
     struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -6312,7 +6312,7 @@ uint32_t __thiscall winISteamClient_SteamClient019_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient019_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient019_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient019_SetWarningMessageHook_params params =
     {
@@ -6453,7 +6453,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient019_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -6464,7 +6464,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIR
     cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -6475,7 +6475,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostA
     cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, SteamAPI_CheckCallbackRegistered_t func)
+void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t))
 {
     struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -6984,7 +6984,7 @@ uint32_t __thiscall winISteamClient_SteamClient020_GetIPCCallCount(struct w_stea
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient020_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamClient_SteamClient020_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamClient_SteamClient020_SetWarningMessageHook_params params =
     {
@@ -7125,7 +7125,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient020_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -7136,7 +7136,7 @@ void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIR
     cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void *_a)
+void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void))
 {
     struct cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -7147,7 +7147,7 @@ void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostA
     cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( &params );
 }
 
-void __thiscall winISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, SteamAPI_CheckCallbackRegistered_t func)
+void __thiscall winISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__cdecl func)(int32_t))
 {
     struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
diff --git a/lsteamclient/winISteamInput.c b/lsteamclient/winISteamInput.c
index 65df2fd0..b15807b3 100644
--- a/lsteamclient/winISteamInput.c
+++ b/lsteamclient/winISteamInput.c
@@ -1223,7 +1223,7 @@ void __thiscall winISteamInput_SteamInput005_EnableDeviceCallbacks(struct w_stea
     cppISteamInput_SteamInput005_EnableDeviceCallbacks( &params );
 }
 
-void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, SteamInputActionEventCallbackPointer pCallback)
+void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*__stdcall pCallback)(SteamInputActionEvent_t *))
 {
     struct cppISteamInput_SteamInput005_EnableActionEventCallbacks_params params =
     {
@@ -1935,7 +1935,7 @@ void __thiscall winISteamInput_SteamInput006_EnableDeviceCallbacks(struct w_stea
     cppISteamInput_SteamInput006_EnableDeviceCallbacks( &params );
 }
 
-void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, SteamInputActionEventCallbackPointer pCallback)
+void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*__stdcall pCallback)(SteamInputActionEvent_t *))
 {
     struct cppISteamInput_SteamInput006_EnableActionEventCallbacks_params params =
     {
diff --git a/lsteamclient/winISteamNetworkingUtils.c b/lsteamclient/winISteamNetworkingUtils.c
index 5d2d6492..d738474a 100644
--- a/lsteamclient/winISteamNetworkingUtils.c
+++ b/lsteamclient/winISteamNetworkingUtils.c
@@ -184,7 +184,7 @@ SteamNetworkingMicroseconds __thiscall winISteamNetworkingUtils_SteamNetworkingU
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, FSteamNetworkingSocketsDebugOutput pfnFunc)
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *))
 {
     struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params params =
     {
@@ -526,7 +526,7 @@ SteamNetworkingMicroseconds __thiscall winISteamNetworkingUtils_SteamNetworkingU
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, FSteamNetworkingSocketsDebugOutput pfnFunc)
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *))
 {
     struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params params =
     {
@@ -881,7 +881,7 @@ SteamNetworkingMicroseconds __thiscall winISteamNetworkingUtils_SteamNetworkingU
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, FSteamNetworkingSocketsDebugOutput pfnFunc)
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *))
 {
     struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params params =
     {
@@ -1240,7 +1240,7 @@ SteamNetworkingMicroseconds __thiscall winISteamNetworkingUtils_SteamNetworkingU
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, FSteamNetworkingSocketsDebugOutput pfnFunc)
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *))
 {
     struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params params =
     {
diff --git a/lsteamclient/winISteamUtils.c b/lsteamclient/winISteamUtils.c
index 3f1e6dc8..c6aee3d5 100644
--- a/lsteamclient/winISteamUtils.c
+++ b/lsteamclient/winISteamUtils.c
@@ -464,7 +464,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils004_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils004_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils004_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params params =
     {
@@ -750,7 +750,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils005_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils005_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils005_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params params =
     {
@@ -1107,7 +1107,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils006_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils006_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils006_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params params =
     {
@@ -1489,7 +1489,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils007_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils007_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils007_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params params =
     {
@@ -1887,7 +1887,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils008_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils008_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils008_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params params =
     {
@@ -2314,7 +2314,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils009_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils009_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils009_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params params =
     {
@@ -2822,7 +2822,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils010_GetIPCCallCount(struct w_steam_
     return params._ret;
 }
 
-void __thiscall winISteamUtils_SteamUtils010_SetWarningMessageHook(struct w_steam_iface *_this, SteamAPIWarningMessageHook_t pFunction)
+void __thiscall winISteamUtils_SteamUtils010_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *))
 {
     struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params params =
     {