diff --git a/lsteamclient/Makefile.in b/lsteamclient/Makefile.in index c5d42a85..bc34251c 100644 --- a/lsteamclient/Makefile.in +++ b/lsteamclient/Makefile.in @@ -68,7 +68,6 @@ SOURCES = \ cppISteamClient_SteamClient017.cpp \ cppISteamClient_SteamClient018.cpp \ cppISteamClient_SteamClient019.cpp \ - cppISteamClient_SteamClient020.cpp \ cppISteamController_SteamController003.cpp \ cppISteamController_SteamController004.cpp \ cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp \ @@ -297,3 +296,4 @@ SOURCES = \ struct_converters_156.cpp \ struct_converters_157.cpp \ struct_converters_158.cpp \ + unix_steam_client_manual.cpp \ diff --git a/lsteamclient/cppISteamClient_SteamClient007.cpp b/lsteamclient/cppISteamClient_SteamClient007.cpp index f8e91da6..6416dd72 100644 --- a/lsteamclient/cppISteamClient_SteamClient007.cpp +++ b/lsteamclient/cppISteamClient_SteamClient007.cpp @@ -164,7 +164,7 @@ void cppISteamClient_SteamClient007_GetISteamNetworking( struct cppISteamClient_ void cppISteamClient_SteamClient007_SetWarningMessageHook( struct cppISteamClient_SteamClient007_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient007 *iface = (struct cppISteamClient_SteamClient007 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient007.h b/lsteamclient/cppISteamClient_SteamClient007.h index 686c839f..51dae9dc 100644 --- a/lsteamclient/cppISteamClient_SteamClient007.h +++ b/lsteamclient/cppISteamClient_SteamClient007.h @@ -181,7 +181,7 @@ extern void cppISteamClient_SteamClient007_GetISteamNetworking( struct cppISteam struct cppISteamClient_SteamClient007_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 2d9be1c5..7cac4b02 100644 --- a/lsteamclient/cppISteamClient_SteamClient008.cpp +++ b/lsteamclient/cppISteamClient_SteamClient008.cpp @@ -163,7 +163,7 @@ void cppISteamClient_SteamClient008_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient008_SetWarningMessageHook( struct cppISteamClient_SteamClient008_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient008 *iface = (struct cppISteamClient_SteamClient008 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient008.h b/lsteamclient/cppISteamClient_SteamClient008.h index 85585de1..90fbc9e1 100644 --- a/lsteamclient/cppISteamClient_SteamClient008.h +++ b/lsteamclient/cppISteamClient_SteamClient008.h @@ -182,7 +182,7 @@ extern void cppISteamClient_SteamClient008_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient008_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 8d046034..4557e90a 100644 --- a/lsteamclient/cppISteamClient_SteamClient009.cpp +++ b/lsteamclient/cppISteamClient_SteamClient009.cpp @@ -170,7 +170,7 @@ void cppISteamClient_SteamClient009_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient009_SetWarningMessageHook( struct cppISteamClient_SteamClient009_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient009 *iface = (struct cppISteamClient_SteamClient009 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient009.h b/lsteamclient/cppISteamClient_SteamClient009.h index 116323c4..58d5809b 100644 --- a/lsteamclient/cppISteamClient_SteamClient009.h +++ b/lsteamclient/cppISteamClient_SteamClient009.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient009_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient009_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 75390483..7dc7839e 100644 --- a/lsteamclient/cppISteamClient_SteamClient010.cpp +++ b/lsteamclient/cppISteamClient_SteamClient010.cpp @@ -172,7 +172,7 @@ void cppISteamClient_SteamClient010_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient010_SetWarningMessageHook( struct cppISteamClient_SteamClient010_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient010 *iface = (struct cppISteamClient_SteamClient010 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient010.h b/lsteamclient/cppISteamClient_SteamClient010.h index c86143a3..79315aa1 100644 --- a/lsteamclient/cppISteamClient_SteamClient010.h +++ b/lsteamclient/cppISteamClient_SteamClient010.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient010_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient010_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 4954de6d..c76db6fa 100644 --- a/lsteamclient/cppISteamClient_SteamClient011.cpp +++ b/lsteamclient/cppISteamClient_SteamClient011.cpp @@ -179,7 +179,7 @@ void cppISteamClient_SteamClient011_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient011_SetWarningMessageHook( struct cppISteamClient_SteamClient011_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient011 *iface = (struct cppISteamClient_SteamClient011 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient011.h b/lsteamclient/cppISteamClient_SteamClient011.h index 70031041..ed6a3e9f 100644 --- a/lsteamclient/cppISteamClient_SteamClient011.h +++ b/lsteamclient/cppISteamClient_SteamClient011.h @@ -202,7 +202,7 @@ extern void cppISteamClient_SteamClient011_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient011_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 1eb1b590..c3baad40 100644 --- a/lsteamclient/cppISteamClient_SteamClient012.cpp +++ b/lsteamclient/cppISteamClient_SteamClient012.cpp @@ -175,7 +175,7 @@ void cppISteamClient_SteamClient012_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient012_SetWarningMessageHook( struct cppISteamClient_SteamClient012_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient012 *iface = (struct cppISteamClient_SteamClient012 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient012.h b/lsteamclient/cppISteamClient_SteamClient012.h index 928b027b..203f20ef 100644 --- a/lsteamclient/cppISteamClient_SteamClient012.h +++ b/lsteamclient/cppISteamClient_SteamClient012.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient012_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient012_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 1f5d8bb1..9dc8f7a1 100644 --- a/lsteamclient/cppISteamClient_SteamClient013.cpp +++ b/lsteamclient/cppISteamClient_SteamClient013.cpp @@ -178,7 +178,7 @@ void cppISteamClient_SteamClient013_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient013_SetWarningMessageHook( struct cppISteamClient_SteamClient013_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient013 *iface = (struct cppISteamClient_SteamClient013 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient013.h b/lsteamclient/cppISteamClient_SteamClient013.h index 1e4d2af7..0fb29f84 100644 --- a/lsteamclient/cppISteamClient_SteamClient013.h +++ b/lsteamclient/cppISteamClient_SteamClient013.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient013_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient013_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 0874d522..7f01f165 100644 --- a/lsteamclient/cppISteamClient_SteamClient014.cpp +++ b/lsteamclient/cppISteamClient_SteamClient014.cpp @@ -177,7 +177,7 @@ void cppISteamClient_SteamClient014_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient014_SetWarningMessageHook( struct cppISteamClient_SteamClient014_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient014 *iface = (struct cppISteamClient_SteamClient014 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient014.h b/lsteamclient/cppISteamClient_SteamClient014.h index 31a7303f..3b7d824b 100644 --- a/lsteamclient/cppISteamClient_SteamClient014.h +++ b/lsteamclient/cppISteamClient_SteamClient014.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient014_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient014_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 004471fa..9674fce4 100644 --- a/lsteamclient/cppISteamClient_SteamClient015.cpp +++ b/lsteamclient/cppISteamClient_SteamClient015.cpp @@ -178,7 +178,7 @@ void cppISteamClient_SteamClient015_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient015_SetWarningMessageHook( struct cppISteamClient_SteamClient015_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient015 *iface = (struct cppISteamClient_SteamClient015 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamClient_SteamClient015.h b/lsteamclient/cppISteamClient_SteamClient015.h index 243c85b6..e9ff652e 100644 --- a/lsteamclient/cppISteamClient_SteamClient015.h +++ b/lsteamclient/cppISteamClient_SteamClient015.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient015_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient015_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 6546dd00..2b359505 100644 --- a/lsteamclient/cppISteamClient_SteamClient016.cpp +++ b/lsteamclient/cppISteamClient_SteamClient016.cpp @@ -182,7 +182,7 @@ void cppISteamClient_SteamClient016_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient016_SetWarningMessageHook( struct cppISteamClient_SteamClient016_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient016 *iface = (struct cppISteamClient_SteamClient016 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } @@ -244,19 +244,21 @@ void cppISteamClient_SteamClient016_GetISteamHTMLSurface( struct cppISteamClient void cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient016 *iface = (struct cppISteamClient_SteamClient016 *)params->linux_side; - iface->Set_SteamAPI_CPostAPIResultInProcess( (void (*)(uint64_t, void *, uint32_t, int32_t))params->func ); + void (*U_STDCALL lin_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( params->func ); + iface->Set_SteamAPI_CPostAPIResultInProcess( lin_func ); } void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient016 *iface = (struct cppISteamClient_SteamClient016 *)params->linux_side; - iface->Remove_SteamAPI_CPostAPIResultInProcess( (void (*)(uint64_t, void *, uint32_t, int32_t))params->func ); + void (*U_STDCALL lin_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( params->func ); + iface->Remove_SteamAPI_CPostAPIResultInProcess( lin_func ); } void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) { struct cppISteamClient_SteamClient016 *iface = (struct cppISteamClient_SteamClient016 *)params->linux_side; - uint32_t (*lin_func)(int32_t) = (uint32_t (*)(int32_t))manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func ); + uint32_t (*U_STDCALL lin_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func ); iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); } diff --git a/lsteamclient/cppISteamClient_SteamClient016.h b/lsteamclient/cppISteamClient_SteamClient016.h index 1985badf..3c62f31e 100644 --- a/lsteamclient/cppISteamClient_SteamClient016.h +++ b/lsteamclient/cppISteamClient_SteamClient016.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient016_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient016_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_CDECL pFunction)(int32_t, const char *); }; extern void cppISteamClient_SteamClient016_SetWarningMessageHook( struct cppISteamClient_SteamClient016_SetWarningMessageHook_params *params ); @@ -286,21 +286,21 @@ extern void cppISteamClient_SteamClient016_GetISteamHTMLSurface( struct cppIStea struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params { void *linux_side; - void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t); + void (*W_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; - void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t); + void (*W_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; - uint32_t (*__stdcall func)(int32_t); + uint32_t (*W_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 ac43b6f1..b635eea4 100644 --- a/lsteamclient/cppISteamClient_SteamClient017.cpp +++ b/lsteamclient/cppISteamClient_SteamClient017.cpp @@ -185,7 +185,7 @@ void cppISteamClient_SteamClient017_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient017_SetWarningMessageHook( struct cppISteamClient_SteamClient017_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient017 *iface = (struct cppISteamClient_SteamClient017 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } @@ -247,19 +247,21 @@ void cppISteamClient_SteamClient017_GetISteamHTMLSurface( struct cppISteamClient void cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient017 *iface = (struct cppISteamClient_SteamClient017 *)params->linux_side; - iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient017 *iface = (struct cppISteamClient_SteamClient017 *)params->linux_side; - iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) { struct cppISteamClient_SteamClient017 *iface = (struct cppISteamClient_SteamClient017 *)params->linux_side; - uint32_t (*lin_func)(int32_t) = (uint32_t (*)(int32_t))manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func ); + uint32_t (*U_STDCALL lin_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func ); iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); } diff --git a/lsteamclient/cppISteamClient_SteamClient017.h b/lsteamclient/cppISteamClient_SteamClient017.h index 4e30273b..efdb34f0 100644 --- a/lsteamclient/cppISteamClient_SteamClient017.h +++ b/lsteamclient/cppISteamClient_SteamClient017.h @@ -192,7 +192,7 @@ extern void cppISteamClient_SteamClient017_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient017_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_CDECL pFunction)(int32_t, const char *); }; extern void cppISteamClient_SteamClient017_SetWarningMessageHook( struct cppISteamClient_SteamClient017_SetWarningMessageHook_params *params ); @@ -286,21 +286,21 @@ extern void cppISteamClient_SteamClient017_GetISteamHTMLSurface( struct cppIStea struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params { void *linux_side; - void (*__stdcall _a)(void); + void (*W_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 (*__stdcall _a)(void); + void (*W_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; - uint32_t (*__stdcall func)(int32_t); + uint32_t (*W_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 ea6e3444..ae151de2 100644 --- a/lsteamclient/cppISteamClient_SteamClient018.cpp +++ b/lsteamclient/cppISteamClient_SteamClient018.cpp @@ -195,7 +195,7 @@ void cppISteamClient_SteamClient018_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient018_SetWarningMessageHook( struct cppISteamClient_SteamClient018_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient018 *iface = (struct cppISteamClient_SteamClient018 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } @@ -257,19 +257,21 @@ void cppISteamClient_SteamClient018_GetISteamHTMLSurface( struct cppISteamClient void cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient018 *iface = (struct cppISteamClient_SteamClient018 *)params->linux_side; - iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient018 *iface = (struct cppISteamClient_SteamClient018 *)params->linux_side; - iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) { struct cppISteamClient_SteamClient018 *iface = (struct cppISteamClient_SteamClient018 *)params->linux_side; - uint32_t (*lin_func)(int32_t) = (uint32_t (*)(int32_t))manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func ); + uint32_t (*U_STDCALL lin_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func ); iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); } diff --git a/lsteamclient/cppISteamClient_SteamClient018.h b/lsteamclient/cppISteamClient_SteamClient018.h index 4d06bf63..21cda01c 100644 --- a/lsteamclient/cppISteamClient_SteamClient018.h +++ b/lsteamclient/cppISteamClient_SteamClient018.h @@ -202,7 +202,7 @@ extern void cppISteamClient_SteamClient018_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient018_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_CDECL pFunction)(int32_t, const char *); }; extern void cppISteamClient_SteamClient018_SetWarningMessageHook( struct cppISteamClient_SteamClient018_SetWarningMessageHook_params *params ); @@ -296,21 +296,21 @@ extern void cppISteamClient_SteamClient018_GetISteamHTMLSurface( struct cppIStea struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params { void *linux_side; - void (*__stdcall _a)(void); + void (*W_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 (*__stdcall _a)(void); + void (*W_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; - uint32_t (*__stdcall func)(int32_t); + uint32_t (*W_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 7f256ccc..308edffb 100644 --- a/lsteamclient/cppISteamClient_SteamClient019.cpp +++ b/lsteamclient/cppISteamClient_SteamClient019.cpp @@ -196,7 +196,7 @@ void cppISteamClient_SteamClient019_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient019_SetWarningMessageHook( struct cppISteamClient_SteamClient019_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient019 *iface = (struct cppISteamClient_SteamClient019 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } @@ -258,19 +258,21 @@ void cppISteamClient_SteamClient019_GetISteamHTMLSurface( struct cppISteamClient void cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient019 *iface = (struct cppISteamClient_SteamClient019 *)params->linux_side; - iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient019 *iface = (struct cppISteamClient_SteamClient019 *)params->linux_side; - iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) { struct cppISteamClient_SteamClient019 *iface = (struct cppISteamClient_SteamClient019 *)params->linux_side; - uint32_t (*lin_func)(int32_t) = (uint32_t (*)(int32_t))manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func ); + uint32_t (*U_STDCALL lin_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func ); iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); } diff --git a/lsteamclient/cppISteamClient_SteamClient019.h b/lsteamclient/cppISteamClient_SteamClient019.h index 94f772e8..488d5bfb 100644 --- a/lsteamclient/cppISteamClient_SteamClient019.h +++ b/lsteamclient/cppISteamClient_SteamClient019.h @@ -202,7 +202,7 @@ extern void cppISteamClient_SteamClient019_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient019_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_CDECL pFunction)(int32_t, const char *); }; extern void cppISteamClient_SteamClient019_SetWarningMessageHook( struct cppISteamClient_SteamClient019_SetWarningMessageHook_params *params ); @@ -296,21 +296,21 @@ extern void cppISteamClient_SteamClient019_GetISteamHTMLSurface( struct cppIStea struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params { void *linux_side; - void (*__stdcall _a)(void); + void (*W_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 (*__stdcall _a)(void); + void (*W_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; - uint32_t (*__stdcall func)(int32_t); + uint32_t (*W_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.h b/lsteamclient/cppISteamClient_SteamClient020.h index 4f681282..c4a25b30 100644 --- a/lsteamclient/cppISteamClient_SteamClient020.h +++ b/lsteamclient/cppISteamClient_SteamClient020.h @@ -202,7 +202,7 @@ extern void cppISteamClient_SteamClient020_GetIPCCallCount( struct cppISteamClie struct cppISteamClient_SteamClient020_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_CDECL pFunction)(int32_t, const char *); }; extern void cppISteamClient_SteamClient020_SetWarningMessageHook( struct cppISteamClient_SteamClient020_SetWarningMessageHook_params *params ); @@ -296,21 +296,21 @@ extern void cppISteamClient_SteamClient020_GetISteamHTMLSurface( struct cppIStea struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params { void *linux_side; - void (*__stdcall _a)(void); + void (*W_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 (*__stdcall _a)(void); + void (*W_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; - uint32_t (*__cdecl func)(int32_t); + uint32_t (*W_CDECL func)(int32_t); }; extern void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ); diff --git a/lsteamclient/cppISteamClient_SteamClient020.cpp b/lsteamclient/cppISteamClient_SteamClient020.hpp similarity index 95% rename from lsteamclient/cppISteamClient_SteamClient020.cpp rename to lsteamclient/cppISteamClient_SteamClient020.hpp index 65c9eeea..87bb9fc3 100644 --- a/lsteamclient/cppISteamClient_SteamClient020.cpp +++ b/lsteamclient/cppISteamClient_SteamClient020.hpp @@ -197,7 +197,7 @@ void cppISteamClient_SteamClient020_GetIPCCallCount( struct cppISteamClient_Stea void cppISteamClient_SteamClient020_SetWarningMessageHook( struct cppISteamClient_SteamClient020_SetWarningMessageHook_params *params ) { struct cppISteamClient_SteamClient020 *iface = (struct cppISteamClient_SteamClient020 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } @@ -259,20 +259,15 @@ void cppISteamClient_SteamClient020_GetISteamHTMLSurface( struct cppISteamClient void cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient020 *iface = (struct cppISteamClient_SteamClient020 *)params->linux_side; - iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( struct cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params ) { struct cppISteamClient_SteamClient020 *iface = (struct cppISteamClient_SteamClient020 *)params->linux_side; - iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( (void (*)(void))params->_a ); -} - -void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) -{ - struct cppISteamClient_SteamClient020 *iface = (struct cppISteamClient_SteamClient020 *)params->linux_side; - uint32_t (*lin_func)(int32_t) = (uint32_t (*)(int32_t))manual_convert_SteamAPI_CheckCallbackRegistered_t( (void *)params->func ); - iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); + void (*U_STDCALL lin__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a ); + iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( lin__a ); } void cppISteamClient_SteamClient020_GetISteamInventory( struct cppISteamClient_SteamClient020_GetISteamInventory_params *params ) diff --git a/lsteamclient/cppISteamInput_SteamInput005.h b/lsteamclient/cppISteamInput_SteamInput005.h index 144d3f44..cd29539c 100644 --- a/lsteamclient/cppISteamInput_SteamInput005.h +++ b/lsteamclient/cppISteamInput_SteamInput005.h @@ -62,7 +62,7 @@ extern void cppISteamInput_SteamInput005_EnableDeviceCallbacks( struct cppISteam struct cppISteamInput_SteamInput005_EnableActionEventCallbacks_params { void *linux_side; - void (*__stdcall pCallback)(SteamInputActionEvent_t *); + void (*W_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 4d475f73..807e1807 100644 --- a/lsteamclient/cppISteamInput_SteamInput006.h +++ b/lsteamclient/cppISteamInput_SteamInput006.h @@ -62,7 +62,7 @@ extern void cppISteamInput_SteamInput006_EnableDeviceCallbacks( struct cppISteam struct cppISteamInput_SteamInput006_EnableActionEventCallbacks_params { void *linux_side; - void (*__stdcall pCallback)(SteamInputActionEvent_t *); + void (*W_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 b3bd0922..6b1a1f44 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp @@ -117,7 +117,7 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils001_GetLocalTimestamp( struct void cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params *params ) { struct cppISteamNetworkingUtils_SteamNetworkingUtils001 *iface = (struct cppISteamNetworkingUtils_SteamNetworkingUtils001 *)params->linux_side; - void (*lin_pfnFunc)(uint32_t, const char *) = (void (*)(uint32_t, const char *))manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc ); + void (*U_STDCALL lin_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc ); iface->SetDebugOutputFunction( params->eDetailLevel, lin_pfnFunc ); } diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h index 99e6f013..367b96cf 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.h @@ -101,7 +101,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_p { void *linux_side; uint32_t eDetailLevel; - void (*__stdcall pfnFunc)(uint32_t, const char *); + void (*W_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 0c88c098..51f07dee 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp @@ -117,7 +117,7 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils002_GetLocalTimestamp( struct void cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *params ) { struct cppISteamNetworkingUtils_SteamNetworkingUtils002 *iface = (struct cppISteamNetworkingUtils_SteamNetworkingUtils002 *)params->linux_side; - void (*lin_pfnFunc)(uint32_t, const char *) = (void (*)(uint32_t, const char *))manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc ); + void (*U_STDCALL lin_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc ); iface->SetDebugOutputFunction( params->eDetailLevel, lin_pfnFunc ); } diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h index a309a7ac..98cf6fbf 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.h @@ -102,7 +102,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_p { void *linux_side; uint32_t eDetailLevel; - void (*__stdcall pfnFunc)(uint32_t, const char *); + void (*W_STDCALL pfnFunc)(uint32_t, const char *); }; extern void cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *params ); diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h index dfb5f91b..52ad7f4b 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.h @@ -110,7 +110,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_p { void *linux_side; uint32_t eDetailLevel; - void (*__stdcall pfnFunc)(uint32_t, const char *); + void (*W_STDCALL pfnFunc)(uint32_t, const char *); }; extern void cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *params ); diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.hpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.hpp index fb2ef0a3..269edab6 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.hpp +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.hpp @@ -118,7 +118,7 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils003_GetLocalTimestamp( struct void cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *params ) { struct cppISteamNetworkingUtils_SteamNetworkingUtils003 *iface = (struct cppISteamNetworkingUtils_SteamNetworkingUtils003 *)params->linux_side; - void (*lin_pfnFunc)(uint32_t, const char *) = (void (*)(uint32_t, const char *))manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc ); + void (*U_STDCALL lin_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc ); iface->SetDebugOutputFunction( params->eDetailLevel, lin_pfnFunc ); } diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h index bacca4dd..e2b839c6 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.h @@ -110,7 +110,7 @@ struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_p { void *linux_side; uint32_t eDetailLevel; - void (*__stdcall pfnFunc)(uint32_t, const char *); + void (*W_STDCALL pfnFunc)(uint32_t, const char *); }; extern void cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *params ); diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.hpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.hpp index 77c00f7c..9001edf5 100644 --- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.hpp +++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.hpp @@ -121,7 +121,7 @@ void cppISteamNetworkingUtils_SteamNetworkingUtils004_GetLocalTimestamp( struct void cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction( struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *params ) { struct cppISteamNetworkingUtils_SteamNetworkingUtils004 *iface = (struct cppISteamNetworkingUtils_SteamNetworkingUtils004 *)params->linux_side; - void (*lin_pfnFunc)(uint32_t, const char *) = (void (*)(uint32_t, const char *))manual_convert_FSteamNetworkingSocketsDebugOutput( (void *)params->pfnFunc ); + void (*U_STDCALL lin_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc ); iface->SetDebugOutputFunction( params->eDetailLevel, lin_pfnFunc ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.cpp b/lsteamclient/cppISteamUtils_SteamUtils004.cpp index fc9801e5..8c9fe637 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils004.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils004.cpp @@ -135,7 +135,7 @@ void cppISteamUtils_SteamUtils004_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils004_SetWarningMessageHook( struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils004 *iface = (struct cppISteamUtils_SteamUtils004 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.h b/lsteamclient/cppISteamUtils_SteamUtils004.h index 8759e13e..9546c0d3 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils004.h +++ b/lsteamclient/cppISteamUtils_SteamUtils004.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils004_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 ca88a65a..9a0f721d 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils005.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils005.cpp @@ -140,7 +140,7 @@ void cppISteamUtils_SteamUtils005_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils005_SetWarningMessageHook( struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils005 *iface = (struct cppISteamUtils_SteamUtils005 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils005.h b/lsteamclient/cppISteamUtils_SteamUtils005.h index bb27beb8..3c9c1fda 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils005.h +++ b/lsteamclient/cppISteamUtils_SteamUtils005.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils005_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 62c73d89..c2558ef2 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils006.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils006.cpp @@ -142,7 +142,7 @@ void cppISteamUtils_SteamUtils006_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils006_SetWarningMessageHook( struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils006 *iface = (struct cppISteamUtils_SteamUtils006 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils006.h b/lsteamclient/cppISteamUtils_SteamUtils006.h index b05d4b73..1588d2f5 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils006.h +++ b/lsteamclient/cppISteamUtils_SteamUtils006.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils006_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 0b75e796..6f3d1577 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils007.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils007.cpp @@ -143,7 +143,7 @@ void cppISteamUtils_SteamUtils007_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils007_SetWarningMessageHook( struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils007 *iface = (struct cppISteamUtils_SteamUtils007 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils007.h b/lsteamclient/cppISteamUtils_SteamUtils007.h index 7d4b7634..9c497fa1 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils007.h +++ b/lsteamclient/cppISteamUtils_SteamUtils007.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils007_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 eb279ff9..8a7c076e 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils008.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils008.cpp @@ -145,7 +145,7 @@ void cppISteamUtils_SteamUtils008_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils008_SetWarningMessageHook( struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils008 *iface = (struct cppISteamUtils_SteamUtils008 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils008.h b/lsteamclient/cppISteamUtils_SteamUtils008.h index 2ae258ff..b37b89d4 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils008.h +++ b/lsteamclient/cppISteamUtils_SteamUtils008.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils008_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 d665ea7a..0bcd171c 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils009.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils009.cpp @@ -152,7 +152,7 @@ void cppISteamUtils_SteamUtils009_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils009_SetWarningMessageHook( struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils009 *iface = (struct cppISteamUtils_SteamUtils009 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils009.h b/lsteamclient/cppISteamUtils_SteamUtils009.h index 36fd1034..f9d403c6 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils009.h +++ b/lsteamclient/cppISteamUtils_SteamUtils009.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils009_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 a5686ad0..951170a7 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils010.cpp +++ b/lsteamclient/cppISteamUtils_SteamUtils010.cpp @@ -156,7 +156,7 @@ void cppISteamUtils_SteamUtils010_GetIPCCallCount( struct cppISteamUtils_SteamUt void cppISteamUtils_SteamUtils010_SetWarningMessageHook( struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params *params ) { struct cppISteamUtils_SteamUtils010 *iface = (struct cppISteamUtils_SteamUtils010 *)params->linux_side; - void (*lin_pFunction)(int32_t, const char *) = (void (*)(int32_t, const char *))manual_convert_SteamAPIWarningMessageHook_t( (void *)params->pFunction ); + void (*U_CDECL lin_pFunction)(int32_t, const char *) = manual_convert_SetWarningMessageHook_pFunction( params->pFunction ); iface->SetWarningMessageHook( lin_pFunction ); } diff --git a/lsteamclient/cppISteamUtils_SteamUtils010.h b/lsteamclient/cppISteamUtils_SteamUtils010.h index d0ca4727..79408ba8 100644 --- a/lsteamclient/cppISteamUtils_SteamUtils010.h +++ b/lsteamclient/cppISteamUtils_SteamUtils010.h @@ -129,7 +129,7 @@ extern void cppISteamUtils_SteamUtils010_GetIPCCallCount( struct cppISteamUtils_ struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params { void *linux_side; - void (*__cdecl pFunction)(int32_t, const char *); + void (*W_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 24e7ccdb..b09fdaac 100755 --- a/lsteamclient/gen_wrapper.py +++ b/lsteamclient/gen_wrapper.py @@ -229,6 +229,9 @@ MANUAL_METHODS = { Method("DestroyFakeUDPPort"), Method("ReceiveMessages"), ], + "cppISteamClient_SteamClient": [ + Method("Set_SteamAPI_CCheckCallbackRegisteredInProcess", lambda version: version >= 20), + ], } @@ -258,7 +261,9 @@ def post_execution_function(classname, method_name): MANUAL_TYPES = [ "FSteamNetworkingSocketsDebugOutput", "SteamAPIWarningMessageHook_t", - "SteamAPI_CheckCallbackRegistered_t" + "SteamAPI_CheckCallbackRegistered_t", + "SteamAPI_PostAPIResultInProcess_t", + "void ()", ] # manual converters for specific parameters @@ -592,9 +597,10 @@ def callconv(cursor, prefix): tokens = cursor.get_tokens() while next(tokens).spelling != '(': pass - token = f'{next(tokens).spelling} ' - return token.replace('*', '__stdcall') \ - .replace('S_CALLTYPE', '__cdecl') + token = next(tokens).spelling.strip('_') + token = token.replace('*', 'stdcall') + token = token.replace('S_CALLTYPE', 'cdecl') + return f'{prefix[0].upper()}_{token.upper()} ' def declspec_func(decl, name, prefix): @@ -691,27 +697,27 @@ def handle_method_cpp(method, classname, cppname, out): type_name = underlying_typename(param) if param.type.kind != TypeKind.POINTER: - out(f' {declspec(param, f"lin_{name}", None)};\n') + out(f' {declspec(param, f"lin_{name}", "u_")};\n') out(f' win_to_lin_struct_{type_name}_{sdkver}( ¶ms->{name}, &lin_{name} );\n') continue pointee = param.type.get_pointee() if pointee.kind == TypeKind.POINTER: need_output[name] = param - out(f' {declspec(pointee, f"lin_{name}", None)};\n') + out(f' {declspec(pointee, f"lin_{name}", "u_")};\n') continue if not pointee.is_const_qualified(): need_output[name] = param - out(f' {declspec(pointee, f"lin_{name}", None)};\n') + out(f' {declspec(pointee, f"lin_{name}", "u_")};\n') out(f' win_to_lin_struct_{type_name}_{sdkver}( params->{name}, &lin_{name} );\n') for name, param in sorted(manual_convert.items()): if name in MANUAL_PARAMS: - out(f' {declspec(param, f"lin_{name}", None)} = manual_convert_{name}( params->{name} );\n') + out(f' {declspec(param, f"lin_{name}", "u_")} = manual_convert_{name}( params->{name} );\n') else: - out(f' {declspec(param, f"lin_{name}", None)} = ({declspec(param, "", None)})manual_convert_{param.type.spelling}( (void *)params->{name} );\n') + out(f' {declspec(param, f"lin_{name}", "u_")} = manual_convert_{method.name}_{name}( params->{name} );\n') if returns_void: out(u' ') @@ -724,8 +730,6 @@ def handle_method_cpp(method, classname, cppname, out): 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 underlying_type(param.type.get_canonical()).kind is TypeKind.FUNCTIONPROTO: - return f'({declspec(param, "", None)})params->{name}' return f'params->{name}' params = [param_call(n, p) for n, p in zip(names[1:], method.get_arguments())] diff --git a/lsteamclient/steamclient_private.h b/lsteamclient/steamclient_private.h index 76410049..892a5b6b 100644 --- a/lsteamclient/steamclient_private.h +++ b/lsteamclient/steamclient_private.h @@ -23,6 +23,11 @@ typedef void (*vtable_ptr)(void); extern "C" { #endif +#define W_CDECL __cdecl +#define W_STDCALL __stdcall +#define U_CDECL __attribute__((sysv_abi)) +#define U_STDCALL __attribute__((sysv_abi)) + struct w_steam_iface { vtable_ptr *vtable; @@ -52,9 +57,32 @@ void *create_LinuxISteamMatchmakingServerListResponse(void *win, const char *ver void *create_LinuxISteamMatchmakingPingResponse(void *win, const char *version); void *create_LinuxISteamMatchmakingPlayersResponse(void *win, const char *version); void *create_LinuxISteamMatchmakingRulesResponse(void *win, const char *version); -void *manual_convert_SteamAPIWarningMessageHook_t(void *win_func); -void *manual_convert_FSteamNetworkingSocketsDebugOutput(void *win_func); -void *manual_convert_SteamAPI_CheckCallbackRegistered_t(void *win_func); + +typedef void (U_CDECL *u_SteamAPIWarningMessageHook_t)( int32_t, const char * ); +typedef void (W_CDECL *w_SteamAPIWarningMessageHook_t)( int32_t, const char * ); +u_SteamAPIWarningMessageHook_t manual_convert_SetWarningMessageHook_pFunction( w_SteamAPIWarningMessageHook_t ); + +typedef void (U_STDCALL *u_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * ); +typedef void (W_STDCALL *w_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * ); +u_FSteamNetworkingSocketsDebugOutput manual_convert_SetDebugOutputFunction_pfnFunc( w_FSteamNetworkingSocketsDebugOutput ); + +typedef uint32_t (U_STDCALL *u_SteamAPI_CheckCallbackRegistered_t)( int32_t ); +typedef uint32_t (W_STDCALL *w_SteamAPI_CheckCallbackRegistered_t)( int32_t ); +u_SteamAPI_CheckCallbackRegistered_t manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( w_SteamAPI_CheckCallbackRegistered_t ); + +typedef uint32_t (U_CDECL *u_SteamAPI_CheckCallbackRegistered_t_156)( int32_t ); +typedef uint32_t (W_CDECL *w_SteamAPI_CheckCallbackRegistered_t_156)( int32_t ); +u_SteamAPI_CheckCallbackRegistered_t_156 manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func_156( w_SteamAPI_CheckCallbackRegistered_t_156 ); + +typedef void (U_STDCALL *u_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int ); +typedef void (W_STDCALL *w_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int ); +u_SteamAPI_PostAPIResultInProcess_t manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t ); +u_SteamAPI_PostAPIResultInProcess_t manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t ); + +typedef void (U_STDCALL *u_void_SteamAPI_PostAPIResultInProcess_t)(void); +typedef void (W_STDCALL *w_void_SteamAPI_PostAPIResultInProcess_t)(void); +u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t ); +u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t ); #define PATH_MAX 4096 extern char g_tmppath[PATH_MAX]; diff --git a/lsteamclient/steamclient_wrappers.c b/lsteamclient/steamclient_wrappers.c index d95390f6..87ac38da 100644 --- a/lsteamclient/steamclient_wrappers.c +++ b/lsteamclient/steamclient_wrappers.c @@ -289,7 +289,7 @@ void *create_LinuxISteamMatchmakingRulesResponse(void *win, const char *version) } /***** FSteamNetworkingSocketsDebugOutput *****/ -static void (__attribute__((ms_abi)) * stored_FSteamNetworkingSocketsDebugOutput)( uint32_t nType, const char *pszMsg ); +static w_FSteamNetworkingSocketsDebugOutput stored_FSteamNetworkingSocketsDebugOutput; static void lin_FSteamNetworkingSocketsDebugOutput( uint32_t nType, const char *pszMsg ) { @@ -303,14 +303,14 @@ static void lin_FSteamNetworkingSocketsDebugOutput( uint32_t nType, const char * execute_callback(&cb_data); } -void *manual_convert_FSteamNetworkingSocketsDebugOutput(void *win_func) +u_FSteamNetworkingSocketsDebugOutput manual_convert_SetDebugOutputFunction_pfnFunc( w_FSteamNetworkingSocketsDebugOutput win_func ) { - stored_FSteamNetworkingSocketsDebugOutput = (void*)win_func; + stored_FSteamNetworkingSocketsDebugOutput = win_func; return &lin_FSteamNetworkingSocketsDebugOutput; } -static void *stored_SteamAPIWarningMessageHook_t; +static w_SteamAPIWarningMessageHook_t stored_SteamAPIWarningMessageHook_t; static void lin_SteamAPIWarningMessageHook_t(int severity, const char *msg) { @@ -324,7 +324,7 @@ static void lin_SteamAPIWarningMessageHook_t(int severity, const char *msg) execute_callback(&cb_data); } -void *manual_convert_SteamAPIWarningMessageHook_t(void *win_func) +u_SteamAPIWarningMessageHook_t manual_convert_SetWarningMessageHook_pFunction( w_SteamAPIWarningMessageHook_t win_func ) { TRACE("win_func %p, returning %p.\n", win_func, lin_SteamAPIWarningMessageHook_t); @@ -334,17 +334,71 @@ void *manual_convert_SteamAPIWarningMessageHook_t(void *win_func) } /***** SteamAPI_CheckCallbackRegistered_t *****/ -static uint32_t (__attribute__((ms_abi)) * stored_SteamAPI_CheckCallbackRegistered_t)( int cb ); +static w_SteamAPI_CheckCallbackRegistered_t stored_SteamAPI_CheckCallbackRegistered_t; static uint32_t lin_SteamAPI_CheckCallbackRegistered_t( int cb ) { return stored_SteamAPI_CheckCallbackRegistered_t(cb); } -void *manual_convert_SteamAPI_CheckCallbackRegistered_t(void *win_func) +u_SteamAPI_CheckCallbackRegistered_t manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( w_SteamAPI_CheckCallbackRegistered_t win_func ) { - if (!(stored_SteamAPI_CheckCallbackRegistered_t = (void*)win_func)) - return NULL; - + FIXME( "\n" ); + if (!(stored_SteamAPI_CheckCallbackRegistered_t = win_func)) return NULL; return &lin_SteamAPI_CheckCallbackRegistered_t; } + +static w_SteamAPI_CheckCallbackRegistered_t_156 stored_SteamAPI_CheckCallbackRegistered_t_156; + +static uint32_t lin_SteamAPI_CheckCallbackRegistered_t_156( int cb ) +{ + return stored_SteamAPI_CheckCallbackRegistered_t_156( cb ); +} + +u_SteamAPI_CheckCallbackRegistered_t_156 manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func_156( w_SteamAPI_CheckCallbackRegistered_t_156 win_func ) +{ + if (!(stored_SteamAPI_CheckCallbackRegistered_t_156 = win_func)) return NULL; + return &lin_SteamAPI_CheckCallbackRegistered_t_156; +} + +static w_SteamAPI_PostAPIResultInProcess_t stored_SteamAPI_PostAPIResultInProcess_t; + +static void lin_SteamAPI_PostAPIResultInProcess_t( uint64_t a, void *b, uint32_t c, int32_t d ) +{ + FIXME( "\n" ); +} + +u_SteamAPI_PostAPIResultInProcess_t manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t win_func ) +{ + FIXME( "\n" ); + if (!(stored_SteamAPI_PostAPIResultInProcess_t = win_func)) return NULL; + return &lin_SteamAPI_PostAPIResultInProcess_t; +} + +u_SteamAPI_PostAPIResultInProcess_t manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t win_func ) +{ + FIXME( "\n" ); + stored_SteamAPI_PostAPIResultInProcess_t = NULL; + return &lin_SteamAPI_PostAPIResultInProcess_t; +} + +static w_void_SteamAPI_PostAPIResultInProcess_t stored_void_SteamAPI_PostAPIResultInProcess_t; + +static void lin_void_SteamAPI_PostAPIResultInProcess_t(void) +{ + FIXME( "\n" ); +} + +u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t win_func ) +{ + FIXME( "\n" ); + if (!(stored_void_SteamAPI_PostAPIResultInProcess_t = win_func)) return NULL; + return &lin_void_SteamAPI_PostAPIResultInProcess_t; +} + +u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t win_func ) +{ + FIXME( "\n" ); + stored_void_SteamAPI_PostAPIResultInProcess_t = NULL; + return &lin_void_SteamAPI_PostAPIResultInProcess_t; +} diff --git a/lsteamclient/unix_steam_client_manual.cpp b/lsteamclient/unix_steam_client_manual.cpp new file mode 100644 index 00000000..b14473c2 --- /dev/null +++ b/lsteamclient/unix_steam_client_manual.cpp @@ -0,0 +1,13 @@ +#include "steamclient_private.h" + +#pragma push_macro( "strncpy" ) +#undef strncpy +#include "cppISteamClient_SteamClient020.hpp" +#pragma pop_macro( "strncpy" ) + +void cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess( struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params ) +{ + struct cppISteamClient_SteamClient020 *iface = (struct cppISteamClient_SteamClient020 *)params->linux_side; + uint32_t (*U_CDECL lin_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func_156( params->func ); + iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( lin_func ); +} diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c index 024e6281..f3c9fc13 100644 --- a/lsteamclient/winISteamClient.c +++ b/lsteamclient/winISteamClient.c @@ -643,7 +643,7 @@ void /*ISteamNetworking*/ * __thiscall winISteamClient_SteamClient007_GetISteamN return params._ret; } -void __thiscall winISteamClient_SteamClient007_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient007_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient007_SetWarningMessageHook_params params = { @@ -1007,7 +1007,7 @@ uint32_t __thiscall winISteamClient_SteamClient008_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient008_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient008_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient008_SetWarningMessageHook_params params = { @@ -1371,7 +1371,7 @@ uint32_t __thiscall winISteamClient_SteamClient009_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient009_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient009_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient009_SetWarningMessageHook_params params = { @@ -1738,7 +1738,7 @@ uint32_t __thiscall winISteamClient_SteamClient010_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient010_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient010_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient010_SetWarningMessageHook_params params = { @@ -2149,7 +2149,7 @@ uint32_t __thiscall winISteamClient_SteamClient011_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient011_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient011_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient011_SetWarningMessageHook_params params = { @@ -2548,7 +2548,7 @@ uint32_t __thiscall winISteamClient_SteamClient012_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient012_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient012_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient012_SetWarningMessageHook_params params = { @@ -2997,7 +2997,7 @@ uint32_t __thiscall winISteamClient_SteamClient013_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient013_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient013_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient013_SetWarningMessageHook_params params = { @@ -3491,7 +3491,7 @@ uint32_t __thiscall winISteamClient_SteamClient014_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient014_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient014_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient014_SetWarningMessageHook_params params = { @@ -3972,7 +3972,7 @@ uint32_t __thiscall winISteamClient_SteamClient015_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient015_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient015_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient015_SetWarningMessageHook_params params = { @@ -4473,7 +4473,7 @@ uint32_t __thiscall winISteamClient_SteamClient016_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient016_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient016_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient016_SetWarningMessageHook_params params = { @@ -4615,7 +4615,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient016_GetISteam return params._ret; } -void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t)) +void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t)) { struct cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params params = { @@ -4626,7 +4626,7 @@ void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProc cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall func)(uint64_t, void *, uint32_t, int32_t)) +void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t)) { struct cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params params = { @@ -4637,7 +4637,7 @@ void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInP cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t)) +void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t)) { struct cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params = { @@ -5029,7 +5029,7 @@ uint32_t __thiscall winISteamClient_SteamClient017_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient017_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient017_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient017_SetWarningMessageHook_params params = { @@ -5170,7 +5170,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient017_GetISteam return params._ret; } -void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params = { @@ -5181,7 +5181,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIR cppISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params = { @@ -5192,7 +5192,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostA cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t)) +void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t)) { struct cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params = { @@ -5650,7 +5650,7 @@ uint32_t __thiscall winISteamClient_SteamClient018_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient018_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient018_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient018_SetWarningMessageHook_params params = { @@ -5791,7 +5791,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient018_GetISteam return params._ret; } -void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params = { @@ -5802,7 +5802,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIR cppISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params = { @@ -5813,7 +5813,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostA cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t)) +void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t)) { struct cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params = { @@ -6305,7 +6305,7 @@ uint32_t __thiscall winISteamClient_SteamClient019_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient019_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient019_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient019_SetWarningMessageHook_params params = { @@ -6446,7 +6446,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient019_GetISteam return params._ret; } -void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params = { @@ -6457,7 +6457,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIR cppISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params = { @@ -6468,7 +6468,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostA cppISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__stdcall func)(int32_t)) +void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t)) { struct cppISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params = { @@ -6977,7 +6977,7 @@ uint32_t __thiscall winISteamClient_SteamClient020_GetIPCCallCount(struct w_stea return params._ret; } -void __thiscall winISteamClient_SteamClient020_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamClient_SteamClient020_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamClient_SteamClient020_SetWarningMessageHook_params params = { @@ -7118,7 +7118,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient020_GetISteam return params._ret; } -void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params = { @@ -7129,7 +7129,7 @@ void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIR cppISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*__stdcall _a)(void)) +void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void)) { struct cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params = { @@ -7140,7 +7140,7 @@ void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostA cppISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( ¶ms ); } -void __thiscall winISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*__cdecl func)(int32_t)) +void __thiscall winISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_CDECL func)(int32_t)) { struct cppISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params = { diff --git a/lsteamclient/winISteamInput.c b/lsteamclient/winISteamInput.c index cf5b9de7..93891b3e 100644 --- a/lsteamclient/winISteamInput.c +++ b/lsteamclient/winISteamInput.c @@ -1216,7 +1216,7 @@ void __thiscall winISteamInput_SteamInput005_EnableDeviceCallbacks(struct w_stea cppISteamInput_SteamInput005_EnableDeviceCallbacks( ¶ms ); } -void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*__stdcall pCallback)(SteamInputActionEvent_t *)) +void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_STDCALL pCallback)(SteamInputActionEvent_t *)) { struct cppISteamInput_SteamInput005_EnableActionEventCallbacks_params params = { @@ -1928,7 +1928,7 @@ void __thiscall winISteamInput_SteamInput006_EnableDeviceCallbacks(struct w_stea cppISteamInput_SteamInput006_EnableDeviceCallbacks( ¶ms ); } -void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*__stdcall pCallback)(SteamInputActionEvent_t *)) +void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_STDCALL pCallback)(SteamInputActionEvent_t *)) { struct cppISteamInput_SteamInput006_EnableActionEventCallbacks_params params = { diff --git a/lsteamclient/winISteamNetworkingUtils.c b/lsteamclient/winISteamNetworkingUtils.c index a20c3b87..babbd35a 100644 --- a/lsteamclient/winISteamNetworkingUtils.c +++ b/lsteamclient/winISteamNetworkingUtils.c @@ -177,7 +177,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_GetLocalTime return params._ret; } -void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *)) +void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *)) { struct cppISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params params = { @@ -519,7 +519,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_GetLocalTime return params._ret; } -void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *)) +void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *)) { struct cppISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params params = { @@ -874,7 +874,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_GetLocalTime return params._ret; } -void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *)) +void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *)) { struct cppISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params params = { @@ -1233,7 +1233,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_GetLocalTime return params._ret; } -void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*__stdcall pfnFunc)(uint32_t, const char *)) +void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *)) { struct cppISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params params = { diff --git a/lsteamclient/winISteamUtils.c b/lsteamclient/winISteamUtils.c index ad64f16e..4823e892 100644 --- a/lsteamclient/winISteamUtils.c +++ b/lsteamclient/winISteamUtils.c @@ -457,7 +457,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils004_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils004_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils004_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils004_SetWarningMessageHook_params params = { @@ -743,7 +743,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils005_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils005_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils005_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils005_SetWarningMessageHook_params params = { @@ -1100,7 +1100,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils006_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils006_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils006_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils006_SetWarningMessageHook_params params = { @@ -1482,7 +1482,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils007_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils007_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils007_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils007_SetWarningMessageHook_params params = { @@ -1880,7 +1880,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils008_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils008_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils008_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils008_SetWarningMessageHook_params params = { @@ -2307,7 +2307,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils009_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils009_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils009_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils009_SetWarningMessageHook_params params = { @@ -2815,7 +2815,7 @@ uint32_t __thiscall winISteamUtils_SteamUtils010_GetIPCCallCount(struct w_steam_ return params._ret; } -void __thiscall winISteamUtils_SteamUtils010_SetWarningMessageHook(struct w_steam_iface *_this, void (*__cdecl pFunction)(int32_t, const char *)) +void __thiscall winISteamUtils_SteamUtils010_SetWarningMessageHook(struct w_steam_iface *_this, void (*W_CDECL pFunction)(int32_t, const char *)) { struct cppISteamUtils_SteamUtils010_SetWarningMessageHook_params params = {