[ros-diffs] [reactos] 01/01: [IMM32] Renaming: s/pImmHeap/ghImmHeap/ (#4416)

[Katayama Hirofumi MZ]

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

commit ed765b7c3b37c38222aa1a2b29727eb16781b337
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Mar 31 09:11:13 2022 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Thu Mar 31 09:11:13 2022 +0900

    [IMM32] Renaming: s/pImmHeap/ghImmHeap/ (#4416)
    
    CORE-11700
---
 dll/win32/imm32/precomp.h |  4 ++--
 dll/win32/imm32/utils.c   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 07c5c6af4ba..62e2b0f0f8e 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -75,7 +75,7 @@ extern PIMEDPI g_pImeDpiList;
 extern PSERVERINFO gpsi;
 extern SHAREDINFO g_SharedInfo;
 extern BYTE g_bClientRegd;
-extern HANDLE pImmHeap;
+extern HANDLE ghImmHeap;
 
 BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName);
 VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW);
@@ -85,7 +85,7 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType);
 BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC);
 
 LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes);
-#define ImmLocalFree(lpData) HeapFree(pImmHeap, 0, (lpData))
+#define ImmLocalFree(lpData) HeapFree(ghImmHeap, 0, (lpData))
 
 LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA);
 LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW);
diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c
index f19cf6cf1c4..c5ded5470b7 100644
--- a/dll/win32/imm32/utils.c
+++ b/dll/win32/imm32/utils.c
@@ -13,7 +13,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
-HANDLE pImmHeap = NULL;
+HANDLE ghImmHeap = NULL; // Win: pImmHeap
 
 HRESULT APIENTRY
 Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase)
@@ -220,13 +220,13 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC)
 
 LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes)
 {
-    if (!pImmHeap)
+    if (!ghImmHeap)
     {
-        pImmHeap = RtlGetProcessHeap();
-        if (pImmHeap == NULL)
+        ghImmHeap = RtlGetProcessHeap();
+        if (ghImmHeap == NULL)
             return NULL;
     }
-    return HeapAlloc(pImmHeap, dwFlags, dwBytes);
+    return HeapAlloc(ghImmHeap, dwFlags, dwBytes);
 }
 
 BOOL APIENTRY