From fbb2c9bdf8f7b2232624a9df35f188c700810910 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@sloboda.ru>
Date: Sat, 9 Sep 2000 19:38:34 +0000
Subject: [PATCH] GetMenu might be used to get child window id.

---
 controls/menu.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/controls/menu.c b/controls/menu.c
index 568b25049bb..6c60391bc5f 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -4036,16 +4036,15 @@ HMENU16 WINAPI GetMenu16( HWND16 hWnd )
  *         GetMenu    (USER32.257)
  */
 HMENU WINAPI GetMenu( HWND hWnd ) 
-{ 
+{
     HMENU retvalue;
     WND * wndPtr = WIN_FindWndPtr(hWnd);
-    if (wndPtr && !(wndPtr->dwStyle & WS_CHILD)) 
-    {
-        retvalue = (HMENU)wndPtr->wIDmenu;
-        goto END;
-    }
-    retvalue = 0;
-END:
+
+    if (!wndPtr) return 0;
+
+    retvalue = (HMENU)wndPtr->wIDmenu;
+    TRACE("for %swindow %04x returning %04x\n",
+          (wndPtr->dwStyle & WS_CHILD) ? "child " : "", hWnd, retvalue);
     WIN_ReleaseWndPtr(wndPtr);
     return retvalue;
 }
-- 
2.11.4.GIT