diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs index 665e4ff..af26303 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs @@ -85,7 +85,8 @@ internal override void Shutdown() #endregion internal bool BIsSubscribed() { - return _BIsSubscribed( Self ); + var returnValue = _BIsSubscribed( Self ); + return returnValue; } #region FunctionMeta @@ -97,7 +98,8 @@ internal bool BIsSubscribed() #endregion internal bool BIsLowViolence() { - return _BIsLowViolence( Self ); + var returnValue = _BIsLowViolence( Self ); + return returnValue; } #region FunctionMeta @@ -109,7 +111,8 @@ internal bool BIsLowViolence() #endregion internal bool BIsCybercafe() { - return _BIsCybercafe( Self ); + var returnValue = _BIsCybercafe( Self ); + return returnValue; } #region FunctionMeta @@ -121,7 +124,8 @@ internal bool BIsCybercafe() #endregion internal bool BIsVACBanned() { - return _BIsVACBanned( Self ); + var returnValue = _BIsVACBanned( Self ); + return returnValue; } #region FunctionMeta @@ -132,7 +136,8 @@ internal bool BIsVACBanned() #endregion internal string GetCurrentGameLanguage() { - return _GetCurrentGameLanguage( Self ); + var returnValue = _GetCurrentGameLanguage( Self ); + return returnValue; } #region FunctionMeta @@ -143,7 +148,8 @@ internal string GetCurrentGameLanguage() #endregion internal string GetAvailableGameLanguages() { - return _GetAvailableGameLanguages( Self ); + var returnValue = _GetAvailableGameLanguages( Self ); + return returnValue; } #region FunctionMeta @@ -155,7 +161,8 @@ internal string GetAvailableGameLanguages() #endregion internal bool BIsSubscribedApp( AppId appID ) { - return _BIsSubscribedApp( Self, appID ); + var returnValue = _BIsSubscribedApp( Self, appID ); + return returnValue; } #region FunctionMeta @@ -167,7 +174,8 @@ internal bool BIsSubscribedApp( AppId appID ) #endregion internal bool BIsDlcInstalled( AppId appID ) { - return _BIsDlcInstalled( Self, appID ); + var returnValue = _BIsDlcInstalled( Self, appID ); + return returnValue; } #region FunctionMeta @@ -178,7 +186,8 @@ internal bool BIsDlcInstalled( AppId appID ) #endregion internal uint GetEarliestPurchaseUnixTime( AppId nAppID ) { - return _GetEarliestPurchaseUnixTime( Self, nAppID ); + var returnValue = _GetEarliestPurchaseUnixTime( Self, nAppID ); + return returnValue; } #region FunctionMeta @@ -190,7 +199,8 @@ internal uint GetEarliestPurchaseUnixTime( AppId nAppID ) #endregion internal bool BIsSubscribedFromFreeWeekend() { - return _BIsSubscribedFromFreeWeekend( Self ); + var returnValue = _BIsSubscribedFromFreeWeekend( Self ); + return returnValue; } #region FunctionMeta @@ -201,19 +211,23 @@ internal bool BIsSubscribedFromFreeWeekend() #endregion internal int GetDLCCount() { - return _GetDLCCount( Self ); + var returnValue = _GetDLCCount( Self ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBGetDLCDataByIndex( IntPtr self, int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ); + private delegate bool FBGetDLCDataByIndex( IntPtr self, int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, IntPtr pchName, int cchNameBufferSize ); private FBGetDLCDataByIndex _BGetDLCDataByIndex; #endregion - internal bool BGetDLCDataByIndex( int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ) + internal bool BGetDLCDataByIndex( int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, out string pchName ) { - return _BGetDLCDataByIndex( Self, iDLC, ref pAppID, ref pbAvailable, pchName, cchNameBufferSize ); + IntPtr mempchName = Helpers.TakeMemory(); + var returnValue = _BGetDLCDataByIndex( Self, iDLC, ref pAppID, ref pbAvailable, mempchName, (1024 * 32) ); + pchName = Helpers.MemoryToString( mempchName ); + return returnValue; } #region FunctionMeta @@ -252,13 +266,16 @@ internal void RequestAppProofOfPurchaseKey( AppId nAppID ) #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetCurrentBetaName( IntPtr self, StringBuilder pchName, int cchNameBufferSize ); + private delegate bool FGetCurrentBetaName( IntPtr self, IntPtr pchName, int cchNameBufferSize ); private FGetCurrentBetaName _GetCurrentBetaName; #endregion - internal bool GetCurrentBetaName( StringBuilder pchName, int cchNameBufferSize ) + internal bool GetCurrentBetaName( out string pchName ) { - return _GetCurrentBetaName( Self, pchName, cchNameBufferSize ); + IntPtr mempchName = Helpers.TakeMemory(); + var returnValue = _GetCurrentBetaName( Self, mempchName, (1024 * 32) ); + pchName = Helpers.MemoryToString( mempchName ); + return returnValue; } #region FunctionMeta @@ -270,7 +287,8 @@ internal bool GetCurrentBetaName( StringBuilder pchName, int cchNameBufferSize ) #endregion internal bool MarkContentCorrupt( [MarshalAs( UnmanagedType.U1 )] bool bMissingFilesOnly ) { - return _MarkContentCorrupt( Self, bMissingFilesOnly ); + var returnValue = _MarkContentCorrupt( Self, bMissingFilesOnly ); + return returnValue; } #region FunctionMeta @@ -281,18 +299,22 @@ internal bool MarkContentCorrupt( [MarshalAs( UnmanagedType.U1 )] bool bMissingF #endregion internal uint GetInstalledDepots( AppId appID, [In,Out] DepotId_t[] pvecDepots, uint cMaxDepots ) { - return _GetInstalledDepots( Self, appID, pvecDepots, cMaxDepots ); + var returnValue = _GetInstalledDepots( Self, appID, pvecDepots, cMaxDepots ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate uint FGetAppInstallDir( IntPtr self, AppId appID, StringBuilder pchFolder, uint cchFolderBufferSize ); + private delegate uint FGetAppInstallDir( IntPtr self, AppId appID, IntPtr pchFolder, uint cchFolderBufferSize ); private FGetAppInstallDir _GetAppInstallDir; #endregion - internal uint GetAppInstallDir( AppId appID, StringBuilder pchFolder, uint cchFolderBufferSize ) + internal uint GetAppInstallDir( AppId appID, out string pchFolder ) { - return _GetAppInstallDir( Self, appID, pchFolder, cchFolderBufferSize ); + IntPtr mempchFolder = Helpers.TakeMemory(); + var returnValue = _GetAppInstallDir( Self, appID, mempchFolder, (1024 * 32) ); + pchFolder = Helpers.MemoryToString( mempchFolder ); + return returnValue; } #region FunctionMeta @@ -304,7 +326,8 @@ internal uint GetAppInstallDir( AppId appID, StringBuilder pchFolder, uint cchFo #endregion internal bool BIsAppInstalled( AppId appID ) { - return _BIsAppInstalled( Self, appID ); + var returnValue = _BIsAppInstalled( Self, appID ); + return returnValue; } #region FunctionMeta @@ -324,7 +347,8 @@ internal SteamId GetAppOwner() _GetAppOwner( Self, ref retVal ); return retVal; #else - return _GetAppOwner( Self ); + var returnValue = _GetAppOwner( Self ); + return returnValue; #endif } @@ -336,7 +360,8 @@ internal SteamId GetAppOwner() #endregion internal string GetLaunchQueryParam( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _GetLaunchQueryParam( Self, pchKey ); + var returnValue = _GetLaunchQueryParam( Self, pchKey ); + return returnValue; } #region FunctionMeta @@ -348,7 +373,8 @@ internal string GetLaunchQueryParam( [MarshalAs( UnmanagedType.CustomMarshaler, #endregion internal bool GetDlcDownloadProgress( AppId nAppID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ) { - return _GetDlcDownloadProgress( Self, nAppID, ref punBytesDownloaded, ref punBytesTotal ); + var returnValue = _GetDlcDownloadProgress( Self, nAppID, ref punBytesDownloaded, ref punBytesTotal ); + return returnValue; } #region FunctionMeta @@ -359,7 +385,8 @@ internal bool GetDlcDownloadProgress( AppId nAppID, ref ulong punBytesDownloaded #endregion internal int GetAppBuildId() { - return _GetAppBuildId( Self ); + var returnValue = _GetAppBuildId( Self ); + return returnValue; } #region FunctionMeta @@ -381,18 +408,22 @@ internal void RequestAllProofOfPurchaseKeys() #endregion internal async Task GetFileDetails( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszFileName ) { - return await FileDetailsResult_t.GetResultAsync( _GetFileDetails( Self, pszFileName ) ); + var returnValue = _GetFileDetails( Self, pszFileName ); + return await FileDetailsResult_t.GetResultAsync( returnValue ); } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate int FGetLaunchCommandLine( IntPtr self, StringBuilder pszCommandLine, int cubCommandLine ); + private delegate int FGetLaunchCommandLine( IntPtr self, IntPtr pszCommandLine, int cubCommandLine ); private FGetLaunchCommandLine _GetLaunchCommandLine; #endregion - internal int GetLaunchCommandLine( StringBuilder pszCommandLine, int cubCommandLine ) + internal int GetLaunchCommandLine( out string pszCommandLine ) { - return _GetLaunchCommandLine( Self, pszCommandLine, cubCommandLine ); + IntPtr mempszCommandLine = Helpers.TakeMemory(); + var returnValue = _GetLaunchCommandLine( Self, mempszCommandLine, (1024 * 32) ); + pszCommandLine = Helpers.MemoryToString( mempszCommandLine ); + return returnValue; } #region FunctionMeta @@ -404,7 +435,8 @@ internal int GetLaunchCommandLine( StringBuilder pszCommandLine, int cubCommandL #endregion internal bool BIsSubscribedFromFamilySharing() { - return _BIsSubscribedFromFamilySharing( Self ); + var returnValue = _BIsSubscribedFromFamilySharing( Self ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs index e091157..d0cf691 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs @@ -174,7 +174,8 @@ internal override void Shutdown() #endregion internal string GetPersonaName() { - return _GetPersonaName( Self ); + var returnValue = _GetPersonaName( Self ); + return returnValue; } #region FunctionMeta @@ -185,7 +186,8 @@ internal string GetPersonaName() #endregion internal async Task SetPersonaName( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPersonaName ) { - return await SetPersonaNameResponse_t.GetResultAsync( _SetPersonaName( Self, pchPersonaName ) ); + var returnValue = _SetPersonaName( Self, pchPersonaName ); + return await SetPersonaNameResponse_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -196,7 +198,8 @@ internal string GetPersonaName() #endregion internal FriendState GetPersonaState() { - return _GetPersonaState( Self ); + var returnValue = _GetPersonaState( Self ); + return returnValue; } #region FunctionMeta @@ -207,7 +210,8 @@ internal FriendState GetPersonaState() #endregion internal int GetFriendCount( int iFriendFlags ) { - return _GetFriendCount( Self, iFriendFlags ); + var returnValue = _GetFriendCount( Self, iFriendFlags ); + return returnValue; } #region FunctionMeta @@ -227,7 +231,8 @@ internal SteamId GetFriendByIndex( int iFriend, int iFriendFlags ) _GetFriendByIndex( Self, ref retVal, iFriend, iFriendFlags ); return retVal; #else - return _GetFriendByIndex( Self, iFriend, iFriendFlags ); + var returnValue = _GetFriendByIndex( Self, iFriend, iFriendFlags ); + return returnValue; #endif } @@ -239,7 +244,8 @@ internal SteamId GetFriendByIndex( int iFriend, int iFriendFlags ) #endregion internal Relationship GetFriendRelationship( SteamId steamIDFriend ) { - return _GetFriendRelationship( Self, steamIDFriend ); + var returnValue = _GetFriendRelationship( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -250,7 +256,8 @@ internal Relationship GetFriendRelationship( SteamId steamIDFriend ) #endregion internal FriendState GetFriendPersonaState( SteamId steamIDFriend ) { - return _GetFriendPersonaState( Self, steamIDFriend ); + var returnValue = _GetFriendPersonaState( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -261,7 +268,8 @@ internal FriendState GetFriendPersonaState( SteamId steamIDFriend ) #endregion internal string GetFriendPersonaName( SteamId steamIDFriend ) { - return _GetFriendPersonaName( Self, steamIDFriend ); + var returnValue = _GetFriendPersonaName( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -273,7 +281,8 @@ internal string GetFriendPersonaName( SteamId steamIDFriend ) #endregion internal bool GetFriendGamePlayed( SteamId steamIDFriend, ref FriendGameInfo_t pFriendGameInfo ) { - return _GetFriendGamePlayed( Self, steamIDFriend, ref pFriendGameInfo ); + var returnValue = _GetFriendGamePlayed( Self, steamIDFriend, ref pFriendGameInfo ); + return returnValue; } #region FunctionMeta @@ -284,7 +293,8 @@ internal bool GetFriendGamePlayed( SteamId steamIDFriend, ref FriendGameInfo_t p #endregion internal string GetFriendPersonaNameHistory( SteamId steamIDFriend, int iPersonaName ) { - return _GetFriendPersonaNameHistory( Self, steamIDFriend, iPersonaName ); + var returnValue = _GetFriendPersonaNameHistory( Self, steamIDFriend, iPersonaName ); + return returnValue; } #region FunctionMeta @@ -295,7 +305,8 @@ internal string GetFriendPersonaNameHistory( SteamId steamIDFriend, int iPersona #endregion internal int GetFriendSteamLevel( SteamId steamIDFriend ) { - return _GetFriendSteamLevel( Self, steamIDFriend ); + var returnValue = _GetFriendSteamLevel( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -306,7 +317,8 @@ internal int GetFriendSteamLevel( SteamId steamIDFriend ) #endregion internal string GetPlayerNickname( SteamId steamIDPlayer ) { - return _GetPlayerNickname( Self, steamIDPlayer ); + var returnValue = _GetPlayerNickname( Self, steamIDPlayer ); + return returnValue; } #region FunctionMeta @@ -317,7 +329,8 @@ internal string GetPlayerNickname( SteamId steamIDPlayer ) #endregion internal int GetFriendsGroupCount() { - return _GetFriendsGroupCount( Self ); + var returnValue = _GetFriendsGroupCount( Self ); + return returnValue; } #region FunctionMeta @@ -328,7 +341,8 @@ internal int GetFriendsGroupCount() #endregion internal FriendsGroupID_t GetFriendsGroupIDByIndex( int iFG ) { - return _GetFriendsGroupIDByIndex( Self, iFG ); + var returnValue = _GetFriendsGroupIDByIndex( Self, iFG ); + return returnValue; } #region FunctionMeta @@ -339,7 +353,8 @@ internal FriendsGroupID_t GetFriendsGroupIDByIndex( int iFG ) #endregion internal string GetFriendsGroupName( FriendsGroupID_t friendsGroupID ) { - return _GetFriendsGroupName( Self, friendsGroupID ); + var returnValue = _GetFriendsGroupName( Self, friendsGroupID ); + return returnValue; } #region FunctionMeta @@ -350,7 +365,8 @@ internal string GetFriendsGroupName( FriendsGroupID_t friendsGroupID ) #endregion internal int GetFriendsGroupMembersCount( FriendsGroupID_t friendsGroupID ) { - return _GetFriendsGroupMembersCount( Self, friendsGroupID ); + var returnValue = _GetFriendsGroupMembersCount( Self, friendsGroupID ); + return returnValue; } #region FunctionMeta @@ -373,7 +389,8 @@ internal void GetFriendsGroupMembersList( FriendsGroupID_t friendsGroupID, [In,O #endregion internal bool HasFriend( SteamId steamIDFriend, int iFriendFlags ) { - return _HasFriend( Self, steamIDFriend, iFriendFlags ); + var returnValue = _HasFriend( Self, steamIDFriend, iFriendFlags ); + return returnValue; } #region FunctionMeta @@ -384,7 +401,8 @@ internal bool HasFriend( SteamId steamIDFriend, int iFriendFlags ) #endregion internal int GetClanCount() { - return _GetClanCount( Self ); + var returnValue = _GetClanCount( Self ); + return returnValue; } #region FunctionMeta @@ -404,7 +422,8 @@ internal SteamId GetClanByIndex( int iClan ) _GetClanByIndex( Self, ref retVal, iClan ); return retVal; #else - return _GetClanByIndex( Self, iClan ); + var returnValue = _GetClanByIndex( Self, iClan ); + return returnValue; #endif } @@ -416,7 +435,8 @@ internal SteamId GetClanByIndex( int iClan ) #endregion internal string GetClanName( SteamId steamIDClan ) { - return _GetClanName( Self, steamIDClan ); + var returnValue = _GetClanName( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -427,7 +447,8 @@ internal string GetClanName( SteamId steamIDClan ) #endregion internal string GetClanTag( SteamId steamIDClan ) { - return _GetClanTag( Self, steamIDClan ); + var returnValue = _GetClanTag( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -439,7 +460,8 @@ internal string GetClanTag( SteamId steamIDClan ) #endregion internal bool GetClanActivityCounts( SteamId steamIDClan, ref int pnOnline, ref int pnInGame, ref int pnChatting ) { - return _GetClanActivityCounts( Self, steamIDClan, ref pnOnline, ref pnInGame, ref pnChatting ); + var returnValue = _GetClanActivityCounts( Self, steamIDClan, ref pnOnline, ref pnInGame, ref pnChatting ); + return returnValue; } #region FunctionMeta @@ -450,7 +472,8 @@ internal bool GetClanActivityCounts( SteamId steamIDClan, ref int pnOnline, ref #endregion internal async Task DownloadClanActivityCounts( [In,Out] SteamId[] psteamIDClans, int cClansToRequest ) { - return await DownloadClanActivityCountsResult_t.GetResultAsync( _DownloadClanActivityCounts( Self, psteamIDClans, cClansToRequest ) ); + var returnValue = _DownloadClanActivityCounts( Self, psteamIDClans, cClansToRequest ); + return await DownloadClanActivityCountsResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -461,7 +484,8 @@ internal bool GetClanActivityCounts( SteamId steamIDClan, ref int pnOnline, ref #endregion internal int GetFriendCountFromSource( SteamId steamIDSource ) { - return _GetFriendCountFromSource( Self, steamIDSource ); + var returnValue = _GetFriendCountFromSource( Self, steamIDSource ); + return returnValue; } #region FunctionMeta @@ -481,7 +505,8 @@ internal SteamId GetFriendFromSourceByIndex( SteamId steamIDSource, int iFriend _GetFriendFromSourceByIndex( Self, ref retVal, steamIDSource, iFriend ); return retVal; #else - return _GetFriendFromSourceByIndex( Self, steamIDSource, iFriend ); + var returnValue = _GetFriendFromSourceByIndex( Self, steamIDSource, iFriend ); + return returnValue; #endif } @@ -494,7 +519,8 @@ internal SteamId GetFriendFromSourceByIndex( SteamId steamIDSource, int iFriend #endregion internal bool IsUserInSource( SteamId steamIDUser, SteamId steamIDSource ) { - return _IsUserInSource( Self, steamIDUser, steamIDSource ); + var returnValue = _IsUserInSource( Self, steamIDUser, steamIDSource ); + return returnValue; } #region FunctionMeta @@ -582,7 +608,8 @@ internal void ActivateGameOverlayInviteDialog( SteamId steamIDLobby ) #endregion internal int GetSmallFriendAvatar( SteamId steamIDFriend ) { - return _GetSmallFriendAvatar( Self, steamIDFriend ); + var returnValue = _GetSmallFriendAvatar( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -593,7 +620,8 @@ internal int GetSmallFriendAvatar( SteamId steamIDFriend ) #endregion internal int GetMediumFriendAvatar( SteamId steamIDFriend ) { - return _GetMediumFriendAvatar( Self, steamIDFriend ); + var returnValue = _GetMediumFriendAvatar( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -604,7 +632,8 @@ internal int GetMediumFriendAvatar( SteamId steamIDFriend ) #endregion internal int GetLargeFriendAvatar( SteamId steamIDFriend ) { - return _GetLargeFriendAvatar( Self, steamIDFriend ); + var returnValue = _GetLargeFriendAvatar( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -616,7 +645,8 @@ internal int GetLargeFriendAvatar( SteamId steamIDFriend ) #endregion internal bool RequestUserInformation( SteamId steamIDUser, [MarshalAs( UnmanagedType.U1 )] bool bRequireNameOnly ) { - return _RequestUserInformation( Self, steamIDUser, bRequireNameOnly ); + var returnValue = _RequestUserInformation( Self, steamIDUser, bRequireNameOnly ); + return returnValue; } #region FunctionMeta @@ -627,7 +657,8 @@ internal bool RequestUserInformation( SteamId steamIDUser, [MarshalAs( Unmanaged #endregion internal async Task RequestClanOfficerList( SteamId steamIDClan ) { - return await ClanOfficerListResponse_t.GetResultAsync( _RequestClanOfficerList( Self, steamIDClan ) ); + var returnValue = _RequestClanOfficerList( Self, steamIDClan ); + return await ClanOfficerListResponse_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -647,7 +678,8 @@ internal SteamId GetClanOwner( SteamId steamIDClan ) _GetClanOwner( Self, ref retVal, steamIDClan ); return retVal; #else - return _GetClanOwner( Self, steamIDClan ); + var returnValue = _GetClanOwner( Self, steamIDClan ); + return returnValue; #endif } @@ -659,7 +691,8 @@ internal SteamId GetClanOwner( SteamId steamIDClan ) #endregion internal int GetClanOfficerCount( SteamId steamIDClan ) { - return _GetClanOfficerCount( Self, steamIDClan ); + var returnValue = _GetClanOfficerCount( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -679,7 +712,8 @@ internal SteamId GetClanOfficerByIndex( SteamId steamIDClan, int iOfficer ) _GetClanOfficerByIndex( Self, ref retVal, steamIDClan, iOfficer ); return retVal; #else - return _GetClanOfficerByIndex( Self, steamIDClan, iOfficer ); + var returnValue = _GetClanOfficerByIndex( Self, steamIDClan, iOfficer ); + return returnValue; #endif } @@ -691,7 +725,8 @@ internal SteamId GetClanOfficerByIndex( SteamId steamIDClan, int iOfficer ) #endregion internal uint GetUserRestrictions() { - return _GetUserRestrictions( Self ); + var returnValue = _GetUserRestrictions( Self ); + return returnValue; } #region FunctionMeta @@ -703,7 +738,8 @@ internal uint GetUserRestrictions() #endregion internal bool SetRichPresence( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue ) { - return _SetRichPresence( Self, pchKey, pchValue ); + var returnValue = _SetRichPresence( Self, pchKey, pchValue ); + return returnValue; } #region FunctionMeta @@ -725,7 +761,8 @@ internal void ClearRichPresence() #endregion internal string GetFriendRichPresence( SteamId steamIDFriend, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _GetFriendRichPresence( Self, steamIDFriend, pchKey ); + var returnValue = _GetFriendRichPresence( Self, steamIDFriend, pchKey ); + return returnValue; } #region FunctionMeta @@ -736,7 +773,8 @@ internal string GetFriendRichPresence( SteamId steamIDFriend, [MarshalAs( Unmana #endregion internal int GetFriendRichPresenceKeyCount( SteamId steamIDFriend ) { - return _GetFriendRichPresenceKeyCount( Self, steamIDFriend ); + var returnValue = _GetFriendRichPresenceKeyCount( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -747,7 +785,8 @@ internal int GetFriendRichPresenceKeyCount( SteamId steamIDFriend ) #endregion internal string GetFriendRichPresenceKeyByIndex( SteamId steamIDFriend, int iKey ) { - return _GetFriendRichPresenceKeyByIndex( Self, steamIDFriend, iKey ); + var returnValue = _GetFriendRichPresenceKeyByIndex( Self, steamIDFriend, iKey ); + return returnValue; } #region FunctionMeta @@ -770,7 +809,8 @@ internal void RequestFriendRichPresence( SteamId steamIDFriend ) #endregion internal bool InviteUserToGame( SteamId steamIDFriend, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectString ) { - return _InviteUserToGame( Self, steamIDFriend, pchConnectString ); + var returnValue = _InviteUserToGame( Self, steamIDFriend, pchConnectString ); + return returnValue; } #region FunctionMeta @@ -781,7 +821,8 @@ internal bool InviteUserToGame( SteamId steamIDFriend, [MarshalAs( UnmanagedType #endregion internal int GetCoplayFriendCount() { - return _GetCoplayFriendCount( Self ); + var returnValue = _GetCoplayFriendCount( Self ); + return returnValue; } #region FunctionMeta @@ -801,7 +842,8 @@ internal SteamId GetCoplayFriend( int iCoplayFriend ) _GetCoplayFriend( Self, ref retVal, iCoplayFriend ); return retVal; #else - return _GetCoplayFriend( Self, iCoplayFriend ); + var returnValue = _GetCoplayFriend( Self, iCoplayFriend ); + return returnValue; #endif } @@ -813,7 +855,8 @@ internal SteamId GetCoplayFriend( int iCoplayFriend ) #endregion internal int GetFriendCoplayTime( SteamId steamIDFriend ) { - return _GetFriendCoplayTime( Self, steamIDFriend ); + var returnValue = _GetFriendCoplayTime( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -824,7 +867,8 @@ internal int GetFriendCoplayTime( SteamId steamIDFriend ) #endregion internal AppId GetFriendCoplayGame( SteamId steamIDFriend ) { - return _GetFriendCoplayGame( Self, steamIDFriend ); + var returnValue = _GetFriendCoplayGame( Self, steamIDFriend ); + return returnValue; } #region FunctionMeta @@ -835,7 +879,8 @@ internal AppId GetFriendCoplayGame( SteamId steamIDFriend ) #endregion internal async Task JoinClanChatRoom( SteamId steamIDClan ) { - return await JoinClanChatRoomCompletionResult_t.GetResultAsync( _JoinClanChatRoom( Self, steamIDClan ) ); + var returnValue = _JoinClanChatRoom( Self, steamIDClan ); + return await JoinClanChatRoomCompletionResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -847,7 +892,8 @@ internal AppId GetFriendCoplayGame( SteamId steamIDFriend ) #endregion internal bool LeaveClanChatRoom( SteamId steamIDClan ) { - return _LeaveClanChatRoom( Self, steamIDClan ); + var returnValue = _LeaveClanChatRoom( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -858,7 +904,8 @@ internal bool LeaveClanChatRoom( SteamId steamIDClan ) #endregion internal int GetClanChatMemberCount( SteamId steamIDClan ) { - return _GetClanChatMemberCount( Self, steamIDClan ); + var returnValue = _GetClanChatMemberCount( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -878,7 +925,8 @@ internal SteamId GetChatMemberByIndex( SteamId steamIDClan, int iUser ) _GetChatMemberByIndex( Self, ref retVal, steamIDClan, iUser ); return retVal; #else - return _GetChatMemberByIndex( Self, steamIDClan, iUser ); + var returnValue = _GetChatMemberByIndex( Self, steamIDClan, iUser ); + return returnValue; #endif } @@ -891,7 +939,8 @@ internal SteamId GetChatMemberByIndex( SteamId steamIDClan, int iUser ) #endregion internal bool SendClanChatMessage( SteamId steamIDClanChat, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchText ) { - return _SendClanChatMessage( Self, steamIDClanChat, pchText ); + var returnValue = _SendClanChatMessage( Self, steamIDClanChat, pchText ); + return returnValue; } #region FunctionMeta @@ -902,7 +951,8 @@ internal bool SendClanChatMessage( SteamId steamIDClanChat, [MarshalAs( Unmanage #endregion internal int GetClanChatMessage( SteamId steamIDClanChat, int iMessage, IntPtr prgchText, int cchTextMax, ref ChatEntryType peChatEntryType, ref SteamId psteamidChatter ) { - return _GetClanChatMessage( Self, steamIDClanChat, iMessage, prgchText, cchTextMax, ref peChatEntryType, ref psteamidChatter ); + var returnValue = _GetClanChatMessage( Self, steamIDClanChat, iMessage, prgchText, cchTextMax, ref peChatEntryType, ref psteamidChatter ); + return returnValue; } #region FunctionMeta @@ -914,7 +964,8 @@ internal int GetClanChatMessage( SteamId steamIDClanChat, int iMessage, IntPtr p #endregion internal bool IsClanChatAdmin( SteamId steamIDClanChat, SteamId steamIDUser ) { - return _IsClanChatAdmin( Self, steamIDClanChat, steamIDUser ); + var returnValue = _IsClanChatAdmin( Self, steamIDClanChat, steamIDUser ); + return returnValue; } #region FunctionMeta @@ -926,7 +977,8 @@ internal bool IsClanChatAdmin( SteamId steamIDClanChat, SteamId steamIDUser ) #endregion internal bool IsClanChatWindowOpenInSteam( SteamId steamIDClanChat ) { - return _IsClanChatWindowOpenInSteam( Self, steamIDClanChat ); + var returnValue = _IsClanChatWindowOpenInSteam( Self, steamIDClanChat ); + return returnValue; } #region FunctionMeta @@ -938,7 +990,8 @@ internal bool IsClanChatWindowOpenInSteam( SteamId steamIDClanChat ) #endregion internal bool OpenClanChatWindowInSteam( SteamId steamIDClanChat ) { - return _OpenClanChatWindowInSteam( Self, steamIDClanChat ); + var returnValue = _OpenClanChatWindowInSteam( Self, steamIDClanChat ); + return returnValue; } #region FunctionMeta @@ -950,7 +1003,8 @@ internal bool OpenClanChatWindowInSteam( SteamId steamIDClanChat ) #endregion internal bool CloseClanChatWindowInSteam( SteamId steamIDClanChat ) { - return _CloseClanChatWindowInSteam( Self, steamIDClanChat ); + var returnValue = _CloseClanChatWindowInSteam( Self, steamIDClanChat ); + return returnValue; } #region FunctionMeta @@ -962,7 +1016,8 @@ internal bool CloseClanChatWindowInSteam( SteamId steamIDClanChat ) #endregion internal bool SetListenForFriendsMessages( [MarshalAs( UnmanagedType.U1 )] bool bInterceptEnabled ) { - return _SetListenForFriendsMessages( Self, bInterceptEnabled ); + var returnValue = _SetListenForFriendsMessages( Self, bInterceptEnabled ); + return returnValue; } #region FunctionMeta @@ -974,7 +1029,8 @@ internal bool SetListenForFriendsMessages( [MarshalAs( UnmanagedType.U1 )] bool #endregion internal bool ReplyToFriendMessage( SteamId steamIDFriend, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchMsgToSend ) { - return _ReplyToFriendMessage( Self, steamIDFriend, pchMsgToSend ); + var returnValue = _ReplyToFriendMessage( Self, steamIDFriend, pchMsgToSend ); + return returnValue; } #region FunctionMeta @@ -985,7 +1041,8 @@ internal bool ReplyToFriendMessage( SteamId steamIDFriend, [MarshalAs( Unmanaged #endregion internal int GetFriendMessage( SteamId steamIDFriend, int iMessageID, IntPtr pvData, int cubData, ref ChatEntryType peChatEntryType ) { - return _GetFriendMessage( Self, steamIDFriend, iMessageID, pvData, cubData, ref peChatEntryType ); + var returnValue = _GetFriendMessage( Self, steamIDFriend, iMessageID, pvData, cubData, ref peChatEntryType ); + return returnValue; } #region FunctionMeta @@ -996,7 +1053,8 @@ internal int GetFriendMessage( SteamId steamIDFriend, int iMessageID, IntPtr pvD #endregion internal async Task GetFollowerCount( SteamId steamID ) { - return await FriendsGetFollowerCount_t.GetResultAsync( _GetFollowerCount( Self, steamID ) ); + var returnValue = _GetFollowerCount( Self, steamID ); + return await FriendsGetFollowerCount_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1007,7 +1065,8 @@ internal int GetFriendMessage( SteamId steamIDFriend, int iMessageID, IntPtr pvD #endregion internal async Task IsFollowing( SteamId steamID ) { - return await FriendsIsFollowing_t.GetResultAsync( _IsFollowing( Self, steamID ) ); + var returnValue = _IsFollowing( Self, steamID ); + return await FriendsIsFollowing_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1018,7 +1077,8 @@ internal int GetFriendMessage( SteamId steamIDFriend, int iMessageID, IntPtr pvD #endregion internal async Task EnumerateFollowingList( uint unStartIndex ) { - return await FriendsEnumerateFollowingList_t.GetResultAsync( _EnumerateFollowingList( Self, unStartIndex ) ); + var returnValue = _EnumerateFollowingList( Self, unStartIndex ); + return await FriendsEnumerateFollowingList_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1030,7 +1090,8 @@ internal int GetFriendMessage( SteamId steamIDFriend, int iMessageID, IntPtr pvD #endregion internal bool IsClanPublic( SteamId steamIDClan ) { - return _IsClanPublic( Self, steamIDClan ); + var returnValue = _IsClanPublic( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -1042,7 +1103,8 @@ internal bool IsClanPublic( SteamId steamIDClan ) #endregion internal bool IsClanOfficialGameGroup( SteamId steamIDClan ) { - return _IsClanOfficialGameGroup( Self, steamIDClan ); + var returnValue = _IsClanOfficialGameGroup( Self, steamIDClan ); + return returnValue; } #region FunctionMeta @@ -1053,7 +1115,8 @@ internal bool IsClanOfficialGameGroup( SteamId steamIDClan ) #endregion internal int GetNumChatsWithUnreadPriorityMessages() { - return _GetNumChatsWithUnreadPriorityMessages( Self ); + var returnValue = _GetNumChatsWithUnreadPriorityMessages( Self ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs index ff676ce..50bb040 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs @@ -117,7 +117,8 @@ internal override void Shutdown() #endregion internal bool InitGameServer( uint unIP, ushort usGamePort, ushort usQueryPort, uint unFlags, AppId nGameAppId, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchVersionString ) { - return _InitGameServer( Self, unIP, usGamePort, usQueryPort, unFlags, nGameAppId, pchVersionString ); + var returnValue = _InitGameServer( Self, unIP, usGamePort, usQueryPort, unFlags, nGameAppId, pchVersionString ); + return returnValue; } #region FunctionMeta @@ -206,7 +207,8 @@ internal void LogOff() #endregion internal bool BLoggedOn() { - return _BLoggedOn( Self ); + var returnValue = _BLoggedOn( Self ); + return returnValue; } #region FunctionMeta @@ -218,7 +220,8 @@ internal bool BLoggedOn() #endregion internal bool BSecure() { - return _BSecure( Self ); + var returnValue = _BSecure( Self ); + return returnValue; } #region FunctionMeta @@ -238,7 +241,8 @@ internal SteamId GetSteamID() _GetSteamID( Self, ref retVal ); return retVal; #else - return _GetSteamID( Self ); + var returnValue = _GetSteamID( Self ); + return returnValue; #endif } @@ -251,7 +255,8 @@ internal SteamId GetSteamID() #endregion internal bool WasRestartRequested() { - return _WasRestartRequested( Self ); + var returnValue = _WasRestartRequested( Self ); + return returnValue; } #region FunctionMeta @@ -395,7 +400,8 @@ internal void SetRegion( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeR #endregion internal bool SendUserConnectAndAuthenticate( uint unIPClient, IntPtr pvAuthBlob, uint cubAuthBlobSize, ref SteamId pSteamIDUser ) { - return _SendUserConnectAndAuthenticate( Self, unIPClient, pvAuthBlob, cubAuthBlobSize, ref pSteamIDUser ); + var returnValue = _SendUserConnectAndAuthenticate( Self, unIPClient, pvAuthBlob, cubAuthBlobSize, ref pSteamIDUser ); + return returnValue; } #region FunctionMeta @@ -415,7 +421,8 @@ internal SteamId CreateUnauthenticatedUserConnection() _CreateUnauthenticatedUserConnection( Self, ref retVal ); return retVal; #else - return _CreateUnauthenticatedUserConnection( Self ); + var returnValue = _CreateUnauthenticatedUserConnection( Self ); + return returnValue; #endif } @@ -439,7 +446,8 @@ internal void SendUserDisconnect( SteamId steamIDUser ) #endregion internal bool BUpdateUserData( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPlayerName, uint uScore ) { - return _BUpdateUserData( Self, steamIDUser, pchPlayerName, uScore ); + var returnValue = _BUpdateUserData( Self, steamIDUser, pchPlayerName, uScore ); + return returnValue; } #region FunctionMeta @@ -450,7 +458,8 @@ internal bool BUpdateUserData( SteamId steamIDUser, [MarshalAs( UnmanagedType.Cu #endregion internal HAuthTicket GetAuthSessionTicket( IntPtr pTicket, int cbMaxTicket, ref uint pcbTicket ) { - return _GetAuthSessionTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + var returnValue = _GetAuthSessionTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + return returnValue; } #region FunctionMeta @@ -461,7 +470,8 @@ internal HAuthTicket GetAuthSessionTicket( IntPtr pTicket, int cbMaxTicket, ref #endregion internal BeginAuthResult BeginAuthSession( IntPtr pAuthTicket, int cbAuthTicket, SteamId steamID ) { - return _BeginAuthSession( Self, pAuthTicket, cbAuthTicket, steamID ); + var returnValue = _BeginAuthSession( Self, pAuthTicket, cbAuthTicket, steamID ); + return returnValue; } #region FunctionMeta @@ -494,7 +504,8 @@ internal void CancelAuthTicket( HAuthTicket hAuthTicket ) #endregion internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId appID ) { - return _UserHasLicenseForApp( Self, steamID, appID ); + var returnValue = _UserHasLicenseForApp( Self, steamID, appID ); + return returnValue; } #region FunctionMeta @@ -506,7 +517,8 @@ internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId #endregion internal bool RequestUserGroupStatus( SteamId steamIDUser, SteamId steamIDGroup ) { - return _RequestUserGroupStatus( Self, steamIDUser, steamIDGroup ); + var returnValue = _RequestUserGroupStatus( Self, steamIDUser, steamIDGroup ); + return returnValue; } #region FunctionMeta @@ -528,7 +540,8 @@ internal void GetGameplayStats() #endregion internal async Task GetServerReputation() { - return await GSReputation_t.GetResultAsync( _GetServerReputation( Self ) ); + var returnValue = _GetServerReputation( Self ); + return await GSReputation_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -539,7 +552,8 @@ internal void GetGameplayStats() #endregion internal uint GetPublicIP() { - return _GetPublicIP( Self ); + var returnValue = _GetPublicIP( Self ); + return returnValue; } #region FunctionMeta @@ -551,7 +565,8 @@ internal uint GetPublicIP() #endregion internal bool HandleIncomingPacket( IntPtr pData, int cbData, uint srcIP, ushort srcPort ) { - return _HandleIncomingPacket( Self, pData, cbData, srcIP, srcPort ); + var returnValue = _HandleIncomingPacket( Self, pData, cbData, srcIP, srcPort ); + return returnValue; } #region FunctionMeta @@ -562,7 +577,8 @@ internal bool HandleIncomingPacket( IntPtr pData, int cbData, uint srcIP, ushort #endregion internal int GetNextOutgoingPacket( IntPtr pOut, int cbMaxOut, ref uint pNetAdr, ref ushort pPort ) { - return _GetNextOutgoingPacket( Self, pOut, cbMaxOut, ref pNetAdr, ref pPort ); + var returnValue = _GetNextOutgoingPacket( Self, pOut, cbMaxOut, ref pNetAdr, ref pPort ); + return returnValue; } #region FunctionMeta @@ -606,7 +622,8 @@ internal void ForceHeartbeat() #endregion internal async Task AssociateWithClan( SteamId steamIDClan ) { - return await AssociateWithClanResult_t.GetResultAsync( _AssociateWithClan( Self, steamIDClan ) ); + var returnValue = _AssociateWithClan( Self, steamIDClan ); + return await AssociateWithClanResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -617,7 +634,8 @@ internal void ForceHeartbeat() #endregion internal async Task ComputeNewPlayerCompatibility( SteamId steamIDNewPlayer ) { - return await ComputeNewPlayerCompatibilityResult_t.GetResultAsync( _ComputeNewPlayerCompatibility( Self, steamIDNewPlayer ) ); + var returnValue = _ComputeNewPlayerCompatibility( Self, steamIDNewPlayer ); + return await ComputeNewPlayerCompatibilityResult_t.GetResultAsync( returnValue ); } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServerStats.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServerStats.cs index 4f3c85c..108b728 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServerStats.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServerStats.cs @@ -56,7 +56,8 @@ internal override void Shutdown() #endregion internal async Task RequestUserStats( SteamId steamIDUser ) { - return await GSStatsReceived_t.GetResultAsync( _RequestUserStats( Self, steamIDUser ) ); + var returnValue = _RequestUserStats( Self, steamIDUser ); + return await GSStatsReceived_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -68,7 +69,8 @@ internal override void Shutdown() #endregion internal bool GetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData ) { - return _GetUserStat1( Self, steamIDUser, pchName, ref pData ); + var returnValue = _GetUserStat1( Self, steamIDUser, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -80,7 +82,8 @@ internal bool GetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool GetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData ) { - return _GetUserStat2( Self, steamIDUser, pchName, ref pData ); + var returnValue = _GetUserStat2( Self, steamIDUser, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -92,7 +95,8 @@ internal bool GetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool GetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) { - return _GetUserAchievement( Self, steamIDUser, pchName, ref pbAchieved ); + var returnValue = _GetUserAchievement( Self, steamIDUser, pchName, ref pbAchieved ); + return returnValue; } #region FunctionMeta @@ -104,7 +108,8 @@ internal bool GetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType #endregion internal bool SetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, int nData ) { - return _SetUserStat1( Self, steamIDUser, pchName, nData ); + var returnValue = _SetUserStat1( Self, steamIDUser, pchName, nData ); + return returnValue; } #region FunctionMeta @@ -116,7 +121,8 @@ internal bool SetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool SetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float fData ) { - return _SetUserStat2( Self, steamIDUser, pchName, fData ); + var returnValue = _SetUserStat2( Self, steamIDUser, pchName, fData ); + return returnValue; } #region FunctionMeta @@ -128,7 +134,8 @@ internal bool SetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool UpdateUserAvgRateStat( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float flCountThisSession, double dSessionLength ) { - return _UpdateUserAvgRateStat( Self, steamIDUser, pchName, flCountThisSession, dSessionLength ); + var returnValue = _UpdateUserAvgRateStat( Self, steamIDUser, pchName, flCountThisSession, dSessionLength ); + return returnValue; } #region FunctionMeta @@ -140,7 +147,8 @@ internal bool UpdateUserAvgRateStat( SteamId steamIDUser, [MarshalAs( UnmanagedT #endregion internal bool SetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName ) { - return _SetUserAchievement( Self, steamIDUser, pchName ); + var returnValue = _SetUserAchievement( Self, steamIDUser, pchName ); + return returnValue; } #region FunctionMeta @@ -152,7 +160,8 @@ internal bool SetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType #endregion internal bool ClearUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName ) { - return _ClearUserAchievement( Self, steamIDUser, pchName ); + var returnValue = _ClearUserAchievement( Self, steamIDUser, pchName ); + return returnValue; } #region FunctionMeta @@ -163,7 +172,8 @@ internal bool ClearUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedTy #endregion internal async Task StoreUserStats( SteamId steamIDUser ) { - return await GSStatsStored_t.GetResultAsync( _StoreUserStats( Self, steamIDUser ) ); + var returnValue = _StoreUserStats( Self, steamIDUser ); + return await GSStatsStored_t.GetResultAsync( returnValue ); } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs index fc8a426..3f68640 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs @@ -95,7 +95,8 @@ internal override void Shutdown() #endregion internal bool DoInit() { - return _DoInit( Self ); + var returnValue = _DoInit( Self ); + return returnValue; } #region FunctionMeta @@ -107,7 +108,8 @@ internal bool DoInit() #endregion internal bool DoShutdown() { - return _DoShutdown( Self ); + var returnValue = _DoShutdown( Self ); + return returnValue; } #region FunctionMeta @@ -129,7 +131,8 @@ internal void RunFrame() #endregion internal int GetConnectedControllers( [In,Out] InputHandle_t[] handlesOut ) { - return _GetConnectedControllers( Self, handlesOut ); + var returnValue = _GetConnectedControllers( Self, handlesOut ); + return returnValue; } #region FunctionMeta @@ -140,7 +143,8 @@ internal int GetConnectedControllers( [In,Out] InputHandle_t[] handlesOut ) #endregion internal InputActionSetHandle_t GetActionSetHandle( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszActionSetName ) { - return _GetActionSetHandle( Self, pszActionSetName ); + var returnValue = _GetActionSetHandle( Self, pszActionSetName ); + return returnValue; } #region FunctionMeta @@ -162,7 +166,8 @@ internal void ActivateActionSet( InputHandle_t inputHandle, InputActionSetHandle #endregion internal InputActionSetHandle_t GetCurrentActionSet( InputHandle_t inputHandle ) { - return _GetCurrentActionSet( Self, inputHandle ); + var returnValue = _GetCurrentActionSet( Self, inputHandle ); + return returnValue; } #region FunctionMeta @@ -206,7 +211,8 @@ internal void DeactivateAllActionSetLayers( InputHandle_t inputHandle ) #endregion internal int GetActiveActionSetLayers( InputHandle_t inputHandle, [In,Out] InputActionSetHandle_t[] handlesOut ) { - return _GetActiveActionSetLayers( Self, inputHandle, handlesOut ); + var returnValue = _GetActiveActionSetLayers( Self, inputHandle, handlesOut ); + return returnValue; } #region FunctionMeta @@ -217,7 +223,8 @@ internal int GetActiveActionSetLayers( InputHandle_t inputHandle, [In,Out] Input #endregion internal InputDigitalActionHandle_t GetDigitalActionHandle( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszActionName ) { - return _GetDigitalActionHandle( Self, pszActionName ); + var returnValue = _GetDigitalActionHandle( Self, pszActionName ); + return returnValue; } #region FunctionMeta @@ -237,7 +244,8 @@ internal DigitalState GetDigitalActionData( InputHandle_t inputHandle, InputDigi _GetDigitalActionData( Self, ref retVal, inputHandle, digitalActionHandle ); return retVal; #else - return _GetDigitalActionData( Self, inputHandle, digitalActionHandle ); + var returnValue = _GetDigitalActionData( Self, inputHandle, digitalActionHandle ); + return returnValue; #endif } @@ -249,7 +257,8 @@ internal DigitalState GetDigitalActionData( InputHandle_t inputHandle, InputDigi #endregion internal int GetDigitalActionOrigins( InputHandle_t inputHandle, InputActionSetHandle_t actionSetHandle, InputDigitalActionHandle_t digitalActionHandle, ref InputActionOrigin originsOut ) { - return _GetDigitalActionOrigins( Self, inputHandle, actionSetHandle, digitalActionHandle, ref originsOut ); + var returnValue = _GetDigitalActionOrigins( Self, inputHandle, actionSetHandle, digitalActionHandle, ref originsOut ); + return returnValue; } #region FunctionMeta @@ -260,7 +269,8 @@ internal int GetDigitalActionOrigins( InputHandle_t inputHandle, InputActionSetH #endregion internal InputAnalogActionHandle_t GetAnalogActionHandle( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszActionName ) { - return _GetAnalogActionHandle( Self, pszActionName ); + var returnValue = _GetAnalogActionHandle( Self, pszActionName ); + return returnValue; } #region FunctionMeta @@ -280,7 +290,8 @@ internal AnalogState GetAnalogActionData( InputHandle_t inputHandle, InputAnalog _GetAnalogActionData( Self, ref retVal, inputHandle, analogActionHandle ); return retVal; #else - return _GetAnalogActionData( Self, inputHandle, analogActionHandle ); + var returnValue = _GetAnalogActionData( Self, inputHandle, analogActionHandle ); + return returnValue; #endif } @@ -292,7 +303,8 @@ internal AnalogState GetAnalogActionData( InputHandle_t inputHandle, InputAnalog #endregion internal int GetAnalogActionOrigins( InputHandle_t inputHandle, InputActionSetHandle_t actionSetHandle, InputAnalogActionHandle_t analogActionHandle, ref InputActionOrigin originsOut ) { - return _GetAnalogActionOrigins( Self, inputHandle, actionSetHandle, analogActionHandle, ref originsOut ); + var returnValue = _GetAnalogActionOrigins( Self, inputHandle, actionSetHandle, analogActionHandle, ref originsOut ); + return returnValue; } #region FunctionMeta @@ -303,7 +315,8 @@ internal int GetAnalogActionOrigins( InputHandle_t inputHandle, InputActionSetHa #endregion internal string GetGlyphForActionOrigin( InputActionOrigin eOrigin ) { - return _GetGlyphForActionOrigin( Self, eOrigin ); + var returnValue = _GetGlyphForActionOrigin( Self, eOrigin ); + return returnValue; } #region FunctionMeta @@ -314,7 +327,8 @@ internal string GetGlyphForActionOrigin( InputActionOrigin eOrigin ) #endregion internal string GetStringForActionOrigin( InputActionOrigin eOrigin ) { - return _GetStringForActionOrigin( Self, eOrigin ); + var returnValue = _GetStringForActionOrigin( Self, eOrigin ); + return returnValue; } #region FunctionMeta @@ -345,7 +359,8 @@ internal MotionState GetMotionData( InputHandle_t inputHandle ) _GetMotionData( Self, ref retVal, inputHandle ); return retVal; #else - return _GetMotionData( Self, inputHandle ); + var returnValue = _GetMotionData( Self, inputHandle ); + return returnValue; #endif } @@ -402,7 +417,8 @@ internal void TriggerRepeatedHapticPulse( InputHandle_t inputHandle, SteamContro #endregion internal bool ShowBindingPanel( InputHandle_t inputHandle ) { - return _ShowBindingPanel( Self, inputHandle ); + var returnValue = _ShowBindingPanel( Self, inputHandle ); + return returnValue; } #region FunctionMeta @@ -413,7 +429,8 @@ internal bool ShowBindingPanel( InputHandle_t inputHandle ) #endregion internal InputType GetInputTypeForHandle( InputHandle_t inputHandle ) { - return _GetInputTypeForHandle( Self, inputHandle ); + var returnValue = _GetInputTypeForHandle( Self, inputHandle ); + return returnValue; } #region FunctionMeta @@ -424,7 +441,8 @@ internal InputType GetInputTypeForHandle( InputHandle_t inputHandle ) #endregion internal InputHandle_t GetControllerForGamepadIndex( int nIndex ) { - return _GetControllerForGamepadIndex( Self, nIndex ); + var returnValue = _GetControllerForGamepadIndex( Self, nIndex ); + return returnValue; } #region FunctionMeta @@ -435,7 +453,8 @@ internal InputHandle_t GetControllerForGamepadIndex( int nIndex ) #endregion internal int GetGamepadIndexForController( InputHandle_t ulinputHandle ) { - return _GetGamepadIndexForController( Self, ulinputHandle ); + var returnValue = _GetGamepadIndexForController( Self, ulinputHandle ); + return returnValue; } #region FunctionMeta @@ -446,7 +465,8 @@ internal int GetGamepadIndexForController( InputHandle_t ulinputHandle ) #endregion internal string GetStringForXboxOrigin( XboxOrigin eOrigin ) { - return _GetStringForXboxOrigin( Self, eOrigin ); + var returnValue = _GetStringForXboxOrigin( Self, eOrigin ); + return returnValue; } #region FunctionMeta @@ -457,7 +477,8 @@ internal string GetStringForXboxOrigin( XboxOrigin eOrigin ) #endregion internal string GetGlyphForXboxOrigin( XboxOrigin eOrigin ) { - return _GetGlyphForXboxOrigin( Self, eOrigin ); + var returnValue = _GetGlyphForXboxOrigin( Self, eOrigin ); + return returnValue; } #region FunctionMeta @@ -468,7 +489,8 @@ internal string GetGlyphForXboxOrigin( XboxOrigin eOrigin ) #endregion internal InputActionOrigin GetActionOriginFromXboxOrigin( InputHandle_t inputHandle, XboxOrigin eOrigin ) { - return _GetActionOriginFromXboxOrigin( Self, inputHandle, eOrigin ); + var returnValue = _GetActionOriginFromXboxOrigin( Self, inputHandle, eOrigin ); + return returnValue; } #region FunctionMeta @@ -479,7 +501,8 @@ internal InputActionOrigin GetActionOriginFromXboxOrigin( InputHandle_t inputHan #endregion internal InputActionOrigin TranslateActionOrigin( InputType eDestinationInputType, InputActionOrigin eSourceOrigin ) { - return _TranslateActionOrigin( Self, eDestinationInputType, eSourceOrigin ); + var returnValue = _TranslateActionOrigin( Self, eDestinationInputType, eSourceOrigin ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs index 27e55fe..e1a4d34 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs @@ -102,7 +102,8 @@ internal override void Shutdown() #endregion internal Result GetResultStatus( SteamInventoryResult_t resultHandle ) { - return _GetResultStatus( Self, resultHandle ); + var returnValue = _GetResultStatus( Self, resultHandle ); + return returnValue; } #region FunctionMeta @@ -114,19 +115,23 @@ internal Result GetResultStatus( SteamInventoryResult_t resultHandle ) #endregion internal bool GetResultItems( SteamInventoryResult_t resultHandle, [In,Out] SteamItemDetails_t[] pOutItemsArray, ref uint punOutItemsArraySize ) { - return _GetResultItems( Self, resultHandle, pOutItemsArray, ref punOutItemsArraySize ); + var returnValue = _GetResultItems( Self, resultHandle, pOutItemsArray, ref punOutItemsArraySize ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetResultItemProperty( IntPtr self, SteamInventoryResult_t resultHandle, uint unItemIndex, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ); + private delegate bool FGetResultItemProperty( IntPtr self, SteamInventoryResult_t resultHandle, uint unItemIndex, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, IntPtr pchValueBuffer, ref uint punValueBufferSizeOut ); private FGetResultItemProperty _GetResultItemProperty; #endregion - internal bool GetResultItemProperty( SteamInventoryResult_t resultHandle, uint unItemIndex, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ) + internal bool GetResultItemProperty( SteamInventoryResult_t resultHandle, uint unItemIndex, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, out string pchValueBuffer, ref uint punValueBufferSizeOut ) { - return _GetResultItemProperty( Self, resultHandle, unItemIndex, pchPropertyName, pchValueBuffer, ref punValueBufferSizeOut ); + IntPtr mempchValueBuffer = Helpers.TakeMemory(); + var returnValue = _GetResultItemProperty( Self, resultHandle, unItemIndex, pchPropertyName, mempchValueBuffer, ref punValueBufferSizeOut ); + pchValueBuffer = Helpers.MemoryToString( mempchValueBuffer ); + return returnValue; } #region FunctionMeta @@ -137,7 +142,8 @@ internal bool GetResultItemProperty( SteamInventoryResult_t resultHandle, uint u #endregion internal uint GetResultTimestamp( SteamInventoryResult_t resultHandle ) { - return _GetResultTimestamp( Self, resultHandle ); + var returnValue = _GetResultTimestamp( Self, resultHandle ); + return returnValue; } #region FunctionMeta @@ -149,7 +155,8 @@ internal uint GetResultTimestamp( SteamInventoryResult_t resultHandle ) #endregion internal bool CheckResultSteamID( SteamInventoryResult_t resultHandle, SteamId steamIDExpected ) { - return _CheckResultSteamID( Self, resultHandle, steamIDExpected ); + var returnValue = _CheckResultSteamID( Self, resultHandle, steamIDExpected ); + return returnValue; } #region FunctionMeta @@ -172,7 +179,8 @@ internal void DestroyResult( SteamInventoryResult_t resultHandle ) #endregion internal bool GetAllItems( ref SteamInventoryResult_t pResultHandle ) { - return _GetAllItems( Self, ref pResultHandle ); + var returnValue = _GetAllItems( Self, ref pResultHandle ); + return returnValue; } #region FunctionMeta @@ -184,7 +192,8 @@ internal bool GetAllItems( ref SteamInventoryResult_t pResultHandle ) #endregion internal bool GetItemsByID( ref SteamInventoryResult_t pResultHandle, ref InventoryItemId pInstanceIDs, uint unCountInstanceIDs ) { - return _GetItemsByID( Self, ref pResultHandle, ref pInstanceIDs, unCountInstanceIDs ); + var returnValue = _GetItemsByID( Self, ref pResultHandle, ref pInstanceIDs, unCountInstanceIDs ); + return returnValue; } #region FunctionMeta @@ -196,7 +205,8 @@ internal bool GetItemsByID( ref SteamInventoryResult_t pResultHandle, ref Invent #endregion internal bool SerializeResult( SteamInventoryResult_t resultHandle, IntPtr pOutBuffer, ref uint punOutBufferSize ) { - return _SerializeResult( Self, resultHandle, pOutBuffer, ref punOutBufferSize ); + var returnValue = _SerializeResult( Self, resultHandle, pOutBuffer, ref punOutBufferSize ); + return returnValue; } #region FunctionMeta @@ -208,7 +218,8 @@ internal bool SerializeResult( SteamInventoryResult_t resultHandle, IntPtr pOutB #endregion internal bool DeserializeResult( ref SteamInventoryResult_t pOutResultHandle, IntPtr pBuffer, uint unBufferSize, [MarshalAs( UnmanagedType.U1 )] bool bRESERVED_MUST_BE_FALSE ) { - return _DeserializeResult( Self, ref pOutResultHandle, pBuffer, unBufferSize, bRESERVED_MUST_BE_FALSE ); + var returnValue = _DeserializeResult( Self, ref pOutResultHandle, pBuffer, unBufferSize, bRESERVED_MUST_BE_FALSE ); + return returnValue; } #region FunctionMeta @@ -220,7 +231,8 @@ internal bool DeserializeResult( ref SteamInventoryResult_t pOutResultHandle, In #endregion internal bool GenerateItems( ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ) { - return _GenerateItems( Self, ref pResultHandle, pArrayItemDefs, punArrayQuantity, unArrayLength ); + var returnValue = _GenerateItems( Self, ref pResultHandle, pArrayItemDefs, punArrayQuantity, unArrayLength ); + return returnValue; } #region FunctionMeta @@ -232,7 +244,8 @@ internal bool GenerateItems( ref SteamInventoryResult_t pResultHandle, [In,Out] #endregion internal bool GrantPromoItems( ref SteamInventoryResult_t pResultHandle ) { - return _GrantPromoItems( Self, ref pResultHandle ); + var returnValue = _GrantPromoItems( Self, ref pResultHandle ); + return returnValue; } #region FunctionMeta @@ -244,7 +257,8 @@ internal bool GrantPromoItems( ref SteamInventoryResult_t pResultHandle ) #endregion internal bool AddPromoItem( ref SteamInventoryResult_t pResultHandle, InventoryDefId itemDef ) { - return _AddPromoItem( Self, ref pResultHandle, itemDef ); + var returnValue = _AddPromoItem( Self, ref pResultHandle, itemDef ); + return returnValue; } #region FunctionMeta @@ -256,7 +270,8 @@ internal bool AddPromoItem( ref SteamInventoryResult_t pResultHandle, InventoryD #endregion internal bool AddPromoItems( ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, uint unArrayLength ) { - return _AddPromoItems( Self, ref pResultHandle, pArrayItemDefs, unArrayLength ); + var returnValue = _AddPromoItems( Self, ref pResultHandle, pArrayItemDefs, unArrayLength ); + return returnValue; } #region FunctionMeta @@ -268,7 +283,8 @@ internal bool AddPromoItems( ref SteamInventoryResult_t pResultHandle, [In,Out] #endregion internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, InventoryItemId itemConsume, uint unQuantity ) { - return _ConsumeItem( Self, ref pResultHandle, itemConsume, unQuantity ); + var returnValue = _ConsumeItem( Self, ref pResultHandle, itemConsume, unQuantity ); + return returnValue; } #region FunctionMeta @@ -280,7 +296,8 @@ internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, InventoryIt #endregion internal bool ExchangeItems( ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayGenerate, [In,Out] uint[] punArrayGenerateQuantity, uint unArrayGenerateLength, [In,Out] InventoryItemId[] pArrayDestroy, [In,Out] uint[] punArrayDestroyQuantity, uint unArrayDestroyLength ) { - return _ExchangeItems( Self, ref pResultHandle, pArrayGenerate, punArrayGenerateQuantity, unArrayGenerateLength, pArrayDestroy, punArrayDestroyQuantity, unArrayDestroyLength ); + var returnValue = _ExchangeItems( Self, ref pResultHandle, pArrayGenerate, punArrayGenerateQuantity, unArrayGenerateLength, pArrayDestroy, punArrayDestroyQuantity, unArrayDestroyLength ); + return returnValue; } #region FunctionMeta @@ -292,7 +309,8 @@ internal bool ExchangeItems( ref SteamInventoryResult_t pResultHandle, [In,Out] #endregion internal bool TransferItemQuantity( ref SteamInventoryResult_t pResultHandle, InventoryItemId itemIdSource, uint unQuantity, InventoryItemId itemIdDest ) { - return _TransferItemQuantity( Self, ref pResultHandle, itemIdSource, unQuantity, itemIdDest ); + var returnValue = _TransferItemQuantity( Self, ref pResultHandle, itemIdSource, unQuantity, itemIdDest ); + return returnValue; } #region FunctionMeta @@ -315,7 +333,8 @@ internal void SendItemDropHeartbeat() #endregion internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, InventoryDefId dropListDefinition ) { - return _TriggerItemDrop( Self, ref pResultHandle, dropListDefinition ); + var returnValue = _TriggerItemDrop( Self, ref pResultHandle, dropListDefinition ); + return returnValue; } #region FunctionMeta @@ -327,7 +346,8 @@ internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, Invento #endregion internal bool TradeItems( ref SteamInventoryResult_t pResultHandle, SteamId steamIDTradePartner, [In,Out] InventoryItemId[] pArrayGive, [In,Out] uint[] pArrayGiveQuantity, uint nArrayGiveLength, [In,Out] InventoryItemId[] pArrayGet, [In,Out] uint[] pArrayGetQuantity, uint nArrayGetLength ) { - return _TradeItems( Self, ref pResultHandle, steamIDTradePartner, pArrayGive, pArrayGiveQuantity, nArrayGiveLength, pArrayGet, pArrayGetQuantity, nArrayGetLength ); + var returnValue = _TradeItems( Self, ref pResultHandle, steamIDTradePartner, pArrayGive, pArrayGiveQuantity, nArrayGiveLength, pArrayGet, pArrayGetQuantity, nArrayGetLength ); + return returnValue; } #region FunctionMeta @@ -339,7 +359,8 @@ internal bool TradeItems( ref SteamInventoryResult_t pResultHandle, SteamId stea #endregion internal bool LoadItemDefinitions() { - return _LoadItemDefinitions( Self ); + var returnValue = _LoadItemDefinitions( Self ); + return returnValue; } #region FunctionMeta @@ -351,19 +372,23 @@ internal bool LoadItemDefinitions() #endregion internal bool GetItemDefinitionIDs( [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize ) { - return _GetItemDefinitionIDs( Self, pItemDefIDs, ref punItemDefIDsArraySize ); + var returnValue = _GetItemDefinitionIDs( Self, pItemDefIDs, ref punItemDefIDsArraySize ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetItemDefinitionProperty( IntPtr self, InventoryDefId iDefinition, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ); + private delegate bool FGetItemDefinitionProperty( IntPtr self, InventoryDefId iDefinition, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, IntPtr pchValueBuffer, ref uint punValueBufferSizeOut ); private FGetItemDefinitionProperty _GetItemDefinitionProperty; #endregion - internal bool GetItemDefinitionProperty( InventoryDefId iDefinition, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ) + internal bool GetItemDefinitionProperty( InventoryDefId iDefinition, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, out string pchValueBuffer, ref uint punValueBufferSizeOut ) { - return _GetItemDefinitionProperty( Self, iDefinition, pchPropertyName, pchValueBuffer, ref punValueBufferSizeOut ); + IntPtr mempchValueBuffer = Helpers.TakeMemory(); + var returnValue = _GetItemDefinitionProperty( Self, iDefinition, pchPropertyName, mempchValueBuffer, ref punValueBufferSizeOut ); + pchValueBuffer = Helpers.MemoryToString( mempchValueBuffer ); + return returnValue; } #region FunctionMeta @@ -374,7 +399,8 @@ internal bool GetItemDefinitionProperty( InventoryDefId iDefinition, [MarshalAs( #endregion internal async Task RequestEligiblePromoItemDefinitionsIDs( SteamId steamID ) { - return await SteamInventoryEligiblePromoItemDefIDs_t.GetResultAsync( _RequestEligiblePromoItemDefinitionsIDs( Self, steamID ) ); + var returnValue = _RequestEligiblePromoItemDefinitionsIDs( Self, steamID ); + return await SteamInventoryEligiblePromoItemDefIDs_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -386,7 +412,8 @@ internal bool GetItemDefinitionProperty( InventoryDefId iDefinition, [MarshalAs( #endregion internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize ) { - return _GetEligiblePromoItemDefinitionIDs( Self, steamID, pItemDefIDs, ref punItemDefIDsArraySize ); + var returnValue = _GetEligiblePromoItemDefinitionIDs( Self, steamID, pItemDefIDs, ref punItemDefIDsArraySize ); + return returnValue; } #region FunctionMeta @@ -397,7 +424,8 @@ internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] Inven #endregion internal async Task StartPurchase( [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ) { - return await SteamInventoryStartPurchaseResult_t.GetResultAsync( _StartPurchase( Self, pArrayItemDefs, punArrayQuantity, unArrayLength ) ); + var returnValue = _StartPurchase( Self, pArrayItemDefs, punArrayQuantity, unArrayLength ); + return await SteamInventoryStartPurchaseResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -408,7 +436,8 @@ internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] Inven #endregion internal async Task RequestPrices() { - return await SteamInventoryRequestPricesResult_t.GetResultAsync( _RequestPrices( Self ) ); + var returnValue = _RequestPrices( Self ); + return await SteamInventoryRequestPricesResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -419,7 +448,8 @@ internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] Inven #endregion internal uint GetNumItemsWithPrices() { - return _GetNumItemsWithPrices( Self ); + var returnValue = _GetNumItemsWithPrices( Self ); + return returnValue; } #region FunctionMeta @@ -431,7 +461,8 @@ internal uint GetNumItemsWithPrices() #endregion internal bool GetItemsWithPrices( [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] ulong[] pCurrentPrices, [In,Out] ulong[] pBasePrices, uint unArrayLength ) { - return _GetItemsWithPrices( Self, pArrayItemDefs, pCurrentPrices, pBasePrices, unArrayLength ); + var returnValue = _GetItemsWithPrices( Self, pArrayItemDefs, pCurrentPrices, pBasePrices, unArrayLength ); + return returnValue; } #region FunctionMeta @@ -443,7 +474,8 @@ internal bool GetItemsWithPrices( [In,Out] InventoryDefId[] pArrayItemDefs, [In #endregion internal bool GetItemPrice( InventoryDefId iDefinition, ref ulong pCurrentPrice, ref ulong pBasePrice ) { - return _GetItemPrice( Self, iDefinition, ref pCurrentPrice, ref pBasePrice ); + var returnValue = _GetItemPrice( Self, iDefinition, ref pCurrentPrice, ref pBasePrice ); + return returnValue; } #region FunctionMeta @@ -454,7 +486,8 @@ internal bool GetItemPrice( InventoryDefId iDefinition, ref ulong pCurrentPrice, #endregion internal SteamInventoryUpdateHandle_t StartUpdateProperties() { - return _StartUpdateProperties( Self ); + var returnValue = _StartUpdateProperties( Self ); + return returnValue; } #region FunctionMeta @@ -466,7 +499,8 @@ internal SteamInventoryUpdateHandle_t StartUpdateProperties() #endregion internal bool RemoveProperty( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName ) { - return _RemoveProperty( Self, handle, nItemID, pchPropertyName ); + var returnValue = _RemoveProperty( Self, handle, nItemID, pchPropertyName ); + return returnValue; } #region FunctionMeta @@ -478,7 +512,8 @@ internal bool RemoveProperty( SteamInventoryUpdateHandle_t handle, InventoryItem #endregion internal bool SetProperty1( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyValue ) { - return _SetProperty1( Self, handle, nItemID, pchPropertyName, pchPropertyValue ); + var returnValue = _SetProperty1( Self, handle, nItemID, pchPropertyName, pchPropertyValue ); + return returnValue; } #region FunctionMeta @@ -490,7 +525,8 @@ internal bool SetProperty1( SteamInventoryUpdateHandle_t handle, InventoryItemId #endregion internal bool SetProperty2( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, [MarshalAs( UnmanagedType.U1 )] bool bValue ) { - return _SetProperty2( Self, handle, nItemID, pchPropertyName, bValue ); + var returnValue = _SetProperty2( Self, handle, nItemID, pchPropertyName, bValue ); + return returnValue; } #region FunctionMeta @@ -502,7 +538,8 @@ internal bool SetProperty2( SteamInventoryUpdateHandle_t handle, InventoryItemId #endregion internal bool SetProperty3( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, long nValue ) { - return _SetProperty3( Self, handle, nItemID, pchPropertyName, nValue ); + var returnValue = _SetProperty3( Self, handle, nItemID, pchPropertyName, nValue ); + return returnValue; } #region FunctionMeta @@ -514,7 +551,8 @@ internal bool SetProperty3( SteamInventoryUpdateHandle_t handle, InventoryItemId #endregion internal bool SetProperty4( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPropertyName, float flValue ) { - return _SetProperty4( Self, handle, nItemID, pchPropertyName, flValue ); + var returnValue = _SetProperty4( Self, handle, nItemID, pchPropertyName, flValue ); + return returnValue; } #region FunctionMeta @@ -526,7 +564,8 @@ internal bool SetProperty4( SteamInventoryUpdateHandle_t handle, InventoryItemId #endregion internal bool SubmitUpdateProperties( SteamInventoryUpdateHandle_t handle, ref SteamInventoryResult_t pResultHandle ) { - return _SubmitUpdateProperties( Self, handle, ref pResultHandle ); + var returnValue = _SubmitUpdateProperties( Self, handle, ref pResultHandle ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmaking.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmaking.cs index fd72e4d..6a134dc 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmaking.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmaking.cs @@ -104,7 +104,8 @@ internal override void Shutdown() #endregion internal int GetFavoriteGameCount() { - return _GetFavoriteGameCount( Self ); + var returnValue = _GetFavoriteGameCount( Self ); + return returnValue; } #region FunctionMeta @@ -116,7 +117,8 @@ internal int GetFavoriteGameCount() #endregion internal bool GetFavoriteGame( int iGame, ref AppId pnAppID, ref uint pnIP, ref ushort pnConnPort, ref ushort pnQueryPort, ref uint punFlags, ref uint pRTime32LastPlayedOnServer ) { - return _GetFavoriteGame( Self, iGame, ref pnAppID, ref pnIP, ref pnConnPort, ref pnQueryPort, ref punFlags, ref pRTime32LastPlayedOnServer ); + var returnValue = _GetFavoriteGame( Self, iGame, ref pnAppID, ref pnIP, ref pnConnPort, ref pnQueryPort, ref punFlags, ref pRTime32LastPlayedOnServer ); + return returnValue; } #region FunctionMeta @@ -127,7 +129,8 @@ internal bool GetFavoriteGame( int iGame, ref AppId pnAppID, ref uint pnIP, ref #endregion internal int AddFavoriteGame( AppId nAppID, uint nIP, ushort nConnPort, ushort nQueryPort, uint unFlags, uint rTime32LastPlayedOnServer ) { - return _AddFavoriteGame( Self, nAppID, nIP, nConnPort, nQueryPort, unFlags, rTime32LastPlayedOnServer ); + var returnValue = _AddFavoriteGame( Self, nAppID, nIP, nConnPort, nQueryPort, unFlags, rTime32LastPlayedOnServer ); + return returnValue; } #region FunctionMeta @@ -139,7 +142,8 @@ internal int AddFavoriteGame( AppId nAppID, uint nIP, ushort nConnPort, ushort n #endregion internal bool RemoveFavoriteGame( AppId nAppID, uint nIP, ushort nConnPort, ushort nQueryPort, uint unFlags ) { - return _RemoveFavoriteGame( Self, nAppID, nIP, nConnPort, nQueryPort, unFlags ); + var returnValue = _RemoveFavoriteGame( Self, nAppID, nIP, nConnPort, nQueryPort, unFlags ); + return returnValue; } #region FunctionMeta @@ -150,7 +154,8 @@ internal bool RemoveFavoriteGame( AppId nAppID, uint nIP, ushort nConnPort, usho #endregion internal async Task RequestLobbyList() { - return await LobbyMatchList_t.GetResultAsync( _RequestLobbyList( Self ) ); + var returnValue = _RequestLobbyList( Self ); + return await LobbyMatchList_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -247,7 +252,8 @@ internal SteamId GetLobbyByIndex( int iLobby ) _GetLobbyByIndex( Self, ref retVal, iLobby ); return retVal; #else - return _GetLobbyByIndex( Self, iLobby ); + var returnValue = _GetLobbyByIndex( Self, iLobby ); + return returnValue; #endif } @@ -259,7 +265,8 @@ internal SteamId GetLobbyByIndex( int iLobby ) #endregion internal async Task CreateLobby( LobbyType eLobbyType, int cMaxMembers ) { - return await LobbyCreated_t.GetResultAsync( _CreateLobby( Self, eLobbyType, cMaxMembers ) ); + var returnValue = _CreateLobby( Self, eLobbyType, cMaxMembers ); + return await LobbyCreated_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -270,7 +277,8 @@ internal SteamId GetLobbyByIndex( int iLobby ) #endregion internal async Task JoinLobby( SteamId steamIDLobby ) { - return await LobbyEnter_t.GetResultAsync( _JoinLobby( Self, steamIDLobby ) ); + var returnValue = _JoinLobby( Self, steamIDLobby ); + return await LobbyEnter_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -293,7 +301,8 @@ internal void LeaveLobby( SteamId steamIDLobby ) #endregion internal bool InviteUserToLobby( SteamId steamIDLobby, SteamId steamIDInvitee ) { - return _InviteUserToLobby( Self, steamIDLobby, steamIDInvitee ); + var returnValue = _InviteUserToLobby( Self, steamIDLobby, steamIDInvitee ); + return returnValue; } #region FunctionMeta @@ -304,7 +313,8 @@ internal bool InviteUserToLobby( SteamId steamIDLobby, SteamId steamIDInvitee ) #endregion internal int GetNumLobbyMembers( SteamId steamIDLobby ) { - return _GetNumLobbyMembers( Self, steamIDLobby ); + var returnValue = _GetNumLobbyMembers( Self, steamIDLobby ); + return returnValue; } #region FunctionMeta @@ -324,7 +334,8 @@ internal SteamId GetLobbyMemberByIndex( SteamId steamIDLobby, int iMember ) _GetLobbyMemberByIndex( Self, ref retVal, steamIDLobby, iMember ); return retVal; #else - return _GetLobbyMemberByIndex( Self, steamIDLobby, iMember ); + var returnValue = _GetLobbyMemberByIndex( Self, steamIDLobby, iMember ); + return returnValue; #endif } @@ -336,7 +347,8 @@ internal SteamId GetLobbyMemberByIndex( SteamId steamIDLobby, int iMember ) #endregion internal string GetLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _GetLobbyData( Self, steamIDLobby, pchKey ); + var returnValue = _GetLobbyData( Self, steamIDLobby, pchKey ); + return returnValue; } #region FunctionMeta @@ -348,7 +360,8 @@ internal string GetLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.Cu #endregion internal bool SetLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue ) { - return _SetLobbyData( Self, steamIDLobby, pchKey, pchValue ); + var returnValue = _SetLobbyData( Self, steamIDLobby, pchKey, pchValue ); + return returnValue; } #region FunctionMeta @@ -359,19 +372,25 @@ internal bool SetLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.Cust #endregion internal int GetLobbyDataCount( SteamId steamIDLobby ) { - return _GetLobbyDataCount( Self, steamIDLobby ); + var returnValue = _GetLobbyDataCount( Self, steamIDLobby ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetLobbyDataByIndex( IntPtr self, SteamId steamIDLobby, int iLobbyData, StringBuilder pchKey, int cchKeyBufferSize, StringBuilder pchValue, int cchValueBufferSize ); + private delegate bool FGetLobbyDataByIndex( IntPtr self, SteamId steamIDLobby, int iLobbyData, IntPtr pchKey, int cchKeyBufferSize, IntPtr pchValue, int cchValueBufferSize ); private FGetLobbyDataByIndex _GetLobbyDataByIndex; #endregion - internal bool GetLobbyDataByIndex( SteamId steamIDLobby, int iLobbyData, StringBuilder pchKey, int cchKeyBufferSize, StringBuilder pchValue, int cchValueBufferSize ) + internal bool GetLobbyDataByIndex( SteamId steamIDLobby, int iLobbyData, out string pchKey, out string pchValue ) { - return _GetLobbyDataByIndex( Self, steamIDLobby, iLobbyData, pchKey, cchKeyBufferSize, pchValue, cchValueBufferSize ); + IntPtr mempchKey = Helpers.TakeMemory(); + IntPtr mempchValue = Helpers.TakeMemory(); + var returnValue = _GetLobbyDataByIndex( Self, steamIDLobby, iLobbyData, mempchKey, (1024 * 32), mempchValue, (1024 * 32) ); + pchKey = Helpers.MemoryToString( mempchKey ); + pchValue = Helpers.MemoryToString( mempchValue ); + return returnValue; } #region FunctionMeta @@ -383,7 +402,8 @@ internal bool GetLobbyDataByIndex( SteamId steamIDLobby, int iLobbyData, StringB #endregion internal bool DeleteLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _DeleteLobbyData( Self, steamIDLobby, pchKey ); + var returnValue = _DeleteLobbyData( Self, steamIDLobby, pchKey ); + return returnValue; } #region FunctionMeta @@ -394,7 +414,8 @@ internal bool DeleteLobbyData( SteamId steamIDLobby, [MarshalAs( UnmanagedType.C #endregion internal string GetLobbyMemberData( SteamId steamIDLobby, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _GetLobbyMemberData( Self, steamIDLobby, steamIDUser, pchKey ); + var returnValue = _GetLobbyMemberData( Self, steamIDLobby, steamIDUser, pchKey ); + return returnValue; } #region FunctionMeta @@ -417,7 +438,8 @@ internal void SetLobbyMemberData( SteamId steamIDLobby, [MarshalAs( UnmanagedTyp #endregion internal bool SendLobbyChatMsg( SteamId steamIDLobby, IntPtr pvMsgBody, int cubMsgBody ) { - return _SendLobbyChatMsg( Self, steamIDLobby, pvMsgBody, cubMsgBody ); + var returnValue = _SendLobbyChatMsg( Self, steamIDLobby, pvMsgBody, cubMsgBody ); + return returnValue; } #region FunctionMeta @@ -428,7 +450,8 @@ internal bool SendLobbyChatMsg( SteamId steamIDLobby, IntPtr pvMsgBody, int cubM #endregion internal int GetLobbyChatEntry( SteamId steamIDLobby, int iChatID, ref SteamId pSteamIDUser, IntPtr pvData, int cubData, ref ChatEntryType peChatEntryType ) { - return _GetLobbyChatEntry( Self, steamIDLobby, iChatID, ref pSteamIDUser, pvData, cubData, ref peChatEntryType ); + var returnValue = _GetLobbyChatEntry( Self, steamIDLobby, iChatID, ref pSteamIDUser, pvData, cubData, ref peChatEntryType ); + return returnValue; } #region FunctionMeta @@ -440,7 +463,8 @@ internal int GetLobbyChatEntry( SteamId steamIDLobby, int iChatID, ref SteamId p #endregion internal bool RequestLobbyData( SteamId steamIDLobby ) { - return _RequestLobbyData( Self, steamIDLobby ); + var returnValue = _RequestLobbyData( Self, steamIDLobby ); + return returnValue; } #region FunctionMeta @@ -463,7 +487,8 @@ internal void SetLobbyGameServer( SteamId steamIDLobby, uint unGameServerIP, ush #endregion internal bool GetLobbyGameServer( SteamId steamIDLobby, ref uint punGameServerIP, ref ushort punGameServerPort, ref SteamId psteamIDGameServer ) { - return _GetLobbyGameServer( Self, steamIDLobby, ref punGameServerIP, ref punGameServerPort, ref psteamIDGameServer ); + var returnValue = _GetLobbyGameServer( Self, steamIDLobby, ref punGameServerIP, ref punGameServerPort, ref psteamIDGameServer ); + return returnValue; } #region FunctionMeta @@ -475,7 +500,8 @@ internal bool GetLobbyGameServer( SteamId steamIDLobby, ref uint punGameServerIP #endregion internal bool SetLobbyMemberLimit( SteamId steamIDLobby, int cMaxMembers ) { - return _SetLobbyMemberLimit( Self, steamIDLobby, cMaxMembers ); + var returnValue = _SetLobbyMemberLimit( Self, steamIDLobby, cMaxMembers ); + return returnValue; } #region FunctionMeta @@ -486,7 +512,8 @@ internal bool SetLobbyMemberLimit( SteamId steamIDLobby, int cMaxMembers ) #endregion internal int GetLobbyMemberLimit( SteamId steamIDLobby ) { - return _GetLobbyMemberLimit( Self, steamIDLobby ); + var returnValue = _GetLobbyMemberLimit( Self, steamIDLobby ); + return returnValue; } #region FunctionMeta @@ -498,7 +525,8 @@ internal int GetLobbyMemberLimit( SteamId steamIDLobby ) #endregion internal bool SetLobbyType( SteamId steamIDLobby, LobbyType eLobbyType ) { - return _SetLobbyType( Self, steamIDLobby, eLobbyType ); + var returnValue = _SetLobbyType( Self, steamIDLobby, eLobbyType ); + return returnValue; } #region FunctionMeta @@ -510,7 +538,8 @@ internal bool SetLobbyType( SteamId steamIDLobby, LobbyType eLobbyType ) #endregion internal bool SetLobbyJoinable( SteamId steamIDLobby, [MarshalAs( UnmanagedType.U1 )] bool bLobbyJoinable ) { - return _SetLobbyJoinable( Self, steamIDLobby, bLobbyJoinable ); + var returnValue = _SetLobbyJoinable( Self, steamIDLobby, bLobbyJoinable ); + return returnValue; } #region FunctionMeta @@ -530,7 +559,8 @@ internal SteamId GetLobbyOwner( SteamId steamIDLobby ) _GetLobbyOwner( Self, ref retVal, steamIDLobby ); return retVal; #else - return _GetLobbyOwner( Self, steamIDLobby ); + var returnValue = _GetLobbyOwner( Self, steamIDLobby ); + return returnValue; #endif } @@ -543,7 +573,8 @@ internal SteamId GetLobbyOwner( SteamId steamIDLobby ) #endregion internal bool SetLobbyOwner( SteamId steamIDLobby, SteamId steamIDNewOwner ) { - return _SetLobbyOwner( Self, steamIDLobby, steamIDNewOwner ); + var returnValue = _SetLobbyOwner( Self, steamIDLobby, steamIDNewOwner ); + return returnValue; } #region FunctionMeta @@ -555,7 +586,8 @@ internal bool SetLobbyOwner( SteamId steamIDLobby, SteamId steamIDNewOwner ) #endregion internal bool SetLinkedLobby( SteamId steamIDLobby, SteamId steamIDLobbyDependent ) { - return _SetLinkedLobby( Self, steamIDLobby, steamIDLobbyDependent ); + var returnValue = _SetLinkedLobby( Self, steamIDLobby, steamIDLobbyDependent ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs index 3279eeb..3401895 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs @@ -62,7 +62,8 @@ internal override void Shutdown() #endregion internal HServerListRequest RequestInternetServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { - return _RequestInternetServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + var returnValue = _RequestInternetServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -73,7 +74,8 @@ internal HServerListRequest RequestInternetServerList( AppId iApp, [In,Out] ref #endregion internal HServerListRequest RequestLANServerList( AppId iApp, IntPtr pRequestServersResponse ) { - return _RequestLANServerList( Self, iApp, pRequestServersResponse ); + var returnValue = _RequestLANServerList( Self, iApp, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -84,7 +86,8 @@ internal HServerListRequest RequestLANServerList( AppId iApp, IntPtr pRequestSer #endregion internal HServerListRequest RequestFriendsServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { - return _RequestFriendsServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + var returnValue = _RequestFriendsServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -95,7 +98,8 @@ internal HServerListRequest RequestFriendsServerList( AppId iApp, [In,Out] ref M #endregion internal HServerListRequest RequestFavoritesServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { - return _RequestFavoritesServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + var returnValue = _RequestFavoritesServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -106,7 +110,8 @@ internal HServerListRequest RequestFavoritesServerList( AppId iApp, [In,Out] ref #endregion internal HServerListRequest RequestHistoryServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { - return _RequestHistoryServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + var returnValue = _RequestHistoryServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -117,7 +122,8 @@ internal HServerListRequest RequestHistoryServerList( AppId iApp, [In,Out] ref M #endregion internal HServerListRequest RequestSpectatorServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { - return _RequestSpectatorServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + var returnValue = _RequestSpectatorServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -139,7 +145,8 @@ internal void ReleaseRequest( HServerListRequest hServerListRequest ) #endregion internal gameserveritem_t GetServerDetails( HServerListRequest hRequest, int iServer ) { - return gameserveritem_t.Fill( _GetServerDetails( Self, hRequest, iServer ) ); + var returnValue = _GetServerDetails( Self, hRequest, iServer ); + return gameserveritem_t.Fill( returnValue ); } #region FunctionMeta @@ -173,7 +180,8 @@ internal void RefreshQuery( HServerListRequest hRequest ) #endregion internal bool IsRefreshing( HServerListRequest hRequest ) { - return _IsRefreshing( Self, hRequest ); + var returnValue = _IsRefreshing( Self, hRequest ); + return returnValue; } #region FunctionMeta @@ -184,7 +192,8 @@ internal bool IsRefreshing( HServerListRequest hRequest ) #endregion internal int GetServerCount( HServerListRequest hRequest ) { - return _GetServerCount( Self, hRequest ); + var returnValue = _GetServerCount( Self, hRequest ); + return returnValue; } #region FunctionMeta @@ -206,7 +215,8 @@ internal void RefreshServer( HServerListRequest hRequest, int iServer ) #endregion internal HServerQuery PingServer( uint unIP, ushort usPort, IntPtr pRequestServersResponse ) { - return _PingServer( Self, unIP, usPort, pRequestServersResponse ); + var returnValue = _PingServer( Self, unIP, usPort, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -217,7 +227,8 @@ internal HServerQuery PingServer( uint unIP, ushort usPort, IntPtr pRequestServe #endregion internal HServerQuery PlayerDetails( uint unIP, ushort usPort, IntPtr pRequestServersResponse ) { - return _PlayerDetails( Self, unIP, usPort, pRequestServersResponse ); + var returnValue = _PlayerDetails( Self, unIP, usPort, pRequestServersResponse ); + return returnValue; } #region FunctionMeta @@ -228,7 +239,8 @@ internal HServerQuery PlayerDetails( uint unIP, ushort usPort, IntPtr pRequestSe #endregion internal HServerQuery ServerRules( uint unIP, ushort usPort, IntPtr pRequestServersResponse ) { - return _ServerRules( Self, unIP, usPort, pRequestServersResponse ); + var returnValue = _ServerRules( Self, unIP, usPort, pRequestServersResponse ); + return returnValue; } #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamMusic.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamMusic.cs index 417c6bd..f07f7ad 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamMusic.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamMusic.cs @@ -47,7 +47,8 @@ internal override void Shutdown() #endregion internal bool BIsEnabled() { - return _BIsEnabled( Self ); + var returnValue = _BIsEnabled( Self ); + return returnValue; } #region FunctionMeta @@ -59,7 +60,8 @@ internal bool BIsEnabled() #endregion internal bool BIsPlaying() { - return _BIsPlaying( Self ); + var returnValue = _BIsPlaying( Self ); + return returnValue; } #region FunctionMeta @@ -70,7 +72,8 @@ internal bool BIsPlaying() #endregion internal MusicStatus GetPlaybackStatus() { - return _GetPlaybackStatus( Self ); + var returnValue = _GetPlaybackStatus( Self ); + return returnValue; } #region FunctionMeta @@ -136,7 +139,8 @@ internal void SetVolume( float flVolume ) #endregion internal float GetVolume() { - return _GetVolume( Self ); + var returnValue = _GetVolume( Self ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworking.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworking.cs index b59129e..ee94c80 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworking.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworking.cs @@ -73,7 +73,8 @@ internal override void Shutdown() #endregion internal bool SendP2PPacket( SteamId steamIDRemote, IntPtr pubData, uint cubData, P2PSend eP2PSendType, int nChannel ) { - return _SendP2PPacket( Self, steamIDRemote, pubData, cubData, eP2PSendType, nChannel ); + var returnValue = _SendP2PPacket( Self, steamIDRemote, pubData, cubData, eP2PSendType, nChannel ); + return returnValue; } #region FunctionMeta @@ -85,7 +86,8 @@ internal bool SendP2PPacket( SteamId steamIDRemote, IntPtr pubData, uint cubData #endregion internal bool IsP2PPacketAvailable( ref uint pcubMsgSize, int nChannel ) { - return _IsP2PPacketAvailable( Self, ref pcubMsgSize, nChannel ); + var returnValue = _IsP2PPacketAvailable( Self, ref pcubMsgSize, nChannel ); + return returnValue; } #region FunctionMeta @@ -97,7 +99,8 @@ internal bool IsP2PPacketAvailable( ref uint pcubMsgSize, int nChannel ) #endregion internal bool ReadP2PPacket( IntPtr pubDest, uint cubDest, ref uint pcubMsgSize, ref SteamId psteamIDRemote, int nChannel ) { - return _ReadP2PPacket( Self, pubDest, cubDest, ref pcubMsgSize, ref psteamIDRemote, nChannel ); + var returnValue = _ReadP2PPacket( Self, pubDest, cubDest, ref pcubMsgSize, ref psteamIDRemote, nChannel ); + return returnValue; } #region FunctionMeta @@ -109,7 +112,8 @@ internal bool ReadP2PPacket( IntPtr pubDest, uint cubDest, ref uint pcubMsgSize, #endregion internal bool AcceptP2PSessionWithUser( SteamId steamIDRemote ) { - return _AcceptP2PSessionWithUser( Self, steamIDRemote ); + var returnValue = _AcceptP2PSessionWithUser( Self, steamIDRemote ); + return returnValue; } #region FunctionMeta @@ -121,7 +125,8 @@ internal bool AcceptP2PSessionWithUser( SteamId steamIDRemote ) #endregion internal bool CloseP2PSessionWithUser( SteamId steamIDRemote ) { - return _CloseP2PSessionWithUser( Self, steamIDRemote ); + var returnValue = _CloseP2PSessionWithUser( Self, steamIDRemote ); + return returnValue; } #region FunctionMeta @@ -133,7 +138,8 @@ internal bool CloseP2PSessionWithUser( SteamId steamIDRemote ) #endregion internal bool CloseP2PChannelWithUser( SteamId steamIDRemote, int nChannel ) { - return _CloseP2PChannelWithUser( Self, steamIDRemote, nChannel ); + var returnValue = _CloseP2PChannelWithUser( Self, steamIDRemote, nChannel ); + return returnValue; } #region FunctionMeta @@ -145,7 +151,8 @@ internal bool CloseP2PChannelWithUser( SteamId steamIDRemote, int nChannel ) #endregion internal bool GetP2PSessionState( SteamId steamIDRemote, ref P2PSessionState_t pConnectionState ) { - return _GetP2PSessionState( Self, steamIDRemote, ref pConnectionState ); + var returnValue = _GetP2PSessionState( Self, steamIDRemote, ref pConnectionState ); + return returnValue; } #region FunctionMeta @@ -157,7 +164,8 @@ internal bool GetP2PSessionState( SteamId steamIDRemote, ref P2PSessionState_t p #endregion internal bool AllowP2PPacketRelay( [MarshalAs( UnmanagedType.U1 )] bool bAllow ) { - return _AllowP2PPacketRelay( Self, bAllow ); + var returnValue = _AllowP2PPacketRelay( Self, bAllow ); + return returnValue; } #region FunctionMeta @@ -168,7 +176,8 @@ internal bool AllowP2PPacketRelay( [MarshalAs( UnmanagedType.U1 )] bool bAllow ) #endregion internal SNetListenSocket_t CreateListenSocket( int nVirtualP2PPort, uint nIP, ushort nPort, [MarshalAs( UnmanagedType.U1 )] bool bAllowUseOfPacketRelay ) { - return _CreateListenSocket( Self, nVirtualP2PPort, nIP, nPort, bAllowUseOfPacketRelay ); + var returnValue = _CreateListenSocket( Self, nVirtualP2PPort, nIP, nPort, bAllowUseOfPacketRelay ); + return returnValue; } #region FunctionMeta @@ -179,7 +188,8 @@ internal SNetListenSocket_t CreateListenSocket( int nVirtualP2PPort, uint nIP, u #endregion internal SNetSocket_t CreateP2PConnectionSocket( SteamId steamIDTarget, int nVirtualPort, int nTimeoutSec, [MarshalAs( UnmanagedType.U1 )] bool bAllowUseOfPacketRelay ) { - return _CreateP2PConnectionSocket( Self, steamIDTarget, nVirtualPort, nTimeoutSec, bAllowUseOfPacketRelay ); + var returnValue = _CreateP2PConnectionSocket( Self, steamIDTarget, nVirtualPort, nTimeoutSec, bAllowUseOfPacketRelay ); + return returnValue; } #region FunctionMeta @@ -190,7 +200,8 @@ internal SNetSocket_t CreateP2PConnectionSocket( SteamId steamIDTarget, int nVir #endregion internal SNetSocket_t CreateConnectionSocket( uint nIP, ushort nPort, int nTimeoutSec ) { - return _CreateConnectionSocket( Self, nIP, nPort, nTimeoutSec ); + var returnValue = _CreateConnectionSocket( Self, nIP, nPort, nTimeoutSec ); + return returnValue; } #region FunctionMeta @@ -202,7 +213,8 @@ internal SNetSocket_t CreateConnectionSocket( uint nIP, ushort nPort, int nTimeo #endregion internal bool DestroySocket( SNetSocket_t hSocket, [MarshalAs( UnmanagedType.U1 )] bool bNotifyRemoteEnd ) { - return _DestroySocket( Self, hSocket, bNotifyRemoteEnd ); + var returnValue = _DestroySocket( Self, hSocket, bNotifyRemoteEnd ); + return returnValue; } #region FunctionMeta @@ -214,7 +226,8 @@ internal bool DestroySocket( SNetSocket_t hSocket, [MarshalAs( UnmanagedType.U1 #endregion internal bool DestroyListenSocket( SNetListenSocket_t hSocket, [MarshalAs( UnmanagedType.U1 )] bool bNotifyRemoteEnd ) { - return _DestroyListenSocket( Self, hSocket, bNotifyRemoteEnd ); + var returnValue = _DestroyListenSocket( Self, hSocket, bNotifyRemoteEnd ); + return returnValue; } #region FunctionMeta @@ -226,7 +239,8 @@ internal bool DestroyListenSocket( SNetListenSocket_t hSocket, [MarshalAs( Unman #endregion internal bool SendDataOnSocket( SNetSocket_t hSocket, [In,Out] IntPtr[] pubData, uint cubData, [MarshalAs( UnmanagedType.U1 )] bool bReliable ) { - return _SendDataOnSocket( Self, hSocket, pubData, cubData, bReliable ); + var returnValue = _SendDataOnSocket( Self, hSocket, pubData, cubData, bReliable ); + return returnValue; } #region FunctionMeta @@ -238,7 +252,8 @@ internal bool SendDataOnSocket( SNetSocket_t hSocket, [In,Out] IntPtr[] pubData #endregion internal bool IsDataAvailableOnSocket( SNetSocket_t hSocket, ref uint pcubMsgSize ) { - return _IsDataAvailableOnSocket( Self, hSocket, ref pcubMsgSize ); + var returnValue = _IsDataAvailableOnSocket( Self, hSocket, ref pcubMsgSize ); + return returnValue; } #region FunctionMeta @@ -250,7 +265,8 @@ internal bool IsDataAvailableOnSocket( SNetSocket_t hSocket, ref uint pcubMsgSiz #endregion internal bool RetrieveDataFromSocket( SNetSocket_t hSocket, [In,Out] IntPtr[] pubDest, uint cubDest, ref uint pcubMsgSize ) { - return _RetrieveDataFromSocket( Self, hSocket, pubDest, cubDest, ref pcubMsgSize ); + var returnValue = _RetrieveDataFromSocket( Self, hSocket, pubDest, cubDest, ref pcubMsgSize ); + return returnValue; } #region FunctionMeta @@ -262,7 +278,8 @@ internal bool RetrieveDataFromSocket( SNetSocket_t hSocket, [In,Out] IntPtr[] p #endregion internal bool IsDataAvailable( SNetListenSocket_t hListenSocket, ref uint pcubMsgSize, ref SNetSocket_t phSocket ) { - return _IsDataAvailable( Self, hListenSocket, ref pcubMsgSize, ref phSocket ); + var returnValue = _IsDataAvailable( Self, hListenSocket, ref pcubMsgSize, ref phSocket ); + return returnValue; } #region FunctionMeta @@ -274,7 +291,8 @@ internal bool IsDataAvailable( SNetListenSocket_t hListenSocket, ref uint pcubMs #endregion internal bool RetrieveData( SNetListenSocket_t hListenSocket, [In,Out] IntPtr[] pubDest, uint cubDest, ref uint pcubMsgSize, ref SNetSocket_t phSocket ) { - return _RetrieveData( Self, hListenSocket, pubDest, cubDest, ref pcubMsgSize, ref phSocket ); + var returnValue = _RetrieveData( Self, hListenSocket, pubDest, cubDest, ref pcubMsgSize, ref phSocket ); + return returnValue; } #region FunctionMeta @@ -286,7 +304,8 @@ internal bool RetrieveData( SNetListenSocket_t hListenSocket, [In,Out] IntPtr[] #endregion internal bool GetSocketInfo( SNetSocket_t hSocket, ref SteamId pSteamIDRemote, ref int peSocketStatus, ref uint punIPRemote, ref ushort punPortRemote ) { - return _GetSocketInfo( Self, hSocket, ref pSteamIDRemote, ref peSocketStatus, ref punIPRemote, ref punPortRemote ); + var returnValue = _GetSocketInfo( Self, hSocket, ref pSteamIDRemote, ref peSocketStatus, ref punIPRemote, ref punPortRemote ); + return returnValue; } #region FunctionMeta @@ -298,7 +317,8 @@ internal bool GetSocketInfo( SNetSocket_t hSocket, ref SteamId pSteamIDRemote, r #endregion internal bool GetListenSocketInfo( SNetListenSocket_t hListenSocket, ref uint pnIP, ref ushort pnPort ) { - return _GetListenSocketInfo( Self, hListenSocket, ref pnIP, ref pnPort ); + var returnValue = _GetListenSocketInfo( Self, hListenSocket, ref pnIP, ref pnPort ); + return returnValue; } #region FunctionMeta @@ -309,7 +329,8 @@ internal bool GetListenSocketInfo( SNetListenSocket_t hListenSocket, ref uint pn #endregion internal SNetSocketConnectionType GetSocketConnectionType( SNetSocket_t hSocket ) { - return _GetSocketConnectionType( Self, hSocket ); + var returnValue = _GetSocketConnectionType( Self, hSocket ); + return returnValue; } #region FunctionMeta @@ -320,7 +341,8 @@ internal SNetSocketConnectionType GetSocketConnectionType( SNetSocket_t hSocket #endregion internal int GetMaxPacketSize( SNetSocket_t hSocket ) { - return _GetMaxPacketSize( Self, hSocket ); + var returnValue = _GetMaxPacketSize( Self, hSocket ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index 7be0b06..4dcf5c5 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -86,7 +86,8 @@ internal override void Shutdown() #endregion internal Socket CreateListenSocketIP( ref NetAddress localAddress ) { - return _CreateListenSocketIP( Self, ref localAddress ); + var returnValue = _CreateListenSocketIP( Self, ref localAddress ); + return returnValue; } #region FunctionMeta @@ -97,7 +98,8 @@ internal Socket CreateListenSocketIP( ref NetAddress localAddress ) #endregion internal Connection ConnectByIPAddress( ref NetAddress address ) { - return _ConnectByIPAddress( Self, ref address ); + var returnValue = _ConnectByIPAddress( Self, ref address ); + return returnValue; } #region FunctionMeta @@ -108,7 +110,8 @@ internal Connection ConnectByIPAddress( ref NetAddress address ) #endregion internal Socket CreateListenSocketP2P( int nVirtualPort ) { - return _CreateListenSocketP2P( Self, nVirtualPort ); + var returnValue = _CreateListenSocketP2P( Self, nVirtualPort ); + return returnValue; } #region FunctionMeta @@ -119,7 +122,8 @@ internal Socket CreateListenSocketP2P( int nVirtualPort ) #endregion internal Connection ConnectP2P( ref NetIdentity identityRemote, int nVirtualPort ) { - return _ConnectP2P( Self, ref identityRemote, nVirtualPort ); + var returnValue = _ConnectP2P( Self, ref identityRemote, nVirtualPort ); + return returnValue; } #region FunctionMeta @@ -130,7 +134,8 @@ internal Connection ConnectP2P( ref NetIdentity identityRemote, int nVirtualPort #endregion internal Result AcceptConnection( Connection hConn ) { - return _AcceptConnection( Self, hConn ); + var returnValue = _AcceptConnection( Self, hConn ); + return returnValue; } #region FunctionMeta @@ -142,7 +147,8 @@ internal Result AcceptConnection( Connection hConn ) #endregion internal bool CloseConnection( Connection hPeer, int nReason, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszDebug, [MarshalAs( UnmanagedType.U1 )] bool bEnableLinger ) { - return _CloseConnection( Self, hPeer, nReason, pszDebug, bEnableLinger ); + var returnValue = _CloseConnection( Self, hPeer, nReason, pszDebug, bEnableLinger ); + return returnValue; } #region FunctionMeta @@ -154,7 +160,8 @@ internal bool CloseConnection( Connection hPeer, int nReason, [MarshalAs( Unmana #endregion internal bool CloseListenSocket( Socket hSocket ) { - return _CloseListenSocket( Self, hSocket ); + var returnValue = _CloseListenSocket( Self, hSocket ); + return returnValue; } #region FunctionMeta @@ -166,7 +173,8 @@ internal bool CloseListenSocket( Socket hSocket ) #endregion internal bool SetConnectionUserData( Connection hPeer, long nUserData ) { - return _SetConnectionUserData( Self, hPeer, nUserData ); + var returnValue = _SetConnectionUserData( Self, hPeer, nUserData ); + return returnValue; } #region FunctionMeta @@ -177,7 +185,8 @@ internal bool SetConnectionUserData( Connection hPeer, long nUserData ) #endregion internal long GetConnectionUserData( Connection hPeer ) { - return _GetConnectionUserData( Self, hPeer ); + var returnValue = _GetConnectionUserData( Self, hPeer ); + return returnValue; } #region FunctionMeta @@ -194,13 +203,16 @@ internal void SetConnectionName( Connection hPeer, [MarshalAs( UnmanagedType.Cus #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetConnectionName( IntPtr self, Connection hPeer, StringBuilder pszName, int nMaxLen ); + private delegate bool FGetConnectionName( IntPtr self, Connection hPeer, IntPtr pszName, int nMaxLen ); private FGetConnectionName _GetConnectionName; #endregion - internal bool GetConnectionName( Connection hPeer, StringBuilder pszName, int nMaxLen ) + internal bool GetConnectionName( Connection hPeer, out string pszName ) { - return _GetConnectionName( Self, hPeer, pszName, nMaxLen ); + IntPtr mempszName = Helpers.TakeMemory(); + var returnValue = _GetConnectionName( Self, hPeer, mempszName, (1024 * 32) ); + pszName = Helpers.MemoryToString( mempszName ); + return returnValue; } #region FunctionMeta @@ -211,7 +223,8 @@ internal bool GetConnectionName( Connection hPeer, StringBuilder pszName, int nM #endregion internal Result SendMessageToConnection( Connection hConn, IntPtr pData, uint cbData, int nSendFlags ) { - return _SendMessageToConnection( Self, hConn, pData, cbData, nSendFlags ); + var returnValue = _SendMessageToConnection( Self, hConn, pData, cbData, nSendFlags ); + return returnValue; } #region FunctionMeta @@ -222,7 +235,8 @@ internal Result SendMessageToConnection( Connection hConn, IntPtr pData, uint cb #endregion internal Result FlushMessagesOnConnection( Connection hConn ) { - return _FlushMessagesOnConnection( Self, hConn ); + var returnValue = _FlushMessagesOnConnection( Self, hConn ); + return returnValue; } #region FunctionMeta @@ -233,7 +247,8 @@ internal Result FlushMessagesOnConnection( Connection hConn ) #endregion internal int ReceiveMessagesOnConnection( Connection hConn, IntPtr ppOutMessages, int nMaxMessages ) { - return _ReceiveMessagesOnConnection( Self, hConn, ppOutMessages, nMaxMessages ); + var returnValue = _ReceiveMessagesOnConnection( Self, hConn, ppOutMessages, nMaxMessages ); + return returnValue; } #region FunctionMeta @@ -244,7 +259,8 @@ internal int ReceiveMessagesOnConnection( Connection hConn, IntPtr ppOutMessages #endregion internal int ReceiveMessagesOnListenSocket( Socket hSocket, IntPtr ppOutMessages, int nMaxMessages ) { - return _ReceiveMessagesOnListenSocket( Self, hSocket, ppOutMessages, nMaxMessages ); + var returnValue = _ReceiveMessagesOnListenSocket( Self, hSocket, ppOutMessages, nMaxMessages ); + return returnValue; } #region FunctionMeta @@ -256,7 +272,8 @@ internal int ReceiveMessagesOnListenSocket( Socket hSocket, IntPtr ppOutMessages #endregion internal bool GetConnectionInfo( Connection hConn, ref ConnectionInfo pInfo ) { - return _GetConnectionInfo( Self, hConn, ref pInfo ); + var returnValue = _GetConnectionInfo( Self, hConn, ref pInfo ); + return returnValue; } #region FunctionMeta @@ -268,18 +285,22 @@ internal bool GetConnectionInfo( Connection hConn, ref ConnectionInfo pInfo ) #endregion internal bool GetQuickConnectionStatus( Connection hConn, ref SteamNetworkingQuickConnectionStatus pStats ) { - return _GetQuickConnectionStatus( Self, hConn, ref pStats ); + var returnValue = _GetQuickConnectionStatus( Self, hConn, ref pStats ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate int FGetDetailedConnectionStatus( IntPtr self, Connection hConn, StringBuilder pszBuf, int cbBuf ); + private delegate int FGetDetailedConnectionStatus( IntPtr self, Connection hConn, IntPtr pszBuf, int cbBuf ); private FGetDetailedConnectionStatus _GetDetailedConnectionStatus; #endregion - internal int GetDetailedConnectionStatus( Connection hConn, StringBuilder pszBuf, int cbBuf ) + internal int GetDetailedConnectionStatus( Connection hConn, out string pszBuf ) { - return _GetDetailedConnectionStatus( Self, hConn, pszBuf, cbBuf ); + IntPtr mempszBuf = Helpers.TakeMemory(); + var returnValue = _GetDetailedConnectionStatus( Self, hConn, mempszBuf, (1024 * 32) ); + pszBuf = Helpers.MemoryToString( mempszBuf ); + return returnValue; } #region FunctionMeta @@ -291,7 +312,8 @@ internal int GetDetailedConnectionStatus( Connection hConn, StringBuilder pszBuf #endregion internal bool GetListenSocketAddress( Socket hSocket, ref NetAddress address ) { - return _GetListenSocketAddress( Self, hSocket, ref address ); + var returnValue = _GetListenSocketAddress( Self, hSocket, ref address ); + return returnValue; } #region FunctionMeta @@ -303,7 +325,8 @@ internal bool GetListenSocketAddress( Socket hSocket, ref NetAddress address ) #endregion internal bool CreateSocketPair( [In,Out] Connection[] pOutConnection1, [In,Out] Connection[] pOutConnection2, [MarshalAs( UnmanagedType.U1 )] bool bUseNetworkLoopback, ref NetIdentity pIdentity1, ref NetIdentity pIdentity2 ) { - return _CreateSocketPair( Self, pOutConnection1, pOutConnection2, bUseNetworkLoopback, ref pIdentity1, ref pIdentity2 ); + var returnValue = _CreateSocketPair( Self, pOutConnection1, pOutConnection2, bUseNetworkLoopback, ref pIdentity1, ref pIdentity2 ); + return returnValue; } #region FunctionMeta @@ -315,7 +338,8 @@ internal bool CreateSocketPair( [In,Out] Connection[] pOutConnection1, [In,Out] #endregion internal bool GetIdentity( ref NetIdentity pIdentity ) { - return _GetIdentity( Self, ref pIdentity ); + var returnValue = _GetIdentity( Self, ref pIdentity ); + return returnValue; } #region FunctionMeta @@ -327,7 +351,8 @@ internal bool GetIdentity( ref NetIdentity pIdentity ) #endregion internal bool ReceivedRelayAuthTicket( IntPtr pvTicket, int cbTicket, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ) { - return _ReceivedRelayAuthTicket( Self, pvTicket, cbTicket, pOutParsedTicket ); + var returnValue = _ReceivedRelayAuthTicket( Self, pvTicket, cbTicket, pOutParsedTicket ); + return returnValue; } #region FunctionMeta @@ -338,7 +363,8 @@ internal bool ReceivedRelayAuthTicket( IntPtr pvTicket, int cbTicket, [In,Out] S #endregion internal int FindRelayAuthTicketForServer( ref NetIdentity identityGameServer, int nVirtualPort, [In,Out] SteamDatagramRelayAuthTicket[] pOutParsedTicket ) { - return _FindRelayAuthTicketForServer( Self, ref identityGameServer, nVirtualPort, pOutParsedTicket ); + var returnValue = _FindRelayAuthTicketForServer( Self, ref identityGameServer, nVirtualPort, pOutParsedTicket ); + return returnValue; } #region FunctionMeta @@ -349,7 +375,8 @@ internal int FindRelayAuthTicketForServer( ref NetIdentity identityGameServer, i #endregion internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarget, int nVirtualPort ) { - return _ConnectToHostedDedicatedServer( Self, ref identityTarget, nVirtualPort ); + var returnValue = _ConnectToHostedDedicatedServer( Self, ref identityTarget, nVirtualPort ); + return returnValue; } #region FunctionMeta @@ -360,7 +387,8 @@ internal Connection ConnectToHostedDedicatedServer( ref NetIdentity identityTarg #endregion internal ushort GetHostedDedicatedServerPort() { - return _GetHostedDedicatedServerPort( Self ); + var returnValue = _GetHostedDedicatedServerPort( Self ); + return returnValue; } #region FunctionMeta @@ -371,7 +399,8 @@ internal ushort GetHostedDedicatedServerPort() #endregion internal SteamNetworkingPOPID GetHostedDedicatedServerPOPID() { - return _GetHostedDedicatedServerPOPID( Self ); + var returnValue = _GetHostedDedicatedServerPOPID( Self ); + return returnValue; } #region FunctionMeta @@ -383,7 +412,8 @@ internal SteamNetworkingPOPID GetHostedDedicatedServerPOPID() #endregion internal bool GetHostedDedicatedServerAddress( ref SteamDatagramHostedAddress pRouting ) { - return _GetHostedDedicatedServerAddress( Self, ref pRouting ); + var returnValue = _GetHostedDedicatedServerAddress( Self, ref pRouting ); + return returnValue; } #region FunctionMeta @@ -394,7 +424,8 @@ internal bool GetHostedDedicatedServerAddress( ref SteamDatagramHostedAddress pR #endregion internal Socket CreateHostedDedicatedServerListenSocket( int nVirtualPort ) { - return _CreateHostedDedicatedServerListenSocket( Self, nVirtualPort ); + var returnValue = _CreateHostedDedicatedServerListenSocket( Self, nVirtualPort ); + return returnValue; } #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs index 5f6b9ca..8da7049 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs @@ -62,7 +62,8 @@ internal override void Shutdown() #endregion internal float GetLocalPingLocation( ref PingLocation result ) { - return _GetLocalPingLocation( Self, ref result ); + var returnValue = _GetLocalPingLocation( Self, ref result ); + return returnValue; } #region FunctionMeta @@ -73,7 +74,8 @@ internal float GetLocalPingLocation( ref PingLocation result ) #endregion internal int EstimatePingTimeBetweenTwoLocations( ref PingLocation location1, ref PingLocation location2 ) { - return _EstimatePingTimeBetweenTwoLocations( Self, ref location1, ref location2 ); + var returnValue = _EstimatePingTimeBetweenTwoLocations( Self, ref location1, ref location2 ); + return returnValue; } #region FunctionMeta @@ -84,18 +86,21 @@ internal int EstimatePingTimeBetweenTwoLocations( ref PingLocation location1, re #endregion internal int EstimatePingTimeFromLocalHost( ref PingLocation remoteLocation ) { - return _EstimatePingTimeFromLocalHost( Self, ref remoteLocation ); + var returnValue = _EstimatePingTimeFromLocalHost( Self, ref remoteLocation ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate void FConvertPingLocationToString( IntPtr self, ref PingLocation location, StringBuilder pszBuf, int cchBufSize ); + private delegate void FConvertPingLocationToString( IntPtr self, ref PingLocation location, IntPtr pszBuf, int cchBufSize ); private FConvertPingLocationToString _ConvertPingLocationToString; #endregion - internal void ConvertPingLocationToString( ref PingLocation location, StringBuilder pszBuf, int cchBufSize ) + internal void ConvertPingLocationToString( ref PingLocation location, out string pszBuf ) { - _ConvertPingLocationToString( Self, ref location, pszBuf, cchBufSize ); + IntPtr mempszBuf = Helpers.TakeMemory(); + _ConvertPingLocationToString( Self, ref location, mempszBuf, (1024 * 32) ); + pszBuf = Helpers.MemoryToString( mempszBuf ); } #region FunctionMeta @@ -107,7 +112,8 @@ internal void ConvertPingLocationToString( ref PingLocation location, StringBuil #endregion internal bool ParsePingLocationString( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszString, ref PingLocation result ) { - return _ParsePingLocationString( Self, pszString, ref result ); + var returnValue = _ParsePingLocationString( Self, pszString, ref result ); + return returnValue; } #region FunctionMeta @@ -119,7 +125,8 @@ internal bool ParsePingLocationString( [MarshalAs( UnmanagedType.CustomMarshaler #endregion internal bool CheckPingDataUpToDate( float flMaxAgeSeconds ) { - return _CheckPingDataUpToDate( Self, flMaxAgeSeconds ); + var returnValue = _CheckPingDataUpToDate( Self, flMaxAgeSeconds ); + return returnValue; } #region FunctionMeta @@ -131,7 +138,8 @@ internal bool CheckPingDataUpToDate( float flMaxAgeSeconds ) #endregion internal bool IsPingMeasurementInProgress() { - return _IsPingMeasurementInProgress( Self ); + var returnValue = _IsPingMeasurementInProgress( Self ); + return returnValue; } #region FunctionMeta @@ -142,7 +150,8 @@ internal bool IsPingMeasurementInProgress() #endregion internal int GetPingToDataCenter( SteamNetworkingPOPID popID, ref SteamNetworkingPOPID pViaRelayPoP ) { - return _GetPingToDataCenter( Self, popID, ref pViaRelayPoP ); + var returnValue = _GetPingToDataCenter( Self, popID, ref pViaRelayPoP ); + return returnValue; } #region FunctionMeta @@ -153,7 +162,8 @@ internal int GetPingToDataCenter( SteamNetworkingPOPID popID, ref SteamNetworkin #endregion internal int GetDirectPingToPOP( SteamNetworkingPOPID popID ) { - return _GetDirectPingToPOP( Self, popID ); + var returnValue = _GetDirectPingToPOP( Self, popID ); + return returnValue; } #region FunctionMeta @@ -164,7 +174,8 @@ internal int GetDirectPingToPOP( SteamNetworkingPOPID popID ) #endregion internal int GetPOPCount() { - return _GetPOPCount( Self ); + var returnValue = _GetPOPCount( Self ); + return returnValue; } #region FunctionMeta @@ -175,7 +186,8 @@ internal int GetPOPCount() #endregion internal int GetPOPList( ref SteamNetworkingPOPID list, int nListSz ) { - return _GetPOPList( Self, ref list, nListSz ); + var returnValue = _GetPOPList( Self, ref list, nListSz ); + return returnValue; } #region FunctionMeta @@ -186,7 +198,8 @@ internal int GetPOPList( ref SteamNetworkingPOPID list, int nListSz ) #endregion internal long GetLocalTimestamp() { - return _GetLocalTimestamp( Self ); + var returnValue = _GetLocalTimestamp( Self ); + return returnValue; } #region FunctionMeta @@ -209,7 +222,8 @@ internal void SetDebugOutputFunction( DebugOutputType eDetailLevel, FSteamNetwor #endregion internal bool SetConfigValue( NetConfig eValue, NetScope eScopeType, long scopeObj, NetConfigType eDataType, IntPtr pArg ) { - return _SetConfigValue( Self, eValue, eScopeType, scopeObj, eDataType, pArg ); + var returnValue = _SetConfigValue( Self, eValue, eScopeType, scopeObj, eDataType, pArg ); + return returnValue; } #region FunctionMeta @@ -220,7 +234,8 @@ internal bool SetConfigValue( NetConfig eValue, NetScope eScopeType, long scopeO #endregion internal NetConfigResult GetConfigValue( NetConfig eValue, NetScope eScopeType, long scopeObj, ref NetConfigType pOutDataType, IntPtr pResult, ref ulong cbResult ) { - return _GetConfigValue( Self, eValue, eScopeType, scopeObj, ref pOutDataType, pResult, ref cbResult ); + var returnValue = _GetConfigValue( Self, eValue, eScopeType, scopeObj, ref pOutDataType, pResult, ref cbResult ); + return returnValue; } #region FunctionMeta @@ -232,7 +247,8 @@ internal NetConfigResult GetConfigValue( NetConfig eValue, NetScope eScopeType, #endregion internal bool GetConfigValueInfo( NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref NetConfigType pOutDataType, [In,Out] NetScope[] pOutScope, [In,Out] NetConfig[] pOutNextValue ) { - return _GetConfigValueInfo( Self, eValue, pOutName, ref pOutDataType, pOutScope, pOutNextValue ); + var returnValue = _GetConfigValueInfo( Self, eValue, pOutName, ref pOutDataType, pOutScope, pOutNextValue ); + return returnValue; } #region FunctionMeta @@ -243,7 +259,8 @@ internal bool GetConfigValueInfo( NetConfig eValue, [MarshalAs( UnmanagedType.Cu #endregion internal NetConfig GetFirstConfigValue() { - return _GetFirstConfigValue( Self ); + var returnValue = _GetFirstConfigValue( Self ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs index 785b2e3..84e3f15 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs @@ -41,7 +41,8 @@ internal override void Shutdown() #endregion internal bool BIsParentalLockEnabled() { - return _BIsParentalLockEnabled( Self ); + var returnValue = _BIsParentalLockEnabled( Self ); + return returnValue; } #region FunctionMeta @@ -53,7 +54,8 @@ internal bool BIsParentalLockEnabled() #endregion internal bool BIsParentalLockLocked() { - return _BIsParentalLockLocked( Self ); + var returnValue = _BIsParentalLockLocked( Self ); + return returnValue; } #region FunctionMeta @@ -65,7 +67,8 @@ internal bool BIsParentalLockLocked() #endregion internal bool BIsAppBlocked( AppId nAppID ) { - return _BIsAppBlocked( Self, nAppID ); + var returnValue = _BIsAppBlocked( Self, nAppID ); + return returnValue; } #region FunctionMeta @@ -77,7 +80,8 @@ internal bool BIsAppBlocked( AppId nAppID ) #endregion internal bool BIsAppInBlockList( AppId nAppID ) { - return _BIsAppInBlockList( Self, nAppID ); + var returnValue = _BIsAppInBlockList( Self, nAppID ); + return returnValue; } #region FunctionMeta @@ -89,7 +93,8 @@ internal bool BIsAppInBlockList( AppId nAppID ) #endregion internal bool BIsFeatureBlocked( ParentalFeature eFeature ) { - return _BIsFeatureBlocked( Self, eFeature ); + var returnValue = _BIsFeatureBlocked( Self, eFeature ); + return returnValue; } #region FunctionMeta @@ -101,7 +106,8 @@ internal bool BIsFeatureBlocked( ParentalFeature eFeature ) #endregion internal bool BIsFeatureInBlockList( ParentalFeature eFeature ) { - return _BIsFeatureInBlockList( Self, eFeature ); + var returnValue = _BIsFeatureInBlockList( Self, eFeature ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamParties.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamParties.cs index 11ab35e..58a5029 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamParties.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamParties.cs @@ -52,7 +52,8 @@ internal override void Shutdown() #endregion internal uint GetNumActiveBeacons() { - return _GetNumActiveBeacons( Self ); + var returnValue = _GetNumActiveBeacons( Self ); + return returnValue; } #region FunctionMeta @@ -63,19 +64,23 @@ internal uint GetNumActiveBeacons() #endregion internal PartyBeaconID_t GetBeaconByIndex( uint unIndex ) { - return _GetBeaconByIndex( Self, unIndex ); + var returnValue = _GetBeaconByIndex( Self, unIndex ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetBeaconDetails( IntPtr self, PartyBeaconID_t ulBeaconID, ref SteamId pSteamIDBeaconOwner, ref SteamPartyBeaconLocation_t pLocation, StringBuilder pchMetadata, int cchMetadata ); + private delegate bool FGetBeaconDetails( IntPtr self, PartyBeaconID_t ulBeaconID, ref SteamId pSteamIDBeaconOwner, ref SteamPartyBeaconLocation_t pLocation, IntPtr pchMetadata, int cchMetadata ); private FGetBeaconDetails _GetBeaconDetails; #endregion - internal bool GetBeaconDetails( PartyBeaconID_t ulBeaconID, ref SteamId pSteamIDBeaconOwner, ref SteamPartyBeaconLocation_t pLocation, StringBuilder pchMetadata, int cchMetadata ) + internal bool GetBeaconDetails( PartyBeaconID_t ulBeaconID, ref SteamId pSteamIDBeaconOwner, ref SteamPartyBeaconLocation_t pLocation, out string pchMetadata ) { - return _GetBeaconDetails( Self, ulBeaconID, ref pSteamIDBeaconOwner, ref pLocation, pchMetadata, cchMetadata ); + IntPtr mempchMetadata = Helpers.TakeMemory(); + var returnValue = _GetBeaconDetails( Self, ulBeaconID, ref pSteamIDBeaconOwner, ref pLocation, mempchMetadata, (1024 * 32) ); + pchMetadata = Helpers.MemoryToString( mempchMetadata ); + return returnValue; } #region FunctionMeta @@ -86,7 +91,8 @@ internal bool GetBeaconDetails( PartyBeaconID_t ulBeaconID, ref SteamId pSteamID #endregion internal async Task JoinParty( PartyBeaconID_t ulBeaconID ) { - return await JoinPartyCallback_t.GetResultAsync( _JoinParty( Self, ulBeaconID ) ); + var returnValue = _JoinParty( Self, ulBeaconID ); + return await JoinPartyCallback_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -98,7 +104,8 @@ internal bool GetBeaconDetails( PartyBeaconID_t ulBeaconID, ref SteamId pSteamID #endregion internal bool GetNumAvailableBeaconLocations( ref uint puNumLocations ) { - return _GetNumAvailableBeaconLocations( Self, ref puNumLocations ); + var returnValue = _GetNumAvailableBeaconLocations( Self, ref puNumLocations ); + return returnValue; } #region FunctionMeta @@ -110,7 +117,8 @@ internal bool GetNumAvailableBeaconLocations( ref uint puNumLocations ) #endregion internal bool GetAvailableBeaconLocations( ref SteamPartyBeaconLocation_t pLocationList, uint uMaxNumLocations ) { - return _GetAvailableBeaconLocations( Self, ref pLocationList, uMaxNumLocations ); + var returnValue = _GetAvailableBeaconLocations( Self, ref pLocationList, uMaxNumLocations ); + return returnValue; } #region FunctionMeta @@ -121,7 +129,8 @@ internal bool GetAvailableBeaconLocations( ref SteamPartyBeaconLocation_t pLocat #endregion internal async Task CreateBeacon( uint unOpenSlots, /* ref */ SteamPartyBeaconLocation_t pBeaconLocation, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectString, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchMetadata ) { - return await CreateBeaconCallback_t.GetResultAsync( _CreateBeacon( Self, unOpenSlots, ref pBeaconLocation, pchConnectString, pchMetadata ) ); + var returnValue = _CreateBeacon( Self, unOpenSlots, ref pBeaconLocation, pchConnectString, pchMetadata ); + return await CreateBeaconCallback_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -154,7 +163,8 @@ internal void CancelReservation( PartyBeaconID_t ulBeacon, SteamId steamIDUser ) #endregion internal async Task ChangeNumOpenSlots( PartyBeaconID_t ulBeacon, uint unOpenSlots ) { - return await ChangeNumOpenSlotsCallback_t.GetResultAsync( _ChangeNumOpenSlots( Self, ulBeacon, unOpenSlots ) ); + var returnValue = _ChangeNumOpenSlots( Self, ulBeacon, unOpenSlots ); + return await ChangeNumOpenSlotsCallback_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -166,19 +176,23 @@ internal void CancelReservation( PartyBeaconID_t ulBeacon, SteamId steamIDUser ) #endregion internal bool DestroyBeacon( PartyBeaconID_t ulBeacon ) { - return _DestroyBeacon( Self, ulBeacon ); + var returnValue = _DestroyBeacon( Self, ulBeacon ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetBeaconLocationData( IntPtr self, SteamPartyBeaconLocation_t BeaconLocation, SteamPartyBeaconLocationData eData, StringBuilder pchDataStringOut, int cchDataStringOut ); + private delegate bool FGetBeaconLocationData( IntPtr self, SteamPartyBeaconLocation_t BeaconLocation, SteamPartyBeaconLocationData eData, IntPtr pchDataStringOut, int cchDataStringOut ); private FGetBeaconLocationData _GetBeaconLocationData; #endregion - internal bool GetBeaconLocationData( SteamPartyBeaconLocation_t BeaconLocation, SteamPartyBeaconLocationData eData, StringBuilder pchDataStringOut, int cchDataStringOut ) + internal bool GetBeaconLocationData( SteamPartyBeaconLocation_t BeaconLocation, SteamPartyBeaconLocationData eData, out string pchDataStringOut ) { - return _GetBeaconLocationData( Self, BeaconLocation, eData, pchDataStringOut, cchDataStringOut ); + IntPtr mempchDataStringOut = Helpers.TakeMemory(); + var returnValue = _GetBeaconLocationData( Self, BeaconLocation, eData, mempchDataStringOut, (1024 * 32) ); + pchDataStringOut = Helpers.MemoryToString( mempchDataStringOut ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs index 46cad5c..48e9030 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs @@ -113,7 +113,8 @@ internal override void Shutdown() #endregion internal bool FileWrite( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile, IntPtr pvData, int cubData ) { - return _FileWrite( Self, pchFile, pvData, cubData ); + var returnValue = _FileWrite( Self, pchFile, pvData, cubData ); + return returnValue; } #region FunctionMeta @@ -124,7 +125,8 @@ internal bool FileWrite( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeR #endregion internal int FileRead( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile, IntPtr pvData, int cubDataToRead ) { - return _FileRead( Self, pchFile, pvData, cubDataToRead ); + var returnValue = _FileRead( Self, pchFile, pvData, cubDataToRead ); + return returnValue; } #region FunctionMeta @@ -135,7 +137,8 @@ internal int FileRead( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef #endregion internal async Task FileWriteAsync( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile, IntPtr pvData, uint cubData ) { - return await RemoteStorageFileWriteAsyncComplete_t.GetResultAsync( _FileWriteAsync( Self, pchFile, pvData, cubData ) ); + var returnValue = _FileWriteAsync( Self, pchFile, pvData, cubData ); + return await RemoteStorageFileWriteAsyncComplete_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -146,7 +149,8 @@ internal int FileRead( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef #endregion internal async Task FileReadAsync( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile, uint nOffset, uint cubToRead ) { - return await RemoteStorageFileReadAsyncComplete_t.GetResultAsync( _FileReadAsync( Self, pchFile, nOffset, cubToRead ) ); + var returnValue = _FileReadAsync( Self, pchFile, nOffset, cubToRead ); + return await RemoteStorageFileReadAsyncComplete_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -158,7 +162,8 @@ internal int FileRead( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef #endregion internal bool FileReadAsyncComplete( SteamAPICall_t hReadCall, IntPtr pvBuffer, uint cubToRead ) { - return _FileReadAsyncComplete( Self, hReadCall, pvBuffer, cubToRead ); + var returnValue = _FileReadAsyncComplete( Self, hReadCall, pvBuffer, cubToRead ); + return returnValue; } #region FunctionMeta @@ -170,7 +175,8 @@ internal bool FileReadAsyncComplete( SteamAPICall_t hReadCall, IntPtr pvBuffer, #endregion internal bool FileForget( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _FileForget( Self, pchFile ); + var returnValue = _FileForget( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -182,7 +188,8 @@ internal bool FileForget( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalType #endregion internal bool FileDelete( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _FileDelete( Self, pchFile ); + var returnValue = _FileDelete( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -193,7 +200,8 @@ internal bool FileDelete( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalType #endregion internal async Task FileShare( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return await RemoteStorageFileShareResult_t.GetResultAsync( _FileShare( Self, pchFile ) ); + var returnValue = _FileShare( Self, pchFile ); + return await RemoteStorageFileShareResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -205,7 +213,8 @@ internal bool FileDelete( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalType #endregion internal bool SetSyncPlatforms( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile, RemoteStoragePlatform eRemoteStoragePlatform ) { - return _SetSyncPlatforms( Self, pchFile, eRemoteStoragePlatform ); + var returnValue = _SetSyncPlatforms( Self, pchFile, eRemoteStoragePlatform ); + return returnValue; } #region FunctionMeta @@ -216,7 +225,8 @@ internal bool SetSyncPlatforms( [MarshalAs( UnmanagedType.CustomMarshaler, Marsh #endregion internal UGCFileWriteStreamHandle_t FileWriteStreamOpen( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _FileWriteStreamOpen( Self, pchFile ); + var returnValue = _FileWriteStreamOpen( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -228,7 +238,8 @@ internal UGCFileWriteStreamHandle_t FileWriteStreamOpen( [MarshalAs( UnmanagedTy #endregion internal bool FileWriteStreamWriteChunk( UGCFileWriteStreamHandle_t writeHandle, IntPtr pvData, int cubData ) { - return _FileWriteStreamWriteChunk( Self, writeHandle, pvData, cubData ); + var returnValue = _FileWriteStreamWriteChunk( Self, writeHandle, pvData, cubData ); + return returnValue; } #region FunctionMeta @@ -240,7 +251,8 @@ internal bool FileWriteStreamWriteChunk( UGCFileWriteStreamHandle_t writeHandle, #endregion internal bool FileWriteStreamClose( UGCFileWriteStreamHandle_t writeHandle ) { - return _FileWriteStreamClose( Self, writeHandle ); + var returnValue = _FileWriteStreamClose( Self, writeHandle ); + return returnValue; } #region FunctionMeta @@ -252,7 +264,8 @@ internal bool FileWriteStreamClose( UGCFileWriteStreamHandle_t writeHandle ) #endregion internal bool FileWriteStreamCancel( UGCFileWriteStreamHandle_t writeHandle ) { - return _FileWriteStreamCancel( Self, writeHandle ); + var returnValue = _FileWriteStreamCancel( Self, writeHandle ); + return returnValue; } #region FunctionMeta @@ -264,7 +277,8 @@ internal bool FileWriteStreamCancel( UGCFileWriteStreamHandle_t writeHandle ) #endregion internal bool FileExists( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _FileExists( Self, pchFile ); + var returnValue = _FileExists( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -276,7 +290,8 @@ internal bool FileExists( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalType #endregion internal bool FilePersisted( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _FilePersisted( Self, pchFile ); + var returnValue = _FilePersisted( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -287,7 +302,8 @@ internal bool FilePersisted( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalT #endregion internal int GetFileSize( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _GetFileSize( Self, pchFile ); + var returnValue = _GetFileSize( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -298,7 +314,8 @@ internal int GetFileSize( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalType #endregion internal long GetFileTimestamp( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _GetFileTimestamp( Self, pchFile ); + var returnValue = _GetFileTimestamp( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -309,7 +326,8 @@ internal long GetFileTimestamp( [MarshalAs( UnmanagedType.CustomMarshaler, Marsh #endregion internal RemoteStoragePlatform GetSyncPlatforms( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFile ) { - return _GetSyncPlatforms( Self, pchFile ); + var returnValue = _GetSyncPlatforms( Self, pchFile ); + return returnValue; } #region FunctionMeta @@ -320,7 +338,8 @@ internal RemoteStoragePlatform GetSyncPlatforms( [MarshalAs( UnmanagedType.Custo #endregion internal int GetFileCount() { - return _GetFileCount( Self ); + var returnValue = _GetFileCount( Self ); + return returnValue; } #region FunctionMeta @@ -331,7 +350,8 @@ internal int GetFileCount() #endregion internal string GetFileNameAndSize( int iFile, ref int pnFileSizeInBytes ) { - return _GetFileNameAndSize( Self, iFile, ref pnFileSizeInBytes ); + var returnValue = _GetFileNameAndSize( Self, iFile, ref pnFileSizeInBytes ); + return returnValue; } #region FunctionMeta @@ -343,7 +363,8 @@ internal string GetFileNameAndSize( int iFile, ref int pnFileSizeInBytes ) #endregion internal bool GetQuota( ref ulong pnTotalBytes, ref ulong puAvailableBytes ) { - return _GetQuota( Self, ref pnTotalBytes, ref puAvailableBytes ); + var returnValue = _GetQuota( Self, ref pnTotalBytes, ref puAvailableBytes ); + return returnValue; } #region FunctionMeta @@ -355,7 +376,8 @@ internal bool GetQuota( ref ulong pnTotalBytes, ref ulong puAvailableBytes ) #endregion internal bool IsCloudEnabledForAccount() { - return _IsCloudEnabledForAccount( Self ); + var returnValue = _IsCloudEnabledForAccount( Self ); + return returnValue; } #region FunctionMeta @@ -367,7 +389,8 @@ internal bool IsCloudEnabledForAccount() #endregion internal bool IsCloudEnabledForApp() { - return _IsCloudEnabledForApp( Self ); + var returnValue = _IsCloudEnabledForApp( Self ); + return returnValue; } #region FunctionMeta @@ -389,7 +412,8 @@ internal void SetCloudEnabledForApp( [MarshalAs( UnmanagedType.U1 )] bool bEnabl #endregion internal async Task UGCDownload( UGCHandle_t hContent, uint unPriority ) { - return await RemoteStorageDownloadUGCResult_t.GetResultAsync( _UGCDownload( Self, hContent, unPriority ) ); + var returnValue = _UGCDownload( Self, hContent, unPriority ); + return await RemoteStorageDownloadUGCResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -401,7 +425,8 @@ internal void SetCloudEnabledForApp( [MarshalAs( UnmanagedType.U1 )] bool bEnabl #endregion internal bool GetUGCDownloadProgress( UGCHandle_t hContent, ref int pnBytesDownloaded, ref int pnBytesExpected ) { - return _GetUGCDownloadProgress( Self, hContent, ref pnBytesDownloaded, ref pnBytesExpected ); + var returnValue = _GetUGCDownloadProgress( Self, hContent, ref pnBytesDownloaded, ref pnBytesExpected ); + return returnValue; } #region FunctionMeta @@ -413,7 +438,8 @@ internal bool GetUGCDownloadProgress( UGCHandle_t hContent, ref int pnBytesDownl #endregion internal bool GetUGCDetails( UGCHandle_t hContent, ref AppId pnAppID, [In,Out] ref char[] ppchName, ref int pnFileSizeInBytes, ref SteamId pSteamIDOwner ) { - return _GetUGCDetails( Self, hContent, ref pnAppID, ref ppchName, ref pnFileSizeInBytes, ref pSteamIDOwner ); + var returnValue = _GetUGCDetails( Self, hContent, ref pnAppID, ref ppchName, ref pnFileSizeInBytes, ref pSteamIDOwner ); + return returnValue; } #region FunctionMeta @@ -424,7 +450,8 @@ internal bool GetUGCDetails( UGCHandle_t hContent, ref AppId pnAppID, [In,Out] r #endregion internal int UGCRead( UGCHandle_t hContent, IntPtr pvData, int cubDataToRead, uint cOffset, UGCReadAction eAction ) { - return _UGCRead( Self, hContent, pvData, cubDataToRead, cOffset, eAction ); + var returnValue = _UGCRead( Self, hContent, pvData, cubDataToRead, cOffset, eAction ); + return returnValue; } #region FunctionMeta @@ -435,7 +462,8 @@ internal int UGCRead( UGCHandle_t hContent, IntPtr pvData, int cubDataToRead, ui #endregion internal int GetCachedUGCCount() { - return _GetCachedUGCCount( Self ); + var returnValue = _GetCachedUGCCount( Self ); + return returnValue; } #region FunctionMeta @@ -446,7 +474,8 @@ internal int GetCachedUGCCount() #endregion internal async Task UGCDownloadToLocation( UGCHandle_t hContent, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLocation, uint unPriority ) { - return await RemoteStorageDownloadUGCResult_t.GetResultAsync( _UGCDownloadToLocation( Self, hContent, pchLocation, unPriority ) ); + var returnValue = _UGCDownloadToLocation( Self, hContent, pchLocation, unPriority ); + return await RemoteStorageDownloadUGCResult_t.GetResultAsync( returnValue ); } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamScreenshots.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamScreenshots.cs index af05051..84e570c 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamScreenshots.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamScreenshots.cs @@ -46,7 +46,8 @@ internal override void Shutdown() #endregion internal ScreenshotHandle WriteScreenshot( IntPtr pubRGB, uint cubRGB, int nWidth, int nHeight ) { - return _WriteScreenshot( Self, pubRGB, cubRGB, nWidth, nHeight ); + var returnValue = _WriteScreenshot( Self, pubRGB, cubRGB, nWidth, nHeight ); + return returnValue; } #region FunctionMeta @@ -57,7 +58,8 @@ internal ScreenshotHandle WriteScreenshot( IntPtr pubRGB, uint cubRGB, int nWidt #endregion internal ScreenshotHandle AddScreenshotToLibrary( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFilename, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchThumbnailFilename, int nWidth, int nHeight ) { - return _AddScreenshotToLibrary( Self, pchFilename, pchThumbnailFilename, nWidth, nHeight ); + var returnValue = _AddScreenshotToLibrary( Self, pchFilename, pchThumbnailFilename, nWidth, nHeight ); + return returnValue; } #region FunctionMeta @@ -91,7 +93,8 @@ internal void HookScreenshots( [MarshalAs( UnmanagedType.U1 )] bool bHook ) #endregion internal bool SetLocation( ScreenshotHandle hScreenshot, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLocation ) { - return _SetLocation( Self, hScreenshot, pchLocation ); + var returnValue = _SetLocation( Self, hScreenshot, pchLocation ); + return returnValue; } #region FunctionMeta @@ -103,7 +106,8 @@ internal bool SetLocation( ScreenshotHandle hScreenshot, [MarshalAs( UnmanagedTy #endregion internal bool TagUser( ScreenshotHandle hScreenshot, SteamId steamID ) { - return _TagUser( Self, hScreenshot, steamID ); + var returnValue = _TagUser( Self, hScreenshot, steamID ); + return returnValue; } #region FunctionMeta @@ -115,7 +119,8 @@ internal bool TagUser( ScreenshotHandle hScreenshot, SteamId steamID ) #endregion internal bool TagPublishedFile( ScreenshotHandle hScreenshot, PublishedFileId unPublishedFileID ) { - return _TagPublishedFile( Self, hScreenshot, unPublishedFileID ); + var returnValue = _TagPublishedFile( Self, hScreenshot, unPublishedFileID ); + return returnValue; } #region FunctionMeta @@ -127,7 +132,8 @@ internal bool TagPublishedFile( ScreenshotHandle hScreenshot, PublishedFileId un #endregion internal bool IsScreenshotsHooked() { - return _IsScreenshotsHooked( Self ); + var returnValue = _IsScreenshotsHooked( Self ); + return returnValue; } #region FunctionMeta @@ -138,7 +144,8 @@ internal bool IsScreenshotsHooked() #endregion internal ScreenshotHandle AddVRScreenshotToLibrary( VRScreenshotType eType, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchFilename, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchVRFilename ) { - return _AddVRScreenshotToLibrary( Self, eType, pchFilename, pchVRFilename ); + var returnValue = _AddVRScreenshotToLibrary( Self, eType, pchFilename, pchVRFilename ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs index 31cd643..941eb34 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs @@ -186,7 +186,8 @@ internal override void Shutdown() #endregion internal UGCQueryHandle_t CreateQueryUserUGCRequest( AccountID_t unAccountID, UserUGCList eListType, UgcType eMatchingUGCType, UserUGCListSortOrder eSortOrder, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ) { - return _CreateQueryUserUGCRequest( Self, unAccountID, eListType, eMatchingUGCType, eSortOrder, nCreatorAppID, nConsumerAppID, unPage ); + var returnValue = _CreateQueryUserUGCRequest( Self, unAccountID, eListType, eMatchingUGCType, eSortOrder, nCreatorAppID, nConsumerAppID, unPage ); + return returnValue; } #region FunctionMeta @@ -197,7 +198,8 @@ internal UGCQueryHandle_t CreateQueryUserUGCRequest( AccountID_t unAccountID, Us #endregion internal UGCQueryHandle_t CreateQueryAllUGCRequest1( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ) { - return _CreateQueryAllUGCRequest1( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, unPage ); + var returnValue = _CreateQueryAllUGCRequest1( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, unPage ); + return returnValue; } #region FunctionMeta @@ -208,7 +210,8 @@ internal UGCQueryHandle_t CreateQueryAllUGCRequest1( UGCQuery eQueryType, UgcTyp #endregion internal UGCQueryHandle_t CreateQueryAllUGCRequest2( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchCursor ) { - return _CreateQueryAllUGCRequest2( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, pchCursor ); + var returnValue = _CreateQueryAllUGCRequest2( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, pchCursor ); + return returnValue; } #region FunctionMeta @@ -219,7 +222,8 @@ internal UGCQueryHandle_t CreateQueryAllUGCRequest2( UGCQuery eQueryType, UgcTyp #endregion internal UGCQueryHandle_t CreateQueryUGCDetailsRequest( [In,Out] PublishedFileId[] pvecPublishedFileID, uint unNumPublishedFileIDs ) { - return _CreateQueryUGCDetailsRequest( Self, pvecPublishedFileID, unNumPublishedFileIDs ); + var returnValue = _CreateQueryUGCDetailsRequest( Self, pvecPublishedFileID, unNumPublishedFileIDs ); + return returnValue; } #region FunctionMeta @@ -230,7 +234,8 @@ internal UGCQueryHandle_t CreateQueryUGCDetailsRequest( [In,Out] PublishedFileId #endregion internal async Task SendQueryUGCRequest( UGCQueryHandle_t handle ) { - return await SteamUGCQueryCompleted_t.GetResultAsync( _SendQueryUGCRequest( Self, handle ) ); + var returnValue = _SendQueryUGCRequest( Self, handle ); + return await SteamUGCQueryCompleted_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -242,31 +247,38 @@ internal UGCQueryHandle_t CreateQueryUGCDetailsRequest( [In,Out] PublishedFileId #endregion internal bool GetQueryUGCResult( UGCQueryHandle_t handle, uint index, ref SteamUGCDetails_t pDetails ) { - return _GetQueryUGCResult( Self, handle, index, ref pDetails ); + var returnValue = _GetQueryUGCResult( Self, handle, index, ref pDetails ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetQueryUGCPreviewURL( IntPtr self, UGCQueryHandle_t handle, uint index, StringBuilder pchURL, uint cchURLSize ); + private delegate bool FGetQueryUGCPreviewURL( IntPtr self, UGCQueryHandle_t handle, uint index, IntPtr pchURL, uint cchURLSize ); private FGetQueryUGCPreviewURL _GetQueryUGCPreviewURL; #endregion - internal bool GetQueryUGCPreviewURL( UGCQueryHandle_t handle, uint index, StringBuilder pchURL, uint cchURLSize ) + internal bool GetQueryUGCPreviewURL( UGCQueryHandle_t handle, uint index, out string pchURL ) { - return _GetQueryUGCPreviewURL( Self, handle, index, pchURL, cchURLSize ); + IntPtr mempchURL = Helpers.TakeMemory(); + var returnValue = _GetQueryUGCPreviewURL( Self, handle, index, mempchURL, (1024 * 32) ); + pchURL = Helpers.MemoryToString( mempchURL ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetQueryUGCMetadata( IntPtr self, UGCQueryHandle_t handle, uint index, StringBuilder pchMetadata, uint cchMetadatasize ); + private delegate bool FGetQueryUGCMetadata( IntPtr self, UGCQueryHandle_t handle, uint index, IntPtr pchMetadata, uint cchMetadatasize ); private FGetQueryUGCMetadata _GetQueryUGCMetadata; #endregion - internal bool GetQueryUGCMetadata( UGCQueryHandle_t handle, uint index, StringBuilder pchMetadata, uint cchMetadatasize ) + internal bool GetQueryUGCMetadata( UGCQueryHandle_t handle, uint index, out string pchMetadata ) { - return _GetQueryUGCMetadata( Self, handle, index, pchMetadata, cchMetadatasize ); + IntPtr mempchMetadata = Helpers.TakeMemory(); + var returnValue = _GetQueryUGCMetadata( Self, handle, index, mempchMetadata, (1024 * 32) ); + pchMetadata = Helpers.MemoryToString( mempchMetadata ); + return returnValue; } #region FunctionMeta @@ -278,7 +290,8 @@ internal bool GetQueryUGCMetadata( UGCQueryHandle_t handle, uint index, StringBu #endregion internal bool GetQueryUGCChildren( UGCQueryHandle_t handle, uint index, [In,Out] PublishedFileId[] pvecPublishedFileID, uint cMaxEntries ) { - return _GetQueryUGCChildren( Self, handle, index, pvecPublishedFileID, cMaxEntries ); + var returnValue = _GetQueryUGCChildren( Self, handle, index, pvecPublishedFileID, cMaxEntries ); + return returnValue; } #region FunctionMeta @@ -290,7 +303,8 @@ internal bool GetQueryUGCChildren( UGCQueryHandle_t handle, uint index, [In,Out] #endregion internal bool GetQueryUGCStatistic( UGCQueryHandle_t handle, uint index, ItemStatistic eStatType, ref ulong pStatValue ) { - return _GetQueryUGCStatistic( Self, handle, index, eStatType, ref pStatValue ); + var returnValue = _GetQueryUGCStatistic( Self, handle, index, eStatType, ref pStatValue ); + return returnValue; } #region FunctionMeta @@ -301,19 +315,25 @@ internal bool GetQueryUGCStatistic( UGCQueryHandle_t handle, uint index, ItemSta #endregion internal uint GetQueryUGCNumAdditionalPreviews( UGCQueryHandle_t handle, uint index ) { - return _GetQueryUGCNumAdditionalPreviews( Self, handle, index ); + var returnValue = _GetQueryUGCNumAdditionalPreviews( Self, handle, index ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetQueryUGCAdditionalPreview( IntPtr self, UGCQueryHandle_t handle, uint index, uint previewIndex, StringBuilder pchURLOrVideoID, uint cchURLSize, StringBuilder pchOriginalFileName, uint cchOriginalFileNameSize, ref ItemPreviewType pPreviewType ); + private delegate bool FGetQueryUGCAdditionalPreview( IntPtr self, UGCQueryHandle_t handle, uint index, uint previewIndex, IntPtr pchURLOrVideoID, uint cchURLSize, IntPtr pchOriginalFileName, uint cchOriginalFileNameSize, ref ItemPreviewType pPreviewType ); private FGetQueryUGCAdditionalPreview _GetQueryUGCAdditionalPreview; #endregion - internal bool GetQueryUGCAdditionalPreview( UGCQueryHandle_t handle, uint index, uint previewIndex, StringBuilder pchURLOrVideoID, uint cchURLSize, StringBuilder pchOriginalFileName, uint cchOriginalFileNameSize, ref ItemPreviewType pPreviewType ) + internal bool GetQueryUGCAdditionalPreview( UGCQueryHandle_t handle, uint index, uint previewIndex, out string pchURLOrVideoID, out string pchOriginalFileName, ref ItemPreviewType pPreviewType ) { - return _GetQueryUGCAdditionalPreview( Self, handle, index, previewIndex, pchURLOrVideoID, cchURLSize, pchOriginalFileName, cchOriginalFileNameSize, ref pPreviewType ); + IntPtr mempchURLOrVideoID = Helpers.TakeMemory(); + IntPtr mempchOriginalFileName = Helpers.TakeMemory(); + var returnValue = _GetQueryUGCAdditionalPreview( Self, handle, index, previewIndex, mempchURLOrVideoID, (1024 * 32), mempchOriginalFileName, (1024 * 32), ref pPreviewType ); + pchURLOrVideoID = Helpers.MemoryToString( mempchURLOrVideoID ); + pchOriginalFileName = Helpers.MemoryToString( mempchOriginalFileName ); + return returnValue; } #region FunctionMeta @@ -324,19 +344,25 @@ internal bool GetQueryUGCAdditionalPreview( UGCQueryHandle_t handle, uint index, #endregion internal uint GetQueryUGCNumKeyValueTags( UGCQueryHandle_t handle, uint index ) { - return _GetQueryUGCNumKeyValueTags( Self, handle, index ); + var returnValue = _GetQueryUGCNumKeyValueTags( Self, handle, index ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetQueryUGCKeyValueTag( IntPtr self, UGCQueryHandle_t handle, uint index, uint keyValueTagIndex, StringBuilder pchKey, uint cchKeySize, StringBuilder pchValue, uint cchValueSize ); + private delegate bool FGetQueryUGCKeyValueTag( IntPtr self, UGCQueryHandle_t handle, uint index, uint keyValueTagIndex, IntPtr pchKey, uint cchKeySize, IntPtr pchValue, uint cchValueSize ); private FGetQueryUGCKeyValueTag _GetQueryUGCKeyValueTag; #endregion - internal bool GetQueryUGCKeyValueTag( UGCQueryHandle_t handle, uint index, uint keyValueTagIndex, StringBuilder pchKey, uint cchKeySize, StringBuilder pchValue, uint cchValueSize ) + internal bool GetQueryUGCKeyValueTag( UGCQueryHandle_t handle, uint index, uint keyValueTagIndex, out string pchKey, out string pchValue ) { - return _GetQueryUGCKeyValueTag( Self, handle, index, keyValueTagIndex, pchKey, cchKeySize, pchValue, cchValueSize ); + IntPtr mempchKey = Helpers.TakeMemory(); + IntPtr mempchValue = Helpers.TakeMemory(); + var returnValue = _GetQueryUGCKeyValueTag( Self, handle, index, keyValueTagIndex, mempchKey, (1024 * 32), mempchValue, (1024 * 32) ); + pchKey = Helpers.MemoryToString( mempchKey ); + pchValue = Helpers.MemoryToString( mempchValue ); + return returnValue; } #region FunctionMeta @@ -348,7 +374,8 @@ internal bool GetQueryUGCKeyValueTag( UGCQueryHandle_t handle, uint index, uint #endregion internal bool ReleaseQueryUGCRequest( UGCQueryHandle_t handle ) { - return _ReleaseQueryUGCRequest( Self, handle ); + var returnValue = _ReleaseQueryUGCRequest( Self, handle ); + return returnValue; } #region FunctionMeta @@ -360,7 +387,8 @@ internal bool ReleaseQueryUGCRequest( UGCQueryHandle_t handle ) #endregion internal bool AddRequiredTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pTagName ) { - return _AddRequiredTag( Self, handle, pTagName ); + var returnValue = _AddRequiredTag( Self, handle, pTagName ); + return returnValue; } #region FunctionMeta @@ -372,7 +400,8 @@ internal bool AddRequiredTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType #endregion internal bool AddExcludedTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pTagName ) { - return _AddExcludedTag( Self, handle, pTagName ); + var returnValue = _AddExcludedTag( Self, handle, pTagName ); + return returnValue; } #region FunctionMeta @@ -384,7 +413,8 @@ internal bool AddExcludedTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType #endregion internal bool SetReturnOnlyIDs( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnOnlyIDs ) { - return _SetReturnOnlyIDs( Self, handle, bReturnOnlyIDs ); + var returnValue = _SetReturnOnlyIDs( Self, handle, bReturnOnlyIDs ); + return returnValue; } #region FunctionMeta @@ -396,7 +426,8 @@ internal bool SetReturnOnlyIDs( UGCQueryHandle_t handle, [MarshalAs( UnmanagedTy #endregion internal bool SetReturnKeyValueTags( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnKeyValueTags ) { - return _SetReturnKeyValueTags( Self, handle, bReturnKeyValueTags ); + var returnValue = _SetReturnKeyValueTags( Self, handle, bReturnKeyValueTags ); + return returnValue; } #region FunctionMeta @@ -408,7 +439,8 @@ internal bool SetReturnKeyValueTags( UGCQueryHandle_t handle, [MarshalAs( Unmana #endregion internal bool SetReturnLongDescription( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnLongDescription ) { - return _SetReturnLongDescription( Self, handle, bReturnLongDescription ); + var returnValue = _SetReturnLongDescription( Self, handle, bReturnLongDescription ); + return returnValue; } #region FunctionMeta @@ -420,7 +452,8 @@ internal bool SetReturnLongDescription( UGCQueryHandle_t handle, [MarshalAs( Unm #endregion internal bool SetReturnMetadata( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnMetadata ) { - return _SetReturnMetadata( Self, handle, bReturnMetadata ); + var returnValue = _SetReturnMetadata( Self, handle, bReturnMetadata ); + return returnValue; } #region FunctionMeta @@ -432,7 +465,8 @@ internal bool SetReturnMetadata( UGCQueryHandle_t handle, [MarshalAs( UnmanagedT #endregion internal bool SetReturnChildren( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnChildren ) { - return _SetReturnChildren( Self, handle, bReturnChildren ); + var returnValue = _SetReturnChildren( Self, handle, bReturnChildren ); + return returnValue; } #region FunctionMeta @@ -444,7 +478,8 @@ internal bool SetReturnChildren( UGCQueryHandle_t handle, [MarshalAs( UnmanagedT #endregion internal bool SetReturnAdditionalPreviews( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnAdditionalPreviews ) { - return _SetReturnAdditionalPreviews( Self, handle, bReturnAdditionalPreviews ); + var returnValue = _SetReturnAdditionalPreviews( Self, handle, bReturnAdditionalPreviews ); + return returnValue; } #region FunctionMeta @@ -456,7 +491,8 @@ internal bool SetReturnAdditionalPreviews( UGCQueryHandle_t handle, [MarshalAs( #endregion internal bool SetReturnTotalOnly( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bReturnTotalOnly ) { - return _SetReturnTotalOnly( Self, handle, bReturnTotalOnly ); + var returnValue = _SetReturnTotalOnly( Self, handle, bReturnTotalOnly ); + return returnValue; } #region FunctionMeta @@ -468,7 +504,8 @@ internal bool SetReturnTotalOnly( UGCQueryHandle_t handle, [MarshalAs( Unmanaged #endregion internal bool SetReturnPlaytimeStats( UGCQueryHandle_t handle, uint unDays ) { - return _SetReturnPlaytimeStats( Self, handle, unDays ); + var returnValue = _SetReturnPlaytimeStats( Self, handle, unDays ); + return returnValue; } #region FunctionMeta @@ -480,7 +517,8 @@ internal bool SetReturnPlaytimeStats( UGCQueryHandle_t handle, uint unDays ) #endregion internal bool SetLanguage( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLanguage ) { - return _SetLanguage( Self, handle, pchLanguage ); + var returnValue = _SetLanguage( Self, handle, pchLanguage ); + return returnValue; } #region FunctionMeta @@ -492,7 +530,8 @@ internal bool SetLanguage( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.Cu #endregion internal bool SetAllowCachedResponse( UGCQueryHandle_t handle, uint unMaxAgeSeconds ) { - return _SetAllowCachedResponse( Self, handle, unMaxAgeSeconds ); + var returnValue = _SetAllowCachedResponse( Self, handle, unMaxAgeSeconds ); + return returnValue; } #region FunctionMeta @@ -504,7 +543,8 @@ internal bool SetAllowCachedResponse( UGCQueryHandle_t handle, uint unMaxAgeSeco #endregion internal bool SetCloudFileNameFilter( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pMatchCloudFileName ) { - return _SetCloudFileNameFilter( Self, handle, pMatchCloudFileName ); + var returnValue = _SetCloudFileNameFilter( Self, handle, pMatchCloudFileName ); + return returnValue; } #region FunctionMeta @@ -516,7 +556,8 @@ internal bool SetCloudFileNameFilter( UGCQueryHandle_t handle, [MarshalAs( Unman #endregion internal bool SetMatchAnyTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bMatchAnyTag ) { - return _SetMatchAnyTag( Self, handle, bMatchAnyTag ); + var returnValue = _SetMatchAnyTag( Self, handle, bMatchAnyTag ); + return returnValue; } #region FunctionMeta @@ -528,7 +569,8 @@ internal bool SetMatchAnyTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType #endregion internal bool SetSearchText( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pSearchText ) { - return _SetSearchText( Self, handle, pSearchText ); + var returnValue = _SetSearchText( Self, handle, pSearchText ); + return returnValue; } #region FunctionMeta @@ -540,7 +582,8 @@ internal bool SetSearchText( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType. #endregion internal bool SetRankedByTrendDays( UGCQueryHandle_t handle, uint unDays ) { - return _SetRankedByTrendDays( Self, handle, unDays ); + var returnValue = _SetRankedByTrendDays( Self, handle, unDays ); + return returnValue; } #region FunctionMeta @@ -552,7 +595,8 @@ internal bool SetRankedByTrendDays( UGCQueryHandle_t handle, uint unDays ) #endregion internal bool AddRequiredKeyValueTag( UGCQueryHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pValue ) { - return _AddRequiredKeyValueTag( Self, handle, pKey, pValue ); + var returnValue = _AddRequiredKeyValueTag( Self, handle, pKey, pValue ); + return returnValue; } #region FunctionMeta @@ -563,7 +607,8 @@ internal bool AddRequiredKeyValueTag( UGCQueryHandle_t handle, [MarshalAs( Unman #endregion internal async Task RequestUGCDetails( PublishedFileId nPublishedFileID, uint unMaxAgeSeconds ) { - return await SteamUGCRequestUGCDetailsResult_t.GetResultAsync( _RequestUGCDetails( Self, nPublishedFileID, unMaxAgeSeconds ) ); + var returnValue = _RequestUGCDetails( Self, nPublishedFileID, unMaxAgeSeconds ); + return await SteamUGCRequestUGCDetailsResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -574,7 +619,8 @@ internal bool AddRequiredKeyValueTag( UGCQueryHandle_t handle, [MarshalAs( Unman #endregion internal async Task CreateItem( AppId nConsumerAppId, WorkshopFileType eFileType ) { - return await CreateItemResult_t.GetResultAsync( _CreateItem( Self, nConsumerAppId, eFileType ) ); + var returnValue = _CreateItem( Self, nConsumerAppId, eFileType ); + return await CreateItemResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -585,7 +631,8 @@ internal bool AddRequiredKeyValueTag( UGCQueryHandle_t handle, [MarshalAs( Unman #endregion internal UGCUpdateHandle_t StartItemUpdate( AppId nConsumerAppId, PublishedFileId nPublishedFileID ) { - return _StartItemUpdate( Self, nConsumerAppId, nPublishedFileID ); + var returnValue = _StartItemUpdate( Self, nConsumerAppId, nPublishedFileID ); + return returnValue; } #region FunctionMeta @@ -597,7 +644,8 @@ internal UGCUpdateHandle_t StartItemUpdate( AppId nConsumerAppId, PublishedFileI #endregion internal bool SetItemTitle( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchTitle ) { - return _SetItemTitle( Self, handle, pchTitle ); + var returnValue = _SetItemTitle( Self, handle, pchTitle ); + return returnValue; } #region FunctionMeta @@ -609,7 +657,8 @@ internal bool SetItemTitle( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType. #endregion internal bool SetItemDescription( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchDescription ) { - return _SetItemDescription( Self, handle, pchDescription ); + var returnValue = _SetItemDescription( Self, handle, pchDescription ); + return returnValue; } #region FunctionMeta @@ -621,7 +670,8 @@ internal bool SetItemDescription( UGCUpdateHandle_t handle, [MarshalAs( Unmanage #endregion internal bool SetItemUpdateLanguage( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLanguage ) { - return _SetItemUpdateLanguage( Self, handle, pchLanguage ); + var returnValue = _SetItemUpdateLanguage( Self, handle, pchLanguage ); + return returnValue; } #region FunctionMeta @@ -633,7 +683,8 @@ internal bool SetItemUpdateLanguage( UGCUpdateHandle_t handle, [MarshalAs( Unman #endregion internal bool SetItemMetadata( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchMetaData ) { - return _SetItemMetadata( Self, handle, pchMetaData ); + var returnValue = _SetItemMetadata( Self, handle, pchMetaData ); + return returnValue; } #region FunctionMeta @@ -645,7 +696,8 @@ internal bool SetItemMetadata( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedTy #endregion internal bool SetItemVisibility( UGCUpdateHandle_t handle, RemoteStoragePublishedFileVisibility eVisibility ) { - return _SetItemVisibility( Self, handle, eVisibility ); + var returnValue = _SetItemVisibility( Self, handle, eVisibility ); + return returnValue; } #region FunctionMeta @@ -657,7 +709,8 @@ internal bool SetItemVisibility( UGCUpdateHandle_t handle, RemoteStoragePublishe #endregion internal bool SetItemTags( UGCUpdateHandle_t updateHandle, ref SteamParamStringArray_t pTags ) { - return _SetItemTags( Self, updateHandle, ref pTags ); + var returnValue = _SetItemTags( Self, updateHandle, ref pTags ); + return returnValue; } #region FunctionMeta @@ -669,7 +722,8 @@ internal bool SetItemTags( UGCUpdateHandle_t updateHandle, ref SteamParamStringA #endregion internal bool SetItemContent( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszContentFolder ) { - return _SetItemContent( Self, handle, pszContentFolder ); + var returnValue = _SetItemContent( Self, handle, pszContentFolder ); + return returnValue; } #region FunctionMeta @@ -681,7 +735,8 @@ internal bool SetItemContent( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedTyp #endregion internal bool SetItemPreview( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszPreviewFile ) { - return _SetItemPreview( Self, handle, pszPreviewFile ); + var returnValue = _SetItemPreview( Self, handle, pszPreviewFile ); + return returnValue; } #region FunctionMeta @@ -693,7 +748,8 @@ internal bool SetItemPreview( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedTyp #endregion internal bool SetAllowLegacyUpload( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.U1 )] bool bAllowLegacyUpload ) { - return _SetAllowLegacyUpload( Self, handle, bAllowLegacyUpload ); + var returnValue = _SetAllowLegacyUpload( Self, handle, bAllowLegacyUpload ); + return returnValue; } #region FunctionMeta @@ -705,7 +761,8 @@ internal bool SetAllowLegacyUpload( UGCUpdateHandle_t handle, [MarshalAs( Unmana #endregion internal bool RemoveItemKeyValueTags( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _RemoveItemKeyValueTags( Self, handle, pchKey ); + var returnValue = _RemoveItemKeyValueTags( Self, handle, pchKey ); + return returnValue; } #region FunctionMeta @@ -717,7 +774,8 @@ internal bool RemoveItemKeyValueTags( UGCUpdateHandle_t handle, [MarshalAs( Unma #endregion internal bool AddItemKeyValueTag( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue ) { - return _AddItemKeyValueTag( Self, handle, pchKey, pchValue ); + var returnValue = _AddItemKeyValueTag( Self, handle, pchKey, pchValue ); + return returnValue; } #region FunctionMeta @@ -729,7 +787,8 @@ internal bool AddItemKeyValueTag( UGCUpdateHandle_t handle, [MarshalAs( Unmanage #endregion internal bool AddItemPreviewFile( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszPreviewFile, ItemPreviewType type ) { - return _AddItemPreviewFile( Self, handle, pszPreviewFile, type ); + var returnValue = _AddItemPreviewFile( Self, handle, pszPreviewFile, type ); + return returnValue; } #region FunctionMeta @@ -741,7 +800,8 @@ internal bool AddItemPreviewFile( UGCUpdateHandle_t handle, [MarshalAs( Unmanage #endregion internal bool AddItemPreviewVideo( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszVideoID ) { - return _AddItemPreviewVideo( Self, handle, pszVideoID ); + var returnValue = _AddItemPreviewVideo( Self, handle, pszVideoID ); + return returnValue; } #region FunctionMeta @@ -753,7 +813,8 @@ internal bool AddItemPreviewVideo( UGCUpdateHandle_t handle, [MarshalAs( Unmanag #endregion internal bool UpdateItemPreviewFile( UGCUpdateHandle_t handle, uint index, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszPreviewFile ) { - return _UpdateItemPreviewFile( Self, handle, index, pszPreviewFile ); + var returnValue = _UpdateItemPreviewFile( Self, handle, index, pszPreviewFile ); + return returnValue; } #region FunctionMeta @@ -765,7 +826,8 @@ internal bool UpdateItemPreviewFile( UGCUpdateHandle_t handle, uint index, [Mars #endregion internal bool UpdateItemPreviewVideo( UGCUpdateHandle_t handle, uint index, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszVideoID ) { - return _UpdateItemPreviewVideo( Self, handle, index, pszVideoID ); + var returnValue = _UpdateItemPreviewVideo( Self, handle, index, pszVideoID ); + return returnValue; } #region FunctionMeta @@ -777,7 +839,8 @@ internal bool UpdateItemPreviewVideo( UGCUpdateHandle_t handle, uint index, [Mar #endregion internal bool RemoveItemPreview( UGCUpdateHandle_t handle, uint index ) { - return _RemoveItemPreview( Self, handle, index ); + var returnValue = _RemoveItemPreview( Self, handle, index ); + return returnValue; } #region FunctionMeta @@ -788,7 +851,8 @@ internal bool RemoveItemPreview( UGCUpdateHandle_t handle, uint index ) #endregion internal async Task SubmitItemUpdate( UGCUpdateHandle_t handle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchChangeNote ) { - return await SubmitItemUpdateResult_t.GetResultAsync( _SubmitItemUpdate( Self, handle, pchChangeNote ) ); + var returnValue = _SubmitItemUpdate( Self, handle, pchChangeNote ); + return await SubmitItemUpdateResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -799,7 +863,8 @@ internal bool RemoveItemPreview( UGCUpdateHandle_t handle, uint index ) #endregion internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref ulong punBytesProcessed, ref ulong punBytesTotal ) { - return _GetItemUpdateProgress( Self, handle, ref punBytesProcessed, ref punBytesTotal ); + var returnValue = _GetItemUpdateProgress( Self, handle, ref punBytesProcessed, ref punBytesTotal ); + return returnValue; } #region FunctionMeta @@ -810,7 +875,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task SetUserItemVote( PublishedFileId nPublishedFileID, [MarshalAs( UnmanagedType.U1 )] bool bVoteUp ) { - return await SetUserItemVoteResult_t.GetResultAsync( _SetUserItemVote( Self, nPublishedFileID, bVoteUp ) ); + var returnValue = _SetUserItemVote( Self, nPublishedFileID, bVoteUp ); + return await SetUserItemVoteResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -821,7 +887,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task GetUserItemVote( PublishedFileId nPublishedFileID ) { - return await GetUserItemVoteResult_t.GetResultAsync( _GetUserItemVote( Self, nPublishedFileID ) ); + var returnValue = _GetUserItemVote( Self, nPublishedFileID ); + return await GetUserItemVoteResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -832,7 +899,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task AddItemToFavorites( AppId nAppId, PublishedFileId nPublishedFileID ) { - return await UserFavoriteItemsListChanged_t.GetResultAsync( _AddItemToFavorites( Self, nAppId, nPublishedFileID ) ); + var returnValue = _AddItemToFavorites( Self, nAppId, nPublishedFileID ); + return await UserFavoriteItemsListChanged_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -843,7 +911,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task RemoveItemFromFavorites( AppId nAppId, PublishedFileId nPublishedFileID ) { - return await UserFavoriteItemsListChanged_t.GetResultAsync( _RemoveItemFromFavorites( Self, nAppId, nPublishedFileID ) ); + var returnValue = _RemoveItemFromFavorites( Self, nAppId, nPublishedFileID ); + return await UserFavoriteItemsListChanged_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -854,7 +923,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task SubscribeItem( PublishedFileId nPublishedFileID ) { - return await RemoteStorageSubscribePublishedFileResult_t.GetResultAsync( _SubscribeItem( Self, nPublishedFileID ) ); + var returnValue = _SubscribeItem( Self, nPublishedFileID ); + return await RemoteStorageSubscribePublishedFileResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -865,7 +935,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal async Task UnsubscribeItem( PublishedFileId nPublishedFileID ) { - return await RemoteStorageUnsubscribePublishedFileResult_t.GetResultAsync( _UnsubscribeItem( Self, nPublishedFileID ) ); + var returnValue = _UnsubscribeItem( Self, nPublishedFileID ); + return await RemoteStorageUnsubscribePublishedFileResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -876,7 +947,8 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #endregion internal uint GetNumSubscribedItems() { - return _GetNumSubscribedItems( Self ); + var returnValue = _GetNumSubscribedItems( Self ); + return returnValue; } #region FunctionMeta @@ -887,7 +959,8 @@ internal uint GetNumSubscribedItems() #endregion internal uint GetSubscribedItems( [In,Out] PublishedFileId[] pvecPublishedFileID, uint cMaxEntries ) { - return _GetSubscribedItems( Self, pvecPublishedFileID, cMaxEntries ); + var returnValue = _GetSubscribedItems( Self, pvecPublishedFileID, cMaxEntries ); + return returnValue; } #region FunctionMeta @@ -898,19 +971,23 @@ internal uint GetSubscribedItems( [In,Out] PublishedFileId[] pvecPublishedFileI #endregion internal uint GetItemState( PublishedFileId nPublishedFileID ) { - return _GetItemState( Self, nPublishedFileID ); + var returnValue = _GetItemState( Self, nPublishedFileID ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetItemInstallInfo( IntPtr self, PublishedFileId nPublishedFileID, ref ulong punSizeOnDisk, StringBuilder pchFolder, uint cchFolderSize, ref uint punTimeStamp ); + private delegate bool FGetItemInstallInfo( IntPtr self, PublishedFileId nPublishedFileID, ref ulong punSizeOnDisk, IntPtr pchFolder, uint cchFolderSize, ref uint punTimeStamp ); private FGetItemInstallInfo _GetItemInstallInfo; #endregion - internal bool GetItemInstallInfo( PublishedFileId nPublishedFileID, ref ulong punSizeOnDisk, StringBuilder pchFolder, uint cchFolderSize, ref uint punTimeStamp ) + internal bool GetItemInstallInfo( PublishedFileId nPublishedFileID, ref ulong punSizeOnDisk, out string pchFolder, ref uint punTimeStamp ) { - return _GetItemInstallInfo( Self, nPublishedFileID, ref punSizeOnDisk, pchFolder, cchFolderSize, ref punTimeStamp ); + IntPtr mempchFolder = Helpers.TakeMemory(); + var returnValue = _GetItemInstallInfo( Self, nPublishedFileID, ref punSizeOnDisk, mempchFolder, (1024 * 32), ref punTimeStamp ); + pchFolder = Helpers.MemoryToString( mempchFolder ); + return returnValue; } #region FunctionMeta @@ -922,7 +999,8 @@ internal bool GetItemInstallInfo( PublishedFileId nPublishedFileID, ref ulong pu #endregion internal bool GetItemDownloadInfo( PublishedFileId nPublishedFileID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ) { - return _GetItemDownloadInfo( Self, nPublishedFileID, ref punBytesDownloaded, ref punBytesTotal ); + var returnValue = _GetItemDownloadInfo( Self, nPublishedFileID, ref punBytesDownloaded, ref punBytesTotal ); + return returnValue; } #region FunctionMeta @@ -934,7 +1012,8 @@ internal bool GetItemDownloadInfo( PublishedFileId nPublishedFileID, ref ulong p #endregion internal bool DownloadItem( PublishedFileId nPublishedFileID, [MarshalAs( UnmanagedType.U1 )] bool bHighPriority ) { - return _DownloadItem( Self, nPublishedFileID, bHighPriority ); + var returnValue = _DownloadItem( Self, nPublishedFileID, bHighPriority ); + return returnValue; } #region FunctionMeta @@ -946,7 +1025,8 @@ internal bool DownloadItem( PublishedFileId nPublishedFileID, [MarshalAs( Unmana #endregion internal bool BInitWorkshopForGameServer( DepotId_t unWorkshopDepotID, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszFolder ) { - return _BInitWorkshopForGameServer( Self, unWorkshopDepotID, pszFolder ); + var returnValue = _BInitWorkshopForGameServer( Self, unWorkshopDepotID, pszFolder ); + return returnValue; } #region FunctionMeta @@ -968,7 +1048,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task StartPlaytimeTracking( [In,Out] PublishedFileId[] pvecPublishedFileID, uint unNumPublishedFileIDs ) { - return await StartPlaytimeTrackingResult_t.GetResultAsync( _StartPlaytimeTracking( Self, pvecPublishedFileID, unNumPublishedFileIDs ) ); + var returnValue = _StartPlaytimeTracking( Self, pvecPublishedFileID, unNumPublishedFileIDs ); + return await StartPlaytimeTrackingResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -979,7 +1060,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task StopPlaytimeTracking( [In,Out] PublishedFileId[] pvecPublishedFileID, uint unNumPublishedFileIDs ) { - return await StopPlaytimeTrackingResult_t.GetResultAsync( _StopPlaytimeTracking( Self, pvecPublishedFileID, unNumPublishedFileIDs ) ); + var returnValue = _StopPlaytimeTracking( Self, pvecPublishedFileID, unNumPublishedFileIDs ); + return await StopPlaytimeTrackingResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -990,7 +1072,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task StopPlaytimeTrackingForAllItems() { - return await StopPlaytimeTrackingResult_t.GetResultAsync( _StopPlaytimeTrackingForAllItems( Self ) ); + var returnValue = _StopPlaytimeTrackingForAllItems( Self ); + return await StopPlaytimeTrackingResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1001,7 +1084,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task AddDependency( PublishedFileId nParentPublishedFileID, PublishedFileId nChildPublishedFileID ) { - return await AddUGCDependencyResult_t.GetResultAsync( _AddDependency( Self, nParentPublishedFileID, nChildPublishedFileID ) ); + var returnValue = _AddDependency( Self, nParentPublishedFileID, nChildPublishedFileID ); + return await AddUGCDependencyResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1012,7 +1096,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task RemoveDependency( PublishedFileId nParentPublishedFileID, PublishedFileId nChildPublishedFileID ) { - return await RemoveUGCDependencyResult_t.GetResultAsync( _RemoveDependency( Self, nParentPublishedFileID, nChildPublishedFileID ) ); + var returnValue = _RemoveDependency( Self, nParentPublishedFileID, nChildPublishedFileID ); + return await RemoveUGCDependencyResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1023,7 +1108,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task AddAppDependency( PublishedFileId nPublishedFileID, AppId nAppID ) { - return await AddAppDependencyResult_t.GetResultAsync( _AddAppDependency( Self, nPublishedFileID, nAppID ) ); + var returnValue = _AddAppDependency( Self, nPublishedFileID, nAppID ); + return await AddAppDependencyResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1034,7 +1120,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task RemoveAppDependency( PublishedFileId nPublishedFileID, AppId nAppID ) { - return await RemoveAppDependencyResult_t.GetResultAsync( _RemoveAppDependency( Self, nPublishedFileID, nAppID ) ); + var returnValue = _RemoveAppDependency( Self, nPublishedFileID, nAppID ); + return await RemoveAppDependencyResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1045,7 +1132,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task GetAppDependencies( PublishedFileId nPublishedFileID ) { - return await GetAppDependenciesResult_t.GetResultAsync( _GetAppDependencies( Self, nPublishedFileID ) ); + var returnValue = _GetAppDependencies( Self, nPublishedFileID ); + return await GetAppDependenciesResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -1056,7 +1144,8 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #endregion internal async Task DeleteItem( PublishedFileId nPublishedFileID ) { - return await DeleteItemResult_t.GetResultAsync( _DeleteItem( Self, nPublishedFileID ) ); + var returnValue = _DeleteItem( Self, nPublishedFileID ); + return await DeleteItemResult_t.GetResultAsync( returnValue ); } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs index 1f41e8a..b44bd13 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs @@ -88,7 +88,8 @@ internal override void Shutdown() #endregion internal HSteamUser GetHSteamUser() { - return _GetHSteamUser( Self ); + var returnValue = _GetHSteamUser( Self ); + return returnValue; } #region FunctionMeta @@ -100,7 +101,8 @@ internal HSteamUser GetHSteamUser() #endregion internal bool BLoggedOn() { - return _BLoggedOn( Self ); + var returnValue = _BLoggedOn( Self ); + return returnValue; } #region FunctionMeta @@ -120,7 +122,8 @@ internal SteamId GetSteamID() _GetSteamID( Self, ref retVal ); return retVal; #else - return _GetSteamID( Self ); + var returnValue = _GetSteamID( Self ); + return returnValue; #endif } @@ -132,7 +135,8 @@ internal SteamId GetSteamID() #endregion internal int InitiateGameConnection( IntPtr pAuthBlob, int cbMaxAuthBlob, SteamId steamIDGameServer, uint unIPServer, ushort usPortServer, [MarshalAs( UnmanagedType.U1 )] bool bSecure ) { - return _InitiateGameConnection( Self, pAuthBlob, cbMaxAuthBlob, steamIDGameServer, unIPServer, usPortServer, bSecure ); + var returnValue = _InitiateGameConnection( Self, pAuthBlob, cbMaxAuthBlob, steamIDGameServer, unIPServer, usPortServer, bSecure ); + return returnValue; } #region FunctionMeta @@ -160,13 +164,16 @@ internal void TrackAppUsageEvent( GameId gameID, int eAppUsageEvent, [MarshalAs( #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetUserDataFolder( IntPtr self, StringBuilder pchBuffer, int cubBuffer ); + private delegate bool FGetUserDataFolder( IntPtr self, IntPtr pchBuffer, int cubBuffer ); private FGetUserDataFolder _GetUserDataFolder; #endregion - internal bool GetUserDataFolder( StringBuilder pchBuffer, int cubBuffer ) + internal bool GetUserDataFolder( out string pchBuffer ) { - return _GetUserDataFolder( Self, pchBuffer, cubBuffer ); + IntPtr mempchBuffer = Helpers.TakeMemory(); + var returnValue = _GetUserDataFolder( Self, mempchBuffer, (1024 * 32) ); + pchBuffer = Helpers.MemoryToString( mempchBuffer ); + return returnValue; } #region FunctionMeta @@ -199,7 +206,8 @@ internal void StopVoiceRecording() #endregion internal VoiceResult GetAvailableVoice( ref uint pcbCompressed, ref uint pcbUncompressed_Deprecated, uint nUncompressedVoiceDesiredSampleRate_Deprecated ) { - return _GetAvailableVoice( Self, ref pcbCompressed, ref pcbUncompressed_Deprecated, nUncompressedVoiceDesiredSampleRate_Deprecated ); + var returnValue = _GetAvailableVoice( Self, ref pcbCompressed, ref pcbUncompressed_Deprecated, nUncompressedVoiceDesiredSampleRate_Deprecated ); + return returnValue; } #region FunctionMeta @@ -210,7 +218,8 @@ internal VoiceResult GetAvailableVoice( ref uint pcbCompressed, ref uint pcbUnco #endregion internal VoiceResult GetVoice( [MarshalAs( UnmanagedType.U1 )] bool bWantCompressed, IntPtr pDestBuffer, uint cbDestBufferSize, ref uint nBytesWritten, [MarshalAs( UnmanagedType.U1 )] bool bWantUncompressed_Deprecated, IntPtr pUncompressedDestBuffer_Deprecated, uint cbUncompressedDestBufferSize_Deprecated, ref uint nUncompressBytesWritten_Deprecated, uint nUncompressedVoiceDesiredSampleRate_Deprecated ) { - return _GetVoice( Self, bWantCompressed, pDestBuffer, cbDestBufferSize, ref nBytesWritten, bWantUncompressed_Deprecated, pUncompressedDestBuffer_Deprecated, cbUncompressedDestBufferSize_Deprecated, ref nUncompressBytesWritten_Deprecated, nUncompressedVoiceDesiredSampleRate_Deprecated ); + var returnValue = _GetVoice( Self, bWantCompressed, pDestBuffer, cbDestBufferSize, ref nBytesWritten, bWantUncompressed_Deprecated, pUncompressedDestBuffer_Deprecated, cbUncompressedDestBufferSize_Deprecated, ref nUncompressBytesWritten_Deprecated, nUncompressedVoiceDesiredSampleRate_Deprecated ); + return returnValue; } #region FunctionMeta @@ -221,7 +230,8 @@ internal VoiceResult GetVoice( [MarshalAs( UnmanagedType.U1 )] bool bWantCompres #endregion internal VoiceResult DecompressVoice( IntPtr pCompressed, uint cbCompressed, IntPtr pDestBuffer, uint cbDestBufferSize, ref uint nBytesWritten, uint nDesiredSampleRate ) { - return _DecompressVoice( Self, pCompressed, cbCompressed, pDestBuffer, cbDestBufferSize, ref nBytesWritten, nDesiredSampleRate ); + var returnValue = _DecompressVoice( Self, pCompressed, cbCompressed, pDestBuffer, cbDestBufferSize, ref nBytesWritten, nDesiredSampleRate ); + return returnValue; } #region FunctionMeta @@ -232,7 +242,8 @@ internal VoiceResult DecompressVoice( IntPtr pCompressed, uint cbCompressed, Int #endregion internal uint GetVoiceOptimalSampleRate() { - return _GetVoiceOptimalSampleRate( Self ); + var returnValue = _GetVoiceOptimalSampleRate( Self ); + return returnValue; } #region FunctionMeta @@ -243,7 +254,8 @@ internal uint GetVoiceOptimalSampleRate() #endregion internal HAuthTicket GetAuthSessionTicket( IntPtr pTicket, int cbMaxTicket, ref uint pcbTicket ) { - return _GetAuthSessionTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + var returnValue = _GetAuthSessionTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + return returnValue; } #region FunctionMeta @@ -254,7 +266,8 @@ internal HAuthTicket GetAuthSessionTicket( IntPtr pTicket, int cbMaxTicket, ref #endregion internal BeginAuthResult BeginAuthSession( IntPtr pAuthTicket, int cbAuthTicket, SteamId steamID ) { - return _BeginAuthSession( Self, pAuthTicket, cbAuthTicket, steamID ); + var returnValue = _BeginAuthSession( Self, pAuthTicket, cbAuthTicket, steamID ); + return returnValue; } #region FunctionMeta @@ -287,7 +300,8 @@ internal void CancelAuthTicket( HAuthTicket hAuthTicket ) #endregion internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId appID ) { - return _UserHasLicenseForApp( Self, steamID, appID ); + var returnValue = _UserHasLicenseForApp( Self, steamID, appID ); + return returnValue; } #region FunctionMeta @@ -299,7 +313,8 @@ internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId #endregion internal bool BIsBehindNAT() { - return _BIsBehindNAT( Self ); + var returnValue = _BIsBehindNAT( Self ); + return returnValue; } #region FunctionMeta @@ -321,7 +336,8 @@ internal void AdvertiseGame( SteamId steamIDGameServer, uint unIPServer, ushort #endregion internal async Task RequestEncryptedAppTicket( IntPtr pDataToInclude, int cbDataToInclude ) { - return await EncryptedAppTicketResponse_t.GetResultAsync( _RequestEncryptedAppTicket( Self, pDataToInclude, cbDataToInclude ) ); + var returnValue = _RequestEncryptedAppTicket( Self, pDataToInclude, cbDataToInclude ); + return await EncryptedAppTicketResponse_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -333,7 +349,8 @@ internal void AdvertiseGame( SteamId steamIDGameServer, uint unIPServer, ushort #endregion internal bool GetEncryptedAppTicket( IntPtr pTicket, int cbMaxTicket, ref uint pcbTicket ) { - return _GetEncryptedAppTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + var returnValue = _GetEncryptedAppTicket( Self, pTicket, cbMaxTicket, ref pcbTicket ); + return returnValue; } #region FunctionMeta @@ -344,7 +361,8 @@ internal bool GetEncryptedAppTicket( IntPtr pTicket, int cbMaxTicket, ref uint p #endregion internal int GetGameBadgeLevel( int nSeries, [MarshalAs( UnmanagedType.U1 )] bool bFoil ) { - return _GetGameBadgeLevel( Self, nSeries, bFoil ); + var returnValue = _GetGameBadgeLevel( Self, nSeries, bFoil ); + return returnValue; } #region FunctionMeta @@ -355,7 +373,8 @@ internal int GetGameBadgeLevel( int nSeries, [MarshalAs( UnmanagedType.U1 )] boo #endregion internal int GetPlayerSteamLevel() { - return _GetPlayerSteamLevel( Self ); + var returnValue = _GetPlayerSteamLevel( Self ); + return returnValue; } #region FunctionMeta @@ -366,7 +385,8 @@ internal int GetPlayerSteamLevel() #endregion internal async Task RequestStoreAuthURL( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchRedirectURL ) { - return await StoreAuthURLResponse_t.GetResultAsync( _RequestStoreAuthURL( Self, pchRedirectURL ) ); + var returnValue = _RequestStoreAuthURL( Self, pchRedirectURL ); + return await StoreAuthURLResponse_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -378,7 +398,8 @@ internal int GetPlayerSteamLevel() #endregion internal bool BIsPhoneVerified() { - return _BIsPhoneVerified( Self ); + var returnValue = _BIsPhoneVerified( Self ); + return returnValue; } #region FunctionMeta @@ -390,7 +411,8 @@ internal bool BIsPhoneVerified() #endregion internal bool BIsTwoFactorEnabled() { - return _BIsTwoFactorEnabled( Self ); + var returnValue = _BIsTwoFactorEnabled( Self ); + return returnValue; } #region FunctionMeta @@ -402,7 +424,8 @@ internal bool BIsTwoFactorEnabled() #endregion internal bool BIsPhoneIdentifying() { - return _BIsPhoneIdentifying( Self ); + var returnValue = _BIsPhoneIdentifying( Self ); + return returnValue; } #region FunctionMeta @@ -414,7 +437,8 @@ internal bool BIsPhoneIdentifying() #endregion internal bool BIsPhoneRequiringVerification() { - return _BIsPhoneRequiringVerification( Self ); + var returnValue = _BIsPhoneRequiringVerification( Self ); + return returnValue; } #region FunctionMeta @@ -425,7 +449,8 @@ internal bool BIsPhoneRequiringVerification() #endregion internal async Task GetMarketEligibility() { - return await MarketEligibilityResponse_t.GetResultAsync( _GetMarketEligibility( Self ) ); + var returnValue = _GetMarketEligibility( Self ); + return await MarketEligibilityResponse_t.GetResultAsync( returnValue ); } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs index b94a6d5..4376970 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs @@ -129,7 +129,8 @@ internal override void Shutdown() #endregion internal bool RequestCurrentStats() { - return _RequestCurrentStats( Self ); + var returnValue = _RequestCurrentStats( Self ); + return returnValue; } #region FunctionMeta @@ -141,7 +142,8 @@ internal bool RequestCurrentStats() #endregion internal bool GetStat1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData ) { - return _GetStat1( Self, pchName, ref pData ); + var returnValue = _GetStat1( Self, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -153,7 +155,8 @@ internal bool GetStat1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRe #endregion internal bool GetStat2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData ) { - return _GetStat2( Self, pchName, ref pData ); + var returnValue = _GetStat2( Self, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -165,7 +168,8 @@ internal bool GetStat2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRe #endregion internal bool SetStat1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, int nData ) { - return _SetStat1( Self, pchName, nData ); + var returnValue = _SetStat1( Self, pchName, nData ); + return returnValue; } #region FunctionMeta @@ -177,7 +181,8 @@ internal bool SetStat1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRe #endregion internal bool SetStat2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float fData ) { - return _SetStat2( Self, pchName, fData ); + var returnValue = _SetStat2( Self, pchName, fData ); + return returnValue; } #region FunctionMeta @@ -189,7 +194,8 @@ internal bool SetStat2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRe #endregion internal bool UpdateAvgRateStat( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float flCountThisSession, double dSessionLength ) { - return _UpdateAvgRateStat( Self, pchName, flCountThisSession, dSessionLength ); + var returnValue = _UpdateAvgRateStat( Self, pchName, flCountThisSession, dSessionLength ); + return returnValue; } #region FunctionMeta @@ -201,7 +207,8 @@ internal bool UpdateAvgRateStat( [MarshalAs( UnmanagedType.CustomMarshaler, Mars #endregion internal bool GetAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) { - return _GetAchievement( Self, pchName, ref pbAchieved ); + var returnValue = _GetAchievement( Self, pchName, ref pbAchieved ); + return returnValue; } #region FunctionMeta @@ -213,7 +220,8 @@ internal bool GetAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, Marshal #endregion internal bool SetAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName ) { - return _SetAchievement( Self, pchName ); + var returnValue = _SetAchievement( Self, pchName ); + return returnValue; } #region FunctionMeta @@ -225,7 +233,8 @@ internal bool SetAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, Marshal #endregion internal bool ClearAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName ) { - return _ClearAchievement( Self, pchName ); + var returnValue = _ClearAchievement( Self, pchName ); + return returnValue; } #region FunctionMeta @@ -237,7 +246,8 @@ internal bool ClearAchievement( [MarshalAs( UnmanagedType.CustomMarshaler, Marsh #endregion internal bool GetAchievementAndUnlockTime( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved, ref uint punUnlockTime ) { - return _GetAchievementAndUnlockTime( Self, pchName, ref pbAchieved, ref punUnlockTime ); + var returnValue = _GetAchievementAndUnlockTime( Self, pchName, ref pbAchieved, ref punUnlockTime ); + return returnValue; } #region FunctionMeta @@ -249,7 +259,8 @@ internal bool GetAchievementAndUnlockTime( [MarshalAs( UnmanagedType.CustomMarsh #endregion internal bool StoreStats() { - return _StoreStats( Self ); + var returnValue = _StoreStats( Self ); + return returnValue; } #region FunctionMeta @@ -260,7 +271,8 @@ internal bool StoreStats() #endregion internal int GetAchievementIcon( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName ) { - return _GetAchievementIcon( Self, pchName ); + var returnValue = _GetAchievementIcon( Self, pchName ); + return returnValue; } #region FunctionMeta @@ -271,7 +283,8 @@ internal int GetAchievementIcon( [MarshalAs( UnmanagedType.CustomMarshaler, Mars #endregion internal string GetAchievementDisplayAttribute( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey ) { - return _GetAchievementDisplayAttribute( Self, pchName, pchKey ); + var returnValue = _GetAchievementDisplayAttribute( Self, pchName, pchKey ); + return returnValue; } #region FunctionMeta @@ -283,7 +296,8 @@ internal string GetAchievementDisplayAttribute( [MarshalAs( UnmanagedType.Custom #endregion internal bool IndicateAchievementProgress( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, uint nCurProgress, uint nMaxProgress ) { - return _IndicateAchievementProgress( Self, pchName, nCurProgress, nMaxProgress ); + var returnValue = _IndicateAchievementProgress( Self, pchName, nCurProgress, nMaxProgress ); + return returnValue; } #region FunctionMeta @@ -294,7 +308,8 @@ internal bool IndicateAchievementProgress( [MarshalAs( UnmanagedType.CustomMarsh #endregion internal uint GetNumAchievements() { - return _GetNumAchievements( Self ); + var returnValue = _GetNumAchievements( Self ); + return returnValue; } #region FunctionMeta @@ -305,7 +320,8 @@ internal uint GetNumAchievements() #endregion internal string GetAchievementName( uint iAchievement ) { - return _GetAchievementName( Self, iAchievement ); + var returnValue = _GetAchievementName( Self, iAchievement ); + return returnValue; } #region FunctionMeta @@ -316,7 +332,8 @@ internal string GetAchievementName( uint iAchievement ) #endregion internal async Task RequestUserStats( SteamId steamIDUser ) { - return await UserStatsReceived_t.GetResultAsync( _RequestUserStats( Self, steamIDUser ) ); + var returnValue = _RequestUserStats( Self, steamIDUser ); + return await UserStatsReceived_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -328,7 +345,8 @@ internal string GetAchievementName( uint iAchievement ) #endregion internal bool GetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData ) { - return _GetUserStat1( Self, steamIDUser, pchName, ref pData ); + var returnValue = _GetUserStat1( Self, steamIDUser, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -340,7 +358,8 @@ internal bool GetUserStat1( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool GetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData ) { - return _GetUserStat2( Self, steamIDUser, pchName, ref pData ); + var returnValue = _GetUserStat2( Self, steamIDUser, pchName, ref pData ); + return returnValue; } #region FunctionMeta @@ -352,7 +371,8 @@ internal bool GetUserStat2( SteamId steamIDUser, [MarshalAs( UnmanagedType.Custo #endregion internal bool GetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) { - return _GetUserAchievement( Self, steamIDUser, pchName, ref pbAchieved ); + var returnValue = _GetUserAchievement( Self, steamIDUser, pchName, ref pbAchieved ); + return returnValue; } #region FunctionMeta @@ -364,7 +384,8 @@ internal bool GetUserAchievement( SteamId steamIDUser, [MarshalAs( UnmanagedType #endregion internal bool GetUserAchievementAndUnlockTime( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved, ref uint punUnlockTime ) { - return _GetUserAchievementAndUnlockTime( Self, steamIDUser, pchName, ref pbAchieved, ref punUnlockTime ); + var returnValue = _GetUserAchievementAndUnlockTime( Self, steamIDUser, pchName, ref pbAchieved, ref punUnlockTime ); + return returnValue; } #region FunctionMeta @@ -376,7 +397,8 @@ internal bool GetUserAchievementAndUnlockTime( SteamId steamIDUser, [MarshalAs( #endregion internal bool ResetAllStats( [MarshalAs( UnmanagedType.U1 )] bool bAchievementsToo ) { - return _ResetAllStats( Self, bAchievementsToo ); + var returnValue = _ResetAllStats( Self, bAchievementsToo ); + return returnValue; } #region FunctionMeta @@ -387,7 +409,8 @@ internal bool ResetAllStats( [MarshalAs( UnmanagedType.U1 )] bool bAchievementsT #endregion internal async Task FindOrCreateLeaderboard( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLeaderboardName, LeaderboardSort eLeaderboardSortMethod, LeaderboardDisplay eLeaderboardDisplayType ) { - return await LeaderboardFindResult_t.GetResultAsync( _FindOrCreateLeaderboard( Self, pchLeaderboardName, eLeaderboardSortMethod, eLeaderboardDisplayType ) ); + var returnValue = _FindOrCreateLeaderboard( Self, pchLeaderboardName, eLeaderboardSortMethod, eLeaderboardDisplayType ); + return await LeaderboardFindResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -398,7 +421,8 @@ internal bool ResetAllStats( [MarshalAs( UnmanagedType.U1 )] bool bAchievementsT #endregion internal async Task FindLeaderboard( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchLeaderboardName ) { - return await LeaderboardFindResult_t.GetResultAsync( _FindLeaderboard( Self, pchLeaderboardName ) ); + var returnValue = _FindLeaderboard( Self, pchLeaderboardName ); + return await LeaderboardFindResult_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -409,7 +433,8 @@ internal bool ResetAllStats( [MarshalAs( UnmanagedType.U1 )] bool bAchievementsT #endregion internal string GetLeaderboardName( SteamLeaderboard_t hSteamLeaderboard ) { - return _GetLeaderboardName( Self, hSteamLeaderboard ); + var returnValue = _GetLeaderboardName( Self, hSteamLeaderboard ); + return returnValue; } #region FunctionMeta @@ -420,7 +445,8 @@ internal string GetLeaderboardName( SteamLeaderboard_t hSteamLeaderboard ) #endregion internal int GetLeaderboardEntryCount( SteamLeaderboard_t hSteamLeaderboard ) { - return _GetLeaderboardEntryCount( Self, hSteamLeaderboard ); + var returnValue = _GetLeaderboardEntryCount( Self, hSteamLeaderboard ); + return returnValue; } #region FunctionMeta @@ -431,7 +457,8 @@ internal int GetLeaderboardEntryCount( SteamLeaderboard_t hSteamLeaderboard ) #endregion internal LeaderboardSort GetLeaderboardSortMethod( SteamLeaderboard_t hSteamLeaderboard ) { - return _GetLeaderboardSortMethod( Self, hSteamLeaderboard ); + var returnValue = _GetLeaderboardSortMethod( Self, hSteamLeaderboard ); + return returnValue; } #region FunctionMeta @@ -442,7 +469,8 @@ internal LeaderboardSort GetLeaderboardSortMethod( SteamLeaderboard_t hSteamLead #endregion internal LeaderboardDisplay GetLeaderboardDisplayType( SteamLeaderboard_t hSteamLeaderboard ) { - return _GetLeaderboardDisplayType( Self, hSteamLeaderboard ); + var returnValue = _GetLeaderboardDisplayType( Self, hSteamLeaderboard ); + return returnValue; } #region FunctionMeta @@ -453,7 +481,8 @@ internal LeaderboardDisplay GetLeaderboardDisplayType( SteamLeaderboard_t hSteam #endregion internal async Task DownloadLeaderboardEntries( SteamLeaderboard_t hSteamLeaderboard, LeaderboardDataRequest eLeaderboardDataRequest, int nRangeStart, int nRangeEnd ) { - return await LeaderboardScoresDownloaded_t.GetResultAsync( _DownloadLeaderboardEntries( Self, hSteamLeaderboard, eLeaderboardDataRequest, nRangeStart, nRangeEnd ) ); + var returnValue = _DownloadLeaderboardEntries( Self, hSteamLeaderboard, eLeaderboardDataRequest, nRangeStart, nRangeEnd ); + return await LeaderboardScoresDownloaded_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -464,7 +493,8 @@ internal LeaderboardDisplay GetLeaderboardDisplayType( SteamLeaderboard_t hSteam #endregion internal async Task DownloadLeaderboardEntriesForUsers( SteamLeaderboard_t hSteamLeaderboard, [In,Out] SteamId[] prgUsers, int cUsers ) { - return await LeaderboardScoresDownloaded_t.GetResultAsync( _DownloadLeaderboardEntriesForUsers( Self, hSteamLeaderboard, prgUsers, cUsers ) ); + var returnValue = _DownloadLeaderboardEntriesForUsers( Self, hSteamLeaderboard, prgUsers, cUsers ); + return await LeaderboardScoresDownloaded_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -476,7 +506,8 @@ internal LeaderboardDisplay GetLeaderboardDisplayType( SteamLeaderboard_t hSteam #endregion internal bool GetDownloadedLeaderboardEntry( SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, ref LeaderboardEntry_t pLeaderboardEntry, [In,Out] int[] pDetails, int cDetailsMax ) { - return _GetDownloadedLeaderboardEntry( Self, hSteamLeaderboardEntries, index, ref pLeaderboardEntry, pDetails, cDetailsMax ); + var returnValue = _GetDownloadedLeaderboardEntry( Self, hSteamLeaderboardEntries, index, ref pLeaderboardEntry, pDetails, cDetailsMax ); + return returnValue; } #region FunctionMeta @@ -487,7 +518,8 @@ internal bool GetDownloadedLeaderboardEntry( SteamLeaderboardEntries_t hSteamLea #endregion internal async Task UploadLeaderboardScore( SteamLeaderboard_t hSteamLeaderboard, LeaderboardUploadScoreMethod eLeaderboardUploadScoreMethod, int nScore, [In,Out] int[] pScoreDetails, int cScoreDetailsCount ) { - return await LeaderboardScoreUploaded_t.GetResultAsync( _UploadLeaderboardScore( Self, hSteamLeaderboard, eLeaderboardUploadScoreMethod, nScore, pScoreDetails, cScoreDetailsCount ) ); + var returnValue = _UploadLeaderboardScore( Self, hSteamLeaderboard, eLeaderboardUploadScoreMethod, nScore, pScoreDetails, cScoreDetailsCount ); + return await LeaderboardScoreUploaded_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -498,7 +530,8 @@ internal bool GetDownloadedLeaderboardEntry( SteamLeaderboardEntries_t hSteamLea #endregion internal async Task AttachLeaderboardUGC( SteamLeaderboard_t hSteamLeaderboard, UGCHandle_t hUGC ) { - return await LeaderboardUGCSet_t.GetResultAsync( _AttachLeaderboardUGC( Self, hSteamLeaderboard, hUGC ) ); + var returnValue = _AttachLeaderboardUGC( Self, hSteamLeaderboard, hUGC ); + return await LeaderboardUGCSet_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -509,7 +542,8 @@ internal bool GetDownloadedLeaderboardEntry( SteamLeaderboardEntries_t hSteamLea #endregion internal async Task GetNumberOfCurrentPlayers() { - return await NumberOfCurrentPlayers_t.GetResultAsync( _GetNumberOfCurrentPlayers( Self ) ); + var returnValue = _GetNumberOfCurrentPlayers( Self ); + return await NumberOfCurrentPlayers_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -520,29 +554,36 @@ internal bool GetDownloadedLeaderboardEntry( SteamLeaderboardEntries_t hSteamLea #endregion internal async Task RequestGlobalAchievementPercentages() { - return await GlobalAchievementPercentagesReady_t.GetResultAsync( _RequestGlobalAchievementPercentages( Self ) ); + var returnValue = _RequestGlobalAchievementPercentages( Self ); + return await GlobalAchievementPercentagesReady_t.GetResultAsync( returnValue ); } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate int FGetMostAchievedAchievementInfo( IntPtr self, StringBuilder pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ); + private delegate int FGetMostAchievedAchievementInfo( IntPtr self, IntPtr pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ); private FGetMostAchievedAchievementInfo _GetMostAchievedAchievementInfo; #endregion - internal int GetMostAchievedAchievementInfo( StringBuilder pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) + internal int GetMostAchievedAchievementInfo( out string pchName, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) { - return _GetMostAchievedAchievementInfo( Self, pchName, unNameBufLen, ref pflPercent, ref pbAchieved ); + IntPtr mempchName = Helpers.TakeMemory(); + var returnValue = _GetMostAchievedAchievementInfo( Self, mempchName, (1024 * 32), ref pflPercent, ref pbAchieved ); + pchName = Helpers.MemoryToString( mempchName ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] - private delegate int FGetNextMostAchievedAchievementInfo( IntPtr self, int iIteratorPrevious, StringBuilder pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ); + private delegate int FGetNextMostAchievedAchievementInfo( IntPtr self, int iIteratorPrevious, IntPtr pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ); private FGetNextMostAchievedAchievementInfo _GetNextMostAchievedAchievementInfo; #endregion - internal int GetNextMostAchievedAchievementInfo( int iIteratorPrevious, StringBuilder pchName, uint unNameBufLen, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) + internal int GetNextMostAchievedAchievementInfo( int iIteratorPrevious, out string pchName, ref float pflPercent, [MarshalAs( UnmanagedType.U1 )] ref bool pbAchieved ) { - return _GetNextMostAchievedAchievementInfo( Self, iIteratorPrevious, pchName, unNameBufLen, ref pflPercent, ref pbAchieved ); + IntPtr mempchName = Helpers.TakeMemory(); + var returnValue = _GetNextMostAchievedAchievementInfo( Self, iIteratorPrevious, mempchName, (1024 * 32), ref pflPercent, ref pbAchieved ); + pchName = Helpers.MemoryToString( mempchName ); + return returnValue; } #region FunctionMeta @@ -554,7 +595,8 @@ internal int GetNextMostAchievedAchievementInfo( int iIteratorPrevious, StringBu #endregion internal bool GetAchievementAchievedPercent( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pflPercent ) { - return _GetAchievementAchievedPercent( Self, pchName, ref pflPercent ); + var returnValue = _GetAchievementAchievedPercent( Self, pchName, ref pflPercent ); + return returnValue; } #region FunctionMeta @@ -565,7 +607,8 @@ internal bool GetAchievementAchievedPercent( [MarshalAs( UnmanagedType.CustomMar #endregion internal async Task RequestGlobalStats( int nHistoryDays ) { - return await GlobalStatsReceived_t.GetResultAsync( _RequestGlobalStats( Self, nHistoryDays ) ); + var returnValue = _RequestGlobalStats( Self, nHistoryDays ); + return await GlobalStatsReceived_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -577,7 +620,8 @@ internal bool GetAchievementAchievedPercent( [MarshalAs( UnmanagedType.CustomMar #endregion internal bool GetGlobalStat1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchStatName, ref long pData ) { - return _GetGlobalStat1( Self, pchStatName, ref pData ); + var returnValue = _GetGlobalStat1( Self, pchStatName, ref pData ); + return returnValue; } #region FunctionMeta @@ -589,7 +633,8 @@ internal bool GetGlobalStat1( [MarshalAs( UnmanagedType.CustomMarshaler, Marshal #endregion internal bool GetGlobalStat2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchStatName, ref double pData ) { - return _GetGlobalStat2( Self, pchStatName, ref pData ); + var returnValue = _GetGlobalStat2( Self, pchStatName, ref pData ); + return returnValue; } #region FunctionMeta @@ -600,7 +645,8 @@ internal bool GetGlobalStat2( [MarshalAs( UnmanagedType.CustomMarshaler, Marshal #endregion internal int GetGlobalStatHistory1( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchStatName, [In,Out] long[] pData, uint cubData ) { - return _GetGlobalStatHistory1( Self, pchStatName, pData, cubData ); + var returnValue = _GetGlobalStatHistory1( Self, pchStatName, pData, cubData ); + return returnValue; } #region FunctionMeta @@ -611,7 +657,8 @@ internal int GetGlobalStatHistory1( [MarshalAs( UnmanagedType.CustomMarshaler, M #endregion internal int GetGlobalStatHistory2( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchStatName, [In,Out] double[] pData, uint cubData ) { - return _GetGlobalStatHistory2( Self, pchStatName, pData, cubData ); + var returnValue = _GetGlobalStatHistory2( Self, pchStatName, pData, cubData ); + return returnValue; } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs index 19f83ae..bfe1161 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs @@ -88,7 +88,8 @@ internal override void Shutdown() #endregion internal uint GetSecondsSinceAppActive() { - return _GetSecondsSinceAppActive( Self ); + var returnValue = _GetSecondsSinceAppActive( Self ); + return returnValue; } #region FunctionMeta @@ -99,7 +100,8 @@ internal uint GetSecondsSinceAppActive() #endregion internal uint GetSecondsSinceComputerActive() { - return _GetSecondsSinceComputerActive( Self ); + var returnValue = _GetSecondsSinceComputerActive( Self ); + return returnValue; } #region FunctionMeta @@ -110,7 +112,8 @@ internal uint GetSecondsSinceComputerActive() #endregion internal Universe GetConnectedUniverse() { - return _GetConnectedUniverse( Self ); + var returnValue = _GetConnectedUniverse( Self ); + return returnValue; } #region FunctionMeta @@ -121,7 +124,8 @@ internal Universe GetConnectedUniverse() #endregion internal uint GetServerRealTime() { - return _GetServerRealTime( Self ); + var returnValue = _GetServerRealTime( Self ); + return returnValue; } #region FunctionMeta @@ -132,7 +136,8 @@ internal uint GetServerRealTime() #endregion internal string GetIPCountry() { - return _GetIPCountry( Self ); + var returnValue = _GetIPCountry( Self ); + return returnValue; } #region FunctionMeta @@ -144,7 +149,8 @@ internal string GetIPCountry() #endregion internal bool GetImageSize( int iImage, ref uint pnWidth, ref uint pnHeight ) { - return _GetImageSize( Self, iImage, ref pnWidth, ref pnHeight ); + var returnValue = _GetImageSize( Self, iImage, ref pnWidth, ref pnHeight ); + return returnValue; } #region FunctionMeta @@ -156,7 +162,8 @@ internal bool GetImageSize( int iImage, ref uint pnWidth, ref uint pnHeight ) #endregion internal bool GetImageRGBA( int iImage, [In,Out] byte[] pubDest, int nDestBufferSize ) { - return _GetImageRGBA( Self, iImage, pubDest, nDestBufferSize ); + var returnValue = _GetImageRGBA( Self, iImage, pubDest, nDestBufferSize ); + return returnValue; } #region FunctionMeta @@ -168,7 +175,8 @@ internal bool GetImageRGBA( int iImage, [In,Out] byte[] pubDest, int nDestBuffe #endregion internal bool GetCSERIPPort( ref uint unIP, ref ushort usPort ) { - return _GetCSERIPPort( Self, ref unIP, ref usPort ); + var returnValue = _GetCSERIPPort( Self, ref unIP, ref usPort ); + return returnValue; } #region FunctionMeta @@ -179,7 +187,8 @@ internal bool GetCSERIPPort( ref uint unIP, ref ushort usPort ) #endregion internal byte GetCurrentBatteryPower() { - return _GetCurrentBatteryPower( Self ); + var returnValue = _GetCurrentBatteryPower( Self ); + return returnValue; } #region FunctionMeta @@ -190,7 +199,8 @@ internal byte GetCurrentBatteryPower() #endregion internal uint GetAppID() { - return _GetAppID( Self ); + var returnValue = _GetAppID( Self ); + return returnValue; } #region FunctionMeta @@ -213,7 +223,8 @@ internal void SetOverlayNotificationPosition( NotificationPosition eNotification #endregion internal bool IsAPICallCompleted( SteamAPICall_t hSteamAPICall, [MarshalAs( UnmanagedType.U1 )] ref bool pbFailed ) { - return _IsAPICallCompleted( Self, hSteamAPICall, ref pbFailed ); + var returnValue = _IsAPICallCompleted( Self, hSteamAPICall, ref pbFailed ); + return returnValue; } #region FunctionMeta @@ -224,7 +235,8 @@ internal bool IsAPICallCompleted( SteamAPICall_t hSteamAPICall, [MarshalAs( Unma #endregion internal SteamAPICallFailure GetAPICallFailureReason( SteamAPICall_t hSteamAPICall ) { - return _GetAPICallFailureReason( Self, hSteamAPICall ); + var returnValue = _GetAPICallFailureReason( Self, hSteamAPICall ); + return returnValue; } #region FunctionMeta @@ -236,7 +248,8 @@ internal SteamAPICallFailure GetAPICallFailureReason( SteamAPICall_t hSteamAPICa #endregion internal bool GetAPICallResult( SteamAPICall_t hSteamAPICall, IntPtr pCallback, int cubCallback, int iCallbackExpected, [MarshalAs( UnmanagedType.U1 )] ref bool pbFailed ) { - return _GetAPICallResult( Self, hSteamAPICall, pCallback, cubCallback, iCallbackExpected, ref pbFailed ); + var returnValue = _GetAPICallResult( Self, hSteamAPICall, pCallback, cubCallback, iCallbackExpected, ref pbFailed ); + return returnValue; } #region FunctionMeta @@ -258,7 +271,8 @@ internal void RunFrame() #endregion internal uint GetIPCCallCount() { - return _GetIPCCallCount( Self ); + var returnValue = _GetIPCCallCount( Self ); + return returnValue; } #region FunctionMeta @@ -281,7 +295,8 @@ internal void SetWarningMessageHook( IntPtr pFunction ) #endregion internal bool IsOverlayEnabled() { - return _IsOverlayEnabled( Self ); + var returnValue = _IsOverlayEnabled( Self ); + return returnValue; } #region FunctionMeta @@ -293,7 +308,8 @@ internal bool IsOverlayEnabled() #endregion internal bool BOverlayNeedsPresent() { - return _BOverlayNeedsPresent( Self ); + var returnValue = _BOverlayNeedsPresent( Self ); + return returnValue; } #region FunctionMeta @@ -304,7 +320,8 @@ internal bool BOverlayNeedsPresent() #endregion internal async Task CheckFileSignature( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string szFileName ) { - return await CheckFileSignature_t.GetResultAsync( _CheckFileSignature( Self, szFileName ) ); + var returnValue = _CheckFileSignature( Self, szFileName ); + return await CheckFileSignature_t.GetResultAsync( returnValue ); } #region FunctionMeta @@ -316,7 +333,8 @@ internal bool BOverlayNeedsPresent() #endregion internal bool ShowGamepadTextInput( GamepadTextInputMode eInputMode, GamepadTextInputLineMode eLineInputMode, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchDescription, uint unCharMax, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchExistingText ) { - return _ShowGamepadTextInput( Self, eInputMode, eLineInputMode, pchDescription, unCharMax, pchExistingText ); + var returnValue = _ShowGamepadTextInput( Self, eInputMode, eLineInputMode, pchDescription, unCharMax, pchExistingText ); + return returnValue; } #region FunctionMeta @@ -327,19 +345,23 @@ internal bool ShowGamepadTextInput( GamepadTextInputMode eInputMode, GamepadText #endregion internal uint GetEnteredGamepadTextLength() { - return _GetEnteredGamepadTextLength( Self ); + var returnValue = _GetEnteredGamepadTextLength( Self ); + return returnValue; } #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetEnteredGamepadTextInput( IntPtr self, StringBuilder pchText, uint cchText ); + private delegate bool FGetEnteredGamepadTextInput( IntPtr self, IntPtr pchText, uint cchText ); private FGetEnteredGamepadTextInput _GetEnteredGamepadTextInput; #endregion - internal bool GetEnteredGamepadTextInput( StringBuilder pchText, uint cchText ) + internal bool GetEnteredGamepadTextInput( out string pchText ) { - return _GetEnteredGamepadTextInput( Self, pchText, cchText ); + IntPtr mempchText = Helpers.TakeMemory(); + var returnValue = _GetEnteredGamepadTextInput( Self, mempchText, (1024 * 32) ); + pchText = Helpers.MemoryToString( mempchText ); + return returnValue; } #region FunctionMeta @@ -350,7 +372,8 @@ internal bool GetEnteredGamepadTextInput( StringBuilder pchText, uint cchText ) #endregion internal string GetSteamUILanguage() { - return _GetSteamUILanguage( Self ); + var returnValue = _GetSteamUILanguage( Self ); + return returnValue; } #region FunctionMeta @@ -362,7 +385,8 @@ internal string GetSteamUILanguage() #endregion internal bool IsSteamRunningInVR() { - return _IsSteamRunningInVR( Self ); + var returnValue = _IsSteamRunningInVR( Self ); + return returnValue; } #region FunctionMeta @@ -385,7 +409,8 @@ internal void SetOverlayNotificationInset( int nHorizontalInset, int nVerticalIn #endregion internal bool IsSteamInBigPictureMode() { - return _IsSteamInBigPictureMode( Self ); + var returnValue = _IsSteamInBigPictureMode( Self ); + return returnValue; } #region FunctionMeta @@ -408,7 +433,8 @@ internal void StartVRDashboard() #endregion internal bool IsVRHeadsetStreamingEnabled() { - return _IsVRHeadsetStreamingEnabled( Self ); + var returnValue = _IsVRHeadsetStreamingEnabled( Self ); + return returnValue; } #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs index 6e08de3..9c45cd7 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs @@ -48,7 +48,8 @@ internal void GetVideoURL( AppId unVideoAppID ) #endregion internal bool IsBroadcasting( ref int pnNumViewers ) { - return _IsBroadcasting( Self, ref pnNumViewers ); + var returnValue = _IsBroadcasting( Self, ref pnNumViewers ); + return returnValue; } #region FunctionMeta @@ -65,13 +66,16 @@ internal void GetOPFSettings( AppId unVideoAppID ) #region FunctionMeta [UnmanagedFunctionPointer( Platform.MemberConvention )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetOPFStringForApp( IntPtr self, AppId unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ); + private delegate bool FGetOPFStringForApp( IntPtr self, AppId unVideoAppID, IntPtr pchBuffer, ref int pnBufferSize ); private FGetOPFStringForApp _GetOPFStringForApp; #endregion - internal bool GetOPFStringForApp( AppId unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ) + internal bool GetOPFStringForApp( AppId unVideoAppID, out string pchBuffer, ref int pnBufferSize ) { - return _GetOPFStringForApp( Self, unVideoAppID, pchBuffer, ref pnBufferSize ); + IntPtr mempchBuffer = Helpers.TakeMemory(); + var returnValue = _GetOPFStringForApp( Self, unVideoAppID, mempchBuffer, ref pnBufferSize ); + pchBuffer = Helpers.MemoryToString( mempchBuffer ); + return returnValue; } } diff --git a/Facepunch.Steamworks/SteamApps.cs b/Facepunch.Steamworks/SteamApps.cs index f79eaaa..d70b333 100644 --- a/Facepunch.Steamworks/SteamApps.cs +++ b/Facepunch.Steamworks/SteamApps.cs @@ -128,15 +128,13 @@ public static IEnumerable DlcInformation() for ( int i = 0; i < Internal.GetDLCCount(); i++ ) { - var sb = Helpers.TakeStringBuilder(); - - if ( !Internal.BGetDLCDataByIndex( i, ref appid, ref available, sb, sb.Capacity ) ) + if ( !Internal.BGetDLCDataByIndex( i, ref appid, ref available, out var strVal ) ) continue; yield return new DlcInformation { AppId = appid.Value, - Name = sb.ToString(), + Name = strVal, Available = available }; } @@ -159,12 +157,10 @@ public static string CurrentBetaName { get { - var sb = Helpers.TakeStringBuilder(); - - if ( !Internal.GetCurrentBetaName( sb, sb.Capacity ) ) + if ( !Internal.GetCurrentBetaName( out var strVal ) ) return null; - return sb.ToString(); + return strVal; } } @@ -204,12 +200,10 @@ public static string CurrentBetaName if ( appid == 0 ) appid = SteamClient.AppId; - var sb = Helpers.TakeStringBuilder(); - - if ( Internal.GetAppInstallDir( appid.Value, sb, (uint) sb.Capacity ) == 0 ) + if ( Internal.GetAppInstallDir( appid.Value, out var strVal ) == 0 ) return null; - return sb.ToString(); + return strVal; } /// @@ -282,9 +276,8 @@ public static string CommandLine { get { - var sb = Helpers.TakeStringBuilder(); - var len = Internal.GetLaunchCommandLine( sb, sb.Capacity ); - return sb.ToString(); + var len = Internal.GetLaunchCommandLine( out var strVal ); + return strVal; } } diff --git a/Facepunch.Steamworks/SteamUtils.cs b/Facepunch.Steamworks/SteamUtils.cs index 04dbe65..40d0cb3 100644 --- a/Facepunch.Steamworks/SteamUtils.cs +++ b/Facepunch.Steamworks/SteamUtils.cs @@ -207,11 +207,10 @@ public static string GetEnteredGamepadText() var len = Internal.GetEnteredGamepadTextLength(); if ( len == 0 ) return string.Empty; - var sb = Helpers.TakeStringBuilder(); - if ( !Internal.GetEnteredGamepadTextInput( sb, len ) ) + if ( !Internal.GetEnteredGamepadTextInput( out var strVal ) ) return string.Empty; - return sb.ToString(); + return strVal; } /// diff --git a/Facepunch.Steamworks/Structs/Connection.cs b/Facepunch.Steamworks/Structs/Connection.cs index babe402..d045d2a 100644 --- a/Facepunch.Steamworks/Structs/Connection.cs +++ b/Facepunch.Steamworks/Structs/Connection.cs @@ -42,11 +42,10 @@ public string ConnectionName { get { - var sb = Helpers.TakeStringBuilder(); - if ( !SteamNetworkingSockets.Internal.GetConnectionName( this, sb, sb.Capacity ) ) + if ( !SteamNetworkingSockets.Internal.GetConnectionName( this, out var strVal ) ) return "ERROR"; - return sb.ToString(); + return strVal; } set => SteamNetworkingSockets.Internal.SetConnectionName( this, value ); @@ -87,12 +86,10 @@ public unsafe Result SendMessage( string str, SendType sendType = SendType.Relia public string DetailedStatus() { - var sb = Helpers.TakeStringBuilder(); - - if ( SteamNetworkingSockets.Internal.GetDetailedConnectionStatus( this, sb, sb.Capacity ) != 0 ) + if ( SteamNetworkingSockets.Internal.GetDetailedConnectionStatus( this, out var strVal ) != 0 ) return null; - return sb.ToString(); + return strVal; } /* diff --git a/Facepunch.Steamworks/Structs/InventoryDef.cs b/Facepunch.Steamworks/Structs/InventoryDef.cs index f438873..4475986 100644 --- a/Facepunch.Steamworks/Structs/InventoryDef.cs +++ b/Facepunch.Steamworks/Structs/InventoryDef.cs @@ -98,16 +98,14 @@ public string GetProperty( string name ) if ( _properties!= null && _properties.TryGetValue( name, out string val ) ) return val; - var sb = Helpers.TakeStringBuilder(); - uint _ = (uint)sb.Capacity; + uint _ = (uint)Helpers.MaxStringSize; - if ( !SteamInventory.Internal.GetItemDefinitionProperty( Id, name, sb, ref _ ) ) + if ( !SteamInventory.Internal.GetItemDefinitionProperty( Id, name, out var vl, ref _ ) ) return null; if ( _properties == null ) _properties = new Dictionary(); - var vl = sb.ToString(); _properties[name] = vl; return vl; diff --git a/Facepunch.Steamworks/Structs/InventoryItem.cs b/Facepunch.Steamworks/Structs/InventoryItem.cs index 4dfacc0..c9e21cc 100644 --- a/Facepunch.Steamworks/Structs/InventoryItem.cs +++ b/Facepunch.Steamworks/Structs/InventoryItem.cs @@ -100,23 +100,20 @@ internal static InventoryItem From( SteamItemDetails_t details ) internal static Dictionary GetProperties( SteamInventoryResult_t result, int index ) { - var sb = Helpers.TakeStringBuilder(); - var strlen = (uint) sb.Capacity; + var strlen = (uint) Helpers.MaxStringSize; - if ( !SteamInventory.Internal.GetResultItemProperty( result, (uint)index, null, sb, ref strlen ) ) + if ( !SteamInventory.Internal.GetResultItemProperty( result, (uint)index, null, out var propNames, ref strlen ) ) return null; - var propNames = sb.ToString(); - var props = new Dictionary(); foreach ( var propertyName in propNames.Split( ',' ) ) { - strlen = (uint)sb.Capacity; + strlen = (uint)Helpers.MaxStringSize; - if ( SteamInventory.Internal.GetResultItemProperty( result, (uint)index, propertyName, sb, ref strlen ) ) + if ( SteamInventory.Internal.GetResultItemProperty( result, (uint)index, propertyName, out var strVal, ref strlen ) ) { - props.Add( propertyName, sb.ToString() ); + props.Add( propertyName, strVal ); } } diff --git a/Facepunch.Steamworks/Structs/Lobby.cs b/Facepunch.Steamworks/Structs/Lobby.cs index f9f8b98..037e712 100644 --- a/Facepunch.Steamworks/Structs/Lobby.cs +++ b/Facepunch.Steamworks/Structs/Lobby.cs @@ -102,14 +102,11 @@ public IEnumerable> Data { var cnt = SteamMatchmaking.Internal.GetLobbyDataCount( Id ); - var a = Helpers.TakeStringBuilder(); - var b = Helpers.TakeStringBuilder(); - for ( int i =0; i( a.ToString(), b.ToString() ); + yield return new KeyValuePair( a, b ); } } } diff --git a/Facepunch.Steamworks/Structs/PartyBeacon.cs b/Facepunch.Steamworks/Structs/PartyBeacon.cs index 2ed88b5..2bb4145 100644 --- a/Facepunch.Steamworks/Structs/PartyBeacon.cs +++ b/Facepunch.Steamworks/Structs/PartyBeacon.cs @@ -18,8 +18,7 @@ public SteamId Owner { var owner = default( SteamId ); var location = default( SteamPartyBeaconLocation_t ); - var sb = Helpers.TakeStringBuilder(); - Internal.GetBeaconDetails( Id, ref owner, ref location, sb, sb.Capacity ); + Internal.GetBeaconDetails( Id, ref owner, ref location, out var strVal ); return owner; } } @@ -33,9 +32,8 @@ public string MetaData { var owner = default( SteamId ); var location = default( SteamPartyBeaconLocation_t ); - var sb = Helpers.TakeStringBuilder(); - Internal.GetBeaconDetails( Id, ref owner, ref location, sb, sb.Capacity ); - return sb.ToString(); + Internal.GetBeaconDetails( Id, ref owner, ref location, out var strVal ); + return strVal; } } diff --git a/Facepunch.Steamworks/Structs/PingLocation.cs b/Facepunch.Steamworks/Structs/PingLocation.cs index a527cbc..9eb0a95 100644 --- a/Facepunch.Steamworks/Structs/PingLocation.cs +++ b/Facepunch.Steamworks/Structs/PingLocation.cs @@ -33,9 +33,8 @@ public struct PingLocation public override string ToString() { - var sb = Helpers.TakeStringBuilder(); - SteamNetworkingUtils.Internal.ConvertPingLocationToString( ref this, sb, sb.Capacity ); - return sb.ToString(); + SteamNetworkingUtils.Internal.ConvertPingLocationToString( ref this, out var strVal ); + return strVal; } /// Estimate the round-trip latency between two arbitrary locations, in diff --git a/Facepunch.Steamworks/Structs/UgcItem.cs b/Facepunch.Steamworks/Structs/UgcItem.cs index f3d5e63..b661aa3 100644 --- a/Facepunch.Steamworks/Structs/UgcItem.cs +++ b/Facepunch.Steamworks/Structs/UgcItem.cs @@ -115,11 +115,11 @@ public string Directory { ulong size = 0; uint ts = 0; - var sb = Helpers.TakeStringBuilder(); - if ( !SteamUGC.Internal.GetItemInstallInfo( Id, ref size, sb, (uint)sb.Capacity, ref ts ) ) + + if ( !SteamUGC.Internal.GetItemInstallInfo( Id, ref size, out var strVal, ref ts ) ) return null; - return sb.ToString(); + return strVal; } } @@ -182,8 +182,8 @@ public long SizeBytes ulong size = 0; uint ts = 0; - var sb = Helpers.TakeStringBuilder(); - if ( !SteamUGC.Internal.GetItemInstallInfo( Id, ref size, sb, (uint)sb.Capacity, ref ts ) ) + + if ( !SteamUGC.Internal.GetItemInstallInfo( Id, ref size, out var strVal, ref ts ) ) return 0; return (long) size; diff --git a/Facepunch.Steamworks/Structs/UgcResultPage.cs b/Facepunch.Steamworks/Structs/UgcResultPage.cs index e9ecdb9..77044af 100644 --- a/Facepunch.Steamworks/Structs/UgcResultPage.cs +++ b/Facepunch.Steamworks/Structs/UgcResultPage.cs @@ -38,10 +38,9 @@ public IEnumerable Entries item.NumSecondsPlayedDuringTimePeriod = GetStat( i, ItemStatistic.NumSecondsPlayedDuringTimePeriod ); item.NumPlaytimeSessionsDuringTimePeriod = GetStat( i, ItemStatistic.NumPlaytimeSessionsDuringTimePeriod ); - var sb = Helpers.TakeStringBuilder(); - if ( SteamUGC.Internal.GetQueryUGCPreviewURL( Handle, i, sb, (uint)sb.Capacity ) ) + if ( SteamUGC.Internal.GetQueryUGCPreviewURL( Handle, i, out string preview ) ) { - item.PreviewImageUrl = sb.ToString(); + item.PreviewImageUrl = preview; } // TODO GetQueryUGCAdditionalPreview diff --git a/Facepunch.Steamworks/Utility/Helpers.cs b/Facepunch.Steamworks/Utility/Helpers.cs index 91dfe5e..549ea06 100644 --- a/Facepunch.Steamworks/Utility/Helpers.cs +++ b/Facepunch.Steamworks/Utility/Helpers.cs @@ -7,41 +7,42 @@ namespace Steamworks { internal static class Helpers { - private static StringBuilder[] StringBuilderPool; - private static int StringBuilderPoolIndex; + public const int MaxStringSize = 1024 * 32; - /// - /// Returns a StringBuilder. This will get returned and reused later on. - /// - public static StringBuilder TakeStringBuilder() - { - if ( StringBuilderPool == null ) - { - // - // The pool has 4 items. This should be safe because we shouldn't really - // ever be using more than 2 StringBuilders at the same time. - // - StringBuilderPool = new StringBuilder[4]; + private static IntPtr[] MemoryPool; + private static int MemoryPoolIndex; - for ( int i = 0; i < StringBuilderPool.Length; i++ ) - StringBuilderPool[i] = new StringBuilder( 1024 * 32 ); - } + public static unsafe IntPtr TakeMemory() + { + if ( MemoryPool == null ) + { + // + // The pool has 5 items. This should be safe because we shouldn't really + // ever be using more than 2 memory pools + // + MemoryPool = new IntPtr[5]; - StringBuilderPoolIndex++; - if ( StringBuilderPoolIndex >= StringBuilderPool.Length ) - StringBuilderPoolIndex = 0; + for ( int i = 0; i < MemoryPool.Length; i++ ) + MemoryPool[i] = Marshal.AllocHGlobal( MaxStringSize ); + } - StringBuilderPool[StringBuilderPoolIndex].Length = 0; + MemoryPoolIndex++; + if ( MemoryPoolIndex >= MemoryPool.Length ) + MemoryPoolIndex = 0; - return StringBuilderPool[StringBuilderPoolIndex]; - } + var take = MemoryPool[MemoryPoolIndex]; + + ((byte*)take)[0] = 0; + + return take; + } private static byte[][] BufferPool; private static int BufferPoolIndex; /// - /// Returns a StringBuilder. This will get returned and reused later on. + /// Returns a buffer. This will get returned and reused later on. /// public static byte[] TakeBuffer( int minSize ) { @@ -67,6 +68,22 @@ public static byte[] TakeBuffer( int minSize ) return BufferPool[BufferPoolIndex]; } + + internal unsafe static string MemoryToString( IntPtr ptr ) + { + var len = 0; + + for( len = 0; len < MaxStringSize; len++ ) + { + if ( ((byte*)ptr)[len] == 0 ) + break; + } + + if ( len == 0 ) + return string.Empty; + + return UTF8Encoding.UTF8.GetString( (byte*)ptr, len ); + } } internal class MonoPInvokeCallbackAttribute : Attribute diff --git a/Generator/CodeWriter/ClassVTable.cs b/Generator/CodeWriter/ClassVTable.cs index b431a8f..84b444b 100644 --- a/Generator/CodeWriter/ClassVTable.cs +++ b/Generator/CodeWriter/ClassVTable.cs @@ -188,8 +188,27 @@ private void WriteFunction( CodeParser.Class clss, CodeParser.Class.Function fun bt.Func = func.Name; return bt; } ).ToArray(); - var argstr = string.Join( ", ", args.Select( x => x.AsArgument() ) ); - var delegateargstr = string.Join( ", ", args.Select( x => x.AsArgument() ) ); + + for( int i=0; i !x.ShouldSkipAsArgument ).Select( x => x.AsArgument() ) ); ; + var delegateargstr = string.Join( ", ", args.Select( x => x.AsNativeArgument() ) ); var windowsSpecific = NeedsWindowsSpecificFunction( func, returnType, args ); @@ -230,6 +249,20 @@ private void WriteFunction( CodeParser.Class clss, CodeParser.Class.Function fun { var callargs = string.Join( ", ", args.Select( x => x.AsCallArgument() ) ); + // + // Code before any calls + // + foreach ( var arg in args ) + { + if ( arg is StringType sb ) + { + WriteLine( $"IntPtr mem{sb.VarName} = Helpers.TakeMemory();" ); + } + } + + // + // The actual call + // if ( returnType.IsReturnedWeird ) { WriteLine( "#if PLATFORM_WIN" ); @@ -247,9 +280,26 @@ private void WriteFunction( CodeParser.Class clss, CodeParser.Class.Function fun } else { - var v = $"_{func.Name}( Self, {callargs} )".Replace( "( Self, )", "( Self )" ); + WriteLine( $"var returnValue = _{func.Name}( Self, {callargs} );".Replace( "( Self, )", "( Self )" ) ); + } - WriteLine( returnType.Return( v ) ); + // + // Code after the call + // + foreach ( var arg in args ) + { + if ( arg is StringType sb ) + { + WriteLine( $"{sb.VarName} = Helpers.MemoryToString( mem{sb.VarName} );" ); + } + } + + // + // Return + // + if ( !returnType.IsVoid ) + { + WriteLine( returnType.Return( "returnValue" ) ); } if ( returnType.IsReturnedWeird ) diff --git a/Generator/CodeWriter/Types/BaseType.cs b/Generator/CodeWriter/Types/BaseType.cs index e4822f6..1e03c50 100644 --- a/Generator/CodeWriter/Types/BaseType.cs +++ b/Generator/CodeWriter/Types/BaseType.cs @@ -26,7 +26,7 @@ public static BaseType Parse( string type, string varname = null ) if ( type == "void" ) return new VoidType { NativeType = type, VarName = varname }; if ( type.Replace( " ", "" ).StartsWith( "constchar*" ) ) return new ConstCharType { NativeType = type, VarName = varname }; - if ( type == "char *" ) return new StringBuilderType { NativeType = type, VarName = varname }; + if ( type == "char *" ) return new StringType { NativeType = type, VarName = varname }; var basicType = type.Replace( "const ", "" ).Trim( ' ', '*', '&' ); @@ -65,6 +65,9 @@ public static BaseType Parse( string type, string varname = null ) return new BaseType { NativeType = type, VarName = varname }; } + public virtual bool ShouldSkipAsArgument => false; + + public virtual string AsNativeArgument() => AsArgument(); public virtual string AsArgument() => IsVector ? $"[In,Out] {Ref}{TypeName.Trim( '*', ' ' )}[] {VarName}" : $"{Ref}{TypeName.Trim( '*', ' ' )} {VarName}"; public virtual string AsCallArgument() => $"{Ref}{VarName}"; @@ -221,9 +224,14 @@ internal class ConstCharType : BaseType public override string Ref => ""; } -internal class StringBuilderType : BaseType +internal class StringType : BaseType { - public override string TypeName => $"StringBuilder"; + public override string TypeName => $"string"; + public override string AsArgument() => $"out string {VarName}"; + + public override string AsNativeArgument() => $"IntPtr {VarName}"; + + public override string AsCallArgument() => $"mem{VarName}"; public override string Ref => ""; } @@ -238,4 +246,23 @@ internal class VoidType : BaseType internal class EnumType : BaseType { +} + +internal class ConstValueType : BaseType +{ + private string Value; + BaseType basetype; + + public ConstValueType( BaseType basetype, string value ) + { + this.basetype = basetype; + this.Value = value; + } + + public override bool ShouldSkipAsArgument => true; + + public override string Ref => ""; + public override bool IsVector => false; + public override string AsArgument() => basetype.AsArgument(); + public override string AsCallArgument() => Value; } \ No newline at end of file