Latest fixes

This commit is contained in:
Garry Newman 2020-02-13 10:22:32 +00:00
parent e8dd99f6ed
commit dd0bc463e4
9 changed files with 25159 additions and 486 deletions

View File

@ -277,10 +277,10 @@ namespace Steamworks
private static extern SteamAPICall_t _DownloadClanActivityCounts( IntPtr self, [In,Out] SteamId[] psteamIDClans, int cClansToRequest ); private static extern SteamAPICall_t _DownloadClanActivityCounts( IntPtr self, [In,Out] SteamId[] psteamIDClans, int cClansToRequest );
#endregion #endregion
internal CallbackResult DownloadClanActivityCounts( [In,Out] SteamId[] psteamIDClans, int cClansToRequest ) internal CallbackResult<DownloadClanActivityCountsResult_t> DownloadClanActivityCounts( [In,Out] SteamId[] psteamIDClans, int cClansToRequest )
{ {
var returnValue = _DownloadClanActivityCounts( Self, psteamIDClans, cClansToRequest ); var returnValue = _DownloadClanActivityCounts( Self, psteamIDClans, cClansToRequest );
return new CallbackResult( returnValue ); return new CallbackResult<DownloadClanActivityCountsResult_t>( returnValue );
} }
#region FunctionMeta #region FunctionMeta

View File

@ -29,7 +29,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServerStats_GetUserStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServerStats_GetUserStatInt32")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _GetUserStat( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData ); private static extern bool _GetUserStat( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData );
@ -41,7 +41,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServerStats_GetUserStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServerStats_GetUserStatFloat")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _GetUserStat( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData ); private static extern bool _GetUserStat( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData );

View File

@ -315,7 +315,7 @@ namespace Steamworks
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ToString")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIPAddr_ToString")]
private static extern void _SteamNetworkingIPAddr_ToString( IntPtr self, ref NetAddress addr, IntPtr buf, UIntPtr cbBuf, [MarshalAs( UnmanagedType.U1 )] bool bWithPort ); private static extern void _SteamNetworkingIPAddr_ToString( IntPtr self, ref NetAddress addr, IntPtr buf, uint cbBuf, [MarshalAs( UnmanagedType.U1 )] bool bWithPort );
#endregion #endregion
internal void SteamNetworkingIPAddr_ToString( ref NetAddress addr, out string buf, [MarshalAs( UnmanagedType.U1 )] bool bWithPort ) internal void SteamNetworkingIPAddr_ToString( ref NetAddress addr, out string buf, [MarshalAs( UnmanagedType.U1 )] bool bWithPort )
@ -339,7 +339,7 @@ namespace Steamworks
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_SteamNetworkingIdentity_ToString")]
private static extern void _SteamNetworkingIdentity_ToString( IntPtr self, ref NetIdentity identity, IntPtr buf, UIntPtr cbBuf ); private static extern void _SteamNetworkingIdentity_ToString( IntPtr self, ref NetIdentity identity, IntPtr buf, uint cbBuf );
#endregion #endregion
internal void SteamNetworkingIdentity_ToString( ref NetIdentity identity, out string buf ) internal void SteamNetworkingIdentity_ToString( ref NetIdentity identity, out string buf )

View File

@ -437,10 +437,10 @@ namespace Steamworks
private static extern SteamAPICall_t _RequestUGCDetails( IntPtr self, PublishedFileId nPublishedFileID, uint unMaxAgeSeconds ); private static extern SteamAPICall_t _RequestUGCDetails( IntPtr self, PublishedFileId nPublishedFileID, uint unMaxAgeSeconds );
#endregion #endregion
internal CallbackResult RequestUGCDetails( PublishedFileId nPublishedFileID, uint unMaxAgeSeconds ) internal CallbackResult<SteamUGCQueryCompleted_t> RequestUGCDetails( PublishedFileId nPublishedFileID, uint unMaxAgeSeconds )
{ {
var returnValue = _RequestUGCDetails( Self, nPublishedFileID, unMaxAgeSeconds ); var returnValue = _RequestUGCDetails( Self, nPublishedFileID, unMaxAgeSeconds );
return new CallbackResult( returnValue ); return new CallbackResult<SteamUGCQueryCompleted_t>( returnValue );
} }
#region FunctionMeta #region FunctionMeta

View File

@ -30,7 +30,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_GetStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_GetStatInt32")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _GetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData ); private static extern bool _GetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref int pData );
@ -42,7 +42,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_GetStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_GetStatFloat")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _GetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData ); private static extern bool _GetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, ref float pData );
@ -54,7 +54,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_SetStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_SetStatInt32")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _SetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, int nData ); private static extern bool _SetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, int nData );
@ -66,7 +66,7 @@ namespace Steamworks
} }
#region FunctionMeta #region FunctionMeta
[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_SetStat")] [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUserStats_SetStatFloat")]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private static extern bool _SetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float fData ); private static extern bool _SetStat( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchName, float fData );

View File

@ -293,7 +293,7 @@ namespace Steamworks
// //
// EAppType // EAppType
// //
internal enum AppType : uint internal enum AppType : int
{ {
Invalid = 0, Invalid = 0,
Game = 1, Game = 1,
@ -314,7 +314,7 @@ namespace Steamworks
Comic_UNUSED = 32768, Comic_UNUSED = 32768,
Beta = 65536, Beta = 65536,
Shortcut = 1073741824, Shortcut = 1073741824,
DepotOnly = 2147483648, DepotOnly = -2147483648,
} }
// //
@ -551,17 +551,6 @@ namespace Steamworks
ExitSoon_Night = 7, ExitSoon_Night = 7,
} }
//
// EGameIDType
//
internal enum GameIDType : int
{
App = 0,
GameMod = 1,
Shortcut = 2,
P2P = 3,
}
// //
// EGameSearchErrorCode_t // EGameSearchErrorCode_t
// //
@ -861,7 +850,7 @@ namespace Steamworks
// //
// ERemoteStoragePlatform // ERemoteStoragePlatform
// //
internal enum RemoteStoragePlatform : uint internal enum RemoteStoragePlatform : int
{ {
None = 0, None = 0,
Windows = 1, Windows = 1,
@ -871,7 +860,7 @@ namespace Steamworks
Switch = 16, Switch = 16,
Android = 32, Android = 32,
IOS = 64, IOS = 64,
All = 4294967295, All = -1,
} }
// //

View File

@ -9,6 +9,8 @@ namespace Steamworks.Data
[StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )]
internal struct SteamIPAddress_t internal struct SteamIPAddress_t
{ {
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] // m_rgubIPv6
internal byte[] GubIPv6; // m_rgubIPv6 uint8 [16]
internal SteamIPType Type; // m_eType ESteamIPType internal SteamIPType Type; // m_eType ESteamIPType
} }
@ -193,13 +195,4 @@ namespace Steamworks.Data
} }
[StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )]
internal struct SteamNetworkingConfigValue_t
{
internal SteamNetworkingConfigValue Value; // m_eValue ESteamNetworkingConfigValue
internal SteamNetworkingConfigDataType DataType; // m_eDataType ESteamNetworkingConfigDataType
//internal (anonymous at ../public/steam/steamnetworkingtypes.h:1171:2) Val; // m_val union (anonymous union at ../public/steam/steamnetworkingtypes.h:1171:2)
}
} }

