Strings in structures are being marshalled as ASCII, Hack fix it

anaisbetts · nulltoken · commit e32dba45b0ed · 2012-02-01T23:50:19.000+01:00
diff --git a/LibGit2Sharp/Core/GitIndexEntry.cs b/LibGit2Sharp/Core/GitIndexEntry.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace LibGit2Sharp.Core
 {
@@ -16,6 +17,6 @@ internal class GitIndexEntry
         public GitOid oid;
         public ushort Flags;
         public ushort ExtendedFlags;
-        public string Path;
+        public IntPtr Path;
     }
 }
diff --git a/LibGit2Sharp/Core/GitSignature.cs b/LibGit2Sharp/Core/GitSignature.cs
@@ -1,12 +1,13 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace LibGit2Sharp.Core
 {
     [StructLayout(LayoutKind.Sequential)]
     internal class GitSignature
     {
-        public string Name;
-        public string Email;
+        public IntPtr Name;
+        public IntPtr Email;
         public GitTime When;
     }
 }
diff --git a/LibGit2Sharp/IndexEntry.cs b/LibGit2Sharp/IndexEntry.cs
@@ -14,6 +14,8 @@ public class IndexEntry : IEquatable<IndexEntry>
 
         private Func<FileStatus> state;
 
+        private static readonly Utf8Marshaler marshaler = new Utf8Marshaler();
+
         /// <summary>
         ///   State of the version of the <see cref = "Blob" /> pointed at by this <see cref = "IndexEntry" />, 
         ///   compared against the <see cref = "Blob" /> known from the <see cref = "Repository.Head" /> and the file in the working directory.
@@ -36,11 +38,13 @@ public FileStatus State
         internal static IndexEntry CreateFromPtr(Repository repo, IntPtr ptr)
         {
             var entry = (GitIndexEntry)Marshal.PtrToStructure(ptr, typeof(GitIndexEntry));
+            var path = (string)marshaler.MarshalNativeToManaged(entry.Path);
+
             return new IndexEntry
                        {
-                           Path = PosixPathHelper.ToNative(entry.Path),
+                           Path = PosixPathHelper.ToNative(path),
                            Id = new ObjectId(entry.oid),
-                           state = () => repo.Index.RetrieveStatus(entry.Path)
+                           state = () => repo.Index.RetrieveStatus(path)
                        };
         }
 
diff --git a/LibGit2Sharp/Signature.cs b/LibGit2Sharp/Signature.cs
@@ -13,13 +13,17 @@ public class Signature
         private readonly string name;
         private readonly string email;
 
+        private static readonly Utf8Marshaler marshaler = new Utf8Marshaler();
+
         internal Signature(IntPtr signaturePtr)
         {
             var handle = new GitSignature();
             Marshal.PtrToStructure(signaturePtr, handle);
 
-            name = handle.Name;
-            email = handle.Email;
+            // XXX: This is unbelievably hacky, but I can't get the 
+            // Utf8Marshaller to work properly.
+            name = (string)marshaler.MarshalNativeToManaged(handle.Name);
+            email = (string)marshaler.MarshalNativeToManaged(handle.Email);
             when = Epoch.ToDateTimeOffset(handle.When.Time, handle.When.Offset);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Runtime.InteropServices;`
	`1`	`+using System;`
	`2`	`+using System.Runtime.InteropServices;`
`2`	`3`
`3`	`4`	`namespace LibGit2Sharp.Core`
`4`	`5`	`{`
`@@ -16,6 +17,6 @@ internal class GitIndexEntry`
`16`	`17`	`public GitOid oid;`
`17`	`18`	`public ushort Flags;`
`18`	`19`	`public ushort ExtendedFlags;`
`19`		`- public string Path;`
	`20`	`+ public IntPtr Path;`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`		`-using System.Runtime.InteropServices;`
	`1`	`+using System;`
	`2`	`+using System.Runtime.InteropServices;`
`2`	`3`
`3`	`4`	`namespace LibGit2Sharp.Core`
`4`	`5`	`{`
`5`	`6`	`[StructLayout(LayoutKind.Sequential)]`
`6`	`7`	`internal class GitSignature`
`7`	`8`	`{`
`8`		`- public string Name;`
`9`		`- public string Email;`
	`9`	`+ public IntPtr Name;`
	`10`	`+ public IntPtr Email;`
`10`	`11`	`public GitTime When;`
`11`	`12`	`}`
`12`	`13`	`}`