ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-03-01 09:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

generator: fixed string[] return types

Browse source
This commit is contained in:
Stephan Sundermann 2013-10-08 17:54:29 +02:00 committed by Andrés G. Aragoneses
parent 8d4ec22ef2
commit b5806d2a1b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/ReturnValue.cs
View file

@ -160,7 +160,7 @@ namespace GtkSharp.Generation {
string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false"); string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
var = "new " + IGen.QualifiedName + "(" + var + args + ")"; var = "new " + IGen.QualifiedName + "(" + var + args + ")";
} else if (is_null_term) } else if (is_null_term)
return String.Format ("GLib.Marshaller.StringArrayToNullTermPointer ({0})", var); return String.Format ("GLib.Marshaller.StringArrayToNullTermStrvPointer ({0})", var);
else if (is_array) else if (is_array)
return String.Format ("GLib.Marshaller.ArrayToArrayPtr ({0})", var); return String.Format ("GLib.Marshaller.ArrayToArrayPtr ({0})", var);

7
glib/Marshaller.cs
View file

@ -170,7 +170,7 @@ namespace GLib {
return ret.Replace ("%", "%%"); return ret.Replace ("%", "%%");
} }
internal static IntPtr StringArrayToStrvPtr (string[] strs) public static IntPtr StringArrayToStrvPtr (string[] strs)
{ {
IntPtr[] ptrs = StringArrayToNullTermPointer (strs); IntPtr[] ptrs = StringArrayToNullTermPointer (strs);
IntPtr ret = g_malloc (new UIntPtr ((ulong) (ptrs.Length * IntPtr.Size))); IntPtr ret = g_malloc (new UIntPtr ((ulong) (ptrs.Length * IntPtr.Size)));
@ -178,6 +178,11 @@ namespace GLib {
return ret; return ret;
} }
public static IntPtr StringArrayToNullTermStrvPointer (string[] strs)
{
return StringArrayToStrvPtr (strs);
}
public static IntPtr[] StringArrayToNullTermPointer (string[] strs) public static IntPtr[] StringArrayToNullTermPointer (string[] strs)
{ {
if (strs == null) if (strs == null)