1
0
forked from aniani/vim

patch 8.1.2361: MS-Windows: test failures related to VIMDLL

Problem:    MS-Windows: test failures related to VIMDLL.
Solution:   Adjust code and tests. (Ken Takata, closes #5283)
This commit is contained in:
Bram Moolenaar
2019-11-29 23:15:25 +01:00
parent 15a7bdcb77
commit 310c32e892
8 changed files with 54 additions and 9 deletions

View File

@@ -5746,6 +5746,14 @@ im_set_active(int active)
HIMC hImc;
static HIMC hImcOld = (HIMC)0;
# ifdef VIMDLL
if (!gui.in_use && !gui.starting)
{
mbyte_im_set_active(active);
return;
}
# endif
if (pImmGetContext) /* if NULL imm32.dll wasn't loaded (yet) */
{
if (p_imdisable)
@@ -5815,6 +5823,11 @@ im_get_status(void)
int status = 0;
HIMC hImc;
# ifdef VIMDLL
if (!gui.in_use && !gui.starting)
return mbyte_im_get_status();
# endif
if (pImmGetContext && (hImc = pImmGetContext(s_hwnd)) != (HIMC)0)
{
status = pImmGetOpenStatus(hImc) ? 1 : 0;