From 0e02698fcecd373f943fc75a6baa5269a7d4ad5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 15 May 2019 17:17:47 -0400 Subject: [PATCH] Adjust memorized numbers encoding --- .../CalcManager/CalculatorManager.Interop.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs index e07c30c1..8cb0f3dc 100644 --- a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs +++ b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs @@ -157,7 +157,9 @@ namespace CalculationManager var numbers = new List(); for (int i = 0; i < count; i++) { - numbers.Add(Marshal.PtrToStringUTF8(Marshal.ReadIntPtr(newMemorizedNumbers, i))); + // TODO Use native encoding instead. + var value = Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(newMemorizedNumbers, i)); + numbers.Add(Encoding.UTF8.GetString(Encoding.ASCII.GetBytes(value))); } manager.SetMemorizedNumbers(numbers);