Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 333907, XRE quits too abruptly when Windows is shut down, r=benjamin

Browse Source
This commit is contained in:
flamingice@sourmilk.net 2007-07-17 11:37:40 -07:00
parent 176d770ac2
commit 63193a345b
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
toolkit/xre/nsNativeAppSupportWin.cpp
View File

@ -73,6 +73,7 @@
#include "nsIWebNavigation.h"
#include "nsIWindowMediator.h"
#include "nsNativeCharsetUtils.h"
#include "nsIAppStartup.h"
#include <windows.h>
#include <shellapi.h>
@ -593,7 +594,7 @@ struct MessageWindow {
static long CALLBACK WindowProc( HWND msgWindow, UINT msg, WPARAM wp, LPARAM lp ) {
if ( msg == WM_COPYDATA ) {
if (!nsNativeAppSupportWin::mCanHandleRequests)
return 0;
return FALSE;
// This is an incoming request.
COPYDATASTRUCT *cds = (COPYDATASTRUCT*)lp;
@ -627,19 +628,37 @@ struct MessageWindow {
return win ? (long)hwndForDOMWindow( win ) : 0;
} else if ( msg == WM_QUERYENDSESSION ) {
if (!nsNativeAppSupportWin::mCanHandleRequests)
return 0;
// Invoke "-killAll" cmd line handler. That will close all open windows,
// and display dialog asking whether to save/don't save/cancel. If the
// user says cancel, then we pass that indicator along to the system
// in order to stop the system shutdown/logoff.
nsCOMPtr<nsICommandLineRunner> cmdLine
(do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
char* argv[] = { "-killAll", 0 };
if (cmdLine &&
NS_SUCCEEDED(cmdLine->Init(1, argv, nsnull,
nsICommandLine::STATE_REMOTE_AUTO))) {
return cmdLine->Run() != NS_ERROR_ABORT;
}
return FALSE;
nsCOMPtr<nsIObserverService> obsServ =
do_GetService("@mozilla.org/observer-service;1");
nsCOMPtr<nsISupportsPRBool> cancelQuit =
do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID);
cancelQuit->SetData(PR_FALSE);
obsServ->NotifyObservers(cancelQuit, "quit-application-requested", nsnull);
PRBool abortQuit;
cancelQuit->GetData(&abortQuit);
return !abortQuit;
} else if ( msg == WM_ENDSESSION ) {
if (!nsNativeAppSupportWin::mCanHandleRequests)
return FALSE;
if (wp == FALSE)
return TRUE;
nsCOMPtr<nsIObserverService> obsServ =
do_GetService("@mozilla.org/observer-service;1");
nsCOMPtr<nsIAppStartup> appService =
do_GetService("@mozilla.org/toolkit/app-startup;1");
if (obsServ)
obsServ->NotifyObservers(nsnull, "quit-application-granted", nsnull);
if (appService)
appService->Quit(nsIAppStartup::eForceQuit);
return TRUE;
}
return DefWindowProc( msgWindow, msg, wp, lp );
}