Update main branch module to support Steamworks 1.57

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gmsv_workshop"
-version = "2.2.4"
+version = "2.2.5"
 edition = "2021"
 authors = ["William Venner <[email protected]>"]
 publish = false

src/workshop.rs

@@ -394,7 +394,14 @@ pub struct Steam {
 impl Steam {
 	pub fn init() -> Steam {
 		let (server, callbacks) = unsafe {
-			steamworks::Server::from_raw(steamworks::sys::SteamAPI_SteamGameServer_v013())
+			steamworks::Server::from_raw({
+				#[cfg(target_pointer_width = "32")] {
+					steamworks::sys::SteamAPI_SteamGameServer_v015()
+				}
+				#[cfg(target_pointer_width = "64")] {
+					steamworks::sys::SteamAPI_SteamGameServer_v013()
+				}
+			})
 		};
 
 		let steam = Steam {

steamworks-rs/src/lib.rs

@@ -1,6 +1,42 @@
 #![allow(unused)]
 #![feature(hash_drain_filter)]
 
+#[macro_export]
+#[cfg(target_pointer_width = "64")]
+macro_rules! sys_ugc {
+	() => { $crate::sys::SteamAPI_SteamGameServerUGC_v014() }
+}
+
+#[macro_export]
+#[cfg(target_pointer_width = "64")]
+macro_rules! sys_gameserver {
+	() => { $crate::sys::SteamAPI_SteamGameServer_v013() }
+}
+
+#[macro_export]
+#[cfg(target_pointer_width = "64")]
+macro_rules! sys_steamuser {
+	() => { $crate::sys::SteamAPI_SteamUser_v021() };
+}
+
+#[macro_export]
+#[cfg(target_pointer_width = "32")]
+macro_rules! sys_ugc {
+	() => { $crate::sys::SteamAPI_SteamGameServerUGC_v017() }
+}
+
+#[macro_export]
+#[cfg(target_pointer_width = "32")]
+macro_rules! sys_gameserver {
+	() => { $crate::sys::SteamAPI_SteamGameServer_v015() }
+}
+
+#[macro_export]
+#[cfg(target_pointer_width = "32")]
+macro_rules! sys_steamuser {
+	() => { $crate::sys::SteamAPI_SteamUser_v023() };
+}
+
 #[macro_use]
 extern crate thiserror;
 #[macro_use]
@@ -349,7 +385,7 @@ impl<Manager> Client<Manager> {
     /// Returns an accessor to the steam user interface
     pub fn user(&self) -> User<Manager> {
         unsafe {
-            let user = sys::SteamAPI_SteamUser_v021();
+            let user = sys_steamuser!();
             debug_assert!(!user.is_null());
             User {
                 user,

steamworks-rs/src/server.rs

@@ -76,7 +76,7 @@ impl Server {
                 return Err(SteamError::InitFailed);
             }
             sys::SteamAPI_ManualDispatch_Init();
-            let server_raw = sys::SteamAPI_SteamGameServer_v013();
+            let server_raw = sys_gameserver!();
             let server = Arc::new(Inner {
                 _manager: ServerManager { _priv: () },
                 callbacks: Mutex::new(Callbacks {
@@ -165,7 +165,7 @@ impl Server {
         unsafe {
             let mut ticket = vec![0; 1024];
             let mut ticket_len = 0;
-            let auth_ticket = sys::SteamAPI_ISteamGameServer_GetAuthSessionTicket(self.server, ticket.as_mut_ptr() as *mut _, 1024, &mut ticket_len);
+            let auth_ticket = sys::SteamAPI_ISteamGameServer_GetAuthSessionTicket(self.server, ticket.as_mut_ptr() as *mut _, 1024, &mut ticket_len, #[cfg(target_pointer_width = "32")] unimplemented!("not used in gmsv_workshop"));
             ticket.truncate(ticket_len as usize);
             (AuthTicket(auth_ticket), ticket)
         }
@@ -316,7 +316,7 @@ impl Server {
     /// **For this to work properly, you need to call `UGC::init_for_game_server()`!**
     pub fn ugc(&self) -> UGC<ServerManager> {
         unsafe {
-            let ugc = sys::SteamAPI_SteamGameServerUGC_v014();
+            let ugc = sys_ugc!();
             debug_assert!(!ugc.is_null());
             UGC {
                 ugc,

steamworks-rs/src/ugc.rs

@@ -851,7 +851,7 @@ impl <Manager> UserListQuery<Manager> {
 			register_call_result::<sys::SteamUGCQueryCompleted_t, _, _>(
 				&inner, api_call, CALLBACK_BASE_ID + 1,
 				move |v, io_error| {
-					let ugc = sys::SteamAPI_SteamGameServerUGC_v014();
+					let ugc = sys_ugc!();
 					if io_error {
 						sys::SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(ugc, handle);
 						cb(Err(SteamError::IOFailure));
@@ -1011,7 +1011,7 @@ impl <Manager> ItemListDetailsQuery<Manager> {
 			register_call_result::<sys::SteamUGCQueryCompleted_t, _, _>(
 				&inner, api_call, CALLBACK_BASE_ID + 1,
 				move |v, io_error| {
-					let ugc = sys::SteamAPI_SteamGameServerUGC_v014();
+					let ugc = sys_ugc!();
 					if io_error {
 						sys::SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(ugc, handle);
 						cb(Err(SteamError::IOFailure));
@@ -1140,7 +1140,7 @@ impl <Manager> ItemDetailsQuery<Manager> {
 			register_call_result::<sys::SteamUGCQueryCompleted_t, _, _>(
 				&inner, api_call, CALLBACK_BASE_ID + 1,
 				move |v, io_error| {
-					let ugc = sys::SteamAPI_SteamGameServerUGC_v014();
+					let ugc = sys_ugc!();
 					if io_error {
 						sys::SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(ugc, handle);
 						cb(Err(SteamError::IOFailure));

steamworks-rs/src/user.rs

@@ -31,7 +31,7 @@ impl <Manager> User<Manager> {
         unsafe {
             let mut ticket = vec![0; 1024];
             let mut ticket_len = 0;
-            let auth_ticket = sys::SteamAPI_ISteamUser_GetAuthSessionTicket(self.user, ticket.as_mut_ptr() as *mut _, 1024, &mut ticket_len);
+            let auth_ticket = sys::SteamAPI_ISteamUser_GetAuthSessionTicket(self.user, ticket.as_mut_ptr() as *mut _, 1024, &mut ticket_len, #[cfg(target_pointer_width = "32")] unimplemented!("not used in gmsv_workshop"));
             ticket.truncate(ticket_len as usize);
             (AuthTicket(auth_ticket), ticket)
         }

steamworks-rs/steamworks-sys/build.rs

@@ -10,7 +10,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-    let sdk_loc = "../../lib/steamworks_150";
+    let sdk_loc = if build_cfg!(target_pointer_width = "32") {
+		"../../lib/steamworks_157"
+	} else {
+		"../../lib/steamworks_150"
+	};
     let sdk_loc = Path::new(&sdk_loc);
     println!("cargo:rerun-if-env-changed=STEAM_SDK_LOCATION");