Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-18 21:13:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

-User32: Fixed GetMenuItemInfoA so it should work closely to spec and reimplemented GetMenuItemInfoW so it should do the same. Added a string flag to GetMenuStringW. Tested with explorer, winefile, VIDE, Lazarus (nochg) and Miranda. Wine menu test 1178 failures now.

Browse source 
svn path=/trunk/; revision=23065
This commit is contained in:
James Tabor 2006-07-15 01:40:10 +00:00
parent 1d5f17dc97
commit d61db42063
1 changed files with 68 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
reactos/dll/win32/user32/windows/menu.c
View file

@ -3976,8 +3976,9 @@ GetMenuItemInfoA(
BOOL ByPosition,
LPMENUITEMINFOA mii)
{
LPSTR AnsiBuffer;
MENUITEMINFOW miiW;
LPSTR AnsiBuffer;
INT Count;
if (mii->cbSize != sizeof(MENUITEMINFOA) &&
mii->cbSize != sizeof(MENUITEMINFOA) - sizeof(HBITMAP))
@ -3992,39 +3993,38 @@ GetMenuItemInfoA(
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
}
RtlCopyMemory(&miiW, mii, mii->cbSize);
AnsiBuffer = mii->dwTypeData;
Count = mii->cch;
RtlCopyMemory(&miiW, mii, mii->cbSize);
miiW.dwTypeData = 0;
if (AnsiBuffer != NULL)
if (AnsiBuffer)
{
miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0,
miiW.cch * sizeof(WCHAR));
if (miiW.dwTypeData == NULL)
return FALSE;
if (miiW.dwTypeData == NULL) return FALSE;
}
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE))
{
HeapFree(GetProcessHeap(), 0, miiW.dwTypeData);
return FALSE;
if (!AnsiBuffer || !Count)
{
if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
mii->cch = miiW.cch;
return TRUE;
}
if (AnsiBuffer != NULL)
if (IS_STRING_ITEM(miiW.fType))
{
if (IS_STRING_ITEM(miiW.fType))
{
WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer,
WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer,
mii->cch, NULL, NULL);
}
RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
}
RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
RtlCopyMemory(mii, &miiW, miiW.cbSize);
if (AnsiBuffer)
{
mii->dwTypeData = AnsiBuffer;
mii->cch = strlen(AnsiBuffer);
}
mii->dwTypeData = AnsiBuffer;
mii->cch = strlen(AnsiBuffer);
return TRUE;
}
@ -4039,7 +4039,55 @@ GetMenuItemInfoW(
BOOL ByPosition,
LPMENUITEMINFOW mii)
{
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
MENUITEMINFOW miiW;
LPWSTR String;
INT Count;
if (mii->cbSize != sizeof(MENUITEMINFOW) &&
mii->cbSize != sizeof(MENUITEMINFOW) - sizeof(HBITMAP))
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0)
{
/* No text requested, just pass on */
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
}
String = mii->dwTypeData;
Count = mii->cch;
RtlCopyMemory(&miiW, mii, mii->cbSize);
miiW.dwTypeData = 0;
if (String)
{
miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0,
miiW.cch * sizeof(WCHAR));
if (miiW.dwTypeData == NULL) return FALSE;
}
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE))
return FALSE;
if (!String || !Count)
{
if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
mii->cch = miiW.cch;
return TRUE;
}
if (IS_STRING_ITEM(miiW.fType))
{
lstrcpynW( String, miiW.dwTypeData, Count );
}
RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
RtlCopyMemory(mii, &miiW, miiW.cbSize);
mii->dwTypeData = String;
mii->cch = strlenW(String);
return TRUE;
}
@ -4141,6 +4189,7 @@ GetMenuStringW(
MENUITEMINFOW miiW;
miiW.dwTypeData = lpString;
miiW.fMask = MIIM_STRING;
miiW.fType = MF_STRING;
miiW.cbSize = sizeof(MENUITEMINFOW);
miiW.cch = nMaxCount;