From e4a35ff64d69ded169289e5eb7049f5a2778c6d5 Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Fri, 4 Sep 2020 09:43:19 +0100 Subject: [PATCH] Generated 1.50 --- Facepunch.Steamworks/Generated/CustomEnums.cs | 8 +- .../Interfaces/ISteamNetworkingMessages.cs | 96 +++++++++++++++++++ .../Interfaces/ISteamNetworkingSockets.cs | 58 ++++++----- .../Interfaces/ISteamNetworkingUtils.cs | 72 ++++++++++++++ .../Generated/Interfaces/ISteamUtils.cs | 24 ++--- .../Generated/SteamCallbacks.cs | 49 +++++----- .../Generated/SteamConstants.cs | 1 + Facepunch.Steamworks/Generated/SteamEnums.cs | 21 +++- .../Generated/SteamStructFunctions.cs | 19 ++++ Facepunch.Steamworks/Generated/SteamTypes.cs | 80 ++++++++++++++++ 10 files changed, 362 insertions(+), 66 deletions(-) create mode 100644 Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingMessages.cs diff --git a/Facepunch.Steamworks/Generated/CustomEnums.cs b/Facepunch.Steamworks/Generated/CustomEnums.cs index 5da0597..6d85281 100644 --- a/Facepunch.Steamworks/Generated/CustomEnums.cs +++ b/Facepunch.Steamworks/Generated/CustomEnums.cs @@ -95,6 +95,8 @@ public enum CallbackType P2PSessionConnectFail = 1203, SteamNetConnectionStatusChangedCallback = 1221, SteamNetAuthenticationStatus = 1222, + SteamNetworkingMessagesSessionRequest = 1251, + SteamNetworkingMessagesSessionFailed = 1252, SteamRelayNetworkStatus = 1281, RemoteStorageAppSyncedClient = 1301, RemoteStorageAppSyncedServer = 1302, @@ -189,8 +191,6 @@ public enum CallbackType HTML_UpdateToolTip = 4525, HTML_HideToolTip = 4526, HTML_BrowserRestarted = 4527, - BroadcastUploadStart = 4604, - BroadcastUploadStop = 4605, GetVideoURLResult = 4611, GetOPFSettingsResult = 4624, SteamInventoryResultReady = 4700, @@ -305,6 +305,8 @@ internal static partial class CallbackTypeFactory { CallbackType.P2PSessionConnectFail, typeof( P2PSessionConnectFail_t )}, { CallbackType.SteamNetConnectionStatusChangedCallback, typeof( SteamNetConnectionStatusChangedCallback_t )}, { CallbackType.SteamNetAuthenticationStatus, typeof( SteamNetAuthenticationStatus_t )}, + { CallbackType.SteamNetworkingMessagesSessionRequest, typeof( SteamNetworkingMessagesSessionRequest_t )}, + { CallbackType.SteamNetworkingMessagesSessionFailed, typeof( SteamNetworkingMessagesSessionFailed_t )}, { CallbackType.SteamRelayNetworkStatus, typeof( SteamRelayNetworkStatus_t )}, { CallbackType.RemoteStorageAppSyncedClient, typeof( RemoteStorageAppSyncedClient_t )}, { CallbackType.RemoteStorageAppSyncedServer, typeof( RemoteStorageAppSyncedServer_t )}, @@ -399,8 +401,6 @@ internal static partial class CallbackTypeFactory { CallbackType.HTML_UpdateToolTip, typeof( HTML_UpdateToolTip_t )}, { CallbackType.HTML_HideToolTip, typeof( HTML_HideToolTip_t )}, { CallbackType.HTML_BrowserRestarted, typeof( HTML_BrowserRestarted_t )}, - { CallbackType.BroadcastUploadStart, typeof( BroadcastUploadStart_t )}, - { CallbackType.BroadcastUploadStop, typeof( BroadcastUploadStop_t )}, { CallbackType.GetVideoURLResult, typeof( GetVideoURLResult_t )}, { CallbackType.GetOPFSettingsResult, typeof( GetOPFSettingsResult_t )}, { CallbackType.SteamInventoryResultReady, typeof( SteamInventoryResultReady_t )}, diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingMessages.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingMessages.cs new file mode 100644 index 0000000..691ebd7 --- /dev/null +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingMessages.cs @@ -0,0 +1,96 @@ +using System; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using Steamworks.Data; + + +namespace Steamworks +{ + internal class ISteamNetworkingMessages : SteamInterface + { + + internal ISteamNetworkingMessages( bool IsGameServer ) + { + SetupInterface( IsGameServer ); + } + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingMessages_v002", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamNetworkingMessages_v002(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingMessages_v002(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingMessages_v002", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerNetworkingMessages_v002(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingMessages_v002(); + + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_SendMessageToUser", CallingConvention = Platform.CC)] + private static extern Result _SendMessageToUser( IntPtr self, ref NetIdentity identityRemote, [In,Out] IntPtr[] pubData, uint cubData, int nSendFlags, int nRemoteChannel ); + + #endregion + internal Result SendMessageToUser( ref NetIdentity identityRemote, [In,Out] IntPtr[] pubData, uint cubData, int nSendFlags, int nRemoteChannel ) + { + var returnValue = _SendMessageToUser( Self, ref identityRemote, pubData, cubData, nSendFlags, nRemoteChannel ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_ReceiveMessagesOnChannel", CallingConvention = Platform.CC)] + private static extern int _ReceiveMessagesOnChannel( IntPtr self, int nLocalChannel, IntPtr ppOutMessages, int nMaxMessages ); + + #endregion + internal int ReceiveMessagesOnChannel( int nLocalChannel, IntPtr ppOutMessages, int nMaxMessages ) + { + var returnValue = _ReceiveMessagesOnChannel( Self, nLocalChannel, ppOutMessages, nMaxMessages ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_AcceptSessionWithUser", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _AcceptSessionWithUser( IntPtr self, ref NetIdentity identityRemote ); + + #endregion + internal bool AcceptSessionWithUser( ref NetIdentity identityRemote ) + { + var returnValue = _AcceptSessionWithUser( Self, ref identityRemote ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_CloseSessionWithUser", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _CloseSessionWithUser( IntPtr self, ref NetIdentity identityRemote ); + + #endregion + internal bool CloseSessionWithUser( ref NetIdentity identityRemote ) + { + var returnValue = _CloseSessionWithUser( Self, ref identityRemote ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_CloseChannelWithUser", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _CloseChannelWithUser( IntPtr self, ref NetIdentity identityRemote, int nLocalChannel ); + + #endregion + internal bool CloseChannelWithUser( ref NetIdentity identityRemote, int nLocalChannel ) + { + var returnValue = _CloseChannelWithUser( Self, ref identityRemote, nLocalChannel ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingMessages_GetSessionConnectionInfo", CallingConvention = Platform.CC)] + private static extern ConnectionState _GetSessionConnectionInfo( IntPtr self, ref NetIdentity identityRemote, ref ConnectionInfo pConnectionInfo, ref ConnectionStatus pQuickStatus ); + + #endregion + internal ConnectionState GetSessionConnectionInfo( ref NetIdentity identityRemote, ref ConnectionInfo pConnectionInfo, ref ConnectionStatus pQuickStatus ) + { + var returnValue = _GetSessionConnectionInfo( Self, ref identityRemote, ref pConnectionInfo, ref pQuickStatus ); + return returnValue; + } + + } +} diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index 02c413a..2f2c7aa 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -15,12 +15,12 @@ internal ISteamNetworkingSockets( bool IsGameServer ) SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_v008", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamNetworkingSockets_v008(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_v008(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_v008", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_v008(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_v008(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_v009", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamNetworkingSockets_v009(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_v009(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_v009", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_v009(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_v009(); #region FunctionMeta @@ -47,23 +47,23 @@ internal Connection ConnectByIPAddress( ref NetAddress address, int nOptions, [I #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateListenSocketP2P", CallingConvention = Platform.CC)] - private static extern Socket _CreateListenSocketP2P( IntPtr self, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); + private static extern Socket _CreateListenSocketP2P( IntPtr self, int nLocalVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); #endregion - internal Socket CreateListenSocketP2P( int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) + internal Socket CreateListenSocketP2P( int nLocalVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) { - var returnValue = _CreateListenSocketP2P( Self, nVirtualPort, nOptions, pOptions ); + var returnValue = _CreateListenSocketP2P( Self, nLocalVirtualPort, nOptions, pOptions ); return returnValue; } #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectP2P", CallingConvention = Platform.CC)] - private static extern Connection _ConnectP2P( IntPtr self, ref NetIdentity identityRemote, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); + private static extern Connection _ConnectP2P( IntPtr self, ref NetIdentity identityRemote, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); #endregion - internal Connection ConnectP2P( ref NetIdentity identityRemote, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) + internal Connection ConnectP2P( ref NetIdentity identityRemote, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) { - var returnValue = _ConnectP2P( Self, ref identityRemote, nVirtualPort, nOptions, pOptions ); + var returnValue = _ConnectP2P( Self, ref identityRemote, nRemoteVirtualPort, nOptions, pOptions ); return returnValue; } @@ -347,23 +347,23 @@ internal bool ReceivedRelayAuthTicket( IntPtr pvTicket, int cbTicket, [In,Out] S #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_FindRelayAuthTicketForServer", CallingConvention = Platform.CC)] - private static extern int _FindRelayAuthTicketForServer( IntPtr self, ref NetIdentity identityGameServer, int nVirtualPort, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ); + private static extern int _FindRelayAuthTicketForServer( IntPtr self, ref NetIdentity identityGameServer, int nRemoteVirtualPort, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ); #endregion - internal int FindRelayAuthTicketForServer( ref NetIdentity identityGameServer, int nVirtualPort, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ) + internal int FindRelayAuthTicketForServer( ref NetIdentity identityGameServer, int nRemoteVirtualPort, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ) { - var returnValue = _FindRelayAuthTicketForServer( Self, ref identityGameServer, nVirtualPort, pOutParsedTicket ); + var returnValue = _FindRelayAuthTicketForServer( Self, ref identityGameServer, nRemoteVirtualPort, pOutParsedTicket ); return returnValue; } #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectToHostedDedicatedServer", CallingConvention = Platform.CC)] - private static extern Connection _ConnectToHostedDedicatedServer( IntPtr self, ref NetIdentity identityTarget, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); + private static extern Connection _ConnectToHostedDedicatedServer( IntPtr self, ref NetIdentity identityTarget, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); #endregion - internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarget, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) + internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarget, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) { - var returnValue = _ConnectToHostedDedicatedServer( Self, ref identityTarget, nVirtualPort, nOptions, pOptions ); + var returnValue = _ConnectToHostedDedicatedServer( Self, ref identityTarget, nRemoteVirtualPort, nOptions, pOptions ); return returnValue; } @@ -402,12 +402,12 @@ internal Result GetHostedDedicatedServerAddress( ref SteamDatagramHostedAddress #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateHostedDedicatedServerListenSocket", CallingConvention = Platform.CC)] - private static extern Socket _CreateHostedDedicatedServerListenSocket( IntPtr self, int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); + private static extern Socket _CreateHostedDedicatedServerListenSocket( IntPtr self, int nLocalVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); #endregion - internal Socket CreateHostedDedicatedServerListenSocket( int nVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) + internal Socket CreateHostedDedicatedServerListenSocket( int nLocalVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) { - var returnValue = _CreateHostedDedicatedServerListenSocket( Self, nVirtualPort, nOptions, pOptions ); + var returnValue = _CreateHostedDedicatedServerListenSocket( Self, nLocalVirtualPort, nOptions, pOptions ); return returnValue; } @@ -424,12 +424,12 @@ internal Result GetGameCoordinatorServerLogin( ref SteamDatagramGameCoordinatorS #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConnectP2PCustomSignaling", CallingConvention = Platform.CC)] - private static extern Connection _ConnectP2PCustomSignaling( IntPtr self, IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, [In,Out] NetKeyValue[] pOptions ); + private static extern Connection _ConnectP2PCustomSignaling( IntPtr self, IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ); #endregion - internal Connection ConnectP2PCustomSignaling( IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nOptions, [In,Out] NetKeyValue[] pOptions ) + internal Connection ConnectP2PCustomSignaling( IntPtr pSignaling, ref NetIdentity pPeerIdentity, int nRemoteVirtualPort, int nOptions, [In,Out] NetKeyValue[] pOptions ) { - var returnValue = _ConnectP2PCustomSignaling( Self, pSignaling, ref pPeerIdentity, nOptions, pOptions ); + var returnValue = _ConnectP2PCustomSignaling( Self, pSignaling, ref pPeerIdentity, nRemoteVirtualPort, nOptions, pOptions ); return returnValue; } @@ -469,5 +469,15 @@ internal bool SetCertificate( IntPtr pCertificate, int cbCertificate, ref NetErr return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_RunCallbacks", CallingConvention = Platform.CC)] + private static extern void _RunCallbacks( IntPtr self ); + + #endregion + internal void RunCallbacks() + { + _RunCallbacks( Self ); + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs index c08abff..d185602 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs @@ -222,6 +222,18 @@ internal bool SetGlobalConfigValueString( NetConfig eValue, [MarshalAs( Unmanage return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalConfigValuePtr", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalConfigValuePtr( IntPtr self, NetConfig eValue, IntPtr val ); + + #endregion + internal bool SetGlobalConfigValuePtr( NetConfig eValue, IntPtr val ) + { + var returnValue = _SetGlobalConfigValuePtr( Self, eValue, val ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConnectionConfigValueInt32", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] @@ -258,6 +270,66 @@ internal bool SetConnectionConfigValueString( Connection hConn, NetConfig eValue return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetConnectionStatusChanged", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_SteamNetConnectionStatusChanged( IntPtr self, FnSteamNetConnectionStatusChanged fnCallback ); + + #endregion + internal bool SetGlobalCallback_SteamNetConnectionStatusChanged( FnSteamNetConnectionStatusChanged fnCallback ) + { + var returnValue = _SetGlobalCallback_SteamNetConnectionStatusChanged( Self, fnCallback ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamNetAuthenticationStatusChanged", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_SteamNetAuthenticationStatusChanged( IntPtr self, FnSteamNetAuthenticationStatusChanged fnCallback ); + + #endregion + internal bool SetGlobalCallback_SteamNetAuthenticationStatusChanged( FnSteamNetAuthenticationStatusChanged fnCallback ) + { + var returnValue = _SetGlobalCallback_SteamNetAuthenticationStatusChanged( Self, fnCallback ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_SteamRelayNetworkStatusChanged", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_SteamRelayNetworkStatusChanged( IntPtr self, FnSteamRelayNetworkStatusChanged fnCallback ); + + #endregion + internal bool SetGlobalCallback_SteamRelayNetworkStatusChanged( FnSteamRelayNetworkStatusChanged fnCallback ) + { + var returnValue = _SetGlobalCallback_SteamRelayNetworkStatusChanged( Self, fnCallback ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionRequest", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_MessagesSessionRequest( IntPtr self, FnSteamNetworkingMessagesSessionRequest fnCallback ); + + #endregion + internal bool SetGlobalCallback_MessagesSessionRequest( FnSteamNetworkingMessagesSessionRequest fnCallback ) + { + var returnValue = _SetGlobalCallback_MessagesSessionRequest( Self, fnCallback ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetGlobalCallback_MessagesSessionFailed", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetGlobalCallback_MessagesSessionFailed( IntPtr self, FnSteamNetworkingMessagesSessionFailed fnCallback ); + + #endregion + internal bool SetGlobalCallback_MessagesSessionFailed( FnSteamNetworkingMessagesSessionFailed fnCallback ) + { + var returnValue = _SetGlobalCallback_MessagesSessionFailed( Self, fnCallback ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SetConfigValue", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs index f091960..633766f 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs @@ -15,12 +15,12 @@ internal ISteamUtils( bool IsGameServer ) SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamUtils_v009", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamUtils_v009(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamUtils_v009(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerUtils_v009", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerUtils_v009(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerUtils_v009(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamUtils_v010", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamUtils_v010(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamUtils_v010(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerUtils_v010", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerUtils_v010(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerUtils_v010(); #region FunctionMeta @@ -366,24 +366,24 @@ internal bool IsSteamChinaLauncher() #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_InitFilterText", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _InitFilterText( IntPtr self ); + private static extern bool _InitFilterText( IntPtr self, uint unFilterOptions ); #endregion - internal bool InitFilterText() + internal bool InitFilterText( uint unFilterOptions ) { - var returnValue = _InitFilterText( Self ); + var returnValue = _InitFilterText( Self, unFilterOptions ); return returnValue; } #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_FilterText", CallingConvention = Platform.CC)] - private static extern int _FilterText( IntPtr self, IntPtr pchOutFilteredText, uint nByteSizeOutFilteredText, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputMessage, [MarshalAs( UnmanagedType.U1 )] bool bLegalOnly ); + private static extern int _FilterText( IntPtr self, TextFilteringContext eContext, SteamId sourceSteamID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputMessage, IntPtr pchOutFilteredText, uint nByteSizeOutFilteredText ); #endregion - internal int FilterText( out string pchOutFilteredText, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputMessage, [MarshalAs( UnmanagedType.U1 )] bool bLegalOnly ) + internal int FilterText( TextFilteringContext eContext, SteamId sourceSteamID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputMessage, out string pchOutFilteredText ) { IntPtr mempchOutFilteredText = Helpers.TakeMemory(); - var returnValue = _FilterText( Self, mempchOutFilteredText, (1024 * 32), pchInputMessage, bLegalOnly ); + var returnValue = _FilterText( Self, eContext, sourceSteamID, pchInputMessage, mempchOutFilteredText, (1024 * 32) ); pchOutFilteredText = Helpers.MemoryToString( mempchOutFilteredText ); return returnValue; } diff --git a/Facepunch.Steamworks/Generated/SteamCallbacks.cs b/Facepunch.Steamworks/Generated/SteamCallbacks.cs index 31566b0..2275a42 100644 --- a/Facepunch.Steamworks/Generated/SteamCallbacks.cs +++ b/Facepunch.Steamworks/Generated/SteamCallbacks.cs @@ -2641,31 +2641,6 @@ internal struct GetOPFSettingsResult_t : ICallbackData #endregion } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct BroadcastUploadStart_t : ICallbackData - { - [MarshalAs(UnmanagedType.I1)] - internal bool IsRTMP; // m_bIsRTMP bool - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(BroadcastUploadStart_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.BroadcastUploadStart; - #endregion - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct BroadcastUploadStop_t : ICallbackData - { - internal BroadcastUploadResult Result; // m_eResult EBroadcastUploadResult - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(BroadcastUploadStop_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.BroadcastUploadStop; - #endregion - } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct SteamParentalSettingsChanged_t : ICallbackData { @@ -2701,6 +2676,30 @@ internal struct SteamRemotePlaySessionDisconnected_t : ICallbackData #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamNetworkingMessagesSessionRequest_t : ICallbackData + { + internal NetIdentity DentityRemote; // m_identityRemote SteamNetworkingIdentity + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamNetworkingMessagesSessionRequest_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamNetworkingMessagesSessionRequest; + #endregion + } + + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamNetworkingMessagesSessionFailed_t : ICallbackData + { + internal ConnectionInfo Nfo; // m_info SteamNetConnectionInfo_t + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamNetworkingMessagesSessionFailed_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamNetworkingMessagesSessionFailed; + #endregion + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct SteamNetConnectionStatusChangedCallback_t : ICallbackData { diff --git a/Facepunch.Steamworks/Generated/SteamConstants.cs b/Facepunch.Steamworks/Generated/SteamConstants.cs index a48f8a5..9d03ac4 100644 --- a/Facepunch.Steamworks/Generated/SteamConstants.cs +++ b/Facepunch.Steamworks/Generated/SteamConstants.cs @@ -86,6 +86,7 @@ internal static class Defines internal static readonly int k_nSteamNetworkingSend_Reliable = 8; internal static readonly int k_nSteamNetworkingSend_ReliableNoNagle = k_nSteamNetworkingSend_Reliable | k_nSteamNetworkingSend_NoNagle; internal static readonly int k_nSteamNetworkingSend_UseCurrentThread = 16; + internal static readonly int k_nSteamNetworkingSend_AutoRestartBrokenSession = 32; internal static readonly int k_cchMaxSteamNetworkingPingLocationString = 1024; internal static readonly int k_nSteamNetworkingPing_Failed = - 1; internal static readonly int k_nSteamNetworkingPing_Unknown = - 2; diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs index 01f58e6..cdcc8ef 100644 --- a/Facepunch.Steamworks/Generated/SteamEnums.cs +++ b/Facepunch.Steamworks/Generated/SteamEnums.cs @@ -749,6 +749,17 @@ public enum GamepadTextInputLineMode : int MultipleLines = 1, } + // + // ETextFilteringContext + // + internal enum TextFilteringContext : int + { + Unknown = 0, + GameContent = 1, + Chat = 2, + Name = 3, + } + // // ECheckFileSignature // @@ -2003,6 +2014,7 @@ public enum NetConnectionEnd : int Misc_NoRelaySessionsToClient = 5006, Misc_P2P_Rendezvous = 5008, Misc_P2P_NAT_Firewall = 5009, + Misc_PeerSentNoConnection = 5010, Misc_Max = 5999, } @@ -2041,7 +2053,7 @@ internal enum NetConfigType : int Int64 = 2, Float = 3, String = 4, - FunctionPtr = 5, + Ptr = 5, } // @@ -2071,6 +2083,13 @@ internal enum NetConfig : int MTU_DataSize = 33, Unencrypted = 34, EnumerateDevVars = 35, + SymmetricConnect = 37, + LocalVirtualPort = 38, + Callback_ConnectionStatusChanged = 201, + Callback_AuthStatusChanged = 202, + Callback_RelayNetworkStatusChanged = 203, + Callback_MessagesSessionRequest = 204, + Callback_MessagesSessionFailed = 205, P2P_STUN_ServerList = 103, P2P_Transport_ICE_Enable = 104, P2P_Transport_ICE_Penalty = 105, diff --git a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs index f36675a..9e9786a 100644 --- a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs +++ b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs @@ -88,6 +88,25 @@ internal partial struct SteamIPAddress } + internal partial struct NetKeyValue + { + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingConfigValue_t_SetInt32", CallingConvention = Platform.CC)] + internal static extern void InternalSetInt32( ref NetKeyValue self, NetConfig eVal, int32_t data ); + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingConfigValue_t_SetInt64", CallingConvention = Platform.CC)] + internal static extern void InternalSetInt64( ref NetKeyValue self, NetConfig eVal, int64_t data ); + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingConfigValue_t_SetFloat", CallingConvention = Platform.CC)] + internal static extern void InternalSetFloat( ref NetKeyValue self, NetConfig eVal, float data ); + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingConfigValue_t_SetPtr", CallingConvention = Platform.CC)] + internal static extern void InternalSetPtr( ref NetKeyValue self, NetConfig eVal, IntPtr data ); + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingConfigValue_t_SetString", CallingConvention = Platform.CC)] + internal static extern void InternalSetString( ref NetKeyValue self, NetConfig eVal, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string data ); + + } + public partial struct NetIdentity { [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_Clear", CallingConvention = Platform.CC)] diff --git a/Facepunch.Steamworks/Generated/SteamTypes.cs b/Facepunch.Steamworks/Generated/SteamTypes.cs index 44f5be6..d91f48a 100644 --- a/Facepunch.Steamworks/Generated/SteamTypes.cs +++ b/Facepunch.Steamworks/Generated/SteamTypes.cs @@ -806,6 +806,86 @@ internal struct RemotePlaySessionID_t : IEquatable, IComp public int CompareTo( RemotePlaySessionID_t other ) => Value.CompareTo( other.Value ); } + internal struct FnSteamNetConnectionStatusChanged : IEquatable, IComparable + { + // Name: FnSteamNetConnectionStatusChanged, Type: void (*)(SteamNetConnectionStatusChangedCallback_t *) + public void (*)(SteamNetConnectionStatusChangedCallback_t *) Value; + + public static implicit operator FnSteamNetConnectionStatusChanged( void (*)(SteamNetConnectionStatusChangedCallback_t *) value ) => new FnSteamNetConnectionStatusChanged(){ Value = value }; + public static implicit operator void (*)(SteamNetConnectionStatusChangedCallback_t *)( FnSteamNetConnectionStatusChanged value ) => value.Value; + public override string ToString() => Value.ToString(); + public override int GetHashCode() => Value.GetHashCode(); + public override bool Equals( object p ) => this.Equals( (FnSteamNetConnectionStatusChanged) p ); + public bool Equals( FnSteamNetConnectionStatusChanged p ) => p.Value == Value; + public static bool operator ==( FnSteamNetConnectionStatusChanged a, FnSteamNetConnectionStatusChanged b ) => a.Equals( b ); + public static bool operator !=( FnSteamNetConnectionStatusChanged a, FnSteamNetConnectionStatusChanged b ) => !a.Equals( b ); + public int CompareTo( FnSteamNetConnectionStatusChanged other ) => Value.CompareTo( other.Value ); + } + + internal struct FnSteamNetAuthenticationStatusChanged : IEquatable, IComparable + { + // Name: FnSteamNetAuthenticationStatusChanged, Type: void (*)(SteamNetAuthenticationStatus_t *) + public void (*)(SteamNetAuthenticationStatus_t *) Value; + + public static implicit operator FnSteamNetAuthenticationStatusChanged( void (*)(SteamNetAuthenticationStatus_t *) value ) => new FnSteamNetAuthenticationStatusChanged(){ Value = value }; + public static implicit operator void (*)(SteamNetAuthenticationStatus_t *)( FnSteamNetAuthenticationStatusChanged value ) => value.Value; + public override string ToString() => Value.ToString(); + public override int GetHashCode() => Value.GetHashCode(); + public override bool Equals( object p ) => this.Equals( (FnSteamNetAuthenticationStatusChanged) p ); + public bool Equals( FnSteamNetAuthenticationStatusChanged p ) => p.Value == Value; + public static bool operator ==( FnSteamNetAuthenticationStatusChanged a, FnSteamNetAuthenticationStatusChanged b ) => a.Equals( b ); + public static bool operator !=( FnSteamNetAuthenticationStatusChanged a, FnSteamNetAuthenticationStatusChanged b ) => !a.Equals( b ); + public int CompareTo( FnSteamNetAuthenticationStatusChanged other ) => Value.CompareTo( other.Value ); + } + + internal struct FnSteamRelayNetworkStatusChanged : IEquatable, IComparable + { + // Name: FnSteamRelayNetworkStatusChanged, Type: void (*)(SteamRelayNetworkStatus_t *) + public void (*)(SteamRelayNetworkStatus_t *) Value; + + public static implicit operator FnSteamRelayNetworkStatusChanged( void (*)(SteamRelayNetworkStatus_t *) value ) => new FnSteamRelayNetworkStatusChanged(){ Value = value }; + public static implicit operator void (*)(SteamRelayNetworkStatus_t *)( FnSteamRelayNetworkStatusChanged value ) => value.Value; + public override string ToString() => Value.ToString(); + public override int GetHashCode() => Value.GetHashCode(); + public override bool Equals( object p ) => this.Equals( (FnSteamRelayNetworkStatusChanged) p ); + public bool Equals( FnSteamRelayNetworkStatusChanged p ) => p.Value == Value; + public static bool operator ==( FnSteamRelayNetworkStatusChanged a, FnSteamRelayNetworkStatusChanged b ) => a.Equals( b ); + public static bool operator !=( FnSteamRelayNetworkStatusChanged a, FnSteamRelayNetworkStatusChanged b ) => !a.Equals( b ); + public int CompareTo( FnSteamRelayNetworkStatusChanged other ) => Value.CompareTo( other.Value ); + } + + internal struct FnSteamNetworkingMessagesSessionRequest : IEquatable, IComparable + { + // Name: FnSteamNetworkingMessagesSessionRequest, Type: void (*)(SteamNetworkingMessagesSessionRequest_t *) + public void (*)(SteamNetworkingMessagesSessionRequest_t *) Value; + + public static implicit operator FnSteamNetworkingMessagesSessionRequest( void (*)(SteamNetworkingMessagesSessionRequest_t *) value ) => new FnSteamNetworkingMessagesSessionRequest(){ Value = value }; + public static implicit operator void (*)(SteamNetworkingMessagesSessionRequest_t *)( FnSteamNetworkingMessagesSessionRequest value ) => value.Value; + public override string ToString() => Value.ToString(); + public override int GetHashCode() => Value.GetHashCode(); + public override bool Equals( object p ) => this.Equals( (FnSteamNetworkingMessagesSessionRequest) p ); + public bool Equals( FnSteamNetworkingMessagesSessionRequest p ) => p.Value == Value; + public static bool operator ==( FnSteamNetworkingMessagesSessionRequest a, FnSteamNetworkingMessagesSessionRequest b ) => a.Equals( b ); + public static bool operator !=( FnSteamNetworkingMessagesSessionRequest a, FnSteamNetworkingMessagesSessionRequest b ) => !a.Equals( b ); + public int CompareTo( FnSteamNetworkingMessagesSessionRequest other ) => Value.CompareTo( other.Value ); + } + + internal struct FnSteamNetworkingMessagesSessionFailed : IEquatable, IComparable + { + // Name: FnSteamNetworkingMessagesSessionFailed, Type: void (*)(SteamNetworkingMessagesSessionFailed_t *) + public void (*)(SteamNetworkingMessagesSessionFailed_t *) Value; + + public static implicit operator FnSteamNetworkingMessagesSessionFailed( void (*)(SteamNetworkingMessagesSessionFailed_t *) value ) => new FnSteamNetworkingMessagesSessionFailed(){ Value = value }; + public static implicit operator void (*)(SteamNetworkingMessagesSessionFailed_t *)( FnSteamNetworkingMessagesSessionFailed value ) => value.Value; + public override string ToString() => Value.ToString(); + public override int GetHashCode() => Value.GetHashCode(); + public override bool Equals( object p ) => this.Equals( (FnSteamNetworkingMessagesSessionFailed) p ); + public bool Equals( FnSteamNetworkingMessagesSessionFailed p ) => p.Value == Value; + public static bool operator ==( FnSteamNetworkingMessagesSessionFailed a, FnSteamNetworkingMessagesSessionFailed b ) => a.Equals( b ); + public static bool operator !=( FnSteamNetworkingMessagesSessionFailed a, FnSteamNetworkingMessagesSessionFailed b ) => !a.Equals( b ); + public int CompareTo( FnSteamNetworkingMessagesSessionFailed other ) => Value.CompareTo( other.Value ); + } + internal struct HSteamNetPollGroup : IEquatable, IComparable { // Name: HSteamNetPollGroup, Type: unsigned int