mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-04 08:53:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-03-31 09:11:13 +09:00 committed by GitHub
parent 5d81de7d5b
commit ed765b7c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dll/win32/imm32/precomp.h
View File

@ -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);

10
dll/win32/imm32/utils.c
View File

@ -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