Use custom marshaling

Author: bording

LibGit2Sharp/Core/EncodingMarshaler.cs

@@ -117,11 +117,7 @@ public static unsafe string FromNative(Encoding encoding, byte* pNativeData)
                 return String.Empty;
             }
 
-#if DESKTOP
             return new String((sbyte*)pNativeData, 0, (int)(walk - start), encoding);
-#else
-            return encoding.GetString(pNativeData, (int)(walk - start));
-#endif
         }
 
         public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, int length)
@@ -136,11 +132,7 @@ public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, in
                 return String.Empty;
             }
 
-#if DESKTOP
             return new String((sbyte*)pNativeData.ToPointer(), 0, length, encoding);
-#else
-            return encoding.GetString((byte*)pNativeData.ToPointer(), length);
-#endif
         }
 
         public static string FromBuffer(Encoding encoding, byte[] buffer)

LibGit2Sharp/Core/FilePathMarshaler.cs

@@ -10,13 +10,15 @@ namespace LibGit2Sharp.Core
     /// free the native pointer after conversion, because the memory is owned by libgit2.
     ///
     /// Use this marshaler for return values, for example:
-    /// [return: CustomMarshaler(typeof(LaxFilePathNoCleanupMarshaler), typeof(FilePath))]
+    /// [return: MarshalAs(UnmanagedType.CustomMarshaler,
+    ///                    MarshalCookie = UniqueId.UniqueIdentifier,
+    ///                    MarshalTypeRef = typeof(LaxFilePathNoCleanupMarshaler))]
     /// </summary>
     internal class LaxFilePathNoCleanupMarshaler : LaxFilePathMarshaler
     {
         private static readonly LaxFilePathNoCleanupMarshaler staticInstance = new LaxFilePathNoCleanupMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }
@@ -39,15 +41,16 @@ public override void CleanUpNativeData(IntPtr pNativeData)
     ///
     /// Use this marshaler for function parameters, for example:
     /// [DllImport(libgit2)]
-    /// private static extern unsafe int git_index_remove_bypath(
-    ///     git_index* index,
-    ///     [CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path);
+    /// internal static extern int git_index_open(out IndexSafeHandle index,
+    ///     [MarshalAs(UnmanagedType.CustomMarshaler,
+    ///                MarshalCookie = UniqueId.UniqueIdentifier,
+    ///                MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath indexpath);
     /// </summary>
     internal class StrictFilePathMarshaler : StrictUtf8Marshaler
     {
         private static readonly StrictFilePathMarshaler staticInstance = new StrictFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }
@@ -95,7 +98,7 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }