mirror of
https://github.com/ValveSoftware/Proton.git
synced 2024-12-28 15:45:50 +03:00
lsteamclient: Fix SteamAPI_CheckCallbackRegistered_t calling convention
This commit is contained in:
parent
abfb04f8cc
commit
80465e2a7d
@ -174,6 +174,7 @@ void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(void
|
|||||||
|
|
||||||
void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
||||||
{
|
{
|
||||||
|
func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
|
||||||
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,6 +174,7 @@ void cppISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
|
|||||||
|
|
||||||
void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
||||||
{
|
{
|
||||||
|
func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
|
||||||
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,6 +180,7 @@ void cppISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInP
|
|||||||
|
|
||||||
void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
void cppISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *linux_side, SteamAPI_CheckCallbackRegistered_t func)
|
||||||
{
|
{
|
||||||
|
func = (SteamAPI_CheckCallbackRegistered_t)manual_convert_SteamAPI_CheckCallbackRegistered_t((void*)func);
|
||||||
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
((ISteamClient*)linux_side)->Set_SteamAPI_CCheckCallbackRegisteredInProcess((SteamAPI_CheckCallbackRegistered_t)func);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
CLANG_PATH='/usr/lib/clang/8.0.0'
|
CLANG_PATH='/usr/lib/clang/8.0.1'
|
||||||
|
|
||||||
import pprint
|
import pprint
|
||||||
import sys
|
import sys
|
||||||
@ -178,7 +178,8 @@ manually_handled_methods = {
|
|||||||
|
|
||||||
# manual converters for simple types (function pointers)
|
# manual converters for simple types (function pointers)
|
||||||
manual_type_converters = [
|
manual_type_converters = [
|
||||||
"FSteamNetworkingSocketsDebugOutput"
|
"FSteamNetworkingSocketsDebugOutput",
|
||||||
|
"SteamAPI_CheckCallbackRegistered_t"
|
||||||
]
|
]
|
||||||
|
|
||||||
# manual converters for specific parameters
|
# manual converters for specific parameters
|
||||||
|
@ -205,11 +205,9 @@ typedef struct SteamNetworkingQuickConnectionStatus SteamNetworkingQuickConnecti
|
|||||||
typedef struct SteamDatagramRelayAuthTicket SteamDatagramRelayAuthTicket;
|
typedef struct SteamDatagramRelayAuthTicket SteamDatagramRelayAuthTicket;
|
||||||
typedef struct SteamDatagramHostedAddress SteamDatagramHostedAddress;
|
typedef struct SteamDatagramHostedAddress SteamDatagramHostedAddress;
|
||||||
|
|
||||||
/* FIXME: we don't care about fn pointer types, just pass 'em through */
|
typedef uint32 (*SteamAPI_CheckCallbackRegistered_t)(int cb);
|
||||||
typedef void *SteamAPI_CheckCallbackRegistered_t;
|
typedef void *SteamAPIWarningMessageHook_t; //already cdecl, no need for conversion(?)
|
||||||
typedef void *SteamAPIWarningMessageHook_t;
|
typedef void *SteamAPI_PostAPIResultInProcess_t; //unused
|
||||||
typedef void *SteamAPI_PostAPIResultInProcess_t;
|
|
||||||
|
|
||||||
typedef void (*FSteamNetworkingSocketsDebugOutput)(ESteamNetworkingSocketsDebugOutputType nType, const char *pszMsg);
|
typedef void (*FSteamNetworkingSocketsDebugOutput)(ESteamNetworkingSocketsDebugOutputType nType, const char *pszMsg);
|
||||||
|
|
||||||
typedef uint8 Salt_t[8];
|
typedef uint8 Salt_t[8];
|
||||||
|
@ -48,6 +48,7 @@ void *create_LinuxISteamMatchmakingPingResponse(void *win, const char *version);
|
|||||||
void *create_LinuxISteamMatchmakingPlayersResponse(void *win, const char *version);
|
void *create_LinuxISteamMatchmakingPlayersResponse(void *win, const char *version);
|
||||||
void *create_LinuxISteamMatchmakingRulesResponse(void *win, const char *version);
|
void *create_LinuxISteamMatchmakingRulesResponse(void *win, const char *version);
|
||||||
void *manual_convert_FSteamNetworkingSocketsDebugOutput(void *win_func);
|
void *manual_convert_FSteamNetworkingSocketsDebugOutput(void *win_func);
|
||||||
|
void *manual_convert_SteamAPI_CheckCallbackRegistered_t(void *win_func);
|
||||||
|
|
||||||
extern char g_tmppath[PATH_MAX];
|
extern char g_tmppath[PATH_MAX];
|
||||||
|
|
||||||
|
@ -295,3 +295,18 @@ void *manual_convert_FSteamNetworkingSocketsDebugOutput(void *win_func)
|
|||||||
stored_FSteamNetworkingSocketsDebugOutput = (void*)win_func;
|
stored_FSteamNetworkingSocketsDebugOutput = (void*)win_func;
|
||||||
return &lin_FSteamNetworkingSocketsDebugOutput;
|
return &lin_FSteamNetworkingSocketsDebugOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***** SteamAPI_CheckCallbackRegistered_t *****/
|
||||||
|
static uint32 (__attribute__((ms_abi)) *stored_SteamAPI_CheckCallbackRegistered_t)(int cb);
|
||||||
|
|
||||||
|
static uint32 lin_SteamAPI_CheckCallbackRegistered_t(int cb)
|
||||||
|
{
|
||||||
|
return stored_SteamAPI_CheckCallbackRegistered_t(cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *manual_convert_SteamAPI_CheckCallbackRegistered_t(void *win_func)
|
||||||
|
{
|
||||||
|
stored_SteamAPI_CheckCallbackRegistered_t = (void*)win_func;
|
||||||
|
return &lin_SteamAPI_CheckCallbackRegistered_t;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user