Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 04:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK]

Browse source 
- Rearrange screensaver wait codes around the MsgWaitForMultipleObjects function
- Fixes screensaver configuration windows blocking the control panel
- Refs: http://blogs.msdn.com/b/oldnewthing/archive/2005/02/17/375307.aspx and http://codereflect.com/2008/09/19/when-and-how-should-we-use-msgwaitformultipleobjects/

See issue #4213 for more details.

svn path=/trunk/; revision=47548
This commit is contained in:
Gregor Schneider 2010-06-03 18:47:37 +00:00
parent 42667f14a0
commit 10dc21e801
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/dll/cpl/desk/screensaver.c
View file

@ -147,33 +147,32 @@ static BOOL
WaitForSettingsDialog(HWND hwndDlg, WaitForSettingsDialog(HWND hwndDlg,
HANDLE hProcess) HANDLE hProcess)
{ {
DWORD dwResult;
MSG msg;
while (TRUE) while (TRUE)
{ {
DWORD Ret; dwResult = MsgWaitForMultipleObjects(1,
MSG msg; &hProcess,
FALSE,
while (PeekMessage(&msg, INFINITE,
NULL, QS_ALLINPUT);
0, if (dwResult == WAIT_OBJECT_0 + 1)
0,
PM_REMOVE))
{ {
if (msg.message == WM_QUIT) if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
return FALSE;
if (IsDialogMessage(hwndDlg, &msg))
{ {
TranslateMessage(&msg); if (msg.message == WM_QUIT)
DispatchMessage(&msg); {
return FALSE;
}
if (IsDialogMessage(hwndDlg, &msg))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
} }
} }
else
Ret = MsgWaitForMultipleObjects(1,
&hProcess,
FALSE,
INFINITE,
QS_ALLINPUT);
if (Ret == (WAIT_OBJECT_0))
{ {
return TRUE; return TRUE;
} }