system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 00:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

imm32: Reorder control flow in ImmGetRegisterWordStyleA.

Browse source
This commit is contained in:
Rémi Bernon 2023-02-21 13:30:36 +01:00 committed by Alexandre Julliard
parent 03f1780653
commit 4693428b05
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dlls/imm32/imm.c
View file

@ -1884,29 +1884,26 @@ DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index )
/***********************************************************************
* ImmGetRegisterWordStyleA (IMM32.@)
*/
UINT WINAPI ImmGetRegisterWordStyleA(
HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf)
UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA )
{
struct ime *immHkl = IMM_GetImmHkl( hKL );
TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf);
if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle)
{
if (!is_kbd_ime_unicode(immHkl))
return immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)lpStyleBuf);
else
{
STYLEBUFW sbw;
UINT rc;
struct ime *ime = IMM_GetImmHkl( hkl );
UINT ret;
rc = immHkl->pImeGetRegisterWordStyle(nItem,&sbw);
WideCharToMultiByte(CP_ACP, 0, sbw.szDescription, -1,
lpStyleBuf->szDescription, 32, NULL, NULL);
lpStyleBuf->dwStyle = sbw.dwStyle;
return rc;
}
}
TRACE( "hkl %p, count %u, styleA %p.\n", hkl, count, styleA );
if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0;
if (!is_kbd_ime_unicode( ime ))
ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)styleA );
else
return 0;
{
STYLEBUFW styleW;
ret = ime->pImeGetRegisterWordStyle( count, &styleW );
WideCharToMultiByte( CP_ACP, 0, styleW.szDescription, -1, styleA->szDescription, 32, NULL, NULL );
styleA->dwStyle = styleW.dwStyle;
}
return ret;
}
/***********************************************************************