Adjustments for std:wstring support for CLI

- Adjusted TypeMap for wstring in Stdlib.CLI.cs - Fixed typo in Common.Test.cs - Added check in test - Added wstring exports in Std-symbols.cpp
mono · Sep 14, 2021 · f1743e9 · f1743e9
1 parent 587f466
commit f1743e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std-symbols.cpp
@@ -9,3 +9,9 @@ template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, s
 template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
 template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>& std::basic_string<char, std::char_traits<char>, std::allocator<char>>::assign(const char* const);
 template __declspec(dllexport) const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::data() const noexcept;
+
+template __declspec(dllexport) std::allocator<wchar_t>::allocator() noexcept;
+template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::basic_string() noexcept(true);
+template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::~basic_string() noexcept;
+template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>& std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::assign(const wchar_t* const);
+template __declspec(dllexport) const wchar_t* std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::data() const noexcept;
diff --git a/src/Generator/Types/Std/Stdlib.CLI.cs b/src/Generator/Types/Std/Stdlib.CLI.cs
@@ -103,7 +103,7 @@ public override void CLIMarshalToManaged(MarshalContext ctx)
         }
     }
 
-    [TypeMap("std::wstring", GeneratorKind = GeneratorKind.CLI)]
+    [TypeMap("basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>>", GeneratorKind = GeneratorKind.CLI)]
     public partial class WString : TypeMap
     {
         public override Type CLISignatureType(TypePrinterContext ctx)

diff --git a/tests/Common/Common.Tests.cs b/tests/Common/Common.Tests.cs
@@ -1020,15 +1020,16 @@ This is a very long string. This is a very long string. This is a very long stri
 
         using (var hasStdWString = new HasStdWString())
 		{
+            Assert.That(hasStdWString.TestStdWStringPassedByValue(t), Is.EqualTo(t + "_test"));
             Assert.That(hasStdWString.TestStdWString(t), Is.EqualTo(t + "_test"));
             hasStdWString.S = t;
             Assert.That(hasStdWString.S, Is.EqualTo(t));
             Assert.That(hasStdWString.StdWString, Is.EqualTo(t));
-            Assert.That(hasStdWString.StdWString, Is.EqualTo(t)            
+			Assert.That(hasStdWString.StdWString, Is.EqualTo(t));            
             Assert.That(hasStdWString.TestStdWString(unicodeString1), Is.EqualTo(unicodeString1 + "_test"));
             hasStdWString.S = unicodeString1;
             Assert.That(hasStdWString.S, Is.EqualTo(unicodeString1));
-            Assert.That(hasStdWString.StdWString, Is.EqualTo(unicodeString1)            
+			Assert.That(hasStdWString.StdWString, Is.EqualTo(unicodeString1));
             Assert.That(hasStdWString.TestStdWString(unicodeString2), Is.EqualTo(unicodeString2 + "_test"));
             hasStdWString.S = unicodeString2;
             Assert.That(hasStdWString.S, Is.EqualTo(unicodeString2));