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

wchar_t C# marshalling tweak

Browse source 
Use more appropriate unsigned short (2 byte type) pointer
for C# ctype instead of wchar_t pointer
This commit is contained in:
William S Fulton 2022-04-26 21:27:15 +01:00
commit 0fbd6cc364
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/csharp/std_wstring.i
View file

@ -2,7 +2,9 @@
* std_wstring.i * std_wstring.i
* *
* Typemaps for std::wstring and const std::wstring& * Typemaps for std::wstring and const std::wstring&
* These are mapped to a C# String and are passed around by value. * std::wstring is mapped to a C# Unicode string (UTF16) and is passed around by value.
* std::wstring support includes wchar_t as a 2 byte type (Windows) and a 4 byte type
* (most Unix systems).
* *
* To use non-const std::wstring references use the following %apply. Note * To use non-const std::wstring references use the following %apply. Note
* that they are passed by value. * that they are passed by value.
@ -17,11 +19,11 @@
%fragment("Swig_csharp_UTF16ToWString", "header") %{ %fragment("Swig_csharp_UTF16ToWString", "header") %{
/* For converting from .NET UTF16 (2 byte unicode) strings. wchar_t is 2 bytes on Windows, 4 bytes on Linux. */ /* For converting from .NET UTF16 (2 byte unicode) strings. wchar_t is 2 bytes on Windows, 4 bytes on Linux. */
static std::wstring Swig_csharp_UTF16ToWString(const wchar_t *str) { static std::wstring Swig_csharp_UTF16ToWString(const unsigned short *str) {
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
return std::wstring(str); return std::wstring((wchar_t *)str);
} else { } else {
const unsigned short *pBegin((const unsigned short *)(str)); const unsigned short *pBegin(str);
const unsigned short *ptr(pBegin); const unsigned short *ptr(pBegin);
while (*ptr != 0) while (*ptr != 0)
@ -44,7 +46,7 @@ namespace std {
class wstring; class wstring;
// wstring // wstring
%typemap(ctype, out="void *") wstring "wchar_t *" %typemap(ctype, out="void *") wstring "unsigned short *"
%typemap(imtype, %typemap(imtype,
inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]", 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)]" outattributes="[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]"
@ -84,7 +86,7 @@ class wstring;
return $null; %} return $null; %}
// const wstring & // const wstring &
%typemap(ctype, out="void *") const wstring & "wchar_t *" %typemap(ctype, out="void *") const wstring & "unsigned short *"
%typemap(imtype, %typemap(imtype,
inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]", 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)]" outattributes="[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]"

13
Lib/csharp/wchar.i
View file

@ -2,10 +2,11 @@
* wchar.i * wchar.i
* *
* Typemaps for the wchar_t type * Typemaps for the wchar_t type
* These are mapped to a C# String and are passed around by value. * wchar_t * is mapped to a C# Unicode string (UTF16) and is passed around by value.
* wchar_t * support includes wchar_t as a 2 byte type (Windows) and a 4 byte type
* (most Unix systems).
* *
* Support code for wide strings can be turned off by defining SWIG_CSHARP_NO_WSTRING_HELPER * Support code for wide strings can be turned off by defining SWIG_CSHARP_NO_WSTRING_HELPER
*
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#if !defined(SWIG_CSHARP_NO_WSTRING_HELPER) #if !defined(SWIG_CSHARP_NO_WSTRING_HELPER)
@ -101,14 +102,14 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
%fragment("Swig_csharp_UTF16ToWCharPtr", "header") %{ %fragment("Swig_csharp_UTF16ToWCharPtr", "header") %{
/* For converting from .NET UTF16 (2 byte unicode) strings. wchar_t is 2 bytes on Windows, 4 bytes on Linux. */ /* For converting from .NET UTF16 (2 byte unicode) strings. wchar_t is 2 bytes on Windows, 4 bytes on Linux. */
static wchar_t * Swig_csharp_UTF16ToWCharPtr(const wchar_t *str) { static wchar_t * Swig_csharp_UTF16ToWCharPtr(const unsigned short *str) {
if (sizeof(wchar_t) == 2) { if (sizeof(wchar_t) == 2) {
return (wchar_t *)str; return (wchar_t *)str;
} else { } else {
wchar_t *result = 0; wchar_t *result = 0;
if (str) { if (str) {
const unsigned short *pBegin((const unsigned short *)(str)); const unsigned short *pBegin(str);
const unsigned short *pEnd(pBegin); const unsigned short *pEnd(pBegin);
wchar_t *ptr = 0; wchar_t *ptr = 0;
@ -142,7 +143,7 @@ static void Swig_csharp_UTF16ToWCharPtrFree(wchar_t *str) {
} }
%} %}
%typemap(ctype, out="void *") wchar_t * "wchar_t *" %typemap(ctype, out="void *") wchar_t * "unsigned short *"
%typemap(imtype, %typemap(imtype,
inattributes="[global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]", 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)]" outattributes="[return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPWStr)]"
@ -167,7 +168,7 @@ static void Swig_csharp_UTF16ToWCharPtrFree(wchar_t *str) {
%typemap(in, fragment="Swig_csharp_UTF16ToWCharPtr") wchar_t * %typemap(in, fragment="Swig_csharp_UTF16ToWCharPtr") wchar_t *
%{ $1 = Swig_csharp_UTF16ToWCharPtr($input); %} %{ $1 = Swig_csharp_UTF16ToWCharPtr($input); %}
%typemap(out) wchar_t * %{ $result = $1 ? SWIG_csharp_wstring_callback((wchar_t *)$1) : 0; %} %typemap(out) wchar_t * %{ $result = $1 ? SWIG_csharp_wstring_callback($1) : 0; %}
%typemap(freearg, fragment="Swig_csharp_UTF16ToWCharPtrFree") wchar_t * %typemap(freearg, fragment="Swig_csharp_UTF16ToWCharPtrFree") wchar_t *
%{ Swig_csharp_UTF16ToWCharPtrFree($1); %} %{ Swig_csharp_UTF16ToWCharPtrFree($1); %}