Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Renaming: s/Imm32HeapAlloc/ImmLocalAlloc/

Browse source 
s/Imm32HeapFree/ImmLocalFree/
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-03-29 18:02:25 +09:00
parent 0d744afbc7
commit 46518ad601
8 changed files with 101 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dll/win32/imm32/compstr.c
View file

@ -582,7 +582,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
if (bAnsiClient) if (bAnsiClient)
{ {
cbCompNew = Imm32CompStrWideToAnsi(pComp, dwCompLen, NULL, 0, uCodePage); cbCompNew = Imm32CompStrWideToAnsi(pComp, dwCompLen, NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -591,7 +591,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
else else
{ {
cbCompNew = Imm32CompStrAnsiToWide(pComp, dwCompLen, NULL, 0, uCodePage); cbCompNew = Imm32CompStrAnsiToWide(pComp, dwCompLen, NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -604,7 +604,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
if (bAnsiClient) if (bAnsiClient)
{ {
cbReadNew = Imm32CompStrWideToAnsi(pRead, dwReadLen, NULL, 0, uCodePage); cbReadNew = Imm32CompStrWideToAnsi(pRead, dwReadLen, NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -613,7 +613,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
else else
{ {
cbReadNew = Imm32CompStrAnsiToWide(pRead, dwReadLen, NULL, 0, uCodePage); cbReadNew = Imm32CompStrAnsiToWide(pRead, dwReadLen, NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -631,7 +631,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
CS_StrW(pCS, CompStr), CS_StrW(pCS, CompStr),
CS_SizeW(pCS, CompStr), CS_SizeW(pCS, CompStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -645,7 +645,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
CS_StrA(pCS, CompStr), CS_StrA(pCS, CompStr),
CS_SizeA(pCS, CompStr), CS_SizeA(pCS, CompStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -663,7 +663,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
CS_StrW(pCS, CompReadStr), CS_StrW(pCS, CompReadStr),
CS_SizeW(pCS, CompReadStr), CS_SizeW(pCS, CompReadStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -677,7 +677,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
CS_StrA(pCS, CompReadStr), CS_StrA(pCS, CompReadStr),
CS_SizeA(pCS, CompReadStr), CS_SizeA(pCS, CompReadStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -695,7 +695,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
{ {
cbCompNew = Imm32CompClauseWideToAnsi(pComp, dwCompLen, CS_StrW(pCS, CompStr), cbCompNew = Imm32CompClauseWideToAnsi(pComp, dwCompLen, CS_StrW(pCS, CompStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -706,7 +706,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
{ {
cbCompNew = Imm32CompClauseAnsiToWide(pComp, dwCompLen, CS_StrA(pCS, CompStr), cbCompNew = Imm32CompClauseAnsiToWide(pComp, dwCompLen, CS_StrA(pCS, CompStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -721,7 +721,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
{ {
cbReadNew = Imm32CompClauseWideToAnsi(pRead, dwReadLen, CS_StrW(pCS, CompReadStr), cbReadNew = Imm32CompClauseWideToAnsi(pRead, dwReadLen, CS_StrW(pCS, CompReadStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -733,7 +733,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
{ {
cbReadNew = Imm32CompClauseAnsiToWide(pRead, dwReadLen, CS_StrA(pCS, CompReadStr), cbReadNew = Imm32CompClauseAnsiToWide(pRead, dwReadLen, CS_StrA(pCS, CompReadStr),
NULL, 0, uCodePage); NULL, 0, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -750,7 +750,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
if (bAnsiClient) if (bAnsiClient)
{ {
cbCompNew = Imm32ReconvertAnsiFromWide(NULL, pComp, uCodePage); cbCompNew = Imm32ReconvertAnsiFromWide(NULL, pComp, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -762,7 +762,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
else else
{ {
cbCompNew = Imm32ReconvertWideFromAnsi(NULL, pComp, uCodePage); cbCompNew = Imm32ReconvertWideFromAnsi(NULL, pComp, uCodePage);
pCompNew = Imm32HeapAlloc(0, cbCompNew); pCompNew = ImmLocalAlloc(0, cbCompNew);
if (!pCompNew) if (!pCompNew)
goto Quit; goto Quit;
@ -778,7 +778,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
if (bAnsiClient) if (bAnsiClient)
{ {
cbReadNew = Imm32ReconvertAnsiFromWide(NULL, pRead, uCodePage); cbReadNew = Imm32ReconvertAnsiFromWide(NULL, pRead, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -790,7 +790,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp
else else
{ {
cbReadNew = Imm32ReconvertWideFromAnsi(NULL, pRead, uCodePage); cbReadNew = Imm32ReconvertWideFromAnsi(NULL, pRead, uCodePage);
pReadNew = Imm32HeapAlloc(0, cbReadNew); pReadNew = ImmLocalAlloc(0, cbReadNew);
if (!pReadNew) if (!pReadNew)
goto Quit; goto Quit;
@ -836,8 +836,8 @@ Quit:
ImmUnlockIMCC(pIC->hCompStr); ImmUnlockIMCC(pIC->hCompStr);
if (pIC) if (pIC)
ImmUnlockIMC(hIMC); ImmUnlockIMC(hIMC);
Imm32HeapFree(pCompNew); ImmLocalFree(pCompNew);
Imm32HeapFree(pReadNew); ImmLocalFree(pReadNew);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }

46
dll/win32/imm32/ime.c
View file

@ -229,7 +229,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
return NULL; return NULL;
} }
pImeDpiNew = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI)); pImeDpiNew = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI));
if (pImeDpiNew == NULL) if (pImeDpiNew == NULL)
return NULL; return NULL;
@ -244,7 +244,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew))
{ {
Imm32HeapFree(pImeDpiNew); ImmLocalFree(pImeDpiNew);
return FALSE; return FALSE;
} }
@ -259,7 +259,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock)
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&g_csImeDpi);
Imm32FreeImeDpi(pImeDpiNew, FALSE); Imm32FreeImeDpi(pImeDpiNew, FALSE);
Imm32HeapFree(pImeDpiNew); ImmLocalFree(pImeDpiNew);
return pImeDpiFound; return pImeDpiFound;
} }
else else
@ -343,7 +343,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL)
} }
Imm32FreeImeDpi(pImeDpi0, TRUE); Imm32FreeImeDpi(pImeDpi0, TRUE);
Imm32HeapFree(pImeDpi0); ImmLocalFree(pImeDpi0);
Quit: Quit:
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&g_csImeDpi);
@ -422,7 +422,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen
if (lpImeMenu) if (lpImeMenu)
{ {
cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOA)) * sizeof(IMEMENUITEMINFOW)); cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOA)) * sizeof(IMEMENUITEMINFOW));
pNewItems = Imm32HeapAlloc(0, cbTotal); pNewItems = ImmLocalAlloc(0, cbTotal);
if (!pNewItems) if (!pNewItems)
goto Quit; goto Quit;
} }
@ -435,7 +435,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen
if (lpImeMenu) if (lpImeMenu)
{ {
cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOW)) * sizeof(IMEMENUITEMINFOA)); cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOW)) * sizeof(IMEMENUITEMINFOA));
pNewItems = Imm32HeapAlloc(0, cbTotal); pNewItems = ImmLocalAlloc(0, cbTotal);
if (!pNewItems) if (!pNewItems)
goto Quit; goto Quit;
} }
@ -489,7 +489,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen
Quit: Quit:
if (pNewItems != lpImeMenu) if (pNewItems != lpImeMenu)
Imm32HeapFree(pNewItems); ImmLocalFree(pNewItems);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
ImmUnlockIMC(hIMC); ImmUnlockIMC(hIMC);
return ret; return ret;
@ -516,8 +516,8 @@ HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText)
hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW);
Quit: Quit:
Imm32HeapFree(pszFileNameW); ImmLocalFree(pszFileNameW);
Imm32HeapFree(pszLayoutTextW); ImmLocalFree(pszLayoutTextW);
return hKL; return hKL;
} }
@ -553,10 +553,10 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText)
cLayouts = Imm32GetRegImes(NULL, 0); cLayouts = Imm32GetRegImes(NULL, 0);
if (cLayouts) if (cLayouts)
{ {
pLayouts = Imm32HeapAlloc(0, cLayouts * sizeof(REG_IME)); pLayouts = ImmLocalAlloc(0, cLayouts * sizeof(REG_IME));
if (!pLayouts || !Imm32GetRegImes(pLayouts, cLayouts)) if (!pLayouts || !Imm32GetRegImes(pLayouts, cLayouts))
{ {
Imm32HeapFree(pLayouts); ImmLocalFree(pLayouts);
return NULL; return NULL;
} }
@ -611,7 +611,7 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText)
} }
Quit: Quit:
Imm32HeapFree(pLayouts); ImmLocalFree(pLayouts);
return hNewKL; return hNewKL;
} }
@ -788,7 +788,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi)
} }
Imm32FreeImeDpi(pImeDpi, TRUE); Imm32FreeImeDpi(pImeDpi, TRUE);
Imm32HeapFree(pImeDpi); ImmLocalFree(pImeDpi);
RtlLeaveCriticalSection(&g_csImeDpi); RtlLeaveCriticalSection(&g_csImeDpi);
} }
@ -1520,7 +1520,7 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst,
if (cb == 0) if (cb == 0)
goto Quit; goto Quit;
pCL = Imm32HeapAlloc(0, cb); pCL = ImmLocalAlloc(0, cb);
if (pCL == NULL) if (pCL == NULL)
goto Quit; goto Quit;
@ -1531,8 +1531,8 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst,
ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP); ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP);
Quit: Quit:
Imm32HeapFree(pszSrcW); ImmLocalFree(pszSrcW);
Imm32HeapFree(pCL); ImmLocalFree(pCL);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -1575,7 +1575,7 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst,
if (cb == 0) if (cb == 0)
goto Quit; goto Quit;
pCL = Imm32HeapAlloc(0, cb); pCL = ImmLocalAlloc(0, cb);
if (!pCL) if (!pCL)
goto Quit; goto Quit;
@ -1586,8 +1586,8 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst,
ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP); ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP);
Quit: Quit:
Imm32HeapFree(pszSrcA); ImmLocalFree(pszSrcA);
Imm32HeapFree(pCL); ImmLocalFree(pCL);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -1721,8 +1721,8 @@ DoIt:
SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0);
Quit: Quit:
Imm32HeapFree(RegWordW.lpReading); ImmLocalFree(RegWordW.lpReading);
Imm32HeapFree(RegWordW.lpWord); ImmLocalFree(RegWordW.lpWord);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -1775,8 +1775,8 @@ DoIt:
SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0);
Quit: Quit:
Imm32HeapFree(RegWordA.lpReading); ImmLocalFree(RegWordA.lpReading);
Imm32HeapFree(RegWordA.lpWord); ImmLocalFree(RegWordA.lpWord);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }

