ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Set WM_EXITMENULOOP wParam same way as for WM_ENTERMENULOOP.

This commit is contained in:
Nikolay Sivov 2010-04-11 23:37:19 +04:00 committed by Alexandre Julliard
parent ab53187cf7
commit 6f0560dfa7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/user32/menu.c
View File

@ -3292,14 +3292,15 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags)
return TRUE; return TRUE;
} }
/*********************************************************************** /***********************************************************************
* MENU_ExitTracking * MENU_ExitTracking
*/ */
static BOOL MENU_ExitTracking(HWND hWnd) static BOOL MENU_ExitTracking(HWND hWnd, BOOL bPopup)
{ {
TRACE("hwnd=%p\n", hWnd); TRACE("hwnd=%p\n", hWnd);
SendMessageW( hWnd, WM_EXITMENULOOP, 0, 0 ); SendMessageW( hWnd, WM_EXITMENULOOP, bPopup, 0 );
ShowCaret(0); ShowCaret(0);
top_popup = 0; top_popup = 0;
top_popup_hmenu = NULL; top_popup_hmenu = NULL;
@ -3322,7 +3323,7 @@ void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt )
{ {
MENU_InitTracking( hWnd, hMenu, FALSE, wFlags ); MENU_InitTracking( hWnd, hMenu, FALSE, wFlags );
MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd, NULL ); MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd, NULL );
MENU_ExitTracking(hWnd); MENU_ExitTracking(hWnd, FALSE);
} }
} }
@ -3384,7 +3385,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar)
track_menu: track_menu:
MENU_TrackMenu( hTrackMenu, wFlags, 0, 0, hwnd, NULL ); MENU_TrackMenu( hTrackMenu, wFlags, 0, 0, hwnd, NULL );
MENU_ExitTracking( hwnd ); MENU_ExitTracking( hwnd, FALSE );
} }
/********************************************************************** /**********************************************************************
@ -3424,7 +3425,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 ))
ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd,
lpTpm ? &lpTpm->rcExclude : NULL ); lpTpm ? &lpTpm->rcExclude : NULL );
MENU_ExitTracking(hWnd); MENU_ExitTracking(hWnd, TRUE);
return ret; return ret;
} }