Subject: Release GWL_ID with DestroyMenue, eventually
Date: Sat, 28 Jun 2003 22:02:11 +0200
Changelog:
wine/controls/menu.c: DestroyMenu
Release GWL_ID of lppop->hWnd if it is the same
hMenu we are going to destroy
This lets Capital Eimkommenssteuer 2003 (Infotax Steuer02) access it's Menu
bar.
Also following patchs
From: Marco Pietrobono <pietrobo@pietrobo.com>
Sender: wine-patches-admin@winehq.com
To: wine-patches@winehq.com
Subject: DestroyMenu doesn't remove the link between window and menu under
some conditions...
Date: 07 Apr 2003 12:48:37 +0200
seems to tackle the same problem and wasn't applied neither.
--
Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.164
diff -u -r1.164 menu.c
--- wine/controls/menu.c 12 May 2003 03:19:03 -0000 1.164
+++ wine/controls/menu.c 8 Jul 2003 21:15:59 -0000
@@ -3646,6 +3646,12 @@
lppop->wMagic = 0; /* Mark it as destroyed */
+ /* Release GWL_ID of lppop->hWnd if it is the same
+ hMenu we are going to destroy*/
+ if(lppop->hWnd &&
+ (HMENU)(GetWindowLongA( lppop->hWnd, GWL_ID ) == hMenu ))
+ SetWindowLongA( lppop->hWnd, GWL_ID, (LONG_PTR)0 );
+
if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
{
DestroyWindow( lppop->hWnd );
