mirror of
https://github.com/Ryujinx/GtkSharp.git
synced 2024-09-09 00:13:20 +02:00
fe699e9fbb
* gconf/Value.cs: Update to use new string marshalling. * generator/StringGen.cs, ConstStringGen.cs: Added. * generator/IGeneratable.cs: Add new method ToNativeReturn. * generator/CallbackGen.cs: Implement ToNativeReturn. Call ToNativeReturn for the return statement. Fix a couple of places where s_ret was being used incorrectly for m_ret. * generator/ClassGen.cs, EnumGen.cs, ManualGen.cs, SimpleGen.cs, StructBase.cs: Implement ToNativeReturn. * generator/SignalHandler.cs: Call ToNativeReturn for the return statement, instead of CallByName. * generator/SymbolTable.cs: Use StringGen for gchar, char, and gunichar, and ConstStringGen for their const variants. Add a new method wrapper for ToNativeReturn. (Trim): Add a special-case for const strings so that the const is not stripped. Otherwise there is no way of resolving the const case. * glade/XML.custom: Update to use new string marshalling. * glib/Marshaller.cs: Added. * glib/GException.cs, Markup.cs, ObjectManager.cs, Value.cs: Update to use new string marshalling. * glib/Object.cs: Remove old g_type_name DllImport as it is no longer used. * glue/fileselection.c (gtksharp_file_selection_get_fileop_entry): Mark this as const return. * gtk/ColorSelection.custom, FileSelection.custom, SelectionData.custom: Update to use new string marshalling. svn path=/trunk/gtk-sharp/; revision=15286
53 lines
1.1 KiB
C#
53 lines
1.1 KiB
C#
// GLibSharp.Marshaller.cs : Marshalling utils
|
|
//
|
|
// Author: Rachel Hestilow <rachel@nullenvoid.com>
|
|
//
|
|
// (c) 2002, 2003 Rachel Hestilow
|
|
|
|
namespace GLibSharp {
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
/// <summary>
|
|
/// Marshalling utilities
|
|
/// </summary>
|
|
///
|
|
/// <remarks>
|
|
/// Utility class for internal wrapper use
|
|
/// </remarks>
|
|
|
|
public class Marshaller {
|
|
|
|
[DllImport("libglib-2.0-0.dll")]
|
|
static extern void g_free (IntPtr mem);
|
|
|
|
public static string PtrToStringGFree (IntPtr ptr) {
|
|
string ret = Marshal.PtrToStringAnsi (ptr);
|
|
g_free (ptr);
|
|
return ret;
|
|
}
|
|
|
|
[DllImport("libglib-2.0-0.dll")]
|
|
static extern void g_strfreev (IntPtr mem);
|
|
|
|
public static string[] PtrToStringGFree (IntPtr[] ptrs) {
|
|
// The last pointer is a null terminator.
|
|
string[] ret = new string[ptrs.Length - 1];
|
|
for (int i = 0; i < ret.Length; i++) {
|
|
ret[i] = Marshal.PtrToStringAnsi (ptrs[i]);
|
|
g_free (ptrs[i]);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
[DllImport("libglib-2.0-0.dll")]
|
|
static extern IntPtr g_strdup (string str);
|
|
|
|
public static IntPtr StringToPtrGStrdup (string str) {
|
|
return g_strdup (str);
|
|
}
|
|
|
|
}
|
|
}
|
|
|