20
dll/win32/imm32/imm.c
View file

@ -136,7 +136,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown)
cKLs = GetKeyboardLayoutList(0, NULL); cKLs = GetKeyboardLayoutList(0, NULL);
if (cKLs) if (cKLs)
{ {
pList = Imm32HeapAlloc(0, cKLs * sizeof(HKL)); pList = ImmLocalAlloc(0, cKLs * sizeof(HKL));
if (pList == NULL) if (pList == NULL)
return FALSE; return FALSE;
@ -150,7 +150,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown)
} }
} }
Imm32HeapFree(pList); ImmLocalFree(pList);
} }
StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID);
@ -593,14 +593,14 @@ HIMC WINAPI ImmCreateContext(void)
if (!IS_IMM_MODE()) if (!IS_IMM_MODE())
return NULL; return NULL;
pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC));
if (pClientImc == NULL) if (pClientImc == NULL)
return NULL; return NULL;
hIMC = NtUserCreateInputContext((ULONG_PTR)pClientImc); hIMC = NtUserCreateInputContext((ULONG_PTR)pClientImc);
if (hIMC == NULL) if (hIMC == NULL)
{ {
Imm32HeapFree(pClientImc); ImmLocalFree(pClientImc);
return NULL; return NULL;
} }
@ -624,9 +624,9 @@ static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC)
for (pSubState = pState->pSubState; pSubState; pSubState = pSubStateNext) for (pSubState = pState->pSubState; pSubState; pSubState = pSubStateNext)
{ {
pSubStateNext = pSubState->pNext; pSubStateNext = pSubState->pNext;
Imm32HeapFree(pSubState); ImmLocalFree(pSubState);
} }
Imm32HeapFree(pState); ImmLocalFree(pState);
} }
} }
@ -913,7 +913,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc)
pClientImc = (PCLIENTIMC)pIMC->dwClientImcData; pClientImc = (PCLIENTIMC)pIMC->dwClientImcData;
if (!pClientImc) if (!pClientImc)
{ {
pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC));
if (!pClientImc) if (!pClientImc)
return NULL; return NULL;
@ -923,7 +923,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc)
if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc))
{ {
Imm32HeapFree(pClientImc); ImmLocalFree(pClientImc);
return NULL; return NULL;
} }
@ -958,7 +958,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc)
LocalFree(hInputContext); LocalFree(hInputContext);
RtlDeleteCriticalSection(&pClientImc->cs); RtlDeleteCriticalSection(&pClientImc->cs);
Imm32HeapFree(pClientImc); ImmLocalFree(pClientImc);
} }
static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags)
@ -1117,7 +1117,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD dwThreadId, IMCENUMPROC lpfn, LPARAM lPara
break; break;
} }
Imm32HeapFree(phList); ImmLocalFree(phList);
return ret; return ret;
} }