25141
Generator/steam_api.json Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,450 +0,0 @@
{
"structs": [
{
"struct": "AvailableBeaconLocationsUpdated_t",
"fields": [ ]
},
{
"struct": "ActiveBeaconsUpdated_t",
"fields": [ ]
},
{
"struct": "PlaybackStatusHasChanged_t",
"fields": [ ]
},
{
"struct": "BroadcastUploadStart_t",
"fields": [ ]
},
{
"struct": "NewUrlLaunchParameters_t",
"fields": [ ]
},
{
"struct": "ItemInstalled_t",
"fields": [
{
"fieldname": "m_unAppID",
"fieldtype": "AppId_t"
},
{
"fieldname": "m_nPublishedFileId",
"fieldtype": "PublishedFileId_t"
}
]
},
{
"struct": "SteamNetConnectionStatusChangedCallback_t",
"fields": [
{
"fieldname": "m_hConn",
"fieldtype": "HSteamNetConnection"
},
{
"fieldname": "m_info",
"fieldtype": "SteamNetConnectionInfo_t"
},
{
"fieldname": "m_eOldState",
"fieldtype": "ESteamNetworkingConnectionState"
}
]
},
{
"struct": "InputAnalogActionData_t",
"fields": [
{
"fieldname": "eMode",
"fieldtype": "EInputSourceMode"
},
{
"fieldname": "x",
"fieldtype": "float"
},
{
"fieldname": "y",
"fieldtype": "float"
},
{
"fieldname": "bActive",
"fieldtype": "bool"
}
]
},
{
"struct": "InputMotionData_t",
"fields": [
{
"fieldname": "rotQuatX",
"fieldtype": "float"
},
{
"fieldname": "rotQuatY",
"fieldtype": "float"
},
{
"fieldname": "rotQuatZ",
"fieldtype": "float"
},
{
"fieldname": "rotQuatW",
"fieldtype": "float"
},
{
"fieldname": "posAccelX",
"fieldtype": "float"
},
{
"fieldname": "posAccelY",
"fieldtype": "float"
},
{
"fieldname": "posAccelZ",
"fieldtype": "float"
},
{
"fieldname": "rotVelX",
"fieldtype": "float"
},
{
"fieldname": "rotVelY",
"fieldtype": "float"
},
{
"fieldname": "rotVelZ",
"fieldtype": "float"
}
]
},
{
"struct": "InputDigitalActionData_t",
"fields": [
{
"fieldname": "bState",
"fieldtype": "bool"
},
{
"fieldname": "bActive",
"fieldtype": "bool"
}
]
},
{
"struct": "SteamInventoryDefinitionUpdate_t"
},
{
"struct": "SteamParentalSettingsChanged_t"
},
{
"struct": "SteamServersConnected_t"
},
{
"struct": "NewLaunchQueryParameters_t"
},
{
"struct": "GCMessageAvailable_t",
"fields": [
{
"fieldname": "m_nMessageSize",
"fieldtype": "uint32"
}
]
},
{
"struct": "GCMessageFailed_t"
},
{
"struct": "ScreenshotRequested_t"
},
{
"struct": "LicensesUpdated_t"
},
{
"struct": "SteamShutdown_t"
},
{
"struct": "IPCountry_t"
},
{
"struct": "IPCFailure_t",
"fields": [
{
"fieldname": "m_eFailureType",
"fieldtype": "uint8"
}
]
}
],
"methods":
[
{
"classname": "SteamApi",
"methodname": "SteamAPI_Init",
"returntype": "bool",
"NeedsSelfPointer": false
},
{
"classname": "SteamApi",
"methodname": "SteamAPI_RunCallbacks",
"returntype": "void",
"NeedsSelfPointer": false
},
{
"classname": "SteamApi",
"methodname": "SteamGameServer_RunCallbacks",
"returntype": "void",
"NeedsSelfPointer": false
},
{
"classname": "SteamApi",
"methodname": "SteamAPI_RegisterCallback",
"returntype": "void",
"NeedsSelfPointer": false,
"params":
[
{
"paramname": "pCallback",
"paramtype": "void *"
},
{
"paramname": "callback",
"paramtype": "int"
}
]
},
{
"classname": "SteamApi",
"methodname": "SteamAPI_UnregisterCallback",
"returntype": "void",
"NeedsSelfPointer": false,
"params":
[
{
"paramname": "pCallback",
"paramtype": "void *"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_RegisterCallResult",
"returntype": "void",
"params":
[
{
"paramname": "pCallback",
"paramtype": "void *"
},
{
"paramname": "callback",
"paramtype": "SteamAPICall_t"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_UnregisterCallResult",
"returntype": "void",
"params":
[
{
"paramname": "pCallback",
"paramtype": "void *"
},
{
"paramname": "callback",
"paramtype": "SteamAPICall_t"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamInternal_GameServer_Init",
"returntype": "bool",
"params":
[
{
"paramname": "unIP",
"paramtype": "uint32"
},
{
"paramname": "usPort",
"paramtype": "uint16"
},
{
"paramname": "usGamePort",
"paramtype": "uint16"
},
{
"paramname": "usQueryPort",
"paramtype": "uint16"
},
{
"paramname": "eServerMode",
"paramtype": "int"
},
{
"paramname": "pchVersionString",
"paramtype": "const char *"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamInternal_FindOrCreateUserInterface",
"returntype": "void *",
"params":
[
{
"paramname": "steamuser",
"paramtype": "int32"
},
{
"paramname": "versionname",
"paramtype": "const char *"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamInternal_FindOrCreateGameServerInterface",
"returntype": "void *",
"params":
[
{
"paramname": "steamuser",
"paramtype": "int32"
},
{
"paramname": "versionname",
"paramtype": "const char *"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_Shutdown",
"returntype": "void"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamGameServer_Shutdown",
"returntype": "void"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_GetHSteamUser",
"returntype": "HSteamUser"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_GetHSteamPipe",
"returntype": "HSteamPipe"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamGameServer_GetHSteamUser",
"returntype": "HSteamUser"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamGameServer_GetHSteamPipe",
"returntype": "HSteamPipe"
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamInternal_CreateInterface",
"returntype": "void *",
"params":
[
{
"paramname": "version",
"paramtype": "const char *"
}
]
},
{
"NeedsSelfPointer": false,
"classname": "SteamApi",
"methodname": "SteamAPI_RestartAppIfNecessary",
"returntype": "bool",
"params":
[
{
"paramname": "unOwnAppID",
"paramtype": "uint32"
}
]
}
]
}