Update steamworks.net sdk

.gitignore

@@ -1,4 +1,5 @@
-/Standalone/bin
-/Standalone/obj
-/Standalone/.vs
-/.vs
+bin/
+obj/
+.vs/
+__pycache__/
+/CodeGen/steam/lib/

CodeGen/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2019 Riley Labrecque
+Copyright (c) 2013-2022 Riley Labrecque
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

CodeGen/README.md

@@ -1,4 +1,13 @@
-Steamworks.NET
-=======
+Steamworks.NET CodeGen
+======================
 
-The special sauce that generates the autogen/ folder of [Steamworks.NET](https://github.com/rlabrecque/Steamworks.NET)
+This is special sauce that generates the autogen/ and types/ directories.
+
+It uses [SteamworksParser](https://github.com/rlabrecque/SteamworksParser) to parse the Steamworks C++ header files, then converts them to C#.
+
+Usage
+-----
+
+1. If necessary update the files in `steam/`
+2. Open a command prompt to the CodeGen directory. (The script must be run from this directory or the relative paths will be broken.)
+3. Run `python3 Steamworks.NET_CodeGen.py`, preferably on a linux based OS to generate proper line endings. (I use WSL for this.)

CodeGen/Steamworks.NET_CodeGen.py

@@ -1,31 +1,21 @@
-import sys
 from SteamworksParser import steamworksparser
-import interfaces
-import constants
-import enums
-import structs
-import typedefs
-import output_dummy_files
+from src import interfaces
+from src import constants
+from src import enums
+from src import structs
+from src import typedefs
 
 def main():
- if len(sys.argv) == 2:
- path = sys.argv[1]
- elif len(sys.argv) == 1:
- path = "steam"
- else:
- print("Usage: Steamworks.NET_CodeGen.py [path/to/sdk/public/steam]")
- print(" If a path is not included then a steam/ folder must exist within the cwd.")
- return
+ steam_path = "steam/"
 
  steamworksparser.Settings.fake_gameserver_interfaces = True
- ___parser = steamworksparser.parse(path)
+ ___parser = steamworksparser.parse(steam_path)
 
  interfaces.main(___parser)
  constants.main(___parser)
  enums.main(___parser)
  structs.main(___parser)
  typedefs.main(___parser)
- output_dummy_files.main()
 
 if __name__ == "__main__":
  main()

CodeGen/constants.py → CodeGen/src/constants.py

@@ -14,6 +14,8 @@ def __init__(self, name, value, type_, precomments, comment, spacing):
 g_TypeDict = {
  # Not a bug... But, it's a giant hack.
  # The issue is that most of these are used as the MarshalAs SizeConst in C# amongst other things and C# wont auto convert them.
+ "uint16": "ushort",
+
  "uint32": "int",
  "unsigned int": "int",
 
@@ -48,7 +50,6 @@ def __init__(self, name, value, type_, precomments, comment, spacing):
  "k_steamIDLanModeGS",
  "k_steamIDNotInitYetGS",
  "k_steamIDNonSteamGS",
- "BREAKPAD_INVALID_HANDLE",
  "STEAM_PS3_PATH_MAX",
  "STEAM_PS3_SERVICE_ID_MAX",
  "STEAM_PS3_COMMUNICATION_ID_MAX",
@@ -101,35 +102,24 @@ def __init__(self, name, value, type_, precomments, comment, spacing):
  "k_HAuthTicketInvalid",
 
  # SteamTypes
- "k_JobIDNil",
- "k_uBundleIdInvalid",
  "k_uAppIdInvalid",
  "k_uDepotIdInvalid",
  "k_uAPICallInvalid",
- "k_uManifestIdInvalid",
- "k_ulSiteIdInvalid",
 
  # steamnetworkingtypes.h
  "k_HSteamNetConnection_Invalid",
  "k_HSteamListenSocket_Invalid",
  "k_HSteamNetPollGroup_Invalid",
  "k_SteamDatagramPOPID_dev",
 
- #TODO: Skip all these once we have typedef autogen hooked up.
- #public const ulong k_GIDNil = 0xffffffffffffffffull;
- #public const ulong k_TxnIDNil = k_GIDNil;
- #public const ulong k_TxnIDUnknown = 0;
- #public const int k_uPackageIdFreeSub = 0x0;
- #public const int k_uPackageIdInvalid = 0xFFFFFFFF;
- #public const ulong k_ulAssetClassIdInvalid = 0x0;
- #public const int k_uPhysicalItemIdInvalid = 0x0;
- #public const int k_uCellIDInvalid = 0xFFFFFFFF;
- #public const int k_uPartnerIdInvalid = 0;
+ # steam_gameserver.h
+ "MASTERSERVERUPDATERPORT_USEGAMESOCKETSHARE",
 )
 
 g_SkippedTypedefs = (
  "uint8",
  "int8",
+ "uint16",
  "int32",
  "uint32",
  "int64",
@@ -138,7 +128,6 @@ def __init__(self, name, value, type_, precomments, comment, spacing):
 
 g_CustomDefines = {
  # "Name": ("Type", "Value"),
- "MASTERSERVERUPDATERPORT_USEGAMESOCKETSHARE": ("ushort", "0xFFFF"),
  "k_nMaxLobbyKeyLength": ("byte", None),
  "STEAM_CONTROLLER_HANDLE_ALL_CONTROLLERS": ("ulong", "0xFFFFFFFFFFFFFFFF"),
  "STEAM_CONTROLLER_MIN_ANALOG_ACTION_DATA": ("float", "-1.0f"),
@@ -150,7 +139,7 @@ def __init__(self, name, value, type_, precomments, comment, spacing):
 
 def main(parser):
  try:
- os.makedirs("autogen/")
+ os.makedirs("../com.rlabrecque.steamworks.net/Runtime/autogen/")
  except OSError:
  pass
 
@@ -161,7 +150,7 @@ def main(parser):
  lines.append("//" + precomment)
  lines.append("public const " + constant.type + " " + constant.name + constant.spacing + "= " + constant.value + ";" + constant.comment)
 
- with open("autogen/SteamConstants.cs", "wb") as out:
+ with open("../com.rlabrecque.steamworks.net/Runtime/autogen/SteamConstants.cs", "wb") as out:
  with open("templates/header.txt", "r") as f:
  out.write(bytes(f.read(), "utf-8"))
  out.write(bytes("namespace Steamworks {\n", "utf-8"))

CodeGen/enums.py → CodeGen/src/enums.py

@@ -10,6 +10,9 @@
  #ISteamHTMLSurface
  "EHTMLKeyModifiers",
 
+ #ISteamInput
+ "EControllerHapticLocation",
+
  #ISteamInventory
  "ESteamItemFlags",
 
@@ -23,10 +26,7 @@
  "EItemState",
 
  # SteamClientPublic
- "EAppOwnershipFlags",
- "EAppType",
  "EChatSteamIDInstanceFlags",
- "EMarketingMessageFlags",
  "EMarketNotAllowedReasonFlags",
 )
 
@@ -37,7 +37,6 @@
  # Valve redefined these twice, and ifdef decided which one to use. :(
  # We use the newer ones from isteaminput.h and skip the ones in
  # isteamcontroller.h because it is deprecated.
- "ESteamControllerPad": "isteamcontroller.h",
  "EXboxOrigin": "isteamcontroller.h",
  "ESteamInputType": "isteamcontroller.h",
 }
@@ -46,11 +45,14 @@
  "0xffffffff": "-1",
  "0x80000000": "-2147483647",
  "k_unSteamAccountInstanceMask": "Constants.k_unSteamAccountInstanceMask",
+ "( 1 << k_ESteamControllerPad_Left )": "( 1 << ESteamControllerPad.k_ESteamControllerPad_Left )",
+ "( 1 << k_ESteamControllerPad_Right )": "( 1 << ESteamControllerPad.k_ESteamControllerPad_Right )",
+ "( 1 << k_ESteamControllerPad_Left | 1 << k_ESteamControllerPad_Right )": "( 1 << ESteamControllerPad.k_ESteamControllerPad_Left | 1 << ESteamControllerPad.k_ESteamControllerPad_Right )",
 }
 
 def main(parser):
  try:
- os.makedirs("autogen/")
+ os.makedirs("../com.rlabrecque.steamworks.net/Runtime/autogen/")
  except OSError:
  pass
 
@@ -106,7 +108,7 @@ def main(parser):
  lines.append("\t}")
  lines.append("")
 
- with open("autogen/SteamEnums.cs", "wb") as out:
+ with open("../com.rlabrecque.steamworks.net/Runtime/autogen/SteamEnums.cs", "wb") as out:
  with open("templates/header.txt", "r") as f:
  out.write(bytes(f.read(), "utf-8"))
  out.write(bytes("using Flags = System.FlagsAttribute;\n\n", "utf-8"))

CodeGen/interfaces.py → CodeGen/src/interfaces.py

@@ -17,6 +17,7 @@
  "ISteamGameServerNetworkingConnectionCustomSignaling",
  "ISteamNetworkingCustomSignalingRecvContext",
  "ISteamGameServerNetworkingCustomSignalingRecvContext",
+ "ISteamNetworkingFakeUDPPort",
 )
 
 g_TypeDict = {
@@ -77,6 +78,13 @@
  "SteamNetworkingErrMsg &": "out SteamNetworkingErrMsg",
  "const SteamNetConnectionInfo_t &": "ref SteamNetConnectionInfo_t",
  "SteamNetworkingMessage_t **": "IntPtr[]",
+
+ # SteamNetworkingTypes which are stubbed
+ "SteamDatagramGameCoordinatorServerLogin *": "IntPtr",
+ "ISteamNetworkingFakeUDPPort *": "IntPtr",
+
+ # External type that we don't currently support.
+ "const ScePadTriggerEffectParam *": "IntPtr"
 }
 
 g_WrapperArgsTypeDict = {
@@ -142,7 +150,7 @@
  "ISteamApps_GetInstalledDepots": {
  "pvecDepots": "DepotId_t[]",
  },
- "ISteamGameServer_SendUserConnectAndAuthenticate": {
+ "ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED": {
  "pvAuthBlob": "byte[]",
  },
  "ISteamGameServer_GetAuthSessionTicket": {
@@ -238,7 +246,7 @@
  "ISteamUGC_StopPlaytimeTracking": {
  "pvecPublishedFileID": "PublishedFileId_t[]",
  },
- "ISteamUser_InitiateGameConnection": {
+ "ISteamUser_InitiateGameConnection_DEPRECATED": {
  "pAuthBlob": "byte[]",
  },
  "ISteamUser_GetAvailableVoice": {
@@ -276,9 +284,6 @@
  },
 
  # GameServer Copies
- "ISteamGameServerApps_GetInstalledDepots": {
- "pvecDepots": "DepotId_t[]",
- },
  "ISteamGameServerHTTP_GetHTTPResponseHeaderValue": {
  "pHeaderValueBuffer": "byte[]",
  },
@@ -409,6 +414,13 @@
  "cbBuf": "uint",
  },
 
+ "ISteamNetworkingUtils_GetConfigValue": {
+ "cbResult": "ref ulong",
+ },
+ "ISteamGameServerNetworkingUtils_GetConfigValue": {
+ "cbResult": "ref ulong",
+ },
+
  "ISteamNetworkingSockets_SendMessages": {
  "pMessages": "SteamNetworkingMessage_t[]",
  "pOutMessageNumberOrResult": "long[]",
@@ -417,6 +429,15 @@
  "pMessages": "SteamNetworkingMessage_t[]",
  "pOutMessageNumberOrResult": "long[]",
  },
+
+ "ISteamNetworkingSockets_GetConnectionRealTimeStatus": {
+ "pStatus": "ref SteamNetConnectionRealTimeStatus_t",
+ "pLanes": "ref SteamNetConnectionRealTimeLaneStatus_t",
+ },
+ "ISteamGameServerNetworkingSockets_GetConnectionRealTimeStatus": {
+ "pStatus": "ref SteamNetConnectionRealTimeStatus_t",
+ "pLanes": "ref SteamNetConnectionRealTimeLaneStatus_t",
+ },
 }
 
 g_SpecialWrapperArgsDict = {
@@ -491,7 +512,7 @@
 
 def main(parser):
  try:
- os.makedirs("autogen/")
+ os.makedirs("../com.rlabrecque.steamworks.net/Runtime/autogen/")
  except OSError:
  pass
 
@@ -504,7 +525,7 @@ def main(parser):
  for f in parser.files:
  parse(f)
 
- with open("autogen/NativeMethods.cs", "wb") as out:
+ with open("../com.rlabrecque.steamworks.net/Runtime/autogen/NativeMethods.cs", "wb") as out:
  #out.write(bytes(HEADER, "utf-8"))
  with open("templates/nativemethods.txt", "r") as f:
  out.write(bytes(f.read(), "utf-8"))
@@ -526,7 +547,7 @@ def parse(f):
  parse_interface(f, interface)
 
  if g_Output:
- with open('autogen/' + os.path.splitext(f.name)[0] + '.cs', 'wb') as out:
+ with open('../com.rlabrecque.steamworks.net/Runtime/autogen/' + os.path.splitext(f.name)[0] + '.cs', 'wb') as out:
  if f.name in ["isteamnetworkingutils.h", "isteamnetworkingsockets.h", "isteamgameservernetworkingutils.h", "isteamgameservernetworkingsockets.h"]:
  out.write(bytes("#define STEAMNETWORKINGSOCKETS_ENABLE_SDR\n", "utf-8"))
  out.write(bytes(HEADER, "utf-8"))
@@ -771,7 +792,7 @@ def parse_args(strEntryPoint, args):
  for arg in args:
  argtype = g_TypeDict.get(arg.type, arg.type)
  if argtype.endswith("*"):
- potentialtype = arg.type.rstrip("*").rstrip()
+ potentialtype = arg.type.rstrip("*").lstrip("const ").rstrip()
  argtype = "out " + g_TypeDict.get(potentialtype, potentialtype)
  argtype = g_SpecialArgsDict.get(strEntryPoint, dict()).get(arg.name, argtype)