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

Broken explorer popups with IsBadString, revert string pointer checking. Misc fix to win32k menu and removed byposition flag check and save.

Browse source 
svn path=/trunk/; revision=23274
This commit is contained in:
James Tabor 2006-07-25 00:50:35 +00:00
parent f1470917fa
commit b8da24b40b
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3698,11 +3698,6 @@ MenuSetItemData(
mii->fType |= MFT_RIGHTJUSTIFY; mii->fType |= MFT_RIGHTJUSTIFY;
} }
if(Flags & MF_BYPOSITION)
{
mii->fType |= MF_BYPOSITION;
}
if(Flags & MF_MENUBREAK) if(Flags & MF_MENUBREAK)
{ {
mii->fType |= MFT_MENUBREAK; mii->fType |= MFT_MENUBREAK;
@ -4396,9 +4391,6 @@ InsertMenuItemA(
((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING)))
&& mi.dwTypeData != NULL) && mi.dwTypeData != NULL)
{ {
UINT Count = lpmii->cch;
if(!Count) Count++;
if (IsBadStringPtrA(lpmii->dwTypeData, Count)) return FALSE;
Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData);
if (!NT_SUCCESS (Status)) if (!NT_SUCCESS (Status))
{ {
@ -4451,9 +4443,6 @@ InsertMenuItemW(
((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING)))
&& mi.dwTypeData != NULL) && mi.dwTypeData != NULL)
{ {
UINT Count = lpmii->cch;
if(!Count) Count++;
if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE;
RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData); RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData);
mi.dwTypeData = MenuText.Buffer; mi.dwTypeData = MenuText.Buffer;
mi.cch = MenuText.Length / sizeof(WCHAR); mi.cch = MenuText.Length / sizeof(WCHAR);
@ -4826,9 +4815,6 @@ SetMenuItemInfoA(
&& MenuItemInfoW.dwTypeData != NULL) && MenuItemInfoW.dwTypeData != NULL)
{ {
/* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ /* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */
UINT Count = lpmii->cch;
if(!Count) Count++;
if (IsBadStringPtrA(lpmii->dwTypeData, Count )) return FALSE;
Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString,
(LPSTR)MenuItemInfoW.dwTypeData); (LPSTR)MenuItemInfoW.dwTypeData);
if (!NT_SUCCESS (Status)) if (!NT_SUCCESS (Status))
@ -4883,9 +4869,6 @@ SetMenuItemInfoW(
(MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING)))
&& MenuItemInfoW.dwTypeData != NULL) && MenuItemInfoW.dwTypeData != NULL)
{ {
UINT Count = lpmii->cch;
if (!Count) Count++;
if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE;
MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData);
} }
Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition,

5
reactos/subsystems/win32/win32k/ntuser/menu.c
View file

@ -756,7 +756,7 @@ BOOL FASTCALL
IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii)
{ {
PMENU_OBJECT SubMenuObject; PMENU_OBJECT SubMenuObject;
UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MF_BYPOSITION | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP);
if(!MenuItem || !MenuObject || !lpmii) if(!MenuItem || !MenuObject || !lpmii)
{ {
@ -805,7 +805,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
SetLastNtError( ERROR_INVALID_PARAMETER); SetLastNtError( ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
} }
MenuItem->fType |= lpmii->fType; MenuItem->fType |= lpmii->fType; /* Need to save all the flags, this fixed MFT_RIGHTJUSTIFY */
} }
if(lpmii->fMask & MIIM_BITMAP) if(lpmii->fMask & MIIM_BITMAP)
{ {
@ -1058,6 +1058,7 @@ IntBuildMenuItemList(PMENU_OBJECT MenuObject, PVOID Buffer, ULONG nMax)
mii.hSubMenu = CurItem->hSubMenu; mii.hSubMenu = CurItem->hSubMenu;
mii.Rect = CurItem->Rect; mii.Rect = CurItem->Rect;
mii.XTab = CurItem->XTab; mii.XTab = CurItem->XTab;
mii.Text = CurItem->Text.Buffer;
Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO)); Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO));
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))