https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dfe032152c9fe7656959…
commit 6dfe032152c9fe765695946240be7b55044f7be2
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Mar 31 10:00:06 2022 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Thu Mar 31 10:00:06 2022 +0900
[IMM32] Renaming: s/g_SharedInfo/gSharedInfo/ (#4418)
CORE-11700
---
dll/win32/imm32/imm.c | 6 +++---
dll/win32/imm32/precomp.h | 2 +-
dll/win32/imm32/utils.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index 3ad8d10df56..d811cf693c1 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm);
HMODULE g_hImm32Inst = NULL;
PSERVERINFO gpsi = NULL;
-SHAREDINFO g_SharedInfo = { NULL };
+SHAREDINFO gSharedInfo = { NULL };
BYTE g_bClientRegd = FALSE;
static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)
@@ -42,8 +42,8 @@ static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)
*/
BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod)
{
- g_SharedInfo = *ptr;
- gpsi = g_SharedInfo.psi;
+ gSharedInfo = *ptr;
+ gpsi = gSharedInfo.psi;
return Imm32InitInstance(hMod);
}
diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 62e2b0f0f8e..832d9bb1e77 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -73,7 +73,7 @@ extern HMODULE g_hImm32Inst;
extern RTL_CRITICAL_SECTION g_csImeDpi;
extern PIMEDPI g_pImeDpiList;
extern PSERVERINFO gpsi;
-extern SHAREDINFO g_SharedInfo;
+extern SHAREDINFO gSharedInfo;
extern BYTE g_bClientRegd;
extern HANDLE ghImmHeap;
diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c
index c5ded5470b7..d73eb170a74 100644
--- a/dll/win32/imm32/utils.c
+++ b/dll/win32/imm32/utils.c
@@ -172,11 +172,11 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType)
if (!NtUserValidateHandleSecure(hObject))
return NULL;
- ht = g_SharedInfo.aheList; /* handle table */
+ ht = gSharedInfo.aheList; /* handle table */
ASSERT(ht);
/* ReactOS-Specific! */
- ASSERT(g_SharedInfo.ulSharedDelta != 0);
- he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta);
+ ASSERT(gSharedInfo.ulSharedDelta != 0);
+ he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - gSharedInfo.ulSharedDelta);
index = (LOWORD(hObject) - FIRST_USER_HANDLE) >> 1;
if ((INT)index < 0 || ht->nb_handles <= index || he[index].type != uType)