commit 8f6d97ab8c97295fc74fac05f45f27c91884690a
author smithx <smithx@pm.me> Fri May 17 18:57:52 2019 +0300
committer William S Fulton <wsf@fultondesigns.co.uk> Mon Jul 22 19:11:21 2019 +0100
tree 38224fb4343939d3d457fb4e754fb202b582b264
parent a9a7b03ba6557a6f9c8c8b284d907d6a7017e989

fix undesirable `wstring` encoding at return value marshalling for C#

Lib/csharp/std_wstring.i

diff --git a/Lib/csharp/std_wstring.i b/Lib/csharp/std_wstring.i
index 09bdaaa..b18a2cc 100644
--- a/Lib/csharp/std_wstring.i
+++ b/Lib/csharp/std_wstring.i
@@ -23,7 +23,10 @@
 
 // wstring
 %typemap(ctype, out="void *") wstring "wchar_t *"
-%typemap(imtype, inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]") wstring "string"
+%typemap(imtype,
+         inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]",
+         outattributes="[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]"
+         ) wstring "string"
 %typemap(cstype) wstring "string"
 %typemap(csdirectorin) wstring "$iminput"
 %typemap(csdirectorout) wstring "$cscall"

Lib/csharp/wchar.i

diff --git a/Lib/csharp/wchar.i b/Lib/csharp/wchar.i
index 9361edf..79fb5a8 100644
--- a/Lib/csharp/wchar.i
+++ b/Lib/csharp/wchar.i
@@ -20,6 +20,7 @@
 %pragma(csharp) imclasscode=%{
   protected class SWIGWStringHelper {
 
+    [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]
     public delegate string SWIGWStringDelegate(global::System.IntPtr message);
     static SWIGWStringDelegate wstringDelegate = new SWIGWStringDelegate(CreateWString);