From f1f1d4e9b7fc571926f951da7fe1c6ca0fba6bbd Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 10 Dec 2021 22:01:26 +1000 Subject: [PATCH] feat(windows): fix compile error --- common/core/desktop/src/km_kbp_context_api.cpp | 1 - windows/src/engine/keyman32/Keyman32.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/core/desktop/src/km_kbp_context_api.cpp b/common/core/desktop/src/km_kbp_context_api.cpp index e654b83bad..97b439f9e3 100644 --- a/common/core/desktop/src/km_kbp_context_api.cpp +++ b/common/core/desktop/src/km_kbp_context_api.cpp @@ -252,7 +252,6 @@ km_kbp_context_item_list_size(km_kbp_context_item const *context_items) return n; } - json & operator << (json & j, km::kbp::context const & ctxt) { j << json::array; for (auto & i: ctxt) j << i; diff --git a/windows/src/engine/keyman32/Keyman32.cpp b/windows/src/engine/keyman32/Keyman32.cpp index da46fd4ebc..1c5523e6da 100644 --- a/windows/src/engine/keyman32/Keyman32.cpp +++ b/windows/src/engine/keyman32/Keyman32.cpp @@ -590,11 +590,11 @@ extern "C" BOOL _declspec(dllexport) WINAPI Keyman_ForceKeyboard(PCSTR FileName // TODO: 5650 LoadDLLs // TODO: 5652 verify - ResetCapsLock(); ResetCapsLock(); - err_status = km_kbp_keyboard_get_imx_list(_td->lpActiveKeyboard.lpCoreKeyboard, &_td->lpActiveKeyboard.lpIMXList); + err_status = km_kbp_keyboard_get_imx_list(_td->lpActiveKeyboard->lpCoreKeyboard, &_td->lpActiveKeyboard->lpIMXList); if (err_status != KM_KBP_STATUS_OK) { SendDebugMessageFormat(0, sdmLoad, 0, "Keyman_ForceKeyboard Core: km_kbp_keyboard_get_imx_list failed with error status [%d]", err_status); // Dispose of the keyboard to leave us in a consistent state - ReleaseKeyboardMemoryCore(&_td->lpKeyboards[i].lpCoreKeyboard); + ReleaseKeyboardMemoryCore(&_td->lpActiveKeyboard->lpCoreKeyboard); return FALSE; }