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

Make sure we clear the owning window's hMenu in DestroyMenu().

This commit is contained in:
Andreas Mohr 2002-08-28 23:31:56 +00:00 committed by Alexandre Julliard
parent aface53759
commit 8578f01960
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
controls/menu.c
View File

@ -216,24 +216,24 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
TRACE("%s ", prefix); TRACE("%s ", prefix);
if (mp) { if (mp) {
UINT flags = mp->fType; UINT flags = mp->fType;
int typ = MENU_ITEM_TYPE(flags); int type = MENU_ITEM_TYPE(flags);
DPRINTF( "{ ID=0x%x", mp->wID); DPRINTF( "{ ID=0x%x", mp->wID);
if (flags & MF_POPUP) if (flags & MF_POPUP)
DPRINTF( ", Sub=0x%x", mp->hSubMenu); DPRINTF( ", Sub=0x%x", mp->hSubMenu);
if (flags) { if (flags) {
int count = 0; int count = 0;
DPRINTF( ", Typ="); DPRINTF( ", Type=");
if (typ == MFT_STRING) if (type == MFT_STRING)
/* Nothing */ ; /* Nothing */ ;
else if (typ == MFT_SEPARATOR) else if (type == MFT_SEPARATOR)
MENUOUT("sep"); MENUOUT("sep");
else if (typ == MFT_OWNERDRAW) else if (type == MFT_OWNERDRAW)
MENUOUT("own"); MENUOUT("own");
else if (typ == MFT_BITMAP) else if (type == MFT_BITMAP)
MENUOUT("bit"); MENUOUT("bit");
else else
MENUOUT("???"); MENUOUT("???");
flags -= typ; flags -= type;
MENUFLAG(MF_POPUP, "pop"); MENUFLAG(MF_POPUP, "pop");
MENUFLAG(MFT_MENUBARBREAK, "barbrk"); MENUFLAG(MFT_MENUBARBREAK, "barbrk");
@ -265,7 +265,7 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
if (mp->hUnCheckBit) if (mp->hUnCheckBit)
DPRINTF( ", Unc=0x%x", mp->hUnCheckBit); DPRINTF( ", Unc=0x%x", mp->hUnCheckBit);
if (typ == MFT_STRING) { if (type == MFT_STRING) {
if (mp->text) if (mp->text)
DPRINTF( ", Text=%s", debugstr_w(mp->text)); DPRINTF( ", Text=%s", debugstr_w(mp->text));
else else
@ -357,11 +357,13 @@ HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu )
{ {
HMENU hMenu; HMENU hMenu;
TRACE("loading system menu, hWnd %04x, hPopupMenu %04x\n", hWnd, hPopupMenu);
if ((hMenu = CreateMenu())) if ((hMenu = CreateMenu()))
{ {
POPUPMENU *menu = MENU_GetMenu(hMenu); POPUPMENU *menu = MENU_GetMenu(hMenu);
menu->wFlags = MF_SYSMENU; menu->wFlags = MF_SYSMENU;
menu->hWnd = WIN_GetFullHandle( hWnd ); menu->hWnd = WIN_GetFullHandle( hWnd );
TRACE("hWnd %04x (hMenu %04x)\n", menu->hWnd, hMenu);
if (hPopupMenu == (HMENU)(-1)) if (hPopupMenu == (HMENU)(-1))
hPopupMenu = MENU_CopySysPopup(); hPopupMenu = MENU_CopySysPopup();
@ -375,7 +377,7 @@ HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu )
menu->items[0].fState = 0; menu->items[0].fState = 0;
if ((menu = MENU_GetMenu(hPopupMenu))) menu->wFlags |= MF_SYSMENU; if ((menu = MENU_GetMenu(hPopupMenu))) menu->wFlags |= MF_SYSMENU;
TRACE("GetSysMenu hMenu=%04x (%04x)\n", hMenu, hPopupMenu ); TRACE("hMenu=%04x (hPopup %04x)\n", hMenu, hPopupMenu );
return hMenu; return hMenu;
} }
DestroyMenu( hMenu ); DestroyMenu( hMenu );
@ -678,7 +680,7 @@ static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu,
key = toupper(key); key = toupper(key);
for (i = 0; i < menu->nItems; i++, item++) for (i = 0; i < menu->nItems; i++, item++)
{ {
if (item->text && (IS_STRING_ITEM(item->fType))) if (IS_STRING_ITEM(item->fType) && item->text)
{ {
WCHAR *p = item->text - 2; WCHAR *p = item->text - 2;
do do
@ -1407,7 +1409,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE;
} }
if( !(TWEAK_WineLook == WIN31_LOOK) && (lpitem->fState & MF_GRAYED)) if( (TWEAK_WineLook != WIN31_LOOK) && (lpitem->fState & MF_GRAYED))
{ {
if (!(lpitem->fState & MF_HILITE) ) if (!(lpitem->fState & MF_HILITE) )
{ {
@ -1752,7 +1754,7 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset )
/********************************************************************** /**********************************************************************
* MENU_SetItemData * MENU_SetItemData
* *
* Set an item flags, id and text ptr. Called by InsertMenu() and * Set an item's flags, id and text ptr. Called by InsertMenu() and
* ModifyMenu(). * ModifyMenu().
*/ */
static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id, static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id,
@ -1836,7 +1838,7 @@ static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id,
/********************************************************************** /**********************************************************************
* MENU_InsertItem * MENU_InsertItem
* *
* Insert a new item into a menu. * Insert (allocate) a new item into a menu.
*/ */
static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
{ {
@ -2254,7 +2256,7 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id )
*/ */
static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags )
{ {
TRACE("%p hmenu=0x%04x\n", pmt, hPtMenu); TRACE("%p hPtMenu=0x%04x\n", pmt, hPtMenu);
if (hPtMenu) if (hPtMenu)
{ {
@ -3842,6 +3844,9 @@ BOOL WINAPI DestroyMenu( HMENU hMenu )
if (!lppop) return FALSE; if (!lppop) return FALSE;
/* unregister menu in owning window */
SetWindowLongA( lppop->hWnd, GWL_ID, 0 );
lppop->wMagic = 0; /* Mark it as destroyed */ lppop->wMagic = 0; /* Mark it as destroyed */
if ((lppop->wFlags & MF_POPUP) && lppop->hWnd) if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
@ -4164,11 +4169,11 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
WORD version, offset; WORD version, offset;
LPCSTR p = (LPCSTR)template; LPCSTR p = (LPCSTR)template;
TRACE("%p\n", template );
version = GET_WORD(p); version = GET_WORD(p);
p += sizeof(WORD); p += sizeof(WORD);
TRACE("%p, ver %d\n", template, version );
switch (version) switch (version)
{ {
case 0: case 0:
offset = GET_WORD(p); offset = GET_WORD(p);
p += sizeof(WORD) + offset; p += sizeof(WORD) + offset;
@ -4192,7 +4197,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
default: default:
ERR("version %d not supported.\n", version); ERR("version %d not supported.\n", version);
return 0; return 0;
} }
} }
@ -4362,8 +4367,8 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
debug_print_menuitem("MENU_SetItemInfo_common from: ", menu, ""); debug_print_menuitem("MENU_SetItemInfo_common from: ", menu, "");
if (lpmii->fMask & MIIM_TYPE ) { if (lpmii->fMask & MIIM_TYPE ) {
/* Get rid of old string. */ /* Get rid of old string. */
if ( IS_STRING_ITEM(menu->fType) && menu->text) { if (IS_STRING_ITEM(menu->fType) && menu->text) {
HeapFree(GetProcessHeap(), 0, menu->text); HeapFree(GetProcessHeap(), 0, menu->text);
menu->text = NULL; menu->text = NULL;
} }
@ -4392,7 +4397,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
if (lpmii->fMask & MIIM_STRING ) { if (lpmii->fMask & MIIM_STRING ) {
/* free the string when used */ /* free the string when used */
if ( IS_STRING_ITEM(menu->fType) && menu->text) { if (IS_STRING_ITEM(menu->fType) && menu->text) {
HeapFree(GetProcessHeap(), 0, menu->text); HeapFree(GetProcessHeap(), 0, menu->text);
set_menu_item_text( menu, lpmii->dwTypeData, unicode ); set_menu_item_text( menu, lpmii->dwTypeData, unicode );
} }