GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2025-01-23 20:17:58 +03:00
Code Issues Projects Releases Wiki Activity

More marshalling

Browse Source
This commit is contained in:
Garry Newman 2016-10-26 10:43:08 +01:00
parent 43705fed86
commit 28a781d511
8 changed files with 4153 additions and 4147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

750
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Interface.cs
View File

File diff suppressed because it is too large Load Diff

1504
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Linux32.cs
View File

File diff suppressed because it is too large Load Diff

1504
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Linux64.cs
View File

File diff suppressed because it is too large Load Diff

1504
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Mac.cs
View File

File diff suppressed because it is too large Load Diff

1504
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Win32.cs
View File

File diff suppressed because it is too large Load Diff

1504
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Win64.cs
View File

File diff suppressed because it is too large Load Diff

28
Generator/Argument.cs
View File

@ -154,52 +154,58 @@ namespace Generator
internal string InteropParameter( bool LargePack, bool includeMarshalling = false ) internal string InteropParameter( bool LargePack, bool includeMarshalling = false )
{ {
var ps = LargePack ? "" : ".PackSmall"; var ps = LargePack ? "" : ".PackSmall";
var marshalling = "";
if ( !NativeType.Contains( "_t" ) ) if ( !NativeType.Contains( "_t" ) )
ps = string.Empty; ps = string.Empty;
if ( TypeDef != null ) if ( TypeDef != null )
ps = string.Empty; ps = string.Empty;
if ( includeMarshalling ) if ( includeMarshalling )
{ {
if ( NativeType == "bool" ) marshalling = "[MarshalAs(UnmanagedType.U1)]";
if ( NativeType == "bool *" ) marshalling = "[MarshalAs(UnmanagedType.U1)]";
if ( TypeDef != null && TypeDef.NativeType.Contains( "_t" ) )
{
// if ( !TypeDef.NativeType.Contains( "*" ) )
// return $"{TypeDef.ManagedType} {Name}";
}
} }
if ( ShouldBeIntPtr ) if ( ShouldBeIntPtr )
return $"IntPtr /*{NativeType}*/ {Name}"; return $"IntPtr /*{NativeType}*/ {Name}".Trim();
if ( IsStructShouldBePassedAsRef ) if ( IsStructShouldBePassedAsRef )
return $"ref {ManagedType.Trim( '*', ' ' )}{ps} /*{NativeType}*/ {Name}"; return $"{marshalling} ref {ManagedType.Trim( '*', ' ' )}{ps} /*{NativeType}*/ {Name}".Trim();
if ( ShouldBePassedAsOut ) if ( ShouldBePassedAsOut )
return $"out {ManagedType.Trim( '*', ' ' )} /*{NativeType}*/ {Name}"; return $"{marshalling} out {ManagedType.Trim( '*', ' ' )} /*{NativeType}*/ {Name}".Trim();
if ( NativeType == "char *" || NativeType == "char **" ) if ( NativeType == "char *" || NativeType == "char **" )
{ {
return $"System.Text.StringBuilder /*{NativeType}*/ {Name}"; return $"System.Text.StringBuilder /*{NativeType}*/ {Name}".Trim();
} }
if ( TypeDef != null ) if ( TypeDef != null )
{ {
if ( NativeType.EndsWith( "*" ) ) if ( NativeType.EndsWith( "*" ) )
{ {
return $"IntPtr /*{NativeType}*/ {Name}"; return $"IntPtr /*{NativeType}*/ {Name}".Trim();
} }
else else
{ {
return $"{TypeDef.Name} /*{NativeType}*/ {Name}"; return $"{marshalling} {TypeDef.Name} /*{NativeType}*/ {Name}".Trim();
} }
} }
if ( NativeType.EndsWith( "*" ) && ManagedType.Contains( "_t" ) ) if ( NativeType.EndsWith( "*" ) && ManagedType.Contains( "_t" ) )
{ {
return $"IntPtr /*{NativeType}*/ {Name} "; return $"IntPtr /*{NativeType}*/ {Name} ".Trim();
} }
return $"{ManagedType} /*{NativeType}*/ {Name} "; return $"{marshalling} {ManagedType} /*{NativeType}*/ {Name} ".Trim();
} }
internal string Return() internal string Return()

2
Generator/CodeWriter.PlatformClass.cs
View File

@ -173,7 +173,7 @@ namespace Generator
WriteLine( $"[DllImportAttribute( \"{library}\", EntryPoint = \"{flatName}\" )]" ); WriteLine( $"[DllImportAttribute( \"{library}\", EntryPoint = \"{flatName}\" )]" );
if ( ret.Return() == "bool" )WriteLine( "[return: MarshalAs(UnmanagedType.Bool)]" ); if ( ret.Return() == "bool" ) WriteLine( "[return: MarshalAs(UnmanagedType.U1)]" );
WriteLine( $"internal static extern {ret.Return()} {methodName}({argstring});" ); WriteLine( $"internal static extern {ret.Return()} {methodName}({argstring});" );
LastMethodName = methodDef.Name; LastMethodName = methodDef.Name;