Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

User32: Menu.c I found a small problem with drawing menu popups. This fixes the problem.

Browse source 
svn path=/trunk/; revision=23070
This commit is contained in:
James Tabor 2006-07-16 00:33:50 +00:00
parent a7dcf72d50
commit c1685e75b7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4008,9 +4008,12 @@ GetMenuItemInfoA(
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE))
return FALSE; return FALSE;
RtlCopyMemory(mii, &miiW, miiW.cbSize);
if (!AnsiBuffer || !Count) if (!AnsiBuffer || !Count)
{ {
if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
mii->dwTypeData = AnsiBuffer;
mii->cch = miiW.cch; mii->cch = miiW.cch;
return TRUE; return TRUE;
} }
@ -4022,7 +4025,6 @@ GetMenuItemInfoA(
} }
RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
RtlCopyMemory(mii, &miiW, miiW.cbSize);
mii->dwTypeData = AnsiBuffer; mii->dwTypeData = AnsiBuffer;
mii->cch = strlen(AnsiBuffer); mii->cch = strlen(AnsiBuffer);
return TRUE; return TRUE;
@ -4071,9 +4073,12 @@ GetMenuItemInfoW(
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE))
return FALSE; return FALSE;
RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over right user data.
if (!String || !Count) if (!String || !Count)
{ {
if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
mii->dwTypeData = String; // may not be zero.
mii->cch = miiW.cch; mii->cch = miiW.cch;
return TRUE; return TRUE;
} }
@ -4084,7 +4089,6 @@ GetMenuItemInfoW(
} }
RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
RtlCopyMemory(mii, &miiW, miiW.cbSize);
mii->dwTypeData = String; mii->dwTypeData = String;
mii->cch = strlenW(String); mii->cch = strlenW(String);
return TRUE; return TRUE;