jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix undesirable wstring encoding at return value marshalling for C#

Browse source
This commit is contained in:
smithx 2019-05-17 18:57:52 +03:00 • committed by William S Fulton
commit 8f6d97ab8c
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/csharp/std_wstring.i
View file

@ -23,7 +23,10 @@ class wstring;
// wstring // wstring
%typemap(ctype, out="void *") wstring "wchar_t *" %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(cstype) wstring "string"
%typemap(csdirectorin) wstring "$iminput" %typemap(csdirectorin) wstring "$iminput"
%typemap(csdirectorout) wstring "$cscall" %typemap(csdirectorout) wstring "$cscall"

1
Lib/csharp/wchar.i
View file

@ -20,6 +20,7 @@ static SWIG_CSharpWStringHelperCallback SWIG_csharp_wstring_callback = NULL;
%pragma(csharp) imclasscode=%{ %pragma(csharp) imclasscode=%{
protected class SWIGWStringHelper { protected class SWIGWStringHelper {
[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]
public delegate string SWIGWStringDelegate(global::System.IntPtr message); public delegate string SWIGWStringDelegate(global::System.IntPtr message);
static SWIGWStringDelegate wstringDelegate = new SWIGWStringDelegate(CreateWString); static SWIGWStringDelegate wstringDelegate = new SWIGWStringDelegate(CreateWString);