mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-11 20:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32] Renaming: s/ImmLockOrLoadImeDpi/Imm32FindOrLoadImeDpi/ (#4422)

Browse Source 
- Rename ImmLockOrLoadImeDpi as Imm32FindOrLoadImeDpi.
- Imm32FindOrLoadImeDpi --> Win: FindOrLoadImeDpi.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-03-31 19:35:31 +09:00 committed by GitHub
parent 89846a2977
commit 97f4c3c3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dll/win32/imm32/ime.c
View File

@ -277,7 +277,8 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
}
}
PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL)
// Win: FindOrLoadImeDpi
PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL)
{
PIMEDPI pImeDpi;
@ -940,7 +941,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
if (ImeInfoEx.fLoadFlag != 2)
{
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (pImeDpi == NULL)
return FALSE;
@ -980,7 +981,7 @@ LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData)
TRACE("(%p, %p, %u, %p)\n", hKL, hIMC, uSubFunc, lpData);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -1068,7 +1069,7 @@ LRESULT WINAPI ImmEscapeW(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData)
TRACE("(%p, %p, %u, %p)\n", hKL, hIMC, uSubFunc, lpData);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -1498,7 +1499,7 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst,
TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_a(pSrc),
lpDst, dwBufLen, uFlag);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (pImeDpi == NULL)
return 0;
@ -1553,7 +1554,7 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst,
TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_w(pSrc),
lpDst, dwBufLen, uFlag);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -1688,7 +1689,7 @@ BOOL WINAPI ImmConfigureIMEA(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
if (!ValidateHwndNoErr(hWnd) || Imm32IsCrossProcessAccess(hWnd))
return FALSE;
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return FALSE;
@ -1742,7 +1743,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
if (!ValidateHwndNoErr(hWnd) || Imm32IsCrossProcessAccess(hWnd))
return FALSE;
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return FALSE;

2
dll/win32/imm32/imm.c
View File

@ -819,7 +819,7 @@ LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect)
Word = LOWORD(hKL);
hNewKL = (HKL)(DWORD_PTR)MAKELONG(Word, Word);
pImeDpi = ImmLockOrLoadImeDpi(hNewKL);
pImeDpi = Imm32FindOrLoadImeDpi(hNewKL);
if (pImeDpi)
{
FIXME("We have to do something here\n");

2
dll/win32/imm32/precomp.h
View File

@ -91,7 +91,7 @@ LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA);
LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW);
LONG APIENTRY IchWideFromAnsi(LONG cchAnsi, LPCSTR pchAnsi, UINT uCodePage);
LONG APIENTRY IchAnsiFromWide(LONG cchWide, LPCWSTR pchWide, UINT uCodePage);
PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL);
PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL);
LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect);
BOOL APIENTRY Imm32ReleaseIME(HKL hKL);
BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID);

16
dll/win32/imm32/regword.c
View File

@ -102,7 +102,7 @@ ImmEnumRegisterWordA(HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc,
TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_a(lpszReading),
dwStyle, debugstr_a(lpszRegister), lpData);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -158,7 +158,7 @@ ImmEnumRegisterWordW(HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc,
TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_w(lpszReading),
dwStyle, debugstr_w(lpszRegister), lpData);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -212,7 +212,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf
TRACE("(%p, %u, %p)\n", hKL, nItem, lpStyleBuf);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -270,7 +270,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf
TRACE("(%p, %u, %p)\n", hKL, nItem, lpStyleBuf);
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return 0;
@ -326,7 +326,7 @@ ImmRegisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister
TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_a(lpszReading), dwStyle,
debugstr_a(lpszRegister));
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return FALSE;
@ -373,7 +373,7 @@ ImmRegisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegist
TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszRegister));
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return FALSE;
@ -420,7 +420,7 @@ ImmUnregisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregi
TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_a(lpszReading), dwStyle,
debugstr_a(lpszUnregister));
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (pImeDpi == NULL)
return FALSE;
@ -467,7 +467,7 @@ ImmUnregisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnre
TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszUnregister));
pImeDpi = ImmLockOrLoadImeDpi(hKL);
pImeDpi = Imm32FindOrLoadImeDpi(hKL);
if (!pImeDpi)
return FALSE;