ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GetMenuString should return itemlength on 0 nMax or NULL str 

InsertItem pos=-1, flags = 0 should append item
(thanks to Sander van Leeuwen)
This commit is contained in:
Marcus Meissner 2000-01-08 22:25:57 +00:00 committed by Alexandre Julliard
parent 8b8a3438e2
commit cb3c7bfa70
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
controls/menu.c
View File

@ -1821,19 +1821,14 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
/* Find where to insert new item */ /* Find where to insert new item */
if ((flags & MF_BYPOSITION) && if ((pos==(UINT)-1) || ((flags & MF_BYPOSITION) && (pos == menu->nItems))) {
((pos == (UINT)-1) || (pos == menu->nItems)))
{
/* Special case: append to menu */ /* Special case: append to menu */
/* Some programs specify the menu length to do that */ /* Some programs specify the menu length to do that */
pos = menu->nItems; pos = menu->nItems;
} } else {
else
{
if (!MENU_FindItem( &hMenu, &pos, flags )) if (!MENU_FindItem( &hMenu, &pos, flags ))
{ {
WARN("item %x not found\n", FIXME("item %x not found\n", pos );
pos );
return NULL; return NULL;
} }
if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu)))
@ -3300,17 +3295,21 @@ INT16 WINAPI GetMenuString16( HMENU16 hMenu, UINT16 wItemID,
/******************************************************************* /*******************************************************************
* GetMenuString32A (USER32.268) * GetMenuString32A (USER32.268)
*/ */
INT WINAPI GetMenuStringA( HMENU hMenu, UINT wItemID, INT WINAPI GetMenuStringA(
LPSTR str, INT nMaxSiz, UINT wFlags ) HMENU hMenu, /* [in] menuhandle */
{ UINT wItemID, /* [in] menu item (dep. on wFlags) */
LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/
INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/
UINT wFlags /* [in] MF_ flags */
) {
MENUITEM *item; MENUITEM *item;
TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n", TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
hMenu, wItemID, str, nMaxSiz, wFlags ); hMenu, wItemID, str, nMaxSiz, wFlags );
if (!str || !nMaxSiz) return 0;
str[0] = '\0';
if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0; if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
if (!IS_STRING_ITEM(item->fType)) return 0; if (!IS_STRING_ITEM(item->fType)) return 0;
if (!str || !nMaxSiz) return strlen(item->text);
str[0] = '\0';
lstrcpynA( str, item->text, nMaxSiz ); lstrcpynA( str, item->text, nMaxSiz );
TRACE("returning '%s'\n", str ); TRACE("returning '%s'\n", str );
return strlen(str); return strlen(str);
@ -3327,10 +3326,10 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID,
TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n", TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
hMenu, wItemID, str, nMaxSiz, wFlags ); hMenu, wItemID, str, nMaxSiz, wFlags );
if (!str || !nMaxSiz) return 0;
str[0] = '\0';
if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0; if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
if (!IS_STRING_ITEM(item->fType)) return 0; if (!IS_STRING_ITEM(item->fType)) return 0;
if (!str || !nMaxSiz) return strlen(item->text);
str[0] = '\0';
lstrcpynAtoW( str, item->text, nMaxSiz ); lstrcpynAtoW( str, item->text, nMaxSiz );
return lstrlenW(str); return lstrlenW(str);
} }