From 7baef8966e6b7f4d1fbf6dd5d1206d36b5980e9c Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Thu, 13 Feb 2020 10:54:31 +0000 Subject: [PATCH] Constants --- .../Generated/SteamCallbacks.cs | 6 +- .../Generated/SteamConstants.cs | 92 +++++++++++++++++++ Generator/Cleanup.cs | 2 + Generator/CodeWriter/Types/BaseType.cs | 3 +- Generator/SteamApiDefinition.cs | 17 ++++ 5 files changed, 114 insertions(+), 6 deletions(-) diff --git a/Facepunch.Steamworks/Generated/SteamCallbacks.cs b/Facepunch.Steamworks/Generated/SteamCallbacks.cs index d0351ca..c6d7fea 100644 --- a/Facepunch.Steamworks/Generated/SteamCallbacks.cs +++ b/Facepunch.Steamworks/Generated/SteamCallbacks.cs @@ -2429,8 +2429,7 @@ namespace Steamworks.Data internal int TotalResultCount; // m_nTotalResultCount int32 [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.U8)] internal PublishedFileId[] GPublishedFileId; // m_rgPublishedFileId PublishedFileId_t [50] - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.U4)] - internal uint[] GRTimeSubscribed; // m_rgRTimeSubscribed uint32 [50] + internal uint [50] GRTimeSubscribed; // m_rgRTimeSubscribed uint32 [50] #region SteamCallback public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageEnumerateUserSubscribedFilesResult_t) ); @@ -2939,8 +2938,7 @@ namespace Steamworks.Data internal int TotalResultCount; // m_nTotalResultCount int32 [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.U8)] internal PublishedFileId[] GPublishedFileId; // m_rgPublishedFileId PublishedFileId_t [50] - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.U4)] - internal uint[] GRTimeUpdated; // m_rgRTimeUpdated uint32 [50] + internal uint [50] GRTimeUpdated; // m_rgRTimeUpdated uint32 [50] #region SteamCallback public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageEnumeratePublishedFilesByUserActionResult_t) ); diff --git a/Facepunch.Steamworks/Generated/SteamConstants.cs b/Facepunch.Steamworks/Generated/SteamConstants.cs index 6f621d5..f03c0b2 100644 --- a/Facepunch.Steamworks/Generated/SteamConstants.cs +++ b/Facepunch.Steamworks/Generated/SteamConstants.cs @@ -6,4 +6,96 @@ using System.Threading.Tasks; namespace Steamworks.Data { + internal static class Defines + { + internal static readonly int k_cubSaltSize = 8; + internal static readonly GID_t k_GIDNil = 0xffffffffffffffff; + internal static readonly GID_t k_TxnIDNil = k_GIDNil; + internal static readonly GID_t k_TxnIDUnknown = 0; + internal static readonly JobID_t k_JobIDNil = 0xffffffffffffffff; + internal static readonly PackageId_t k_uPackageIdInvalid = 0xFFFFFFFF; + internal static readonly BundleId_t k_uBundleIdInvalid = 0; + internal static readonly AppId k_uAppIdInvalid = 0x0; + internal static readonly AssetClassId_t k_ulAssetClassIdInvalid = 0x0; + internal static readonly PhysicalItemId_t k_uPhysicalItemIdInvalid = 0x0; + internal static readonly DepotId_t k_uDepotIdInvalid = 0x0; + internal static readonly CellID_t k_uCellIDInvalid = 0xFFFFFFFF; + internal static readonly SteamAPICall_t k_uAPICallInvalid = 0x0; + internal static readonly PartnerId_t k_uPartnerIdInvalid = 0; + internal static readonly ManifestId_t k_uManifestIdInvalid = 0; + internal static readonly SiteId_t k_ulSiteIdInvalid = 0; + internal static readonly PartyBeaconID_t k_ulPartyBeaconIdInvalid = 0; + internal static readonly HAuthTicket k_HAuthTicketInvalid = 0; + internal static readonly uint k_unSteamAccountIDMask = 0xFFFFFFFF; + internal static readonly uint k_unSteamAccountInstanceMask = 0x000FFFFF; + internal static readonly uint k_unSteamUserDefaultInstance = 1; + internal static readonly int k_cchGameExtraInfoMax = 64; + internal static readonly int k_cchMaxFriendsGroupName = 64; + internal static readonly int k_cFriendsGroupLimit = 100; + internal static readonly FriendsGroupID_t k_FriendsGroupID_Invalid = - 1; + internal static readonly int k_cEnumerateFollowersMax = 50; + internal static readonly uint k_cubChatMetadataMax = 8192; + internal static readonly int k_cbMaxGameServerGameDir = 32; + internal static readonly int k_cbMaxGameServerMapName = 32; + internal static readonly int k_cbMaxGameServerGameDescription = 64; + internal static readonly int k_cbMaxGameServerName = 64; + internal static readonly int k_cbMaxGameServerTags = 128; + internal static readonly int k_cbMaxGameServerGameData = 2048; + internal static readonly int HSERVERQUERY_INVALID = -1; + internal static readonly uint k_unFavoriteFlagNone = 0x00; + internal static readonly uint k_unFavoriteFlagFavorite = 0x01; + internal static readonly uint k_unFavoriteFlagHistory = 0x02; + internal static readonly uint k_unMaxCloudFileChunkSize = 100 * 1024 * 1024; + internal static readonly PublishedFileId k_PublishedFileIdInvalid = 0; + internal static readonly UGCHandle_t k_UGCHandleInvalid = 0xffffffffffffffff; + internal static readonly PublishedFileUpdateHandle_t k_PublishedFileUpdateHandleInvalid = 0xffffffffffffffff; + internal static readonly UGCFileWriteStreamHandle_t k_UGCFileStreamHandleInvalid = 0xffffffffffffffff; + internal static readonly uint k_cchPublishedDocumentTitleMax = 128 + 1; + internal static readonly uint k_cchPublishedDocumentDescriptionMax = 8000; + internal static readonly uint k_cchPublishedDocumentChangeDescriptionMax = 8000; + internal static readonly uint k_unEnumeratePublishedFilesMaxResults = 50; + internal static readonly uint k_cchTagListMax = 1024 + 1; + internal static readonly uint k_cchFilenameMax = 260; + internal static readonly uint k_cchPublishedFileURLMax = 256; + internal static readonly int k_cubAppProofOfPurchaseKeyMax = 240; + internal static readonly uint k_nScreenshotMaxTaggedUsers = 32; + internal static readonly uint k_nScreenshotMaxTaggedPublishedFiles = 32; + internal static readonly int k_cubUFSTagTypeMax = 255; + internal static readonly int k_cubUFSTagValueMax = 255; + internal static readonly int k_ScreenshotThumbWidth = 200; + internal static readonly UGCQueryHandle_t k_UGCQueryHandleInvalid = 0xffffffffffffffff; + internal static readonly UGCUpdateHandle_t k_UGCUpdateHandleInvalid = 0xffffffffffffffff; + internal static readonly uint kNumUGCResultsPerPage = 50; + internal static readonly uint k_cchDeveloperMetadataMax = 5000; + internal static readonly uint INVALID_HTMLBROWSER = 0; + internal static readonly InventoryItemId k_SteamItemInstanceIDInvalid = ~default(ulong); + internal static readonly SteamInventoryResult_t k_SteamInventoryResultInvalid = - 1; + internal static readonly SteamInventoryUpdateHandle_t k_SteamInventoryUpdateHandleInvalid = 0xffffffffffffffff; + internal static readonly Connection k_HSteamNetConnection_Invalid = 0; + internal static readonly Socket k_HSteamListenSocket_Invalid = 0; + internal static readonly HSteamNetPollGroup k_HSteamNetPollGroup_Invalid = 0; + internal static readonly int k_cchMaxSteamNetworkingErrMsg = 1024; + internal static readonly int k_cchSteamNetworkingMaxConnectionCloseReason = 128; + internal static readonly int k_cchSteamNetworkingMaxConnectionDescription = 128; + internal static readonly int k_cbMaxSteamNetworkingSocketsMessageSizeSend = 512 * 1024; + internal static readonly int k_nSteamNetworkingSend_Unreliable = 0; + internal static readonly int k_nSteamNetworkingSend_NoNagle = 1; + internal static readonly int k_nSteamNetworkingSend_UnreliableNoNagle = k_nSteamNetworkingSend_Unreliable | k_nSteamNetworkingSend_NoNagle; + internal static readonly int k_nSteamNetworkingSend_NoDelay = 4; + internal static readonly int k_nSteamNetworkingSend_UnreliableNoDelay = k_nSteamNetworkingSend_Unreliable | k_nSteamNetworkingSend_NoDelay | k_nSteamNetworkingSend_NoNagle; + internal static readonly int k_nSteamNetworkingSend_Reliable = 8; + internal static readonly int k_nSteamNetworkingSend_ReliableNoNagle = k_nSteamNetworkingSend_Reliable | k_nSteamNetworkingSend_NoNagle; + internal static readonly int k_nSteamNetworkingSend_UseCurrentThread = 16; + internal static readonly int k_cchMaxSteamNetworkingPingLocationString = 1024; + internal static readonly int k_nSteamNetworkingPing_Failed = - 1; + internal static readonly int k_nSteamNetworkingPing_Unknown = - 2; + internal static readonly SteamNetworkingPOPID k_SteamDatagramPOPID_dev = ( ( uint ) 'd' << 16 ) | ( ( uint ) 'e' << 8 ) | ( uint ) 'v'; + internal static readonly uint k_unServerFlagNone = 0x00; + internal static readonly uint k_unServerFlagActive = 0x01; + internal static readonly uint k_unServerFlagSecure = 0x02; + internal static readonly uint k_unServerFlagDedicated = 0x04; + internal static readonly uint k_unServerFlagLinux = 0x08; + internal static readonly uint k_unServerFlagPassworded = 0x10; + internal static readonly uint k_unServerFlagPrivate = 0x20; + } } diff --git a/Generator/Cleanup.cs b/Generator/Cleanup.cs index ac90e57..510b339 100644 --- a/Generator/Cleanup.cs +++ b/Generator/Cleanup.cs @@ -14,6 +14,8 @@ public static class Cleanup type = type.Replace( "struct ", "" ); type = type.Replace( "unsigned long long", "uint64" ); + type = type.Replace( "unsigned int", "uint" ); + type = type.Replace( "uint32", "uint" ); type = type.Replace( "CSteamID", "SteamId" ); type = type.Replace( "CGameID", "GameId" ); diff --git a/Generator/CodeWriter/Types/BaseType.cs b/Generator/CodeWriter/Types/BaseType.cs index eab8af3..4bc1752 100644 --- a/Generator/CodeWriter/Types/BaseType.cs +++ b/Generator/CodeWriter/Types/BaseType.cs @@ -34,8 +34,7 @@ internal class BaseType if ( basicType.StartsWith( "ISteam" ) ) return new PointerType { NativeType = type, VarName = varname }; if ( basicType == "const void" ) return new PointerType { NativeType = type, VarName = varname }; if ( basicType == "int32" || basicType == "int" ) return new IntType { NativeType = type, VarName = varname }; - if ( basicType == "uint32" ) return new UIntType { NativeType = type, VarName = varname }; - if ( basicType == "unsigned int" ) return new UIntType { NativeType = type, VarName = varname }; + if ( basicType == "uint" ) return new UIntType { NativeType = type, VarName = varname }; if ( basicType == "uint8" ) return new UInt8Type { NativeType = type, VarName = varname }; if ( basicType == "uint16" ) return new UInt16Type { NativeType = type, VarName = varname }; if ( basicType == "unsigned short" ) return new UInt16Type { NativeType = type, VarName = varname }; diff --git a/Generator/SteamApiDefinition.cs b/Generator/SteamApiDefinition.cs index 1d8db23..02e52fa 100644 --- a/Generator/SteamApiDefinition.cs +++ b/Generator/SteamApiDefinition.cs @@ -112,5 +112,22 @@ namespace Generator } public List callback_structs { get; set; } + + public class Const + { + [JsonProperty( PropertyName = "consttype" )] + public string Type { get; set; } + + [JsonProperty( PropertyName = "constname" )] + public string Name { get; set; } + + + [JsonProperty( PropertyName = "constval" )] + public string Val { get; set; } + } + + public List Consts { get; set; } } + + }