lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-01 17:00:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32] Renaming: s/g_SharedInfo/gSharedInfo/ (#4418)

Browse Source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ
2022-03-31 10:00:06 +09:00
committed by GitHub
parent ed765b7c3b
commit 6dfe032152
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -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;

6
dll/win32/imm32/utils.c
View File

@@ -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)