30
dll/win32/imm32/keymsg.c
View file

@ -281,7 +281,7 @@ static DWORD WINAPI Imm32UnknownProcess1Proc(LPVOID arg)
SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, uValue, (LPARAM)pUnknown->hWnd, SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, uValue, (LPARAM)pUnknown->hWnd,
SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult); SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult);
} }
Imm32HeapFree(pUnknown); ImmLocalFree(pUnknown);
return FALSE; return FALSE;
} }
@ -304,7 +304,7 @@ LRESULT APIENTRY Imm32UnknownProcess1(HWND hWnd, BOOL fFlag)
return lResult; return lResult;
} }
pUnknown1 = Imm32HeapAlloc(0, sizeof(IMM_UNKNOWN_PROCESS1)); pUnknown1 = ImmLocalAlloc(0, sizeof(IMM_UNKNOWN_PROCESS1));
if (!pUnknown1) if (!pUnknown1)
return 0; return 0;
@ -428,9 +428,9 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA
if (bAnsiAPI == bAnsiWnd) if (bAnsiAPI == bAnsiWnd)
goto DoIt; goto DoIt;
if (bAnsiWnd) if (bAnsiWnd)
pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTA)); pTempData = ImmLocalAlloc(0, sizeof(LOGFONTA));
else else
pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTW)); pTempData = ImmLocalAlloc(0, sizeof(LOGFONTW));
if (!pTempData) if (!pTempData)
return 0; return 0;
break; break;
@ -444,7 +444,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA
else else
ret = Imm32ReconvertWideFromAnsi(NULL, pData, uCodePage); ret = Imm32ReconvertWideFromAnsi(NULL, pData, uCodePage);
pTempData = Imm32HeapAlloc(0, ret + sizeof(WCHAR)); pTempData = ImmLocalAlloc(0, ret + sizeof(WCHAR));
if (!pTempData) if (!pTempData)
return 0; return 0;
@ -474,7 +474,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA
if (!cchCompStr) if (!cchCompStr)
return 0; return 0;
pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(CHAR)); pCS = ImmLocalAlloc(0, (cchCompStr + 1) * sizeof(CHAR));
if (!pCS) if (!pCS)
return 0; return 0;
@ -487,7 +487,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA
if (!cchCompStr) if (!cchCompStr)
return 0; return 0;
pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(WCHAR)); pCS = ImmLocalAlloc(0, (cchCompStr + 1) * sizeof(WCHAR));
if (!pCS) if (!pCS)
return 0; return 0;
@ -495,7 +495,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA
pICP->dwCharPos = IchAnsiFromWide(pICP->dwCharPos, pCS, uCodePage); pICP->dwCharPos = IchAnsiFromWide(pICP->dwCharPos, pCS, uCodePage);
} }
Imm32HeapFree(pCS); ImmLocalFree(pCS);
break; break;
default: default:
@ -552,7 +552,7 @@ DoIt:
Quit: Quit:
if (pTempData != pData) if (pTempData != pData)
Imm32HeapFree(pTempData); ImmLocalFree(pTempData);
return ret; return ret;
} }
@ -810,7 +810,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC)
goto Quit; goto Quit;
cbTrans = dwCount * sizeof(TRANSMSG); cbTrans = dwCount * sizeof(TRANSMSG);
pTrans = Imm32HeapAlloc(0, cbTrans); pTrans = ImmLocalAlloc(0, cbTrans);
if (pTrans == NULL) if (pTrans == NULL)
goto Quit; goto Quit;
@ -843,7 +843,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC)
} }
Quit: Quit:
Imm32HeapFree(pTrans); ImmLocalFree(pTrans);
if (hMsgBuf) if (hMsgBuf)
ImmUnlockIMCC(hMsgBuf); ImmUnlockIMCC(hMsgBuf);
pIC->dwNumMsgBuf = 0; /* done */ pIC->dwNumMsgBuf = 0; /* done */
@ -877,7 +877,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg)
(Lang == LANG_KOREAN && NtUserGetAppImeLevel(hwnd) == 3)) (Lang == LANG_KOREAN && NtUserGetAppImeLevel(hwnd) == 3))
{ {
DWORD cbTransMsg = dwCount * sizeof(TRANSMSG); DWORD cbTransMsg = dwCount * sizeof(TRANSMSG);
pNewTransMsg = Imm32HeapAlloc(0, cbTransMsg); pNewTransMsg = ImmLocalAlloc(0, cbTransMsg);
if (pNewTransMsg) if (pNewTransMsg)
{ {
RtlCopyMemory(pNewTransMsg, lpTransMsg, cbTransMsg); RtlCopyMemory(pNewTransMsg, lpTransMsg, cbTransMsg);
@ -903,7 +903,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg)
#ifdef IMM_WIN3_SUPPORT #ifdef IMM_WIN3_SUPPORT
if (pNewTransMsg != lpTransMsg) if (pNewTransMsg != lpTransMsg)
Imm32HeapFree(pNewTransMsg); ImmLocalFree(pNewTransMsg);
#endif #endif
} }
@ -997,7 +997,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
/* allocate a list */ /* allocate a list */
cbList = offsetof(TRANSMSGLIST, TransMsg) + MSG_COUNT * sizeof(TRANSMSG); cbList = offsetof(TRANSMSGLIST, TransMsg) + MSG_COUNT * sizeof(TRANSMSG);
pList = Imm32HeapAlloc(0, cbList); pList = ImmLocalAlloc(0, cbList);
if (!pList) if (!pList)
goto Quit; goto Quit;
@ -1023,7 +1023,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
} }
Quit: Quit:
Imm32HeapFree(pList); ImmLocalFree(pList);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
ImmUnlockIMC(hIMC); ImmUnlockIMC(hIMC);
ImmReleaseContext(hwnd, hIMC); ImmReleaseContext(hwnd, hIMC);

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

