github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust for UWP build

Browse source
This commit is contained in:
Jérôme Laban 2019-05-15 11:31:39 -04:00
commit 0187731ea2
2 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs
View file

@ -18,31 +18,31 @@ namespace CalculationManager
[DllImport("CalcManager")] [DllImport("CalcManager")]
public static extern void CalculatorManager_SendCommand(int instance, Command command); public static extern void CalculatorManager_SendCommand(int instance, Command command);
private delegate int GetCEngineStringFunc(int state, string id); public delegate int GetCEngineStringFunc(int state, string id);
private delegate void BinaryOperatorReceivedFunc(int state); public delegate void BinaryOperatorReceivedFunc(int state);
private delegate void SetPrimaryDisplayCallbackFunc(int state, string displayStringValue, bool isError); public delegate void SetPrimaryDisplayCallbackFunc(int state, string displayStringValue, bool isError);
private delegate void SetIsInErrorCallbackFunc(int state, bool isError); public delegate void SetIsInErrorCallbackFunc(int state, bool isError);
private delegate void SetParenthesisNumberCallbackFunc(int state, int parenthesisCount); public delegate void SetParenthesisNumberCallbackFunc(int state, int parenthesisCount);
private delegate void MaxDigitsReachedCallbackFunc(int state); public delegate void MaxDigitsReachedCallbackFunc(int state);
private delegate void MemoryItemChangedCallbackFunc(int state, int indexOfMemory); public delegate void MemoryItemChangedCallbackFunc(int state, int indexOfMemory);
private delegate void OnHistoryItemAddedCallbackFunc(int state, int addedItemIndex); public delegate void OnHistoryItemAddedCallbackFunc(int state, int addedItemIndex);
private delegate void OnNoRightParenAddedCallbackFunc(int state); public delegate void OnNoRightParenAddedCallbackFunc(int state);
private delegate void SetExpressionDisplayCallbackFunc(int state); public delegate void SetExpressionDisplayCallbackFunc(int state);
private delegate void SetMemorizedNumbersCallbackFunc(int state, string[] newMemorizedNumbers); public delegate void SetMemorizedNumbersCallbackFunc(int state, string[] newMemorizedNumbers);
private static GetCEngineStringFunc _getCEngineStringCallback = GetCEngineStringCallback; public static GetCEngineStringFunc _getCEngineStringCallback = GetCEngineStringCallback;
private static BinaryOperatorReceivedFunc _binaryOperatorReceivedCallback = BinaryOperatorReceivedCallback; public static BinaryOperatorReceivedFunc _binaryOperatorReceivedCallback = BinaryOperatorReceivedCallback;
private static SetPrimaryDisplayCallbackFunc _setPrimaryDisplayCallback = SetPrimaryDisplayCallback; public static SetPrimaryDisplayCallbackFunc _setPrimaryDisplayCallback = SetPrimaryDisplayCallback;
private static SetIsInErrorCallbackFunc _setIsInErrorCallback = SetIsInErrorCallback; public static SetIsInErrorCallbackFunc _setIsInErrorCallback = SetIsInErrorCallback;
private static SetParenthesisNumberCallbackFunc _setParenthesisNumberCallback = SetParenthesisNumberCallback; public static SetParenthesisNumberCallbackFunc _setParenthesisNumberCallback = SetParenthesisNumberCallback;
private static MaxDigitsReachedCallbackFunc _maxDigitsReachedCallback = MaxDigitsReachedCallback; public static MaxDigitsReachedCallbackFunc _maxDigitsReachedCallback = MaxDigitsReachedCallback;
private static MemoryItemChangedCallbackFunc _memoryItemChangedCallback = MemoryItemChangedCallback; public static MemoryItemChangedCallbackFunc _memoryItemChangedCallback = MemoryItemChangedCallback;
private static OnHistoryItemAddedCallbackFunc _onHistoryItemAddedCallback = OnHistoryItemAddedCallback; public static OnHistoryItemAddedCallbackFunc _onHistoryItemAddedCallback = OnHistoryItemAddedCallback;
private static OnNoRightParenAddedCallbackFunc _onNoRightParenAddedCallback = OnNoRightParenAddedCallback; public static OnNoRightParenAddedCallbackFunc _onNoRightParenAddedCallback = OnNoRightParenAddedCallback;
private static SetExpressionDisplayCallbackFunc _setExpressionDisplayCallback = SetExpressionDisplayCallback; public static SetExpressionDisplayCallbackFunc _setExpressionDisplayCallback = SetExpressionDisplayCallback;
private static SetMemorizedNumbersCallbackFunc _setMemorizedNumbersCallback = SetMemorizedNumbersCallback; public static SetMemorizedNumbersCallbackFunc _setMemorizedNumbersCallback = SetMemorizedNumbersCallback;
public static void MaxDigitsReachedCallback(int state) public static void MaxDigitsReachedCallback(int state)
{ {

4
src/Calculator.Shared/CalcManager/CalculatorManager.cs
View file

@ -6,8 +6,6 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Uno;
using Uno.Foundation;
namespace CalculationManager namespace CalculationManager
{ {
@ -135,7 +133,7 @@ namespace CalculationManager
var p = new CalculatorManager_CreateParams var p = new CalculatorManager_CreateParams
{ {
CalculatorState = GCHandle.ToIntPtr(_displayCallbackHandle), CalculatorState = GCHandle.ToIntPtr(_displayCallbackHandle),
GetCEngineString = Marshal.GetFunctionPointerForDelegate(_getCEngineStringCallback), GetCEngineString = Marshal.GetFunctionPointerForDelegate(NativeDispatch._getCEngineStringCallback),
GetCEngineString = (IntPtr)int.Parse(ptrs[0]), GetCEngineString = (IntPtr)int.Parse(ptrs[0]),
BinaryOperatorReceived = (IntPtr)int.Parse(ptrs[1]), BinaryOperatorReceived = (IntPtr)int.Parse(ptrs[1]),