GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2024-10-16 23:37:02 +03:00
Code Issues Projects Releases Wiki Activity

64bit working

Browse Source
This commit is contained in:
Garry Newman 2016-07-07 17:19:38 +01:00
parent 15d1d8a0df
commit b206eb88a2
4 changed files with 833 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Facepunch.Steamworks.Test/bin/Debug/FacepunchSteamworksApi32.dll Normal file
View File

Binary file not shown.

BIN
Facepunch.Steamworks.Test/bin/Debug/FacepunchSteamworksApi64.dll Normal file
View File

Binary file not shown.

22
Facepunch.Steamworks/Client.ServerList.Request.cs
View File

@ -12,7 +12,7 @@ public partial class ServerList
public class Request : IDisposable public class Request : IDisposable
{ {
internal Client client; internal Client client;
internal uint Id; internal IntPtr Id;
private IntPtr m_pVTable; private IntPtr m_pVTable;
private GCHandle m_pGCHandle; private GCHandle m_pGCHandle;
@ -133,12 +133,12 @@ public void Dispose()
// //
// Cancel the query if it's still running // Cancel the query if it's still running
// //
if ( !Finished && Id > 0 ) if ( !Finished && Id != IntPtr.Zero )
{ {
if ( client.Valid ) if ( client.Valid )
client._servers.CancelQuery( Id ); client._servers.CancelQuery( Id );
Id = 0; Id = IntPtr.Zero;
} }
// //
@ -156,16 +156,16 @@ public void Dispose()
} }
} }
private void Complete( IntPtr thisptr, uint RequestId, int response ) private void Complete( IntPtr thisptr, IntPtr RequestId, int response )
{ {
if ( RequestId != Id ) if ( RequestId != Id )
throw new Exception( "Request ID is invalid!" ); throw new Exception( "Request ID is invalid!" );
Finished = true; Finished = true;
Id = 0; Id = IntPtr.Zero;
} }
private void NonResponsive( IntPtr thisptr, uint RequestId, int iServer ) private void NonResponsive( IntPtr thisptr, IntPtr RequestId, int iServer )
{ {
if ( RequestId != Id ) if ( RequestId != Id )
throw new Exception( "Request ID is invalid!" ); throw new Exception( "Request ID is invalid!" );
@ -174,13 +174,15 @@ private void NonResponsive( IntPtr thisptr, uint RequestId, int iServer )
Unresponsive.Add( Server.FromSteam( info ) ); Unresponsive.Add( Server.FromSteam( info ) );
} }
private void OnServerResponded( IntPtr thisptr, uint RequestId, int iServer ) private void OnServerResponded( IntPtr thisptr, IntPtr RequestId, int iServer )
{ {
if ( RequestId != Id ) if ( RequestId != Id )
throw new Exception( "Request ID is invalid!" ); throw new Exception( "Request ID is invalid!" );
var info = client._servers.GetServerDetails( Id, iServer ); var info = client._servers.GetServerDetails( Id, iServer );
Responded.Add( Server.FromSteam( info ) ); Responded.Add( Server.FromSteam( info ) );
System.Diagnostics.Debug.WriteLine( info.m_szServerName );
} }
internal IntPtr GetVTablePointer() internal IntPtr GetVTablePointer()
@ -192,11 +194,11 @@ internal IntPtr GetVTablePointer()
internal class VTable internal class VTable
{ {
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
internal delegate void InternalServerResponded( IntPtr thisptr, uint hRequest, int iServer ); internal delegate void InternalServerResponded( IntPtr thisptr, IntPtr hRequest, int iServer );
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
internal delegate void InternalServerFailedToRespond( IntPtr thisptr, uint hRequest, int iServer ); internal delegate void InternalServerFailedToRespond( IntPtr thisptr, IntPtr hRequest, int iServer );
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
internal delegate void InternalRefreshComplete( IntPtr thisptr, uint hRequest, int response ); internal delegate void InternalRefreshComplete( IntPtr thisptr, IntPtr hRequest, int response );
[NonSerialized, MarshalAs(UnmanagedType.FunctionPtr)] [NonSerialized, MarshalAs(UnmanagedType.FunctionPtr)]
internal InternalServerResponded responded; internal InternalServerResponded responded;

1642
Facepunch.Steamworks/steam_api_interop.cs
View File

File diff suppressed because it is too large Load Diff