ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* glib/Value.cs: revert to "working" GValue layout from 2-12 branch.

Browse source 
The replaced code fails because sizeof(GValue) is 20 on 32 bit
    linux but Marshal.SizeOf(GLib.Value) reported 24.  If it aint broke,
    don't fix it, and the long works on 32 and 64 in 2.12 and earlier.
This commit is contained in:
Mike Kestner 2011-04-27 19:05:11 -05:00
parent 6fafc52670
commit 2e115e2aff
1 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
glib/Value.cs
View file

@ -30,23 +30,10 @@ namespace GLib {
[StructLayout (LayoutKind.Sequential)] [StructLayout (LayoutKind.Sequential)]
public struct Value : IDisposable { public struct Value : IDisposable {
[StructLayout(LayoutKind.Explicit)]
struct Padding {
[FieldOffset (0)] public int v_int;
[FieldOffset (0)] public uint v_uint;
[FieldOffset (0)] public int v_long;
[FieldOffset (0)] public uint v_ulong;
[FieldOffset (0)] public long v_int64;
[FieldOffset (0)] public ulong v_uint64;
[FieldOffset (0)] public float v_float;
[FieldOffset (0)] public double v_double;
[FieldOffset (0)] public IntPtr v_pointer;
}
IntPtr type; IntPtr type;
#pragma warning disable 0414 #pragma warning disable 0414
Padding pad1; long pad1;
Padding pad2; long pad2;
#pragma warning restore 0414 #pragma warning restore 0414
public static Value Empty; public static Value Empty;
@ -54,16 +41,14 @@ namespace GLib {
public Value (GLib.GType gtype) public Value (GLib.GType gtype)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
pad1 = new Padding (); pad1 = pad2 = 0;
pad2 = new Padding ();
g_value_init (ref this, gtype.Val); g_value_init (ref this, gtype.Val);
} }
public Value (object obj) public Value (object obj)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
pad1 = new Padding (); pad1 = pad2 = 0;
pad2 = new Padding ();
GType gtype = (GType) obj.GetType (); GType gtype = (GType) obj.GetType ();
g_value_init (ref this, gtype.Val); g_value_init (ref this, gtype.Val);
@ -140,8 +125,7 @@ namespace GLib {
public Value (Opaque val, string type_name) public Value (Opaque val, string type_name)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
pad1 = new Padding (); pad1 = pad2 = 0;
pad2 = new Padding ();
g_value_init (ref this, GType.FromName (type_name).Val); g_value_init (ref this, GType.FromName (type_name).Val);
g_value_set_boxed (ref this, val.Handle); g_value_set_boxed (ref this, val.Handle);
} }
@ -159,8 +143,7 @@ namespace GLib {
public Value (GLib.Object obj, string prop_name) public Value (GLib.Object obj, string prop_name)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
pad1 = new Padding (); pad1 = pad2 = 0;
pad2 = new Padding ();
InitForProperty (obj, prop_name); InitForProperty (obj, prop_name);
} }
@ -168,8 +151,7 @@ namespace GLib {
public Value (IntPtr obj, string prop_name, Opaque val) public Value (IntPtr obj, string prop_name, Opaque val)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
pad1 = new Padding (); pad1 = pad2 = 0;
pad2 = new Padding ();
InitForProperty (GLib.Object.GetObject (obj), prop_name); InitForProperty (GLib.Object.GetObject (obj), prop_name);
g_value_set_boxed (ref this, val.Handle); g_value_set_boxed (ref this, val.Handle);
} }