Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 20:36:35 +00:00
Code Issues Projects Releases Packages 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 PSERVERINFO gpsi;
extern SHAREDINFO g_SharedInfo; extern SHAREDINFO g_SharedInfo;
extern BYTE g_bClientRegd; extern BYTE g_bClientRegd;
extern HANDLE pImmHeap; extern HANDLE ghImmHeap;
BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName);
VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW);
@ -85,7 +85,7 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType);
BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC);
LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes); 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); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA);
LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW);

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

@ -13,7 +13,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(imm); WINE_DEFAULT_DEBUG_CHANNEL(imm);
HANDLE pImmHeap = NULL; HANDLE ghImmHeap = NULL; // Win: pImmHeap
HRESULT APIENTRY HRESULT APIENTRY
Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase)
@ -220,13 +220,13 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC)
LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes) LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes)
{ {
if (!pImmHeap) if (!ghImmHeap)
{ {
pImmHeap = RtlGetProcessHeap(); ghImmHeap = RtlGetProcessHeap();
if (pImmHeap == NULL) if (ghImmHeap == NULL)
return NULL; return NULL;
} }
return HeapAlloc(pImmHeap, dwFlags, dwBytes); return HeapAlloc(ghImmHeap, dwFlags, dwBytes);
} }
BOOL APIENTRY BOOL APIENTRY