Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: chrome_elf/chrome_elf_main.cc

Issue 2491463002: Revert of Windows install_static refactor. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome_elf/chrome_elf.def ('k') | chrome_elf/chrome_elf_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_elf/chrome_elf_main.h" 5 #include "chrome_elf/chrome_elf_main.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include "chrome/install_static/install_details.h"
11 #include "chrome/install_static/install_util.h" 10 #include "chrome/install_static/install_util.h"
12 #include "chrome/install_static/product_install_details.h"
13 #include "chrome_elf/blacklist/blacklist.h" 11 #include "chrome_elf/blacklist/blacklist.h"
14 #include "chrome_elf/crash/crash_helper.h" 12 #include "chrome_elf/crash/crash_helper.h"
15 13
16 // This function is a temporary workaround for https://crbug.com/655788. We 14 // This function is a temporary workaround for https://crbug.com/655788. We
17 // need to come up with a better way to initialize crash reporting that can 15 // need to come up with a better way to initialize crash reporting that can
18 // happen inside DllMain(). 16 // happen inside DllMain().
19 void SignalInitializeCrashReporting() { 17 void SignalInitializeCrashReporting() {
20 if (!elf_crash::InitializeCrashReporting()) { 18 if (!elf_crash::InitializeCrashReporting()) {
21 #ifdef _DEBUG 19 #ifdef _DEBUG
22 assert(false); 20 assert(false);
23 #endif // _DEBUG 21 #endif // _DEBUG
24 } 22 }
25 } 23 }
26 24
27 void SignalChromeElf() { 25 void SignalChromeElf() {
28 blacklist::ResetBeacon(); 26 blacklist::ResetBeacon();
29 } 27 }
30 28
31 // Returns the payload for the ELF's InstallDetails instance. For use by
32 // install_static::InstallDetails::InitializeFromPrimaryModule.
33 extern "C" const install_static::InstallDetails::Payload*
34 GetInstallDetailsPayload() {
35 return install_static::InstallDetails::Get().GetPayload();
36 }
37
38 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { 29 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
39 if (reason == DLL_PROCESS_ATTACH) { 30 if (reason == DLL_PROCESS_ATTACH) {
40 install_static::InitializeProductDetailsForPrimaryModule();
41
42 // CRT on initialization installs an exception filter which calls 31 // CRT on initialization installs an exception filter which calls
43 // TerminateProcess. We need to hook CRT's attempt to set an exception. 32 // TerminateProcess. We need to hook CRT's attempt to set an exception.
44 // NOTE: Do not hook if ASan is present, or ASan will fail to install 33 // NOTE: Do not hook if ASan is present, or ASan will fail to install
45 // its own unhandled exception filter. 34 // its own unhandled exception filter.
46 #if !defined(ADDRESS_SANITIZER) 35 #if !defined(ADDRESS_SANITIZER)
47 elf_crash::DisableSetUnhandledExceptionFilter(); 36 elf_crash::DisableSetUnhandledExceptionFilter();
48 #endif // !defined (ADDRESS_SANITIZER) 37 #endif // !defined (ADDRESS_SANITIZER)
49 38
50 install_static::InitializeProcessType(); 39 install_static::InitializeProcessType();
51 40
52 __try { 41 __try {
53 blacklist::Initialize(false); // Don't force, abort if beacon is present. 42 blacklist::Initialize(false); // Don't force, abort if beacon is present.
54 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) { 43 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
55 } 44 }
56 } else if (reason == DLL_PROCESS_DETACH) { 45 } else if (reason == DLL_PROCESS_DETACH) {
57 elf_crash::ShutdownCrashReporting(); 46 elf_crash::ShutdownCrashReporting();
58 } 47 }
59 return TRUE; 48 return TRUE;
60 } 49 }
OLDNEW
« no previous file with comments | « chrome_elf/chrome_elf.def ('k') | chrome_elf/chrome_elf_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698