Whatlang: fixes for Windows

gluschenko · Nov 8, 2024 · fc6e296 · fc6e296
1 parent b7fe3c6
commit fc6e296
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/LanguageIdentification.Whatlang.ConsoleTest/Properties/launchSettings.json b/src/LanguageIdentification.Whatlang.ConsoleTest/Properties/launchSettings.json
@@ -2,6 +2,14 @@
   "profiles": {
     "Docker": {
       "commandName": "Docker"
+    },
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    },
+    "Project": {
+      "commandName": "Project",
+      "nativeDebugging": true
     }
   }
 }
diff --git a/src/LanguageIdentification.Whatlang.Native/.gitignore b/src/LanguageIdentification.Whatlang.Native/.gitignore
@@ -1,4 +1,5 @@
 libwhatlang.so
 libwhatlang.arm64.dylib
+libwhatlang.x86_64.dylib
 whatlang.dll
 build_temp/**
diff --git a/src/LanguageIdentification.Whatlang/Internal/WhatlangDetectorWrapper.cs b/src/LanguageIdentification.Whatlang/Internal/WhatlangDetectorWrapper.cs
@@ -10,42 +10,42 @@ internal static class WhatlangDetectorWrapper
     {
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_detect", CallingConvention = CallingConvention.Cdecl)]
         public static extern WhatlangStatus WhatlangDetect(
-            string text,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] string text,
             out WhatlangPredictionResult result
         );
 
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_detectn", CallingConvention = CallingConvention.Cdecl)]
         public static extern WhatlangStatus WhatlangDetectN(
-            string text,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] string text,
             int len,
             out WhatlangPredictionResult info
         );
 
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_lang_code", CallingConvention = CallingConvention.Cdecl)]
         public static extern int WhatlangLangCode(
             WhatlangLanguage lang,
-            [MarshalAs(UnmanagedType.LPStr)] StringBuilder buffer,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] StringBuilder buffer,
             UIntPtr bufferSize
         );
 
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_lang_eng_name", CallingConvention = CallingConvention.Cdecl)]
         public static extern int WhatlangLangEngName(
             WhatlangLanguage lang,
-            [MarshalAs(UnmanagedType.LPStr)] StringBuilder buffer,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] StringBuilder buffer,
             UIntPtr bufferSize
         );
 
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_lang_name", CallingConvention = CallingConvention.Cdecl)]
         public static extern int WhatlangLangName(
             WhatlangLanguage lang,
-            [MarshalAs(UnmanagedType.LPStr)] StringBuilder buffer,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] StringBuilder buffer,
             UIntPtr bufferSize
         );
 
         [DllImport(WhatlangNativeLibrary.Name, EntryPoint = "whatlang_script_name", CallingConvention = CallingConvention.Cdecl)]
         public static extern int WhatlangScriptName(
             WhatlangScript script,
-            [MarshalAs(UnmanagedType.LPStr)] StringBuilder buffer,
+            [MarshalAs(UnmanagedType.LPUTF8Str)] StringBuilder buffer,
             UIntPtr bufferSize
         );
     }