diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py index 7725e522..3f2780a9 100755 --- a/lsteamclient/gen_wrapper.py +++ b/lsteamclient/gen_wrapper.py @@ -265,7 +265,7 @@ MANUAL_METHODS = { "ISteamNetworkingSockets_ConnectP2PCustomSignaling": lambda ver, abi: abi == 'u' and ver <= 8, "ISteamNetworkingSockets_ReceivedP2PCustomSignal": lambda ver, abi: abi == 'u' and ver <= 8, - "ISteamMatchmakingServers_CancelQuery": lambda ver, abi: abi == 'u' and ver >= 2, + "ISteamMatchmakingServers_CancelQuery": lambda ver, abi: (abi == 'u' and ver >= 2) or (abi == 'w'), "ISteamMatchmakingServers_GetServerCount": lambda ver, abi: abi == 'u' and ver >= 2, "ISteamMatchmakingServers_GetServerDetails": lambda ver, abi: ver >= 2, "ISteamMatchmakingServers_IsRefreshing": lambda ver, abi: abi == 'u' and ver >= 2, diff --git a/lsteamclient/steam_matchmaking_manual.c b/lsteamclient/steam_matchmaking_manual.c index 733be7e4..50aca7ac 100644 --- a/lsteamclient/steam_matchmaking_manual.c +++ b/lsteamclient/steam_matchmaking_manual.c @@ -2,6 +2,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(steamclient); +void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery(struct w_iface *_this, uint32_t eType) +{ + struct ISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery_params params = + { + .u_iface = _this->u_iface, + .eType = eType, + }; + TRACE("%p\n", _this); + STEAMCLIENT_CALL( ISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery, ¶ms ); +} + void * __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_RequestInternetServerList( struct w_iface *_this, uint32_t iApp, MatchMakingKeyValuePair_t **ppchFilters, uint32_t nFilters, w_ISteamMatchmakingServerListResponse_106 *pRequestServersResponse ) { struct ISteamMatchmakingServers_SteamMatchMakingServers002_RequestInternetServerList_params params = @@ -162,6 +173,17 @@ void * __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_Request return request; } +void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery(struct w_iface *_this, void *hRequest) +{ + struct ISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery_params params = + { + .u_iface = _this->u_iface, + .hRequest = hRequest, + }; + TRACE("%p\n", _this); + STEAMCLIENT_CALL( ISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery, ¶ms ); +} + void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_ReleaseRequest( struct w_iface *_this, void *hServerListRequest ) { struct ISteamMatchmakingServers_SteamMatchMakingServers002_ReleaseRequest_params params = diff --git a/lsteamclient/winISteamMatchmakingServers.c b/lsteamclient/winISteamMatchmakingServers.c index 9f72cbf6..22ca8068 100644 --- a/lsteamclient/winISteamMatchmakingServers.c +++ b/lsteamclient/winISteamMatchmakingServers.c @@ -115,17 +115,6 @@ gameserveritem_t_105 * __thiscall winISteamMatchmakingServers_SteamMatchMakingSe return get_unix_buffer( params._ret ); } -void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery(struct w_iface *_this, uint32_t eType) -{ - struct ISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery_params params = - { - .u_iface = _this->u_iface, - .eType = eType, - }; - TRACE("%p\n", _this); - STEAMCLIENT_CALL( ISteamMatchmakingServers_SteamMatchMakingServers001_CancelQuery, ¶ms ); -} - void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers001_RefreshQuery(struct w_iface *_this, uint32_t eType) { struct ISteamMatchmakingServers_SteamMatchMakingServers001_RefreshQuery_params params = @@ -278,17 +267,6 @@ DEFINE_THISCALL_WRAPPER(winISteamMatchmakingServers_SteamMatchMakingServers002_P DEFINE_THISCALL_WRAPPER(winISteamMatchmakingServers_SteamMatchMakingServers002_ServerRules, 16) DEFINE_THISCALL_WRAPPER(winISteamMatchmakingServers_SteamMatchMakingServers002_CancelServerQuery, 8) -void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery(struct w_iface *_this, void *hRequest) -{ - struct ISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery_params params = - { - .u_iface = _this->u_iface, - .hRequest = hRequest, - }; - TRACE("%p\n", _this); - STEAMCLIENT_CALL( ISteamMatchmakingServers_SteamMatchMakingServers002_CancelQuery, ¶ms ); -} - void __thiscall winISteamMatchmakingServers_SteamMatchMakingServers002_RefreshQuery(struct w_iface *_this, void *hRequest) { struct ISteamMatchmakingServers_SteamMatchMakingServers002_RefreshQuery_params params =