[IMM32] Renaming: s/pImmHeap/ghImmHeap/ (reactos#4416)

CORE-11700
JoachimHenze · Mar 31, 2022 · ed765b7 · ed765b7
1 parent 5d81de7
commit ed765b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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