Skip to content

Commit 8029339

Browse files
authored
[IMM32] Fix ImmLocalAlloc usage (reactos#8007)
JIRA issue: CORE-19268 - Replaces LPTR with 0 in two calls to ImmLocalAlloc within imemenu.c (No need to zero-fill).
1 parent 9e1f2b0 commit 8029339

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

dll/win32/imm32/imemenu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ ImmGetImeMenuItemsAW(
562562
if (lpImeMenuItems)
563563
{
564564
cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOA)) * sizeof(IMEMENUITEMINFOW));
565-
pNewItems = ImmLocalAlloc(LPTR, cbTotal);
565+
pNewItems = ImmLocalAlloc(0, cbTotal);
566566
if (!pNewItems)
567567
{
568568
ERR("!pNewItems\n");
@@ -583,7 +583,7 @@ ImmGetImeMenuItemsAW(
583583
if (lpImeMenuItems)
584584
{
585585
cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOW)) * sizeof(IMEMENUITEMINFOA));
586-
pNewItems = ImmLocalAlloc(LPTR, cbTotal);
586+
pNewItems = ImmLocalAlloc(0, cbTotal);
587587
if (!pNewItems)
588588
{
589589
ERR("!pNewItems\n");

dll/win32/imm32/precomp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ LPVOID FASTCALL ValidateHandle(HANDLE hObject, UINT uType);
113113
#define ValidateHwnd(hwnd) ValidateHandle((hwnd), TYPE_WINDOW)
114114
BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC);
115115

116-
LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes);
116+
LPVOID ImmLocalAlloc(_In_ DWORD dwFlags, _In_ DWORD dwBytes);
117117
#define ImmLocalFree(lpData) HeapFree(ghImmHeap, 0, (lpData))
118118

119119
LPWSTR APIENTRY Imm32WideFromAnsi(UINT uCodePage, LPCSTR pszA);

dll/win32/imm32/utils.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC)
411411
return TRUE;
412412
}
413413

414-
// Win: ImmLocalAlloc
415-
LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes)
414+
LPVOID ImmLocalAlloc(_In_ DWORD dwFlags, _In_ DWORD dwBytes)
416415
{
417416
if (!ghImmHeap)
418417
{

0 commit comments

Comments
 (0)