Index: chrome/app/client_util.cc |
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc |
index 97ff58e1305ea12c91bfa5b68e50b580a7aaa085..a5327a7609cec1d532d36521809b2e25e78ce9e1 100644 |
--- a/chrome/app/client_util.cc |
+++ b/chrome/app/client_util.cc |
@@ -94,6 +94,16 @@ base::FilePath GetExecutableDir() { |
return base::FilePath(path).DirName(); |
} |
+bool IsSandboxedProcess() { |
+ typedef bool (*IsSandboxedProcessFunc)(); |
+ IsSandboxedProcessFunc is_sandboxed_process_func = |
+ reinterpret_cast<IsSandboxedProcessFunc>( |
+ GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess")); |
+ bool is_sandboxed_process = |
+ is_sandboxed_process_func && is_sandboxed_process_func(); |
+ return is_sandboxed_process; |
+} |
+ |
} // namespace |
base::string16 GetCurrentModuleVersion() { |
@@ -235,7 +245,16 @@ int MainDllLoader::Launch(HINSTANCE instance) { |
DLL_MAIN chrome_main = |
reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain")); |
int rc = chrome_main(instance, &sandbox_info); |
- return OnBeforeExit(rc, file); |
+ rc = OnBeforeExit(rc, file); |
+ // Sandboxed processes close some system DLL handles after lockdown so ignore |
+ // EXCEPTION_INVALID_HANDLE generated on Windows 10 during shutdown of these |
+ // processes. |
+ // TODO(wfh): Check whether MS have fixed this in Win10 RTM. crbug.com/456193 |
+ if (base::win::GetVersion() >= base::win::VERSION_WIN10 && |
+ IsSandboxedProcess()) { |
+ breakpad::ConsumeInvalidHandleExceptions(); |
rvargas (doing something else)
2015/02/25 02:02:57
Drive by:
I don't know what this code does (don't
|
+ } |
+ return rc; |
} |
void MainDllLoader::RelaunchChromeBrowserWithNewCommandLineIfNeeded() { |