system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

user: Make ExitWindowsEx asynchronous by deferring the real work to the explorer process.

Browse source
This commit is contained in:
Robert Shearman 2006-08-04 17:28:04 +01:00 committed by Alexandre Julliard
parent 5678ec4db6
commit b550f34f2e
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/user/user_main.c
View file

@ -411,6 +411,18 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason )
{
TRACE("(%x,%lx)\n", flags, reason);
if (!WIN_IsCurrentThread( GetDesktopWindow() ))
{
BOOL ret = PostMessageW( GetDesktopWindow(), WM_USER + 666,
MAKEWPARAM( flags, 0xbabe ), reason);
if (ret)
return TRUE;
/* this can happen if explorer hasn't been started or created the
* desktop window yet */
WARN("PostMessage failed with error %ld\n", GetLastError());
/* fall through to doing it in the same process */
}
if ((flags & EWX_FORCE) == 0)
{
HWND *list;
@ -468,6 +480,5 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason )
MESSAGE("wine: Failed to start wineboot\n");
}
ExitProcess(0);
return TRUE;
}

7
programs/explorer/desktop.c
View file

@ -62,6 +62,13 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR
}
return 0;
/* simple check to prevent applications accidentally triggering the
* ExitWindowsEx code if they send random messages to the desktop window */
case WM_USER + 666:
if (HIWORD(wp) == 0xbabe)
return ExitWindowsEx( LOWORD(wp), lp );
return DefWindowProcW( hwnd, message, wp, lp );
default:
return DefWindowProcW( hwnd, message, wp, lp );
}