ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineboot: Don't abort shutdown if we have to terminate a process. 

We can sometimes get a FALSE result from WM_QUERYENDSESSION as a side-effect
of terminating a process. We should continue the shutdown process in this
case.
This commit is contained in:
Vincent Povirk 2010-07-22 16:49:35 -05:00 committed by Alexandre Julliard
parent 4f30ff875b
commit da8904d150
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/wineboot/shutdown.c
View File

@ -113,6 +113,7 @@ struct endtask_dlg_data
{ {
struct window_info *win; struct window_info *win;
BOOL cancelled; BOOL cancelled;
BOOL terminated;
}; };
static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
@ -138,6 +139,7 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
WINE_TRACE( "terminating process %04x\n", data->win[0].pid ); WINE_TRACE( "terminating process %04x\n", data->win[0].pid );
TerminateProcess( handle, 0 ); TerminateProcess( handle, 0 );
CloseHandle( handle ); CloseHandle( handle );
data->terminated = TRUE;
} }
return TRUE; return TRUE;
case MAKEWPARAM(IDCANCEL, BN_CLICKED): case MAKEWPARAM(IDCANCEL, BN_CLICKED):
@ -175,6 +177,7 @@ static LRESULT send_messages_with_timeout_dialog(
cb_data->window_count = count; cb_data->window_count = count;
dlg_data.win = win; dlg_data.win = win;
dlg_data.terminated = FALSE;
dlg_data.cancelled = FALSE; dlg_data.cancelled = FALSE;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -211,7 +214,7 @@ static LRESULT send_messages_with_timeout_dialog(
} }
if (!cb_data->window_count) if (!cb_data->window_count)
{ {
result = cb_data->result; result = dlg_data.terminated || cb_data->result;
HeapFree( GetProcessHeap(), 0, cb_data ); HeapFree( GetProcessHeap(), 0, cb_data );
if (!result) if (!result)
goto cleanup; goto cleanup;