Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-28 16:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32] Improve ImmSetCompositionFontA/W

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-10-21 16:37:59 +09:00
parent 6585803681
commit 143ed5e72d
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dll/win32/imm32/ime.c
View file

@ -1577,9 +1577,8 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
PCLIENTIMC pClientImc;
BOOL bWide;
LPINPUTCONTEXTDX pIC;
LCID lcid;
LANGID LangID;
HWND hWnd;
PTEB pTeb;
TRACE("(%p, %p)\n", hIMC, lplf);
@ -1603,11 +1602,11 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf)
if (pIC == NULL)
return FALSE;
pTeb = NtCurrentTeb();
if (pTeb->Win32ClientInfo[2] < 0x400)
if (GetWin32ClientInfo()->dwExpWinVer < _WIN32_WINNT_NT4) /* old version (3.x)? */
{
lcid = GetSystemDefaultLCID();
if (PRIMARYLANGID(lcid) == LANG_JAPANESE && !(pIC->dwUIFlags & 2) &&
LangID = LANGIDFROMLCID(GetSystemDefaultLCID());
if (PRIMARYLANGID(LangID) == LANG_JAPANESE &&
!(pIC->dwUIFlags & 2) &&
pIC->cfCompForm.dwStyle != CFS_DEFAULT)
{
PostMessageA(pIC->hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0);
@ -1635,8 +1634,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
BOOL bWide;
HWND hWnd;
LPINPUTCONTEXTDX pIC;
PTEB pTeb;
LCID lcid;
LANGID LangID;
TRACE("(%p, %p)\n", hIMC, lplf);
@ -1660,11 +1658,10 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf)
if (pIC == NULL)
return FALSE;
pTeb = NtCurrentTeb();
if (pTeb->Win32ClientInfo[2] < 0x400)
if (GetWin32ClientInfo()->dwExpWinVer < _WIN32_WINNT_NT4) /* old version (3.x)? */
{
lcid = GetSystemDefaultLCID();
if (PRIMARYLANGID(lcid) == LANG_JAPANESE &&
LangID = LANGIDFROMLCID(GetSystemDefaultLCID());
if (PRIMARYLANGID(LangID) == LANG_JAPANESE &&
!(pIC->dwUIFlags & 2) &&
pIC->cfCompForm.dwStyle != CFS_DEFAULT)
{