[0.4.8] cherry-pick [WINSRV] Don't try to remove messages from the queue without...

To prevent the visible symptom
'sporadic NTOSKRNL work queue deadlock when exiting command.com'

This partially reverts r58615 / 01729482ae.

(cherry picked from commit 3159de5573e3836e31241cc87724f1d3d1f8daf0)
cherry-picked by Joachim Henze

diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
index c3e14d3..e371ea4 100644 (file)
--- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
@@ -229,13 +229,10 @@ GuiConsoleInputThread(PVOID Param)
                  * that the window that we want to destroy doesn't exist yet.
                  * So first empty the message queue.
                  */
-                /*
                 while (PeekMessageW(&TempMsg, NULL, 0, 0, PM_REMOVE))
                 {
-                    TranslateMessage(&TempMsg);
                     DispatchMessageW(&TempMsg);
-                }*/
-                while (PeekMessageW(&TempMsg, NULL, 0, 0, PM_REMOVE)) ;
+                }
 
                 if (GuiData->hWindow == NULL) continue;