@ -84,8 +84,8 @@ PWND FASTCALL ValidateHwndNoErr(HWND hwnd);
LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType); LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType);
BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC);
LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes);
#define Imm32HeapFree(lpData) HeapFree(pImmHeap, 0, (lpData)) #define ImmLocalFree(lpData) HeapFree(pImmHeap, 0, (lpData))
LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA);
LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW);

40
dll/win32/imm32/regword.c
View file

@ -51,8 +51,8 @@ Imm32EnumWordProcA2W(LPCSTR pszReadingA, DWORD dwStyle, LPCSTR pszRegisterA, LPV
lpEnumData->ret = ret; lpEnumData->ret = ret;
Quit: Quit:
Imm32HeapFree(pszReadingW); ImmLocalFree(pszReadingW);
Imm32HeapFree(pszRegisterW); ImmLocalFree(pszRegisterW);
return ret; return ret;
} }
@ -81,8 +81,8 @@ Imm32EnumWordProcW2A(LPCWSTR pszReadingW, DWORD dwStyle, LPCWSTR pszRegisterW, L
lpEnumData->ret = ret; lpEnumData->ret = ret;
Quit: Quit:
Imm32HeapFree(pszReadingA); ImmLocalFree(pszReadingA);
Imm32HeapFree(pszRegisterA); ImmLocalFree(pszRegisterA);
return ret; return ret;
} }
@ -136,8 +136,8 @@ ImmEnumRegisterWordA(HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc,
ret = EnumDataW2A.ret; ret = EnumDataW2A.ret;
Quit: Quit:
Imm32HeapFree(pszReadingW); ImmLocalFree(pszReadingW);
Imm32HeapFree(pszRegisterW); ImmLocalFree(pszRegisterW);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -192,8 +192,8 @@ ImmEnumRegisterWordW(HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc,
ret = EnumDataA2W.ret; ret = EnumDataA2W.ret;
Quit: Quit:
Imm32HeapFree(pszReadingA); ImmLocalFree(pszReadingA);
Imm32HeapFree(pszRegisterA); ImmLocalFree(pszRegisterA);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -224,7 +224,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf
if (nItem > 0) if (nItem > 0)
{ {
pNewStylesW = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFW)); pNewStylesW = ImmLocalAlloc(0, nItem * sizeof(STYLEBUFW));
if (!pNewStylesW) if (!pNewStylesW)
goto Quit; goto Quit;
} }
@ -251,7 +251,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf
} }
Quit: Quit:
Imm32HeapFree(pNewStylesW); ImmLocalFree(pNewStylesW);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -282,7 +282,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf
if (nItem > 0) if (nItem > 0)
{ {
pNewStylesA = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFA)); pNewStylesA = ImmLocalAlloc(0, nItem * sizeof(STYLEBUFA));
if (!pNewStylesA) if (!pNewStylesA)
goto Quit; goto Quit;
} }
@ -308,7 +308,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf
} }
Quit: Quit:
Imm32HeapFree(pNewStylesA); ImmLocalFree(pNewStylesA);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -354,8 +354,8 @@ ImmRegisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister
ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW); ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW);
Quit: Quit:
Imm32HeapFree(pszReadingW); ImmLocalFree(pszReadingW);
Imm32HeapFree(pszRegisterW); ImmLocalFree(pszRegisterW);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -401,8 +401,8 @@ ImmRegisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegist
ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA); ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA);
Quit: Quit:
Imm32HeapFree(pszReadingA); ImmLocalFree(pszReadingA);
Imm32HeapFree(pszRegisterA); ImmLocalFree(pszRegisterA);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -448,8 +448,8 @@ ImmUnregisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregi
ret = pImeDpi->ImeUnregisterWord(pszReadingW, dwStyle, pszUnregisterW); ret = pImeDpi->ImeUnregisterWord(pszReadingW, dwStyle, pszUnregisterW);
Quit: Quit:
Imm32HeapFree(pszReadingW); ImmLocalFree(pszReadingW);
Imm32HeapFree(pszUnregisterW); ImmLocalFree(pszUnregisterW);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }
@ -495,8 +495,8 @@ ImmUnregisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnre
ret = pImeDpi->ImeUnregisterWord(pszReadingA, dwStyle, pszUnregisterA); ret = pImeDpi->ImeUnregisterWord(pszReadingA, dwStyle, pszUnregisterA);
Quit: Quit:
Imm32HeapFree(pszReadingA); ImmLocalFree(pszReadingA);
Imm32HeapFree(pszUnregisterA); ImmLocalFree(pszUnregisterA);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
return ret; return ret;
} }

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

