Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures.

Browse source 
GetMenuString now works the same on both windows and ROS.

svn path=/trunk/; revision=16594
This commit is contained in:
Jens Collin 2005-07-16 11:45:28 +00:00
parent 5638b3729f
commit 431d4a6295
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3772,7 +3772,7 @@ GetMenuItemInfoA(
RtlCopyMemory(mii, &miiW, miiW.cbSize); RtlCopyMemory(mii, &miiW, miiW.cbSize);
mii->dwTypeData = AnsiBuffer; mii->dwTypeData = AnsiBuffer;
mii->cch = strlen(AnsiBuffer);
return TRUE; return TRUE;
} }
@ -3864,11 +3864,11 @@ GetMenuStringA(
MENUITEMINFOA mii; MENUITEMINFOA mii;
mii.dwTypeData = lpString; mii.dwTypeData = lpString;
mii.fMask = MIIM_STRING; mii.fMask = MIIM_STRING;
mii.fType = MF_STRING;
mii.cbSize = sizeof(MENUITEMINFOA); mii.cbSize = sizeof(MENUITEMINFOA);
mii.cch = nMaxCount; mii.cch = nMaxCount;
UNIMPLEMENTED; if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&mii)))
if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii)))
return 0; return 0;
else else
return mii.cch; return mii.cch;
@ -3893,10 +3893,9 @@ GetMenuStringW(
miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cbSize = sizeof(MENUITEMINFOW);
miiW.cch = nMaxCount; miiW.cch = nMaxCount;
UNIMPLEMENTED; if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&miiW)))
if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW)))
return 0; return 0;
else else
return miiW.cch; return miiW.cch;
} }
@ -4318,11 +4317,11 @@ ModifyMenuA(
mii.fState = MFS_ENABLED; mii.fState = MFS_ENABLED;
UNIMPLEMENTED; UNIMPLEMENTED;
if(!GetMenuItemInfoA( hMnu, if(!GetMenuItemInfoA( hMnu,
uPosition, uPosition,
(BOOL)!(MF_BYPOSITION & uFlags), (BOOL)!(MF_BYPOSITION & uFlags),
&mii)) return FALSE; &mii)) return FALSE;
if(uFlags & MF_BITMAP) if(uFlags & MF_BITMAP)
{ {
@ -4341,7 +4340,7 @@ ModifyMenuA(
if(mii.dwTypeData != NULL) if(mii.dwTypeData != NULL)
{ {
HeapFree(GetProcessHeap(),0, mii.dwTypeData); HeapFree(GetProcessHeap(),0, mii.dwTypeData);
} }
/* Item beginning with a backspace is a help item */ /* Item beginning with a backspace is a help item */
if (*lpNewItem == '\b') if (*lpNewItem == '\b')
{ {
@ -4352,7 +4351,7 @@ ModifyMenuA(
mii.dwTypeData = (LPSTR)lpNewItem; mii.dwTypeData = (LPSTR)lpNewItem;
mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem));
} }
if(uFlags & MF_RIGHTJUSTIFY) if(uFlags & MF_RIGHTJUSTIFY)
{ {
mii.fType |= MFT_RIGHTJUSTIFY; mii.fType |= MFT_RIGHTJUSTIFY;
@ -4439,7 +4438,7 @@ ModifyMenuW(
if(mii.dwTypeData != NULL) if(mii.dwTypeData != NULL)
{ {
HeapFree(GetProcessHeap(),0, mii.dwTypeData); HeapFree(GetProcessHeap(),0, mii.dwTypeData);
} }
if (*lpNewItem == '\b') if (*lpNewItem == '\b')
{ {
mii.fType |= MF_HELP; mii.fType |= MF_HELP;
@ -4449,7 +4448,7 @@ ModifyMenuW(
mii.dwTypeData = (LPWSTR)lpNewItem; mii.dwTypeData = (LPWSTR)lpNewItem;
mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem));
} }
if(uFlags & MF_RIGHTJUSTIFY) if(uFlags & MF_RIGHTJUSTIFY)
{ {
mii.fType |= MFT_RIGHTJUSTIFY; mii.fType |= MFT_RIGHTJUSTIFY;