Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Renaming: worker functions (#4420)

Browse source 
Renaming: s/Imm32SetCompositionStringAW/ImmSetCompositionStringAW
Renaming: s/Imm32GetImeMenuItemsAW/ImmGetImeMenuItemsAW/
Renaming: s/Imm32RequestMessageAW/ImmRequestMessageAW/
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-03-31 14:34:08 +09:00 committed by GitHub
parent 166786061c
commit 89846a2977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/imm32/candidate.c
View file

@ -146,6 +146,7 @@ CandidateListAnsiToWide(const CANDIDATELIST *pAnsiCL, LPCANDIDATELIST pWideCL, D
return dwBufLen; return dwBufLen;
} }
// Win: ImmGetCandidateListWorker
static DWORD APIENTRY static DWORD APIENTRY
ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen, ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen,
BOOL bAnsi) BOOL bAnsi)
@ -227,6 +228,7 @@ Quit:
return ret; return ret;
} }
// Win: ImmGetCandidateListCountWorker
DWORD APIENTRY DWORD APIENTRY
ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi) ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi)
{ {

11
dll/win32/imm32/compstr.c
View file

@ -512,9 +512,10 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
return dwBufLen; return dwBufLen;
} }
// Win: ImmSetCompositionStringWorker
BOOL APIENTRY BOOL APIENTRY
Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLen, ImmSetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLen,
LPVOID pRead, DWORD dwReadLen, BOOL bAnsiAPI) LPVOID pRead, DWORD dwReadLen, BOOL bAnsiAPI)
{ {
BOOL ret = FALSE, bAnsiClient; BOOL ret = FALSE, bAnsiClient;
LPVOID pCompNew = NULL, pReadNew = NULL; LPVOID pCompNew = NULL, pReadNew = NULL;
@ -934,8 +935,7 @@ ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpComp, DWORD dwCompLe
{ {
TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", TRACE("(%p, %lu, %p, %lu, %p, %lu)\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, return ImmSetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen, TRUE);
lpRead, dwReadLen, TRUE);
} }
/*********************************************************************** /***********************************************************************
@ -947,6 +947,5 @@ ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpComp, DWORD dwCompLe
{ {
TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", TRACE("(%p, %lu, %p, %lu, %p, %lu)\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, return ImmSetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen, FALSE);
lpRead, dwReadLen, FALSE);
} }

1
dll/win32/imm32/guideline.c
View file

@ -9,6 +9,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(imm); WINE_DEFAULT_DEBUG_CHANNEL(imm);
// Win: ImmGetGuideLineWorker
DWORD APIENTRY DWORD APIENTRY
ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi) ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi)
{ {

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

@ -357,9 +357,10 @@ Imm32GetImeMenuItemWCrossProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID
return 0; return 0;
} }
// Win: ImmGetImeMenuItemsWorker
DWORD APIENTRY DWORD APIENTRY
Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, ImmGetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu,
LPVOID lpImeMenu, DWORD dwSize, BOOL bTargetIsAnsi) LPVOID lpImeMenu, DWORD dwSize, BOOL bTargetIsAnsi)
{ {
DWORD ret = 0, cbTotal, dwProcessId, dwThreadId, iItem; DWORD ret = 0, cbTotal, dwProcessId, dwThreadId, iItem;
LPINPUTCONTEXT pIC; LPINPUTCONTEXT pIC;
@ -1790,8 +1791,7 @@ ImmGetImeMenuItemsA(HIMC hIMC, DWORD dwFlags, DWORD dwType,
{ {
TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n",
hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, return ImmGetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize, TRUE);
dwSize, TRUE);
} }
/*********************************************************************** /***********************************************************************
@ -1804,6 +1804,5 @@ ImmGetImeMenuItemsW(HIMC hIMC, DWORD dwFlags, DWORD dwType,
{ {
TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n",
hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, return ImmGetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize, FALSE);
dwSize, FALSE);
} }

8
dll/win32/imm32/keymsg.c
View file

@ -235,6 +235,7 @@ BOOL APIENTRY Imm32ProcessHotKey(HWND hWnd, HIMC hIMC, HKL hKL, DWORD dwHotKeyID
return ret; return ret;
} }
// Win: ImmIsUIMessageWorker
static BOOL APIENTRY static BOOL APIENTRY
ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAnsi) ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAnsi)
{ {
@ -555,7 +556,8 @@ Quit:
return ret; return ret;
} }
LRESULT APIENTRY Imm32RequestMessageAW(HIMC hIMC, WPARAM wParam, LPARAM lParam, BOOL bAnsi) // Win: ImmRequestMessageWorker
LRESULT APIENTRY ImmRequestMessageAW(HIMC hIMC, WPARAM wParam, LPARAM lParam, BOOL bAnsi)
{ {
LRESULT ret = 0; LRESULT ret = 0;
LPINPUTCONTEXT pIC; LPINPUTCONTEXT pIC;
@ -1036,7 +1038,7 @@ Quit:
LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam)
{ {
TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam);
return Imm32RequestMessageAW(hIMC, wParam, lParam, TRUE); return ImmRequestMessageAW(hIMC, wParam, lParam, TRUE);
} }
/*********************************************************************** /***********************************************************************
@ -1045,7 +1047,7 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam)
LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam)
{ {
TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam);
return Imm32RequestMessageAW(hIMC, wParam, lParam, FALSE); return ImmRequestMessageAW(hIMC, wParam, lParam, FALSE);
} }
/*********************************************************************** /***********************************************************************