@ -63,7 +63,7 @@ BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC)
LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA) LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA)
{ {
INT cch = lstrlenA(pszA); INT cch = lstrlenA(pszA);
LPWSTR pszW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); LPWSTR pszW = ImmLocalAlloc(0, (cch + 1) * sizeof(WCHAR));
if (pszW == NULL) if (pszW == NULL)
return NULL; return NULL;
cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pszA, cch, pszW, cch + 1); cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pszA, cch, pszW, cch + 1);
@ -75,7 +75,7 @@ LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW)
{ {
INT cchW = lstrlenW(pszW); INT cchW = lstrlenW(pszW);
INT cchA = (cchW + 1) * sizeof(WCHAR); INT cchA = (cchW + 1) * sizeof(WCHAR);
LPSTR pszA = Imm32HeapAlloc(0, cchA); LPSTR pszA = ImmLocalAlloc(0, cchA);
if (!pszA) if (!pszA)
return NULL; return NULL;
cchA = WideCharToMultiByte(CP_ACP, 0, pszW, cchW, pszA, cchA, NULL, NULL); cchA = WideCharToMultiByte(CP_ACP, 0, pszW, cchW, pszA, cchA, NULL, NULL);
@ -219,7 +219,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC)
return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess;
} }
LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes) LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes)
{ {
if (!pImmHeap) if (!pImmHeap)
{ {
@ -270,18 +270,18 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList)
DWORD dwCount = INITIAL_COUNT, cRetry = 0; DWORD dwCount = INITIAL_COUNT, cRetry = 0;
HIMC *phNewList; HIMC *phNewList;
phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); phNewList = ImmLocalAlloc(0, dwCount * sizeof(HIMC));
if (phNewList == NULL) if (phNewList == NULL)
return 0; return 0;
Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount); Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount);
while (Status == STATUS_BUFFER_TOO_SMALL) while (Status == STATUS_BUFFER_TOO_SMALL)
{ {
Imm32HeapFree(phNewList); ImmLocalFree(phNewList);
if (cRetry++ >= MAX_RETRY) if (cRetry++ >= MAX_RETRY)
return 0; return 0;
phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); phNewList = ImmLocalAlloc(0, dwCount * sizeof(HIMC));
if (phNewList == NULL) if (phNewList == NULL)
return 0; return 0;
@ -290,7 +290,7 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList)
if (NT_ERROR(Status) || !dwCount) if (NT_ERROR(Status) || !dwCount)
{ {
Imm32HeapFree(phNewList); ImmLocalFree(phNewList);
return 0; return 0;
} }
@ -361,7 +361,7 @@ Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL)
} }
if (!pState) if (!pState)
{ {
pState = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IME_STATE)); pState = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(IME_STATE));
if (pState) if (pState)
{ {
pState->wLang = Lang; pState->wLang = Lang;
@ -381,7 +381,7 @@ Imm32FetchImeSubState(PIME_STATE pState, HKL hKL)
if (pSubState->hKL == hKL) if (pSubState->hKL == hKL)
return pSubState; return pSubState;
} }
pSubState = Imm32HeapAlloc(0, sizeof(IME_SUBSTATE)); pSubState = ImmLocalAlloc(0, sizeof(IME_SUBSTATE));
if (!pSubState) if (!pSubState)
return NULL; return NULL;
pSubState->dwValue = 0; pSubState->dwValue = 0;
@ -650,7 +650,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx)
if (!cbVerInfo) if (!cbVerInfo)
goto Quit; goto Quit;
pVerInfo = Imm32HeapAlloc(0, cbVerInfo); pVerInfo = ImmLocalAlloc(0, cbVerInfo);
if (!pVerInfo) if (!pVerInfo)
goto Quit; goto Quit;
@ -661,7 +661,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx)
ret = Imm32LoadImeLangAndDesc(pImeInfoEx, pVerInfo); ret = Imm32LoadImeLangAndDesc(pImeInfoEx, pVerInfo);
} }
Imm32HeapFree(pVerInfo); ImmLocalFree(pVerInfo);
Quit: Quit:
if (bLoaded) if (bLoaded)

4
dll/win32/imm32/win3.c
View file

@ -49,7 +49,7 @@ ImmNt3JTrans(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC,
// clone the message list // clone the message list
cbTempList = (dwCount + 1) * sizeof(TRANSMSG); cbTempList = (dwCount + 1) * sizeof(TRANSMSG);
pTempList = Imm32HeapAlloc(HEAP_ZERO_MEMORY, cbTempList); pTempList = ImmLocalAlloc(HEAP_ZERO_MEMORY, cbTempList);
if (pTempList == NULL) if (pTempList == NULL)
return 0; return 0;
RtlCopyMemory(pTempList, pTrans, dwCount * sizeof(TRANSMSG)); RtlCopyMemory(pTempList, pTrans, dwCount * sizeof(TRANSMSG));
@ -166,7 +166,7 @@ DoDefault:
} }
} }
Imm32HeapFree(pTempList); ImmLocalFree(pTempList);
return ret; return ret;
} }