DestroyMenu() fix
Andreas Mohr
andi at rhlx01.fht-esslingen.de
Tue Aug 27 14:44:53 CDT 2002
Hi all,
some programs (e.g. FilZip 2.01) make use of dynamic menus, i.e. they do:
hMenu = CreateMenu();
SetMenu(hWnd, hMenu);
DestroyMenu(hMenu);
hNewMenu = CreateMenu();
NO SetMenu(hWnd, hNewMenu); !!!!
The problem here was that our menu tracking code assumed that the
menu owned by hWnd still had hWnd as its owner window, which was not the
case due to the newly created menu, so our tracking code bailed out,
rendering the whole menu inaccessible.
Well, so I thought that DestroyMenu() didn't really destroy the hMenu,
only pretended it (since FilZip had not done a proper SetMenu(hWnd, 0) before).
Not so.
In a test program, a GetMenu() after that DestroyMenu of a still
registered menu returned 0 in fact, so the DestroyMenu had been
successful.
Then I thought that *maybe* a CreateMenu() right after the DestroyMenu()
would restore the hWnd <-> hMenu links somehow on Windows.
Not so either.
Windows still returned 0 for a GetMenu(hWnd); after having created the
new hMenu.
Then I had the idea of testing whether the menu functions I had been
using in my test program were doing exactly the same on Wine as on
Windows.
Not so. :-)
Turned out that a GetMenu() directly after a DestroyMenu()
returned 0 on Windows, but still returned the old, destroyed,
menu handle in Wine.
And this was in fact what FilZip had been checking !!:
DestroyMenu()
CreateMenu()
...prepare menu...
>>> if (GetMenu(hWnd) == 0)
>>> SetMenu(hWnd, hNewMenu);
So after all during the whole investigation I had just been misled
by the fact that FilZip only sets the menu in case the window didn't have
a menu already.
- make sure we clear the owning window's hMenu in case of DestroyMenu()
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.144
diff -u -r1.144 menu.c
--- controls/menu.c 4 Jun 2002 23:08:16 -0000 1.144
+++ controls/menu.c 27 Aug 2002 19:29:18 -0000
@@ -216,24 +216,24 @@
TRACE("%s ", prefix);
if (mp) {
UINT flags = mp->fType;
- int typ = MENU_ITEM_TYPE(flags);
+ int type = MENU_ITEM_TYPE(flags);
DPRINTF( "{ ID=0x%x", mp->wID);
if (flags & MF_POPUP)
DPRINTF( ", Sub=0x%x", mp->hSubMenu);
if (flags) {
int count = 0;
- DPRINTF( ", Typ=");
- if (typ == MFT_STRING)
+ DPRINTF( ", Type=");
+ if (type == MFT_STRING)
/* Nothing */ ;
- else if (typ == MFT_SEPARATOR)
+ else if (type == MFT_SEPARATOR)
MENUOUT("sep");
- else if (typ == MFT_OWNERDRAW)
+ else if (type == MFT_OWNERDRAW)
MENUOUT("own");
- else if (typ == MFT_BITMAP)
+ else if (type == MFT_BITMAP)
MENUOUT("bit");
else
MENUOUT("???");
- flags -= typ;
+ flags -= type;
MENUFLAG(MF_POPUP, "pop");
MENUFLAG(MFT_MENUBARBREAK, "barbrk");
@@ -265,7 +265,7 @@
if (mp->hUnCheckBit)
DPRINTF( ", Unc=0x%x", mp->hUnCheckBit);
- if (typ == MFT_STRING) {
+ if (type == MFT_STRING) {
if (mp->text)
DPRINTF( ", Text=%s", debugstr_w(mp->text));
else
@@ -357,11 +357,13 @@
{
HMENU hMenu;
+ TRACE("loading system menu, hWnd %04x, hPopupMenu %04x\n", hWnd, hPopupMenu);
if ((hMenu = CreateMenu()))
{
POPUPMENU *menu = MENU_GetMenu(hMenu);
menu->wFlags = MF_SYSMENU;
menu->hWnd = WIN_GetFullHandle( hWnd );
+ TRACE("hWnd %04x (hMenu %04x)\n", menu->hWnd, hMenu);
if (hPopupMenu == (HMENU)(-1))
hPopupMenu = MENU_CopySysPopup();
@@ -375,7 +377,7 @@
menu->items[0].fState = 0;
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;
}
DestroyMenu( hMenu );
@@ -678,7 +680,7 @@
key = toupper(key);
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;
do
@@ -1407,7 +1409,7 @@
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) )
{
@@ -1752,7 +1754,7 @@
/**********************************************************************
* 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().
*/
static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id,
@@ -1836,7 +1838,7 @@
/**********************************************************************
* 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 )
{
@@ -2254,7 +2256,7 @@
*/
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)
{
@@ -3842,6 +3844,9 @@
if (!lppop) return FALSE;
+ /* unregister menu in owning window */
+ SetWindowLongA( lppop->hWnd, GWL_ID, 0 );
+
lppop->wMagic = 0; /* Mark it as destroyed */
if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
@@ -4164,11 +4169,11 @@
WORD version, offset;
LPCSTR p = (LPCSTR)template;
- TRACE("%p\n", template );
version = GET_WORD(p);
p += sizeof(WORD);
+ TRACE("%p, ver %d\n", template, version );
switch (version)
- {
+ {
case 0:
offset = GET_WORD(p);
p += sizeof(WORD) + offset;
@@ -4192,7 +4197,7 @@
default:
ERR("version %d not supported.\n", version);
return 0;
- }
+ }
}
@@ -4362,8 +4367,8 @@
debug_print_menuitem("MENU_SetItemInfo_common from: ", menu, "");
if (lpmii->fMask & MIIM_TYPE ) {
- /* Get rid of old string. */
- if ( IS_STRING_ITEM(menu->fType) && menu->text) {
+ /* Get rid of old string. */
+ if (IS_STRING_ITEM(menu->fType) && menu->text) {
HeapFree(GetProcessHeap(), 0, menu->text);
menu->text = NULL;
}
@@ -4392,7 +4397,7 @@
if (lpmii->fMask & MIIM_STRING ) {
/* 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);
set_menu_item_text( menu, lpmii->dwTypeData, unicode );
}
More information about the wine-patches
mailing list