From 194045bb835d6cce239e5feb8de00ab34acc437d Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sat, 5 Feb 2022 01:57:15 +0100 Subject: [PATCH] [0.4.11][WIN32SS] Remove an ambiguous assert entirely CORE-16738 It popped up very reliably when performing git-clone of the ros sources while having the taskmgr open in the processes-tab. Or when building 'ninja bootcd -j1' while having the taskmgr open in the processes-tab. It is always possible to ignore it and then continue using ros for days without noticing any side effects. James Tabor judged the assert to have a "questionable logic". Giannis who once added it, was also ok with commenting it. His words: This assertion isn't something fatal, the worst thing that can happen from continuing on it would be to make the thread get awake more times than it should. The assert was once added by SVN r63880 == git 9ad857369a07eb8d84350c4680fa3ea373a818e3 Fix picked from: 0.4.14-dev-1519-g 87f6c82d854583f71546841f4432f57e4a2d6c99 commenting 2020-04-21 0.4.15-dev-3780-g bf164353035a2bc0f0d1d679d09f2e4076498fa1 removal 2022-02-05 --- win32ss/user/ntuser/misc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 83d0ad1fe58..1ce5424f742 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -419,7 +419,7 @@ NtUserGetGUIThreadInfo( EngSetLastError(ERROR_ACCESS_DENIED); RETURN( FALSE); } - + if ( W32Thread->MessageQueue ) MsgQueue = W32Thread->MessageQueue; else @@ -727,8 +727,6 @@ void UserDbgAssertThreadInfo(BOOL showCaller) ASSERT(pci->ulClientDelta == DesktopHeapGetUserDelta()); if (pti->pcti && pci->pDeskInfo) ASSERT(pci->pClientThreadInfo == (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta)); - if (pti->pcti && IsListEmpty(&pti->SentMessagesListHead)) - ASSERT((pti->pcti->fsChangeBits & QS_SENDMESSAGE) == 0); if (pti->KeyboardLayout) ASSERT(pci->hKL == pti->KeyboardLayout->hkl); if(pti->rpdesk != NULL)