Skip to content

Commit

Permalink
[IMM32] Renaming: s/g_SharedInfo/gSharedInfo/ (reactos#4418)
Browse files Browse the repository at this point in the history
CORE-11700
  • Loading branch information
katahiromz authored Mar 31, 2022
1 parent ed765b7 commit 6dfe032
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions dll/win32/imm32/imm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion dll/win32/imm32/precomp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions dll/win32/imm32/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6dfe032

Please sign in to comment.