https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a40f55bf6dec9f876f527…
commit a40f55bf6dec9f876f527567ad513bdb3f28f508
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Wed Apr 6 15:44:27 2022 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Apr 6 15:44:27 2022 +0900
[IMM32] Renaming: s/Imm32InitInstance/ImmInitializeGlobals/ (#4428)
- Rename Imm32InitInstance as ImmInitializeGlobals.
- Add Win: comments.
CORE-11700
---
dll/win32/imm32/imm.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index ec939a72dda..e3a71f8ba8d 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -6,7 +6,7 @@
* Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart
* Copyright 2017 James Tabor <james.tabor(a)reactos.org>
* Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org>
- * Copyright 2020-2021 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
+ * Copyright 2020-2022 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
*/
#include "precomp.h"
@@ -18,7 +18,8 @@ PSERVERINFO gpsi = NULL;
SHAREDINFO gSharedInfo = { NULL };
BYTE g_bClientRegd = FALSE;
-static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)
+// Win: ImmInitializeGlobals
+static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod)
{
NTSTATUS status;
@@ -44,7 +45,7 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod)
{
gSharedInfo = *ptr;
gpsi = gSharedInfo.psi;
- return Imm32InitInstance(hMod);
+ return ImmInitializeGlobals(hMod);
}
/***********************************************************************
@@ -629,6 +630,7 @@ static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC)
}
}
+// Win: DestroyInputContext
BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep)
{
PIMEDPI pImeDpi;
@@ -792,6 +794,7 @@ Fail:
return FALSE;
}
+// Win: InternalImmLockIMC
LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect)
{
HANDLE hIC;
@@ -960,6 +963,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc)
ImmLocalFree(pClientImc);
}
+// Win: ImmGetSaveContext
static HIMC APIENTRY ImmGetSaveContext(HWND hWnd, DWORD dwContextFlags)
{
HIMC hIMC;
@@ -1256,9 +1260,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
lpReserved)
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
- if (!Imm32InitInstance(hinstDLL))
+ if (!ImmInitializeGlobals(hinstDLL))
{
- ERR("Imm32InitInstance failed\n");
+ ERR("ImmInitializeGlobals failed\n");
return FALSE;
}
if (!User32InitializeImmEntryTable(IMM_INIT_MAGIC))