From a84686563f646a25025c196df637359c22c23de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 15 May 2019 11:31:39 -0400 Subject: [PATCH] Adjust for UWP build --- src/CalcManager/CCalcManager.cpp | 2 +- .../CalcManager/CalculatorManager.Interop.cs | 44 +++++++++---------- .../CalcManager/CalculatorManager.cs | 24 +++++----- src/Calculator.Shared/Styles.xaml | 1 + 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/CalcManager/CCalcManager.cpp b/src/CalcManager/CCalcManager.cpp index 0c4601cc..6db0f533 100644 --- a/src/CalcManager/CCalcManager.cpp +++ b/src/CalcManager/CCalcManager.cpp @@ -78,7 +78,7 @@ public: auto str = convert.to_bytes(memorizedNumbers[i]); auto pData = new char[str.size() + 1]; -#ifdef __STDC_LIB_EXT1__ +#if !defined(__EMSCRIPTEN__) strcpy_s(pData, str.size(), str.data()); #else strcpy(pData, str.data()); diff --git a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs index d5b675da..88ebd595 100644 --- a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs +++ b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs @@ -18,31 +18,31 @@ namespace CalculationManager [DllImport("CalcManager")] public static extern void CalculatorManager_SendCommand(int instance, Command command); - private delegate int GetCEngineStringFunc(int state, string id); - private delegate void BinaryOperatorReceivedFunc(int state); - private delegate void SetPrimaryDisplayCallbackFunc(int state, string displayStringValue, bool isError); - private delegate void SetIsInErrorCallbackFunc(int state, bool isError); - private delegate void SetParenthesisNumberCallbackFunc(int state, int parenthesisCount); + public delegate int GetCEngineStringFunc(int state, string id); + public delegate void BinaryOperatorReceivedFunc(int state); + public delegate void SetPrimaryDisplayCallbackFunc(int state, string displayStringValue, bool isError); + public delegate void SetIsInErrorCallbackFunc(int state, bool isError); + public delegate void SetParenthesisNumberCallbackFunc(int state, int parenthesisCount); - private delegate void MaxDigitsReachedCallbackFunc(int state); - private delegate void MemoryItemChangedCallbackFunc(int state, int indexOfMemory); - private delegate void OnHistoryItemAddedCallbackFunc(int state, int addedItemIndex); - private delegate void OnNoRightParenAddedCallbackFunc(int state); - private delegate void SetExpressionDisplayCallbackFunc(int state); - private delegate void SetMemorizedNumbersCallbackFunc(int state, string[] newMemorizedNumbers); + public delegate void MaxDigitsReachedCallbackFunc(int state); + public delegate void MemoryItemChangedCallbackFunc(int state, int indexOfMemory); + public delegate void OnHistoryItemAddedCallbackFunc(int state, int addedItemIndex); + public delegate void OnNoRightParenAddedCallbackFunc(int state); + public delegate void SetExpressionDisplayCallbackFunc(int state); + public delegate void SetMemorizedNumbersCallbackFunc(int state, string[] newMemorizedNumbers); - private static GetCEngineStringFunc _getCEngineStringCallback = GetCEngineStringCallback; - private static BinaryOperatorReceivedFunc _binaryOperatorReceivedCallback = BinaryOperatorReceivedCallback; - private static SetPrimaryDisplayCallbackFunc _setPrimaryDisplayCallback = SetPrimaryDisplayCallback; - private static SetIsInErrorCallbackFunc _setIsInErrorCallback = SetIsInErrorCallback; - private static SetParenthesisNumberCallbackFunc _setParenthesisNumberCallback = SetParenthesisNumberCallback; + public static GetCEngineStringFunc _getCEngineStringCallback = GetCEngineStringCallback; + public static BinaryOperatorReceivedFunc _binaryOperatorReceivedCallback = BinaryOperatorReceivedCallback; + public static SetPrimaryDisplayCallbackFunc _setPrimaryDisplayCallback = SetPrimaryDisplayCallback; + public static SetIsInErrorCallbackFunc _setIsInErrorCallback = SetIsInErrorCallback; + public static SetParenthesisNumberCallbackFunc _setParenthesisNumberCallback = SetParenthesisNumberCallback; - private static MaxDigitsReachedCallbackFunc _maxDigitsReachedCallback = MaxDigitsReachedCallback; - private static MemoryItemChangedCallbackFunc _memoryItemChangedCallback = MemoryItemChangedCallback; - private static OnHistoryItemAddedCallbackFunc _onHistoryItemAddedCallback = OnHistoryItemAddedCallback; - private static OnNoRightParenAddedCallbackFunc _onNoRightParenAddedCallback = OnNoRightParenAddedCallback; - private static SetExpressionDisplayCallbackFunc _setExpressionDisplayCallback = SetExpressionDisplayCallback; - private static SetMemorizedNumbersCallbackFunc _setMemorizedNumbersCallback = SetMemorizedNumbersCallback; + public static MaxDigitsReachedCallbackFunc _maxDigitsReachedCallback = MaxDigitsReachedCallback; + public static MemoryItemChangedCallbackFunc _memoryItemChangedCallback = MemoryItemChangedCallback; + public static OnHistoryItemAddedCallbackFunc _onHistoryItemAddedCallback = OnHistoryItemAddedCallback; + public static OnNoRightParenAddedCallbackFunc _onNoRightParenAddedCallback = OnNoRightParenAddedCallback; + public static SetExpressionDisplayCallbackFunc _setExpressionDisplayCallback = SetExpressionDisplayCallback; + public static SetMemorizedNumbersCallbackFunc _setMemorizedNumbersCallback = SetMemorizedNumbersCallback; public static void MaxDigitsReachedCallback(int state) { diff --git a/src/Calculator.Shared/CalcManager/CalculatorManager.cs b/src/Calculator.Shared/CalcManager/CalculatorManager.cs index 3002f44e..e256dbdb 100644 --- a/src/Calculator.Shared/CalcManager/CalculatorManager.cs +++ b/src/Calculator.Shared/CalcManager/CalculatorManager.cs @@ -6,8 +6,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -using Uno; -using Uno.Foundation; namespace CalculationManager { @@ -135,19 +133,19 @@ namespace CalculationManager var p = new CalculatorManager_CreateParams { CalculatorState = GCHandle.ToIntPtr(_displayCallbackHandle), - GetCEngineString = Marshal.GetFunctionPointerForDelegate(_getCEngineStringCallback), + GetCEngineString = Marshal.GetFunctionPointerForDelegate(NativeDispatch._getCEngineStringCallback), ResourceState = GCHandle.ToIntPtr(_resourceProviderHandle), - BinaryOperatorReceived = Marshal.GetFunctionPointerForDelegate(_binaryOperatorReceivedCallback), - SetPrimaryDisplay = Marshal.GetFunctionPointerForDelegate(_setPrimaryDisplayCallback), - SetIsInError = Marshal.GetFunctionPointerForDelegate(_setIsInErrorCallback), - SetParenthesisNumber = Marshal.GetFunctionPointerForDelegate(_setParenthesisNumberCallback), - MaxDigitsReached = Marshal.GetFunctionPointerForDelegate(_maxDigitsReachedCallback), - MemoryItemChanged = Marshal.GetFunctionPointerForDelegate(_memoryItemChangedCallback), - OnHistoryItemAdded = Marshal.GetFunctionPointerForDelegate(_onHistoryItemAddedCallback), - OnNoRightParenAdded = Marshal.GetFunctionPointerForDelegate(_onNoRightParenAddedCallback), - SetExpressionDisplay = Marshal.GetFunctionPointerForDelegate(_setExpressionDisplayCallback), - SetMemorizedNumbers = Marshal.GetFunctionPointerForDelegate(_setMemorizedNumbersCallback), + BinaryOperatorReceived = Marshal.GetFunctionPointerForDelegate(NativeDispatch._binaryOperatorReceivedCallback), + SetPrimaryDisplay = Marshal.GetFunctionPointerForDelegate(NativeDispatch._setPrimaryDisplayCallback), + SetIsInError = Marshal.GetFunctionPointerForDelegate(NativeDispatch._setIsInErrorCallback), + SetParenthesisNumber = Marshal.GetFunctionPointerForDelegate(NativeDispatch._setParenthesisNumberCallback), + MaxDigitsReached = Marshal.GetFunctionPointerForDelegate(NativeDispatch._maxDigitsReachedCallback), + MemoryItemChanged = Marshal.GetFunctionPointerForDelegate(NativeDispatch._memoryItemChangedCallback), + OnHistoryItemAdded = Marshal.GetFunctionPointerForDelegate(NativeDispatch._onHistoryItemAddedCallback), + OnNoRightParenAdded = Marshal.GetFunctionPointerForDelegate(NativeDispatch._onNoRightParenAddedCallback), + SetExpressionDisplay = Marshal.GetFunctionPointerForDelegate(NativeDispatch._setExpressionDisplayCallback), + SetMemorizedNumbers = Marshal.GetFunctionPointerForDelegate(NativeDispatch._setMemorizedNumbersCallback), }; #endif diff --git a/src/Calculator.Shared/Styles.xaml b/src/Calculator.Shared/Styles.xaml index 5d3fd51a..eaf53711 100644 --- a/src/Calculator.Shared/Styles.xaml +++ b/src/Calculator.Shared/Styles.xaml @@ -1,6 +1,7 @@