https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d744afbc77ff53a91121…
commit 0d744afbc77ff53a911219192f8d67ca486a2506
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Mar 29 17:59:23 2022 +0900
Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Tue Mar 29 17:59:23 2022 +0900
[IMM32] Renaming: s/g_hImm32Heap/pImmHeap/
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 c2acccec149..e525475f352 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 g_hImm32Heap;
+extern HANDLE pImmHeap;
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 Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes);
-#define Imm32HeapFree(lpData) HeapFree(g_hImm32Heap, 0, (lpData))
+#define Imm32HeapFree(lpData) HeapFree(pImmHeap, 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 e96f80528ae..91434297f14 100644
--- a/dll/win32/imm32/utils.c
+++ b/dll/win32/imm32/utils.c
@@ -14,7 +14,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(imm);
-HANDLE g_hImm32Heap = NULL;
+HANDLE pImmHeap = NULL;
HRESULT APIENTRY
Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase)
@@ -221,13 +221,13 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC)
LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes)
{
- if (!g_hImm32Heap)
+ if (!pImmHeap)
{
- g_hImm32Heap = RtlGetProcessHeap();
- if (g_hImm32Heap == NULL)
+ pImmHeap = RtlGetProcessHeap();
+ if (pImmHeap == NULL)
return NULL;
}
- return HeapAlloc(g_hImm32Heap, dwFlags, dwBytes);
+ return HeapAlloc(pImmHeap, dwFlags, dwBytes);
}
BOOL APIENTRY