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

user32: Put some repeated code for checking and extending of a MENUITEMINFO structure in a separate function.

This commit is contained in:
Rein Klazes 2009-07-23 12:32:30 +02:00 committed by Alexandre Julliard
parent 57f23b875c
commit e9f4c6bb02
1 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dlls/user32/menu.c
View File

@ -4754,28 +4754,45 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
return TRUE; return TRUE;
} }
/**********************************************************************
* MENU_NormalizeMenuItemInfoStruct
*
* Helper for SetMenuItemInfo and InsertMenuItemInfo:
* check, copy and extend the MENUITEMINFO struct from the version that the application
* supplied to the version used by wine source. */
static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in,
MENUITEMINFOW *pmii_out )
{
/* do we recognize the size? */
if( pmii_in->cbSize != sizeof( MENUITEMINFOW) &&
pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) {
SetLastError( ERROR_INVALID_PARAMETER);
return FALSE;
}
/* copy the fields that we have */
memcpy( pmii_out, pmii_in, pmii_in->cbSize);
/* if the hbmpItem member is missing then extend */
if( pmii_in->cbSize != sizeof( MENUITEMINFOW)) {
pmii_out->cbSize = sizeof( MENUITEMINFOW);
pmii_out->hbmpItem = NULL;
}
return TRUE;
}
/********************************************************************** /**********************************************************************
* SetMenuItemInfoA (USER32.@) * SetMenuItemInfoA (USER32.@)
*/ */
BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos,
const MENUITEMINFOA *lpmii) const MENUITEMINFOA *lpmii)
{ {
MENUITEMINFOA mii; MENUITEMINFOW mii;
TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii);
if( lpmii->cbSize != sizeof( mii) && if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE;
lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) {
SetLastError( ERROR_INVALID_PARAMETER);
return FALSE;
}
memcpy( &mii, lpmii, lpmii->cbSize);
if( lpmii->cbSize != sizeof( mii)) {
mii.cbSize = sizeof( mii);
mii.hbmpItem = NULL;
}
return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
(const MENUITEMINFOW *)&mii, FALSE); &mii, FALSE);
} }
/********************************************************************** /**********************************************************************
@ -4788,16 +4805,7 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos,
TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii);
if( lpmii->cbSize != sizeof( mii) && if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE;
lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) {
SetLastError( ERROR_INVALID_PARAMETER);
return FALSE;
}
memcpy( &mii, lpmii, lpmii->cbSize);
if( lpmii->cbSize != sizeof( mii)) {
mii.cbSize = sizeof( mii);
mii.hbmpItem = NULL;
}
return SetMenuItemInfo_common(MENU_FindItem(&hmenu, return SetMenuItemInfo_common(MENU_FindItem(&hmenu,
&item, bypos? MF_BYPOSITION : 0), &mii, TRUE); &item, bypos? MF_BYPOSITION : 0), &mii, TRUE);
} }
@ -4900,23 +4908,14 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos,
const MENUITEMINFOA *lpmii) const MENUITEMINFOA *lpmii)
{ {
MENUITEM *item; MENUITEM *item;
MENUITEMINFOA mii; MENUITEMINFOW mii;
TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii);
if( lpmii->cbSize != sizeof( mii) && if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE;
lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) {
SetLastError( ERROR_INVALID_PARAMETER);
return FALSE;
}
memcpy( &mii, lpmii, lpmii->cbSize);
if( lpmii->cbSize != sizeof( mii)) {
mii.cbSize = sizeof( mii);
mii.hbmpItem = NULL;
}
item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
return SetMenuItemInfo_common(item, (const MENUITEMINFOW *)&mii, FALSE); return SetMenuItemInfo_common(item, &mii, FALSE);
} }
@ -4931,16 +4930,7 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos,
TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii);
if( lpmii->cbSize != sizeof( mii) && if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE;
lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) {
SetLastError( ERROR_INVALID_PARAMETER);
return FALSE;
}
memcpy( &mii, lpmii, lpmii->cbSize);
if( lpmii->cbSize != sizeof( mii)) {
mii.cbSize = sizeof( mii);
mii.hbmpItem = NULL;
}
item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
return SetMenuItemInfo_common(item, &mii, TRUE); return SetMenuItemInfo_common(item, &mii, TRUE);