From 2b90a873580de14364a403ff2675c5db5bcac4e8 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 20 Jul 2017 20:26:14 +0000 Subject: [PATCH] [NtUser] - Patch by Huw Davies : Explicitly set last error to ERROR_SUCCESS. - Remove hack and added a note. svn path=/trunk/; revision=75382 --- reactos/win32ss/user/ntuser/menu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/reactos/win32ss/user/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c index 8228d3443d8..dbb2fff625a 100644 --- a/reactos/win32ss/user/ntuser/menu.c +++ b/reactos/win32ss/user/ntuser/menu.c @@ -4158,6 +4158,7 @@ static INT FASTCALL MENU_TrackMenu(PMENU pmenu, UINT wFlags, INT x, INT y, mt.TopMenu->TimeToHide = FALSE; } + EngSetLastError( ERROR_SUCCESS ); /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0; @@ -4251,7 +4252,7 @@ static BOOL FASTCALL MENU_ExitTracking(PWND pWnd, BOOL bPopup, UINT wFlags) */ VOID MENU_TrackMouseMenuBar( PWND pWnd, ULONG ht, POINT pt) { - PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); + PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); // See 74276 and CORE-12801 UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", pWnd, ht, pt.x, pt.y); @@ -4385,14 +4386,6 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, co_UserSetCapture(NULL); /* release the capture */ } - // - // HACK : Until back trace fault in co_IntUpdateWindows and MENU_TrackMenu. - // - if (EngGetLastError() == ERROR_ACCESS_DENIED) - { - EngSetLastError(NO_ERROR); - } - MENU_ExitTracking(pWnd, TRUE, wFlags); if (menu->hWnd) -- 2.17.1