Author: janderwald
Date: Mon Jul 17 23:16:30 2006
New Revision: 23128
URL:
http://svn.reactos.org/svn/reactos?rev=23128&view=rev
Log:
* unlink menu object from window object on destroy
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Mon Jul 17 23:16:30 2006
@@ -277,6 +277,7 @@
{
if(Menu)
{
+ PWINDOW_OBJECT Window;
PWINSTATION_OBJECT WindowStation;
NTSTATUS Status;
@@ -296,6 +297,15 @@
NULL);
if(NT_SUCCESS(Status))
{
+ if (Menu->MenuInfo.Wnd)
+ {
+ Window = UserGetWindowObject(Menu->MenuInfo.Wnd);
+ if (Window)
+ {
+ Window->IDMenu = 0;;
+ }
+
+ }
ObmDeleteObject(Menu->MenuInfo.Self, otMenu);
ObDereferenceObject(WindowStation);
return TRUE;