[ros-diffs] [reactos] 01/01: [IMM32] Renaming: worker functions (#4420)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89846a29771e51468d93b…

commit 89846a29771e51468d93b1c12262a4e8123e322e
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Mar 31 14:34:08 2022 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Thu Mar 31 14:34:08 2022 +0900

    [IMM32] Renaming: worker functions (#4420)
    
    Renaming: s/Imm32SetCompositionStringAW/ImmSetCompositionStringAW
    Renaming: s/Imm32GetImeMenuItemsAW/ImmGetImeMenuItemsAW/
    Renaming: s/Imm32RequestMessageAW/ImmRequestMessageAW/
    CORE-11700
---
 dll/win32/imm32/candidate.c |  2 ++
 dll/win32/imm32/compstr.c   | 11 +++++------
 dll/win32/imm32/guideline.c |  1 +
 dll/win32/imm32/ime.c       | 11 +++++------
 dll/win32/imm32/keymsg.c    |  8 +++++---
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/dll/win32/imm32/candidate.c b/dll/win32/imm32/candidate.c
index 5d280f60ff4..3fc12bfbeaa 100644
--- a/dll/win32/imm32/candidate.c
+++ b/dll/win32/imm32/candidate.c
@@ -146,6 +146,7 @@ CandidateListAnsiToWide(const CANDIDATELIST *pAnsiCL, LPCANDIDATELIST
pWideCL, D
     return dwBufLen;
 }
 
+// Win: ImmGetCandidateListWorker
 static DWORD APIENTRY
 ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD
dwBufLen,
                       BOOL bAnsi)
@@ -227,6 +228,7 @@ Quit:
     return ret;
 }
 
+// Win: ImmGetCandidateListCountWorker
 DWORD APIENTRY
 ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi)
 {
diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c
index 95df0e11133..5350bcb48bc 100644
--- a/dll/win32/imm32/compstr.c
+++ b/dll/win32/imm32/compstr.c
@@ -512,9 +512,10 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD
dwIndex,
     return dwBufLen;
 }
 
+// Win: ImmSetCompositionStringWorker
 BOOL APIENTRY
-Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLen,
-                            LPVOID pRead, DWORD dwReadLen, BOOL bAnsiAPI)
+ImmSetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLen,
+                          LPVOID pRead, DWORD dwReadLen, BOOL bAnsiAPI)
 {
     BOOL ret = FALSE, bAnsiClient;
     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",
           hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
-    return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen,
-                                       lpRead, dwReadLen, TRUE);
+    return ImmSetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen,
TRUE);
 }
 
 /***********************************************************************
@@ -947,6 +947,5 @@ ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpComp,
DWORD dwCompLe
 {
     TRACE("(%p, %lu, %p, %lu, %p, %lu)\n",
           hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
-    return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen,
-                                       lpRead, dwReadLen, FALSE);
+    return ImmSetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen,
FALSE);
 }
diff --git a/dll/win32/imm32/guideline.c b/dll/win32/imm32/guideline.c
index 3a9a3c6bae1..5ee9986bf25 100644
--- a/dll/win32/imm32/guideline.c
+++ b/dll/win32/imm32/guideline.c
@@ -9,6 +9,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
+// Win: ImmGetGuideLineWorker
 DWORD APIENTRY
 ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi)
 {
diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c
index 5dddb1b0f78..829cb5f1838 100644
--- a/dll/win32/imm32/ime.c
+++ b/dll/win32/imm32/ime.c
@@ -357,9 +357,10 @@ Imm32GetImeMenuItemWCrossProcess(HIMC hIMC, DWORD dwFlags, DWORD
dwType, LPVOID
     return 0;
 }
 
+// Win: ImmGetImeMenuItemsWorker
 DWORD APIENTRY
-Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu,
-                       LPVOID lpImeMenu, DWORD dwSize, BOOL bTargetIsAnsi)
+ImmGetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu,
+                     LPVOID lpImeMenu, DWORD dwSize, BOOL bTargetIsAnsi)
 {
     DWORD ret = 0, cbTotal, dwProcessId, dwThreadId, iItem;
     LPINPUTCONTEXT pIC;
@@ -1790,8 +1791,7 @@ ImmGetImeMenuItemsA(HIMC hIMC, DWORD dwFlags, DWORD dwType,
 {
     TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n",
           hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
-    return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu,
-                                  dwSize, TRUE);
+    return ImmGetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu,
dwSize, TRUE);
 }
 
 /***********************************************************************
@@ -1804,6 +1804,5 @@ ImmGetImeMenuItemsW(HIMC hIMC, DWORD dwFlags, DWORD dwType,
 {
     TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n",
           hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
-    return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu,
-                                  dwSize, FALSE);
+    return ImmGetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu,
dwSize, FALSE);
 }
diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c
index b76c40bf327..9aff8d86a5c 100644
--- a/dll/win32/imm32/keymsg.c
+++ b/dll/win32/imm32/keymsg.c
@@ -235,6 +235,7 @@ BOOL APIENTRY Imm32ProcessHotKey(HWND hWnd, HIMC hIMC, HKL hKL, DWORD
dwHotKeyID
     return ret;
 }
 
+// Win: ImmIsUIMessageWorker
 static BOOL APIENTRY
 ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAnsi)
 {
@@ -555,7 +556,8 @@ Quit:
     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;
     LPINPUTCONTEXT pIC;
@@ -1036,7 +1038,7 @@ Quit:
 LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM 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)
 {
     TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam);
-    return Imm32RequestMessageAW(hIMC, wParam, lParam, FALSE);
+    return ImmRequestMessageAW(hIMC, wParam, lParam, FALSE);
 }
 
 /***********************************************************************