2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
// GLibSharp.Marshaller.cs : Marshalling utils
|
|
|
|
//
|
|
|
|
// Author: Rachel Hestilow <rachel@nullenvoid.com>
|
2004-05-19 18:57:28 +00:00
|
|
|
// Mike Kestner <mkestner@ximian.com>
|
2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
//
|
2004-05-19 18:57:28 +00:00
|
|
|
// Copyright (c) 2002, 2003 Rachel Hestilow
|
|
|
|
// Copyright (c) 2004 Novell, Inc.
|
2004-06-25 18:42:19 +00:00
|
|
|
//
|
|
|
|
// This program is free software; you can redistribute it and/or
|
|
|
|
// modify it under the terms of version 2 of the Lesser GNU General
|
|
|
|
// Public License as published by the Free Software Foundation.
|
|
|
|
//
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
// Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
|
|
// License along with this program; if not, write to the
|
|
|
|
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
// Boston, MA 02111-1307, USA.
|
|
|
|
|
2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
|
2004-05-19 18:57:28 +00:00
|
|
|
namespace GLib {
|
2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
using System;
|
|
|
|
using System.Runtime.InteropServices;
|
|
|
|
|
|
|
|
public class Marshaller {
|
2003-11-28 05:29:34 +00:00
|
|
|
|
|
|
|
private Marshaller () {}
|
|
|
|
|
2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
[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);
|
|
|
|
}
|
|
|
|
|
2004-01-19 03:24:25 +00:00
|
|
|
// Argv marshalling -- unpleasantly complex, but
|
|
|
|
// don't know of a better way to do it.
|
|
|
|
//
|
|
|
|
// Currently, the 64-bit cleanliness is
|
|
|
|
// hypothetical. It's also ugly, but I don't know of a
|
|
|
|
// construct to handle both 32 and 64 bitness
|
|
|
|
// transparently, since we need to alloc buffers of
|
|
|
|
// [native pointer size] * [count] bytes.
|
|
|
|
|
|
|
|
[DllImport("libglib-2.0-0.dll")]
|
|
|
|
static extern IntPtr g_malloc(ulong size);
|
|
|
|
|
|
|
|
static bool check_sixtyfour () {
|
|
|
|
int szint = Marshal.SizeOf (typeof (int));
|
|
|
|
int szlong = Marshal.SizeOf (typeof (long));
|
|
|
|
int szptr = IntPtr.Size;
|
|
|
|
|
|
|
|
if (szptr == szint)
|
|
|
|
return false;
|
|
|
|
if (szptr == szlong)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
throw new Exception ("Pointers are neither int- nor long-sized???");
|
|
|
|
}
|
|
|
|
|
|
|
|
static IntPtr make_buf_32 (string[] args)
|
|
|
|
{
|
|
|
|
int[] ptrs = new int[args.Length];
|
|
|
|
|
|
|
|
for (int i = 0; i < args.Length; i++)
|
|
|
|
ptrs[i] = (int) Marshal.StringToHGlobalAuto (args[i]);
|
|
|
|
|
2004-04-29 21:21:57 +00:00
|
|
|
IntPtr buf = g_malloc ((ulong) Marshal.SizeOf(typeof(int)) *
|
2004-01-19 03:24:25 +00:00
|
|
|
(ulong) args.Length);
|
|
|
|
Marshal.Copy (ptrs, 0, buf, ptrs.Length);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static IntPtr make_buf_64 (string[] args)
|
|
|
|
{
|
|
|
|
long[] ptrs = new long[args.Length];
|
|
|
|
|
|
|
|
for (int i = 0; i < args.Length; i++)
|
|
|
|
ptrs[i] = (long) Marshal.StringToHGlobalAuto (args[i]);
|
|
|
|
|
2004-04-29 21:21:57 +00:00
|
|
|
IntPtr buf = g_malloc ((ulong) Marshal.SizeOf(typeof(long)) *
|
2004-01-19 03:24:25 +00:00
|
|
|
(ulong) args.Length);
|
|
|
|
Marshal.Copy (ptrs, 0, buf, ptrs.Length);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static IntPtr ArgvToArrayPtr (string[] args)
|
|
|
|
{
|
|
|
|
if (args.Length == 0)
|
|
|
|
return IntPtr.Zero;
|
|
|
|
|
|
|
|
if (check_sixtyfour ())
|
|
|
|
return make_buf_64 (args);
|
|
|
|
|
|
|
|
return make_buf_32 (args);
|
|
|
|
}
|
|
|
|
|
|
|
|
// should we be freeing these pointers? they're marshalled
|
|
|
|
// from our own strings, so I think not ...
|
|
|
|
|
|
|
|
static string[] unmarshal_32 (IntPtr buf, int argc)
|
|
|
|
{
|
|
|
|
int[] ptrs = new int[argc];
|
|
|
|
string[] args = new string[argc];
|
|
|
|
|
|
|
|
Marshal.Copy (buf, ptrs, 0, argc);
|
|
|
|
|
|
|
|
for (int i = 0; i < ptrs.Length; i++)
|
|
|
|
args[i] = Marshal.PtrToStringAuto ((IntPtr) ptrs[i]);
|
|
|
|
|
|
|
|
return args;
|
|
|
|
}
|
|
|
|
|
|
|
|
static string[] unmarshal_64 (IntPtr buf, int argc)
|
|
|
|
{
|
|
|
|
long[] ptrs = new long[argc];
|
|
|
|
string[] args = new string[argc];
|
|
|
|
|
|
|
|
Marshal.Copy (buf, ptrs, 0, argc);
|
|
|
|
|
|
|
|
for (int i = 0; i < ptrs.Length; i++)
|
|
|
|
args[i] = Marshal.PtrToStringAuto ((IntPtr) ptrs[i]);
|
|
|
|
|
|
|
|
return args;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static string[] ArrayPtrToArgv (IntPtr array, int argc)
|
|
|
|
{
|
|
|
|
if (argc == 0)
|
|
|
|
return new string[0];
|
|
|
|
|
|
|
|
if (check_sixtyfour ())
|
|
|
|
return unmarshal_64 (array, argc);
|
|
|
|
|
|
|
|
return unmarshal_32 (array, argc);
|
|
|
|
}
|
2004-05-19 18:57:28 +00:00
|
|
|
|
|
|
|
static DateTime local_epoch = new DateTime (1970, 1, 1, 0, 0, 0);
|
|
|
|
|
|
|
|
public static IntPtr DateTimeTotime_t (DateTime time)
|
|
|
|
{
|
|
|
|
return new IntPtr (((int)time.Subtract (local_epoch).TotalSeconds));
|
|
|
|
}
|
|
|
|
|
|
|
|
public static DateTime time_tToDateTime (IntPtr time_t)
|
|
|
|
{
|
|
|
|
return local_epoch.AddSeconds ((int)time_t);
|
|
|
|
}
|
2004-08-17 20:43:49 +00:00
|
|
|
|
|
|
|
[DllImport("glibsharpglue")]
|
|
|
|
static extern IntPtr gtksharp_unichar_to_utf8_string (uint c);
|
|
|
|
|
|
|
|
public static char GUnicharToChar (uint ucs4_char)
|
|
|
|
{
|
|
|
|
IntPtr raw_ret = gtksharp_unichar_to_utf8_string (ucs4_char);
|
|
|
|
string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
|
|
|
|
if (ret.Length > 1)
|
|
|
|
throw new ArgumentOutOfRangeException ("ucs4char is not representable by a char.");
|
|
|
|
|
|
|
|
return ret [0];
|
|
|
|
}
|
|
|
|
|
|
|
|
[DllImport("glibsharpglue")]
|
|
|
|
static extern uint glibsharp_utf16_to_gunichar (ushort c);
|
|
|
|
|
|
|
|
public static uint CharToGUnichar (char c)
|
|
|
|
{
|
|
|
|
return glibsharp_utf16_to_gunichar ((ushort) c);
|
|
|
|
}
|
|
|
|
|
2003-05-29 Rachel Hestilow <rachel@nullenvoid.com>
* 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
2003-06-10 18:09:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|