Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed getting of menu item texts in GetMenuItemInfo[AW]. Fixes bug #316.

Browse source 
- Fixed memory leak in MenuDrawPopupMenu.

svn path=/trunk/; revision=9625
This commit is contained in:
Filip Navara 2004-06-05 18:39:46 +00:00
parent 037ba1baea
commit 6110c706c4
1 changed files with 63 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
reactos/lib/user32/windows/menu.c
View file

@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: menu.c,v 1.68 2004/05/16 19:31:07 navaraf Exp $ /* $Id: menu.c,v 1.69 2004/06/05 18:39:46 navaraf Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/menu.c * FILE: lib/user32/windows/menu.c
@ -917,6 +917,8 @@ MenuDrawPopupMenu(HWND Wnd, HDC Dc, HMENU Menu)
MenuInfo.Height, FALSE, ODA_DRAWENTIRE); MenuInfo.Height, FALSE, ODA_DRAWENTIRE);
} }
} }
MenuCleanupRosMenuItemInfo(&ItemInfo);
} }
} }
else else
@ -3740,59 +3742,83 @@ GetMenuItemID(HMENU hMenu,
*/ */
BOOL STDCALL BOOL STDCALL
GetMenuItemInfoA( GetMenuItemInfoA(
HMENU Menu, HMENU Menu,
UINT Item, UINT Item,
BOOL ByPosition, BOOL ByPosition,
LPMENUITEMINFOA mii) LPMENUITEMINFOA mii)
{ {
LPSTR AString; UNICODE_STRING Text;
UINT ACch; CHAR *AnsiString;
if (0 == (mii->fMask & (MIIM_STRING | MIIM_TYPE))) if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0)
{ {
/* No text requested, just pass on */ /* No text requested, just pass on */
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
} }
AString = mii->dwTypeData; Text.Length = 0;
ACch = mii->cch; Text.MaximumLength = mii->cch * sizeof(WCHAR);
mii->dwTypeData = HeapAlloc(GetProcessHeap(), 0, mii->cch * sizeof(WCHAR)); Text.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, mii->cch * sizeof(WCHAR));
if (NULL == mii->dwTypeData) if (mii->dwTypeData == NULL)
{
mii->dwTypeData = AString;
return FALSE; return FALSE;
} AnsiString = mii->dwTypeData;
if (! NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE)) mii->dwTypeData = (LPSTR) &Text;
{
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)mii, FALSE))
{
HeapFree(GetProcessHeap(), 0, mii->dwTypeData); HeapFree(GetProcessHeap(), 0, mii->dwTypeData);
mii->dwTypeData = AString; mii->dwTypeData = AnsiString;
return FALSE; return FALSE;
} }
if (IS_STRING_ITEM(mii->fType))
{
WideCharToMultiByte(CP_ACP, 0, (LPWSTR) mii->dwTypeData, mii->cch, AString, ACch,
NULL, NULL);
}
HeapFree(GetProcessHeap(), 0, mii->dwTypeData);
mii->dwTypeData = AString;
return TRUE; if (IS_STRING_ITEM(mii->fType))
{
WideCharToMultiByte(CP_ACP, 0, Text.Buffer, mii->cch, AnsiString, mii->cch,
NULL, NULL);
if (Text.MaximumLength > Text.Length)
AnsiString[mii->cch] = 0;
}
RtlFreeHeap(GetProcessHeap(), 0, Text.Buffer);
mii->dwTypeData = AnsiString;
return TRUE;
} }
/* /*
* @implemented * @implemented
*/ */
BOOL BOOL STDCALL
STDCALL
GetMenuItemInfoW( GetMenuItemInfoW(
HMENU Menu, HMENU Menu,
UINT Item, UINT Item,
BOOL ByPosition, BOOL ByPosition,
LPMENUITEMINFOW mii) LPMENUITEMINFOW mii)
{ {
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); UNICODE_STRING Text;
WCHAR *UnicodeString;
if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0)
{
/* No text requested, just pass on */
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
}
Text.Length = 0;
Text.MaximumLength = mii->cch * sizeof(WCHAR);
Text.Buffer = mii->dwTypeData;
UnicodeString = mii->dwTypeData;
mii->dwTypeData = (LPWSTR) &Text;
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)mii, FALSE))
{
mii->dwTypeData = UnicodeString;
return FALSE;
}
mii->dwTypeData = UnicodeString;
return TRUE;
} }