[ros-diffs] [reactos] 01/01: [IMM32] Renaming: s/g_psi/gpsi/

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82fa82d8e19883ef8cd2e…

commit 82fa82d8e19883ef8cd2efc52f85635a7338c14c
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Mar 29 17:57:28 2022 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Tue Mar 29 17:57:28 2022 +0900

    [IMM32] Renaming: s/g_psi/gpsi/
    
    CORE-11700
---
 dll/win32/imm32/imm.c     | 4 ++--
 dll/win32/imm32/keymsg.c  | 2 +-
 dll/win32/imm32/precomp.h | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index a4e48cb88ce..dad6998d9e1 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 g_psi = NULL;
+PSERVERINFO gpsi = NULL;
 SHAREDINFO g_SharedInfo = { NULL };
 BYTE g_bClientRegd = FALSE;
 
@@ -44,7 +44,7 @@ static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)
 BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod)
 {
     g_SharedInfo = *ptr;
-    g_psi = g_SharedInfo.psi;
+    gpsi = g_SharedInfo.psi;
     return Imm32InitInstance(hMod);
 }
 
diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c
index 0b5baaf7e88..a8dd1f93ced 100644
--- a/dll/win32/imm32/keymsg.c
+++ b/dll/win32/imm32/keymsg.c
@@ -292,7 +292,7 @@ LRESULT APIENTRY Imm32UnknownProcess1(HWND hWnd, BOOL fFlag)
     PIMM_UNKNOWN_PROCESS1 pUnknown1;
     DWORD_PTR lResult = 0;
 
-    if (hWnd && g_psi)
+    if (hWnd && gpsi)
         pWnd = ValidateHwndNoErr(hWnd);
 
     if (!pWnd)
diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 3de40f0cbc0..c2acccec149 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -72,7 +72,7 @@ typedef struct REG_IME
 extern HMODULE g_hImm32Inst;
 extern RTL_CRITICAL_SECTION g_csImeDpi;
 extern PIMEDPI g_pImeDpiList;
-extern PSERVERINFO g_psi;
+extern PSERVERINFO gpsi;
 extern SHAREDINFO g_SharedInfo;
 extern BYTE g_bClientRegd;
 extern HANDLE g_hImm32Heap;
@@ -112,8 +112,8 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd)
 BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC);
 
 #define ImeDpi_IsUnicode(pImeDpi)   ((pImeDpi)->ImeInfo.fdwProperty &
IME_PROP_UNICODE)
-#define IS_IMM_MODE()               (g_psi && (g_psi->dwSRVIFlags &
SRVINFO_IMM32))
-#define Imm32IsCiceroMode()         (g_psi && (g_psi->dwSRVIFlags &
SRVINFO_CICERO_ENABLED))
+#define IS_IMM_MODE()               (gpsi && (gpsi->dwSRVIFlags &
SRVINFO_IMM32))
+#define Imm32IsCiceroMode()         (gpsi && (gpsi->dwSRVIFlags &
SRVINFO_CICERO_ENABLED))
 #define Imm32Is16BitMode()          (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)
 
 DWORD APIENTRY