- Add zap active and focus call. Fix comments.

svn path=/trunk/; revision=56831
This commit is contained in:
James Tabor 2012-07-04 22:51:16 +00:00
parent cab33b0688
commit 03578273c3
2 changed files with 12 additions and 3 deletions

View file

@ -246,8 +246,8 @@ IntNotifyWinEvent(
// Must be inside the event window. // Must be inside the event window.
if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event)) if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event))
{ {
// If all process || all thread || other thread same process // if all process || all thread || other thread same process
// If ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) // if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process)
if ( (!pEH->idProcess || pEH->idProcess == PtrToUint(pti->pEThread->Cid.UniqueProcess)) && if ( (!pEH->idProcess || pEH->idProcess == PtrToUint(pti->pEThread->Cid.UniqueProcess)) &&
(!(pEH->Flags & WINEVENT_SKIPOWNPROCESS) || pEH->head.pti->ppi != pti->ppi) && (!(pEH->Flags & WINEVENT_SKIPOWNPROCESS) || pEH->head.pti->ppi != pti->ppi) &&
(!pEH->idThread || pEH->idThread == PtrToUint(pti->pEThread->Cid.UniqueThread)) && (!pEH->idThread || pEH->idThread == PtrToUint(pti->pEThread->Cid.UniqueThread)) &&

View file

@ -118,7 +118,16 @@ NtUserCallNoParam(DWORD Routine)
RETURN( (DWORD_PTR)IntReleaseCapture()); RETURN( (DWORD_PTR)IntReleaseCapture());
case NOPARAM_ROUTINE_LOADUSERAPIHOOK: case NOPARAM_ROUTINE_LOADUSERAPIHOOK:
RETURN(UserLoadApiHook()); RETURN(UserLoadApiHook());
case NOPARAM_ROUTINE_ZAPACTIVEANDFOUS:
{
PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
ERR("Zapping the Active and Focus window out of the Queue!\n");
pti->MessageQueue->spwndFocus = NULL;
pti->MessageQueue->spwndActive = NULL;
RETURN(0);
}
default: default:
ERR("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine); ERR("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);