mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-22 22:23:29 -07:00
Merge pull request #6 from nventive/dev/jela/wasm-update
Native history support, UTF32 support
This commit is contained in:
Jérôme Laban
GitHub
commit
1fdce90a2e
10 changed files with 458 additions and 141 deletions
|
|
@ -10,117 +10,159 @@
|
|||
#include <stdlib.h>
|
||||
#include <iostream>
|
||||
|
||||
#if !defined(__EMSCRIPTEN__)
|
||||
#include <Windows.h>
|
||||
#include <strsafe.h>
|
||||
|
||||
#define DBGPRINT(kwszDebugFormatString, ...) _DBGPRINT(__FUNCTIONW__, __LINE__, kwszDebugFormatString, __VA_ARGS__)
|
||||
|
||||
VOID _DBGPRINT(LPCWSTR kwszFunction, INT iLineNumber, LPCWSTR kwszDebugFormatString, ...)
|
||||
{
|
||||
INT cbFormatString = 0;
|
||||
va_list args;
|
||||
PWCHAR wszDebugString = NULL;
|
||||
size_t st_Offset = 0;
|
||||
|
||||
va_start(args, kwszDebugFormatString);
|
||||
|
||||
cbFormatString = _scwprintf(L"[%s:%d] ", kwszFunction, iLineNumber) * sizeof(WCHAR);
|
||||
cbFormatString += _vscwprintf(kwszDebugFormatString, args) * sizeof(WCHAR) + 2;
|
||||
|
||||
/* Depending on the size of the format string, allocate space on the stack or the heap. */
|
||||
wszDebugString = (PWCHAR)_malloca(cbFormatString);
|
||||
|
||||
/* Populate the buffer with the contents of the format string. */
|
||||
StringCbPrintfW(wszDebugString, cbFormatString, L"[%s:%d] ", kwszFunction, iLineNumber);
|
||||
StringCbLengthW(wszDebugString, cbFormatString, &st_Offset);
|
||||
StringCbVPrintfW(&wszDebugString[st_Offset / sizeof(WCHAR)], cbFormatString - st_Offset, kwszDebugFormatString, args);
|
||||
|
||||
OutputDebugStringW(wszDebugString);
|
||||
|
||||
_freea(wszDebugString);
|
||||
va_end(args);
|
||||
}
|
||||
#endif
|
||||
|
||||
using namespace CalculationManager;
|
||||
|
||||
class CalcDisplay : public ICalcDisplay {
|
||||
|
||||
class CalcDisplay : public ICalcDisplay
|
||||
{
|
||||
private:
|
||||
CalculatorManager_CreateParams _params;
|
||||
CalculatorManager_CreateParams _params;
|
||||
|
||||
public:
|
||||
CalcDisplay(CalculatorManager_CreateParams params) {
|
||||
_params = params;
|
||||
}
|
||||
CalcDisplay(CalculatorManager_CreateParams params)
|
||||
{
|
||||
_params = params;
|
||||
}
|
||||
|
||||
// Inherited via ICalcDisplay
|
||||
virtual void SetPrimaryDisplay(const std::wstring& pszText, bool isError) override
|
||||
{
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(pszText);
|
||||
// Inherited via ICalcDisplay
|
||||
virtual void SetPrimaryDisplay(const std::wstring& pszText, bool isError) override
|
||||
{
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(pszText);
|
||||
|
||||
_params.SetPrimaryDisplay(_params.CalculatorState, str.data(), isError);
|
||||
}
|
||||
printf("Native:SetPrimaryDisplay(%ls, %d)\n", pszText.data(), isError);
|
||||
|
||||
virtual void SetIsInError(bool isInError) override
|
||||
{
|
||||
_params.SetIsInError(_params.CalculatorState, isInError);
|
||||
}
|
||||
_params.SetPrimaryDisplay(_params.CalculatorState, str.data(), isError);
|
||||
}
|
||||
|
||||
virtual void SetExpressionDisplay(
|
||||
std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const& /*tokens*/,
|
||||
std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const& /*commands*/) override
|
||||
{
|
||||
}
|
||||
virtual void SetIsInError(bool isInError) override
|
||||
{
|
||||
printf("Native:SetIsInError(%d)\n", isInError);
|
||||
|
||||
virtual void SetParenthesisNumber(unsigned int count) override
|
||||
{
|
||||
_params.SetParenthesisNumber(_params.CalculatorState, count);
|
||||
}
|
||||
_params.SetIsInError(_params.CalculatorState, isInError);
|
||||
}
|
||||
|
||||
virtual void OnNoRightParenAdded() override
|
||||
{
|
||||
_params.OnNoRightParenAdded(_params.CalculatorState);
|
||||
}
|
||||
virtual void SetExpressionDisplay(
|
||||
std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const& /*tokens*/,
|
||||
std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const& /*commands*/) override
|
||||
{
|
||||
printf("Native:SetExpressionDisplay()\n");
|
||||
|
||||
virtual void MaxDigitsReached() override
|
||||
{
|
||||
_params.MaxDigitsReached(_params.CalculatorState);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void BinaryOperatorReceived() override
|
||||
{
|
||||
_params.BinaryOperatorReceived(_params.CalculatorState);
|
||||
}
|
||||
virtual void SetParenthesisNumber(unsigned int count) override
|
||||
{
|
||||
printf("Native:SetParenthesisNumber(%d)\n", count);
|
||||
|
||||
virtual void OnHistoryItemAdded(unsigned int addedItemIndex) override
|
||||
{
|
||||
_params.OnHistoryItemAdded(_params.CalculatorState, addedItemIndex);
|
||||
}
|
||||
_params.SetParenthesisNumber(_params.CalculatorState, count);
|
||||
}
|
||||
|
||||
virtual void SetMemorizedNumbers(const std::vector<std::wstring>& memorizedNumbers) override
|
||||
{
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
virtual void OnNoRightParenAdded() override
|
||||
{
|
||||
printf("Native:OnNoRightParenAdded()\n");
|
||||
_params.OnNoRightParenAdded(_params.CalculatorState);
|
||||
}
|
||||
|
||||
const char** numbers = new const char* [memorizedNumbers.size()];
|
||||
virtual void MaxDigitsReached() override
|
||||
{
|
||||
printf("Native:MaxDigitsReached()\n");
|
||||
_params.MaxDigitsReached(_params.CalculatorState);
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < memorizedNumbers.size(); i++)
|
||||
{
|
||||
auto str = convert.to_bytes(memorizedNumbers[i]);
|
||||
auto pData = new char[str.size() + 1];
|
||||
virtual void BinaryOperatorReceived() override
|
||||
{
|
||||
printf("Native:BinaryOperatorReceived()\n");
|
||||
_params.BinaryOperatorReceived(_params.CalculatorState);
|
||||
}
|
||||
|
||||
#if !defined(__EMSCRIPTEN__)
|
||||
strcpy_s(pData, str.size()+1, str.data());
|
||||
#else
|
||||
strcpy(pData, str.data());
|
||||
#endif
|
||||
numbers[i] = pData;
|
||||
}
|
||||
virtual void OnHistoryItemAdded(unsigned int addedItemIndex) override
|
||||
{
|
||||
printf("Native:OnHistoryItemAdded(%d)\n", addedItemIndex);
|
||||
_params.OnHistoryItemAdded(_params.CalculatorState, addedItemIndex);
|
||||
}
|
||||
|
||||
_params.SetMemorizedNumbers(_params.CalculatorState, (unsigned int)memorizedNumbers.size(), numbers);
|
||||
virtual void SetMemorizedNumbers(const std::vector<std::wstring>& memorizedNumbers) override
|
||||
{
|
||||
printf("Native:SetMemorizedNumbers(%d)\n", (int)memorizedNumbers.size());
|
||||
|
||||
for (size_t i = 0; i < memorizedNumbers.size(); i++)
|
||||
{
|
||||
delete[] numbers[i];
|
||||
}
|
||||
auto numbers = new const wchar_t* [memorizedNumbers.size()] {};
|
||||
|
||||
delete[] numbers;
|
||||
}
|
||||
for (size_t i = 0; i < memorizedNumbers.size(); i++)
|
||||
{
|
||||
auto str = memorizedNumbers[i];
|
||||
auto pData = new wchar_t[str.size() + 1]{};
|
||||
str.copy(pData, str.size(), 0);
|
||||
numbers[i] = pData;
|
||||
}
|
||||
|
||||
virtual void MemoryItemChanged(unsigned int indexOfMemory) override
|
||||
{
|
||||
_params.MemoryItemChanged(_params.CalculatorState, indexOfMemory);
|
||||
}
|
||||
_params.SetMemorizedNumbers(_params.CalculatorState, (unsigned int)memorizedNumbers.size(), numbers);
|
||||
|
||||
for (size_t i = 0; i < memorizedNumbers.size(); i++)
|
||||
{
|
||||
delete[] numbers[i];
|
||||
}
|
||||
|
||||
delete[] numbers;
|
||||
}
|
||||
|
||||
virtual void MemoryItemChanged(unsigned int indexOfMemory) override
|
||||
{
|
||||
printf("Native:MemoryItemChanged(%d)\n", indexOfMemory);
|
||||
|
||||
_params.MemoryItemChanged(_params.CalculatorState, indexOfMemory);
|
||||
}
|
||||
};
|
||||
|
||||
class ResourceProvider : public CalculationManager::IResourceProvider {
|
||||
class ResourceProvider : public CalculationManager::IResourceProvider
|
||||
{
|
||||
private:
|
||||
CalculatorManager_CreateParams _params;
|
||||
CalculatorManager_CreateParams _params;
|
||||
|
||||
public:
|
||||
ResourceProvider(CalculatorManager_CreateParams params)
|
||||
{
|
||||
_params = params;
|
||||
}
|
||||
ResourceProvider(CalculatorManager_CreateParams params)
|
||||
{
|
||||
_params = params;
|
||||
}
|
||||
|
||||
virtual std::wstring GetCEngineString(const std::wstring& id) override {
|
||||
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(id);
|
||||
|
||||
auto res = _params.GetCEngineString(_params.ResourceState, str.data());
|
||||
|
||||
return convert.from_bytes(res);
|
||||
}
|
||||
virtual std::wstring GetCEngineString(const std::wstring& id) override
|
||||
{
|
||||
auto pResult = _params.GetCEngineString(_params.ResourceState, id.data());
|
||||
auto str = std::wstring(pResult);
|
||||
printf("Native:GetCEngineString(id=%ls, str.data()=%ls)\n", id.data(), str.data());
|
||||
return str;
|
||||
}
|
||||
};
|
||||
|
||||
CalculatorManager* AsManager(void* manager)
|
||||
|
|
@ -128,13 +170,25 @@ CalculatorManager* AsManager(void* manager)
|
|||
return static_cast<CalculatorManager*>(manager);
|
||||
}
|
||||
|
||||
IExpressionCommand* AsIExpressionCommand(void* pExpressionCommand)
|
||||
{
|
||||
return static_cast<IExpressionCommand*>(pExpressionCommand);
|
||||
}
|
||||
|
||||
const wchar_t* ToWChar(std::wstring& str)
|
||||
{
|
||||
auto out = new wchar_t[str.size() + 1]{};
|
||||
str.copy(out, str.size() + 1, 0);
|
||||
return out;
|
||||
}
|
||||
|
||||
void* CalculatorManager_Create(CalculatorManager_CreateParams* pParams)
|
||||
{
|
||||
auto calcDisplay = new CalcDisplay(*pParams);
|
||||
auto resProvider = new ResourceProvider(*pParams);
|
||||
auto calcDisplay = new CalcDisplay(*pParams);
|
||||
auto resProvider = new ResourceProvider(*pParams);
|
||||
|
||||
auto cm = new CalculatorManager(calcDisplay, resProvider);
|
||||
return cm;
|
||||
auto cm = new CalculatorManager(calcDisplay, resProvider);
|
||||
return cm;
|
||||
}
|
||||
|
||||
void CalculatorManager_SendCommand(void* manager, int command)
|
||||
|
|
@ -207,14 +261,14 @@ void CalculatorManager_SetMemorizedNumbersString(void* manager)
|
|||
AsManager(manager)->SetMemorizedNumbersString();
|
||||
}
|
||||
|
||||
const char* CalculatorManager_GetResultForRadix(void* manager, int radix, int precision)
|
||||
const wchar_t* CalculatorManager_GetResultForRadix(void* manager, int radix, int precision)
|
||||
{
|
||||
auto res = AsManager(manager)->GetResultForRadix(radix, precision);
|
||||
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(res);
|
||||
auto out = new wchar_t[res.size() + 1]{};
|
||||
res.copy(out, res.size(), 0);
|
||||
|
||||
return str.data();
|
||||
return out;
|
||||
}
|
||||
|
||||
void CalculatorManager_SetPrecision(void* manager, int precision)
|
||||
|
|
@ -234,7 +288,7 @@ const char* CalculatorManager_DecimalSeparator(void* manager)
|
|||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(res);
|
||||
|
||||
return str.data();
|
||||
return str.data();
|
||||
}
|
||||
|
||||
bool CalculatorManager_RemoveHistoryItem(void* manager, int uIdx)
|
||||
|
|
@ -261,3 +315,105 @@ void CalculatorManager_SetInHistoryItemLoadMode(void* manager, bool isHistoryIte
|
|||
{
|
||||
AsManager(manager)->SetInHistoryItemLoadMode(isHistoryItemLoadMode);
|
||||
}
|
||||
|
||||
GetHistoryItemResult* MarshalHistoryItem(std::shared_ptr<CalculationManager::HISTORYITEM>& historyItem)
|
||||
{
|
||||
auto itemResult = new GetHistoryItemResult{};
|
||||
|
||||
itemResult->expression = ToWChar(historyItem->historyItemVector.expression);
|
||||
itemResult->result = ToWChar(historyItem->historyItemVector.result);
|
||||
|
||||
unsigned int tokenCount;
|
||||
historyItem->historyItemVector.spTokens->GetSize(&tokenCount);
|
||||
itemResult->TokenCount = tokenCount;
|
||||
|
||||
//
|
||||
// Marshal Tokens
|
||||
//
|
||||
auto tokenStrings = new const wchar_t* [tokenCount] {};
|
||||
auto tokenValues = new int32_t[tokenCount]{};
|
||||
|
||||
// DBGPRINT(L"TokenCount: %d (int32_t: %d)\n", tokenCount, sizeof(int32_t));
|
||||
|
||||
for (uint32_t j = 0; j < tokenCount; j++)
|
||||
{
|
||||
std::pair<std::wstring, int> pair;
|
||||
|
||||
if (SUCCEEDED(historyItem->historyItemVector.spTokens->GetAt(j, &pair)))
|
||||
{
|
||||
tokenStrings[j] = ToWChar(pair.first);
|
||||
tokenValues[j] = (int32_t)pair.second;
|
||||
// DBGPRINT(L"\tPair: %ws;%d\n", pair.first.data(), tokenValues[j]);
|
||||
}
|
||||
}
|
||||
|
||||
itemResult->TokenStrings = tokenStrings;
|
||||
itemResult->TokenValues = tokenValues;
|
||||
|
||||
//
|
||||
// Marshal Commands
|
||||
//
|
||||
unsigned int commandCount;
|
||||
historyItem->historyItemVector.spCommands->GetSize(&commandCount);
|
||||
itemResult->CommandCount = commandCount;
|
||||
|
||||
auto commands = new void*[commandCount]{};
|
||||
|
||||
for (uint32_t commandId = 0; commandId < commandCount; commandId++)
|
||||
{
|
||||
std::shared_ptr<IExpressionCommand> command;
|
||||
if (SUCCEEDED(historyItem->historyItemVector.spCommands->GetAt(commandId, &command)))
|
||||
{
|
||||
commands[commandId] = command.get();
|
||||
}
|
||||
}
|
||||
|
||||
itemResult->Commands = commands;
|
||||
|
||||
return itemResult;
|
||||
}
|
||||
|
||||
void* MarshalHistoryItems(std::vector<std::shared_ptr<CalculationManager::HISTORYITEM>>& historyItems)
|
||||
{
|
||||
auto result = new GetHistoryItemsResult{};
|
||||
|
||||
result->ItemsCount = (int32_t)historyItems.size();
|
||||
|
||||
auto resultsArray = new GetHistoryItemResult*[result->ItemsCount];
|
||||
result->HistoryItems = (void*)resultsArray;
|
||||
|
||||
for (size_t i = 0; i < historyItems.size(); i++)
|
||||
{
|
||||
auto historyItem = historyItems[i];
|
||||
|
||||
resultsArray[i] = MarshalHistoryItem(historyItem);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void* CalculatorManager_GetHistoryItems(void* manager)
|
||||
{
|
||||
auto historyItems = AsManager(manager)->GetHistoryItems();
|
||||
|
||||
return MarshalHistoryItems(historyItems);
|
||||
}
|
||||
|
||||
void* CalculatorManager_GetHistoryItemsWithMode(void* manager, int mode)
|
||||
{
|
||||
auto historyItems = AsManager(manager)->GetHistoryItems((CALCULATOR_MODE)mode);
|
||||
|
||||
return MarshalHistoryItems(historyItems);
|
||||
}
|
||||
|
||||
void* CalculatorManager_GetHistoryItem(void* manager, int index)
|
||||
{
|
||||
auto historyItem = AsManager(manager)->GetHistoryItem(index);
|
||||
|
||||
return MarshalHistoryItem(historyItem);
|
||||
}
|
||||
|
||||
int IExpressionCommand_GetCommandType(void* pExpressionCommand)
|
||||
{
|
||||
return (int)AsIExpressionCommand(pExpressionCommand)->GetCommandType();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ typedef void (*OnNoRightParenAddedFunc)(void* state);
|
|||
typedef void (*MaxDigitsReachedFunc)(void* state);
|
||||
typedef void (*BinaryOperatorReceivedFunc)(void* state);
|
||||
typedef void (*OnHistoryItemAddedFunc)(void* state, unsigned int addedItemIndex);
|
||||
typedef void (*SetMemorizedNumbersFunc)(void* state, unsigned int count, const char** memorizedNumbers);
|
||||
typedef void (*SetMemorizedNumbersFunc)(void* state, unsigned int count, const wchar_t** memorizedNumbers);
|
||||
typedef void (*MemoryItemChangedFunc)(void* state, unsigned int indexOfMemory);
|
||||
|
||||
typedef const char* (*GetCEngineStringFunc)(void* state, const char* id);
|
||||
typedef const wchar_t* (*GetCEngineStringFunc)(void* state, const wchar_t* id);
|
||||
|
||||
struct CalculatorManager_CreateParams {
|
||||
void* CalculatorState;
|
||||
|
|
@ -58,6 +58,26 @@ struct CalculatorManager_CreateParams {
|
|||
#endif
|
||||
|
||||
extern "C" {
|
||||
|
||||
struct GetHistoryItemsResult
|
||||
{
|
||||
int32_t ItemsCount;
|
||||
void* HistoryItems;
|
||||
};
|
||||
|
||||
struct GetHistoryItemResult
|
||||
{
|
||||
const wchar_t* expression;
|
||||
const wchar_t* result;
|
||||
|
||||
int32_t TokenCount;
|
||||
const wchar_t** TokenStrings;
|
||||
int32_t* TokenValues;
|
||||
|
||||
int32_t CommandCount;
|
||||
void** Commands;
|
||||
};
|
||||
|
||||
DLL_EXPORT void* CalculatorManager_Create(CalculatorManager_CreateParams* params);
|
||||
DLL_EXPORT void CalculatorManager_SendCommand(void* manager, int command);
|
||||
DLL_EXPORT void CalculatorManager_SetRadix(void* manager, RADIX_TYPE iRadixType);
|
||||
|
|
@ -73,7 +93,7 @@ extern "C" {
|
|||
DLL_EXPORT void CalculatorManager_MemorizedNumberClearAll(void* manager);
|
||||
DLL_EXPORT bool CalculatorManager_IsEngineRecording(void* manager);
|
||||
DLL_EXPORT void CalculatorManager_SetMemorizedNumbersString(void* manager);
|
||||
DLL_EXPORT const char* CalculatorManager_GetResultForRadix(void* manager, int radix, int precision);
|
||||
DLL_EXPORT const wchar_t* CalculatorManager_GetResultForRadix(void* manager, int radix, int precision);
|
||||
DLL_EXPORT void CalculatorManager_SetPrecision(void* manager, int precision);
|
||||
DLL_EXPORT void CalculatorManager_UpdateMaxIntDigits(void* manager);
|
||||
DLL_EXPORT const char* CalculatorManager_DecimalSeparator(void* manager);
|
||||
|
|
@ -82,5 +102,10 @@ extern "C" {
|
|||
DLL_EXPORT size_t CalculatorManager_MaxHistorySize(void* manager);
|
||||
DLL_EXPORT int CalculatorManager_GetCurrentDegreeMode(void* manager);
|
||||
DLL_EXPORT void CalculatorManager_SetInHistoryItemLoadMode(void* manager, bool isHistoryItemLoadMode);
|
||||
DLL_EXPORT void* CalculatorManager_GetHistoryItemsWithMode(void* manager, int mode);
|
||||
DLL_EXPORT void* CalculatorManager_GetHistoryItems(void* manager);
|
||||
DLL_EXPORT void* CalculatorManager_GetHistoryItem(void* manager, int index);
|
||||
|
||||
DLL_EXPORT int IExpressionCommand_GetCommandType(void* pExpressionCommand);
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -57,7 +57,7 @@ namespace CalculationManager
|
|||
[DllImport("CalcManager")]
|
||||
public static extern void CalculatorManager_SetMemorizedNumbersString(IntPtr nativeManager);
|
||||
|
||||
[DllImport("CalcManager")]
|
||||
[DllImport("CalcManager", CharSet = CharSet.Unicode)]
|
||||
public static extern string CalculatorManager_GetResultForRadix(IntPtr nativeManager, int radix, int precision);
|
||||
|
||||
[DllImport("CalcManager")]
|
||||
|
|
@ -84,7 +84,19 @@ namespace CalculationManager
|
|||
[DllImport("CalcManager")]
|
||||
public static extern void CalculatorManager_SetInHistoryItemLoadMode(IntPtr nativeManager, bool isHistoryItemLoadMode);
|
||||
|
||||
public delegate IntPtr GetCEngineStringFunc(IntPtr state, string id);
|
||||
[DllImport("CalcManager")]
|
||||
public static extern IntPtr CalculatorManager_GetHistoryItems(IntPtr nativeManager);
|
||||
|
||||
[DllImport("CalcManager")]
|
||||
public static extern IntPtr CalculatorManager_GetHistoryItemsWithMode(IntPtr nativeManager, CALCULATOR_MODE mode);
|
||||
|
||||
[DllImport("CalcManager")]
|
||||
public static extern IntPtr CalculatorManager_GetHistoryItem(IntPtr nativeManager, int uIdx);
|
||||
|
||||
[DllImport("CalcManager")]
|
||||
public static extern CommandType IExpressionCommand_GetCommandType(IntPtr pExpressionCommand);
|
||||
|
||||
public delegate IntPtr GetCEngineStringFunc(IntPtr state, IntPtr id);
|
||||
public delegate void BinaryOperatorReceivedFunc(IntPtr state);
|
||||
public delegate void SetPrimaryDisplayCallbackFunc(IntPtr state, string displayStringValue, bool isError);
|
||||
public delegate void SetIsInErrorCallbackFunc(IntPtr state, bool isError);
|
||||
|
|
@ -157,9 +169,8 @@ namespace CalculationManager
|
|||
var numbers = new List<String>();
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
// TODO Use native encoding instead.
|
||||
var value = Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(newMemorizedNumbers, i));
|
||||
numbers.Add(Encoding.UTF8.GetString(Encoding.ASCII.GetBytes(value)));
|
||||
var value = Marshal.PtrToStringUni(Marshal.ReadIntPtr(newMemorizedNumbers, i));
|
||||
numbers.Add(value);
|
||||
}
|
||||
|
||||
manager.SetMemorizedNumbers(numbers);
|
||||
|
|
@ -183,7 +194,7 @@ namespace CalculationManager
|
|||
Debug.WriteLine($"CalculatorManager.BinaryOperatorReceivedCallback");
|
||||
}
|
||||
|
||||
public static void SetPrimaryDisplayCallback(IntPtr state, string displayStringValue, bool isError)
|
||||
public static void SetPrimaryDisplayCallback(IntPtr state, [MarshalAs(UnmanagedType.LPWStr)] string displayStringValue, bool isError)
|
||||
{
|
||||
var manager = GCHandle.FromIntPtr((IntPtr)state).Target as CalculatorDisplay;
|
||||
manager.SetPrimaryDisplay(displayStringValue, isError);
|
||||
|
|
@ -199,23 +210,57 @@ namespace CalculationManager
|
|||
Debug.WriteLine($"CalculatorManager.SetIsInErrorCallback({isError})");
|
||||
}
|
||||
|
||||
public static IntPtr GetCEngineStringCallback(IntPtr state, string resourceId)
|
||||
public static IntPtr GetCEngineStringCallback(IntPtr state, IntPtr pResourceId)
|
||||
{
|
||||
var provider = GCHandle.FromIntPtr((IntPtr)state).Target as EngineResourceProvider;
|
||||
var ret = provider.GetCEngineString(resourceId) ?? "";
|
||||
var provider = GCHandle.FromIntPtr(state).Target as EngineResourceProvider;
|
||||
var resourceId = Marshal.PtrToStringUni(pResourceId);
|
||||
var resourceValue = provider.GetCEngineString(resourceId) ?? "";
|
||||
|
||||
var retBytes = Encoding.UTF8.GetBytes(ret);
|
||||
var retPtr = Marshal.AllocHGlobal(retBytes.Length + 1);
|
||||
Marshal.WriteByte(retPtr + retBytes.Length, 0);
|
||||
Marshal.Copy(retBytes, 0, retPtr, retBytes.Length);
|
||||
#if __WASM__
|
||||
// wchar_t is 32bits with emscripten
|
||||
var pEngineString = StringToHGlobalUTF32(resourceValue);
|
||||
#else
|
||||
var pEngineString = Marshal.StringToHGlobalUni(resourceValue);
|
||||
#endif
|
||||
|
||||
Debug.WriteLine($"CalculatorManager.GetCEngineStringCallback({resourceId},{ret})");
|
||||
Debug.WriteLine($"GetCEngineStringCallback({resourceId}, {resourceValue}");
|
||||
|
||||
return retPtr;
|
||||
return pEngineString;
|
||||
}
|
||||
|
||||
private static IntPtr StringToHGlobalUTF32(string resourceValue)
|
||||
{
|
||||
var ret = Encoding.UTF32.GetBytes(resourceValue);
|
||||
var pRet2 = Marshal.AllocHGlobal(resourceValue.Length * 4 + 4);
|
||||
Marshal.Copy(ret, 0, pRet2, resourceValue.Length * 4);
|
||||
Marshal.WriteInt32(pRet2 + resourceValue.Length * 4, 0);
|
||||
return pRet2;
|
||||
}
|
||||
}
|
||||
|
||||
public partial class CalculatorManager : ICalcDisplay
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct GetHistoryItemsResult
|
||||
{
|
||||
public int ItemsCount;
|
||||
public IntPtr HistoryItems;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct GetHistoryItemResult
|
||||
{
|
||||
public string expression;
|
||||
public string result;
|
||||
|
||||
public int TokenCount;
|
||||
public IntPtr TokenStrings;
|
||||
public IntPtr TokenValues;
|
||||
|
||||
public int CommandCount;
|
||||
public IntPtr Commands;
|
||||
}
|
||||
|
||||
|
||||
public partial class CalculatorManager : ICalcDisplay
|
||||
{
|
||||
|
||||
private GCHandle _displayCallbackHandle;
|
||||
|
|
|
|||
|
|
@ -219,17 +219,92 @@ namespace CalculationManager
|
|||
public char DecimalSeparator()
|
||||
=> NativeDispatch.CalculatorManager_DecimalSeparator(_nativeManager);
|
||||
|
||||
public List<HISTORYITEM> GetHistoryItems() => throw new NotImplementedException();
|
||||
public List<HISTORYITEM> GetHistoryItems()
|
||||
{
|
||||
var pResult = NativeDispatch.CalculatorManager_GetHistoryItems(_nativeManager);
|
||||
return UnmarshalHistoryItemsResult(pResult);
|
||||
}
|
||||
|
||||
public List<HISTORYITEM> GetHistoryItems(CalculationManager.CALCULATOR_MODE mode)
|
||||
{
|
||||
Debug.WriteLine($"CalculatorManager.GetHistoryItems({mode})");
|
||||
public List<HISTORYITEM> GetHistoryItems(CalculationManager.CALCULATOR_MODE mode)
|
||||
{
|
||||
var pResult = NativeDispatch.CalculatorManager_GetHistoryItemsWithMode(_nativeManager, mode);
|
||||
return UnmarshalHistoryItemsResult(pResult);
|
||||
}
|
||||
|
||||
return new List<HISTORYITEM>();
|
||||
}
|
||||
private static List<HISTORYITEM> UnmarshalHistoryItemsResult(IntPtr pResult)
|
||||
{
|
||||
var result = Marshal.PtrToStructure<GetHistoryItemsResult>(pResult);
|
||||
var output = new List<HISTORYITEM>();
|
||||
|
||||
public HISTORYITEM GetHistoryItem(int uIdx) => throw new NotImplementedException();
|
||||
public bool RemoveHistoryItem(int uIdx)
|
||||
for (var i = 0; i < result.ItemsCount; i++)
|
||||
{
|
||||
var historyResultItem = Marshal.PtrToStructure<GetHistoryItemResult>(Marshal.ReadIntPtr(result.HistoryItems, i * Marshal.SizeOf<IntPtr>()));
|
||||
|
||||
var historyItem = UnmarshalHistoryItemResult(historyResultItem);
|
||||
|
||||
output.Add(historyItem);
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
private static HISTORYITEM UnmarshalHistoryItemResult(GetHistoryItemResult historyResultItem)
|
||||
{
|
||||
var historyItem = new HISTORYITEM();
|
||||
historyItem.historyItemVector.expression = historyResultItem.expression;
|
||||
historyItem.historyItemVector.result = historyResultItem.result;
|
||||
historyItem.historyItemVector.spTokens = new CalculatorList<(string, int)>();
|
||||
|
||||
for (var i = 0; i < historyResultItem.TokenCount; i++)
|
||||
{
|
||||
var tokenString = Marshal.PtrToStringUni(Marshal.ReadIntPtr(historyResultItem.TokenStrings, i * Marshal.SizeOf<IntPtr>()));
|
||||
var tokenValue = Marshal.ReadInt32(historyResultItem.TokenValues, i * Marshal.SizeOf<int>());
|
||||
|
||||
historyItem.historyItemVector.spTokens.Append((tokenString, tokenValue));
|
||||
}
|
||||
|
||||
historyItem.historyItemVector.spCommands = new CalculatorList<IExpressionCommand>();
|
||||
for (int j = 0; j < historyResultItem.CommandCount; j++)
|
||||
{
|
||||
var pExpressionCommand = Marshal.ReadIntPtr(historyResultItem.Commands, j * Marshal.SizeOf<IntPtr>());
|
||||
var commandType = NativeDispatch.IExpressionCommand_GetCommandType(pExpressionCommand);
|
||||
|
||||
IExpressionCommand getCommand()
|
||||
{
|
||||
switch (commandType)
|
||||
{
|
||||
case CommandType.BinaryCommand:
|
||||
return new CUnaryCommand(pExpressionCommand);
|
||||
|
||||
case CommandType.OperandCommand:
|
||||
return new COpndCommand(pExpressionCommand);
|
||||
|
||||
case CommandType.Parentheses:
|
||||
return new CParentheses(pExpressionCommand);
|
||||
|
||||
case CommandType.UnaryCommand:
|
||||
return new CUnaryCommand(pExpressionCommand);
|
||||
|
||||
default:
|
||||
throw new NotSupportedException($"CommandType.{commandType} is not supported");
|
||||
}
|
||||
}
|
||||
|
||||
historyItem.historyItemVector.spCommands.Append(getCommand());
|
||||
}
|
||||
|
||||
return historyItem;
|
||||
}
|
||||
|
||||
public HISTORYITEM GetHistoryItem(int uIdx)
|
||||
{
|
||||
var pResult = NativeDispatch.CalculatorManager_GetHistoryItem(_nativeManager, uIdx);
|
||||
var result = Marshal.PtrToStructure<GetHistoryItemResult>(pResult);
|
||||
|
||||
return UnmarshalHistoryItemResult(result);
|
||||
}
|
||||
|
||||
public bool RemoveHistoryItem(int uIdx)
|
||||
=> NativeDispatch.CalculatorManager_RemoveHistoryItem(_nativeManager, uIdx);
|
||||
|
||||
public void ClearHistory()
|
||||
|
|
|
|||
|
|
@ -61,14 +61,22 @@ namespace CalculationManager
|
|||
|
||||
public class CParentheses : IParenthesisCommand
|
||||
{
|
||||
public CParentheses(int command) => throw new NotImplementedException();
|
||||
public int GetCommand() => throw new NotImplementedException();
|
||||
private IntPtr pExpressionCommand;
|
||||
|
||||
public CParentheses(int command) => throw new NotImplementedException();
|
||||
public CParentheses(IntPtr pExpressionCommand) => this.pExpressionCommand = pExpressionCommand;
|
||||
|
||||
public int GetCommand() => throw new NotImplementedException();
|
||||
public CalculationManager.CommandType GetCommandType() => throw new NotImplementedException();
|
||||
public void Accept(ISerializeCommandVisitor commandVisitor) => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public class CUnaryCommand : IUnaryCommand
|
||||
{
|
||||
private IntPtr pExpressionCommand;
|
||||
|
||||
public CUnaryCommand(IntPtr pExpressionCommand) => this.pExpressionCommand = pExpressionCommand;
|
||||
|
||||
public CUnaryCommand(int command) => throw new NotImplementedException();
|
||||
public CUnaryCommand(int command1, int command2) => throw new NotImplementedException();
|
||||
public CalculatorList<int> GetCommands() => throw new NotImplementedException();
|
||||
|
|
@ -78,21 +86,29 @@ namespace CalculationManager
|
|||
public void Accept(ISerializeCommandVisitor commandVisitor) => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public class CBinaryCommand : IBinaryCommand
|
||||
{
|
||||
public CBinaryCommand(int command) => throw new NotImplementedException();
|
||||
public void SetCommand(int command) => throw new NotImplementedException();
|
||||
public int GetCommand() => throw new NotImplementedException();
|
||||
public CommandType GetCommandType() => throw new NotImplementedException();
|
||||
public void Accept(ISerializeCommandVisitor commandVisitor) => throw new NotImplementedException();
|
||||
}
|
||||
public class CBinaryCommand : IBinaryCommand
|
||||
{
|
||||
private IntPtr pExpressionCommand;
|
||||
|
||||
public class COpndCommand : IOpndCommand
|
||||
{
|
||||
public COpndCommand(CalculatorList<int> commands, bool fNegative, bool fDecimal, bool fSciFmt) => throw new NotImplementedException();
|
||||
// public void Initialize(CalcEngine.Rational rat) => throw new NotImplementedException();
|
||||
public CBinaryCommand(IntPtr pExpressionCommand) => this.pExpressionCommand = pExpressionCommand;
|
||||
|
||||
public CalculatorList<int> GetCommands() => throw new NotImplementedException();
|
||||
public CBinaryCommand(int command) => throw new NotImplementedException();
|
||||
public void SetCommand(int command) => throw new NotImplementedException();
|
||||
public int GetCommand() => throw new NotImplementedException();
|
||||
public CommandType GetCommandType() => throw new NotImplementedException();
|
||||
public void Accept(ISerializeCommandVisitor commandVisitor) => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public class COpndCommand : IOpndCommand
|
||||
{
|
||||
private IntPtr pExpressionCommand;
|
||||
|
||||
public COpndCommand(CalculatorList<int> commands, bool fNegative, bool fDecimal, bool fSciFmt) => throw new NotImplementedException();
|
||||
public COpndCommand(IntPtr pExpressionCommand) => this.pExpressionCommand = pExpressionCommand;
|
||||
|
||||
// public void Initialize(CalcEngine.Rational rat) => throw new NotImplementedException();
|
||||
|
||||
public CalculatorList<int> GetCommands() => throw new NotImplementedException();
|
||||
public void SetCommands(CalculatorList<int> commands) => throw new NotImplementedException();
|
||||
public void AppendCommand(int command) => throw new NotImplementedException();
|
||||
public void ToggleSign() => throw new NotImplementedException();
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ namespace CalculatorApp
|
|||
{
|
||||
if (m_historyCallbackReference != null)
|
||||
{
|
||||
if (m_callbackReference.Target is ViewModel.HistoryViewModel historyVM)
|
||||
if (m_historyCallbackReference.Target is ViewModel.HistoryViewModel historyVM)
|
||||
{
|
||||
historyVM.OnHistoryItemAdded(addedItemIndex);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ namespace CalculatorApp
|
|||
try
|
||||
{
|
||||
serializedHistoryItem = SerializeHistoryItem(it);
|
||||
historyContainer.Values.Add(index.ToString(), serializedHistoryItem);
|
||||
historyContainer.Values[index.ToString()] = serializedHistoryItem;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<MonoWasmRuntimeConfiguration>release-dynamic</MonoWasmRuntimeConfiguration>
|
||||
|
||||
<!-- This build a custom one pending a PR in mono -->
|
||||
<MonoWasmSDKUri Condition="'$(Configuration)'=='Debug'">C:\Users\jerome.laban\Downloads\mono-wasm-4d023b6bf84.zip</MonoWasmSDKUri>
|
||||
<MonoWasmSDKUri Condition="'$(Configuration)'=='Debug'">C:\Users\jerome.laban\Downloads\mono-wasm-527abcd1152.zip</MonoWasmSDKUri>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\Calculator.UWP\Assets\*.png" Link="Assets\%(FileName)%(Extension)" />
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
|
||||
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1457" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.269" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.271" />
|
||||
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.269" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
var _setExpressionDisplayCallback = Module.mono_bind_static_method("[Calculator.Wasm] CalculationManager.NativeDispatch:SetExpressionDisplayCallback");
|
||||
var _setMemorizedNumbersCallback = Module.mono_bind_static_method("[Calculator.Wasm] CalculationManager.NativeDispatch:SetMemorizedNumbersCallback");
|
||||
|
||||
var fGetCEngineStringCallback = Module.addFunction((state, id) => _getCEngineStringCallback(state, Module.UTF8ToString(id)), 'iii');
|
||||
var fGetCEngineStringCallback = Module.addFunction((state, id) => _getCEngineStringCallback(state, id), 'iii');
|
||||
|
||||
var fBinaryOperatorReceivedCallback = Module.addFunction((state) => _binaryOperatorReceivedCallback(state), 'vi');
|
||||
var fSetPrimaryDisplayCallback = Module.addFunction((state, displayStringValue, isError) => _setPrimaryDisplayCallback(state, Module.UTF8ToString(displayStringValue), isError), 'viii');
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
var fOnHistoryItemAddedCallback = Module.addFunction((state, addedItemIndex) => _onHistoryItemAddedCallback(state, addedItemIndex), 'vii');
|
||||
var fOnNoRightParenAddedCallback = Module.addFunction((state) => _onNoRightParenAddedCallback (state), 'vi');
|
||||
var fSetExpressionDisplayCallback = Module.addFunction((state) => _setExpressionDisplayCallback (state), 'vi');
|
||||
var fSetMemorizedNumbersCallback = Module.addFunction((state, numbers) => _setMemorizedNumbersCallback(state, numbers), 'vii');
|
||||
var fSetMemorizedNumbersCallback = Module.addFunction((state, size, numbers) => _setMemorizedNumbersCallback(state, size, numbers), 'viii');
|
||||
|
||||
var ret = `${fGetCEngineStringCallback};`
|
||||
+ `${fBinaryOperatorReceivedCallback};`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue