From de3f42794a664ff84737579b4d7917e2abb0f8c5 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Mon, 17 Jul 2006 19:16:30 +0000 Subject: [PATCH] * unlink menu object from window object on destroy svn path=/trunk/; revision=23128 --- reactos/subsystems/win32/win32k/ntuser/menu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/reactos/subsystems/win32/win32k/ntuser/menu.c b/reactos/subsystems/win32/win32k/ntuser/menu.c index 0a713370def..879f7334e08 100644 --- a/reactos/subsystems/win32/win32k/ntuser/menu.c +++ b/reactos/subsystems/win32/win32k/ntuser/menu.c @@ -277,6 +277,7 @@ IntDestroyMenuObject(PMENU_OBJECT Menu, { if(Menu) { + PWINDOW_OBJECT Window; PWINSTATION_OBJECT WindowStation; NTSTATUS Status; @@ -296,6 +297,15 @@ IntDestroyMenuObject(PMENU_OBJECT Menu, 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;