@@ -6636,49 +6636,51 @@ NtUserTrackPopupMenuEx(
66366636 HWND hWnd ,
66376637 LPTPMPARAMS lptpm )
66386638{
6639- PMENU menu ;
6640- PWND pWnd ;
6641- TPMPARAMS tpm ;
6642- BOOL Ret = FALSE;
6643- USER_REFERENCE_ENTRY Ref ;
6639+ PMENU menu ;
6640+ PWND pWnd ;
6641+ TPMPARAMS tpm ;
6642+ BOOL Ret = FALSE;
6643+ USER_REFERENCE_ENTRY Ref ;
66446644
6645- TRACE ("Enter NtUserTrackPopupMenuEx\n" );
6646- UserEnterExclusive ();
6647- /* Parameter check */
6648- if (!(menu = UserGetMenuObject ( hMenu )))
6649- {
6650- ERR ("TPME : Invalid Menu handle.\n" );
6651- EngSetLastError ( ERROR_INVALID_MENU_HANDLE );
6652- goto Exit ;
6653- }
6645+ TRACE ("Enter NtUserTrackPopupMenuEx\n" );
6646+ UserEnterExclusive ();
66546647
6655- if (!(pWnd = UserGetWindowObject (hWnd )))
6656- {
6657- ERR ("TPME : Invalid Window handle.\n" );
6658- goto Exit ;
6659- }
6648+ /* Parameter check */
6649+ if (!(menu = UserGetMenuObject ( hMenu )))
6650+ {
6651+ ERR ("TPME : Invalid Menu handle.\n" );
6652+ EngSetLastError ( ERROR_INVALID_MENU_HANDLE );
6653+ goto Exit ;
6654+ }
66606655
6661- if (lptpm )
6662- {
6663- _SEH2_TRY
6664- {
6665- ProbeForRead (lptpm , sizeof (TPMPARAMS ), sizeof (ULONG ));
6666- tpm = * lptpm ;
6667- }
6668- _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER )
6669- {
6670- _SEH2_YIELD (goto Exit );
6671- }
6672- _SEH2_END
6673- }
6674- UserRefObjectCo (pWnd , & Ref );
6675- Ret = IntTrackPopupMenuEx (menu , fuFlags , x , y , pWnd , lptpm ? & tpm : NULL );
6676- UserDerefObjectCo (pWnd );
6656+ if (!(pWnd = UserGetWindowObject (hWnd )))
6657+ {
6658+ ERR ("TPME : Invalid Window handle.\n" );
6659+ goto Exit ;
6660+ }
6661+
6662+ if (lptpm )
6663+ {
6664+ _SEH2_TRY
6665+ {
6666+ ProbeForRead (lptpm , sizeof (TPMPARAMS ), sizeof (ULONG ));
6667+ tpm = * lptpm ;
6668+ }
6669+ _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER )
6670+ {
6671+ _SEH2_YIELD (goto Exit );
6672+ }
6673+ _SEH2_END
6674+ }
6675+
6676+ UserRefObjectCo (pWnd , & Ref );
6677+ Ret = IntTrackPopupMenuEx (menu , fuFlags , x , y , pWnd , lptpm ? & tpm : NULL );
6678+ UserDerefObjectCo (pWnd );
66776679
66786680Exit :
6679- TRACE ("Leave NtUserTrackPopupMenuEx, ret=%i\n" ,Ret );
6680- UserLeave ();
6681- return Ret ;
6681+ TRACE ("Leave NtUserTrackPopupMenuEx, ret=%i\n" ,Ret );
6682+ UserLeave ();
6683+ return Ret ;
66826684}
66836685
66846686/* EOF */
0 commit comments