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

Side by Side Diff: chrome_elf/chrome_elf_main.cc

Issue 2422643002: Windows install_static refactor. (Closed)
Patch Set: sync to position 431863 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
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"
10 #include "chrome/install_static/install_util.h" 11 #include "chrome/install_static/install_util.h"
12 #include "chrome/install_static/product_install_details.h"
11 #include "chrome_elf/blacklist/blacklist.h" 13 #include "chrome_elf/blacklist/blacklist.h"
12 #include "chrome_elf/crash/crash_helper.h" 14 #include "chrome_elf/crash/crash_helper.h"
13 15
14 // This function is a temporary workaround for https://crbug.com/655788. We 16 // This function is a temporary workaround for https://crbug.com/655788. We
15 // need to come up with a better way to initialize crash reporting that can 17 // need to come up with a better way to initialize crash reporting that can
16 // happen inside DllMain(). 18 // happen inside DllMain().
17 void SignalInitializeCrashReporting() { 19 void SignalInitializeCrashReporting() {
18 if (!elf_crash::InitializeCrashReporting()) { 20 if (!elf_crash::InitializeCrashReporting()) {
19 #ifdef _DEBUG 21 #ifdef _DEBUG
20 assert(false); 22 assert(false);
21 #endif // _DEBUG 23 #endif // _DEBUG
22 } 24 }
23 } 25 }
24 26
25 void SignalChromeElf() { 27 void SignalChromeElf() {
26 blacklist::ResetBeacon(); 28 blacklist::ResetBeacon();
27 } 29 }
28 30
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
29 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { 38 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
30 if (reason == DLL_PROCESS_ATTACH) { 39 if (reason == DLL_PROCESS_ATTACH) {
40 install_static::InitializeProductDetailsForPrimaryModule();
41
31 // CRT on initialization installs an exception filter which calls 42 // CRT on initialization installs an exception filter which calls
32 // TerminateProcess. We need to hook CRT's attempt to set an exception. 43 // TerminateProcess. We need to hook CRT's attempt to set an exception.
33 // NOTE: Do not hook if ASan is present, or ASan will fail to install 44 // NOTE: Do not hook if ASan is present, or ASan will fail to install
34 // its own unhandled exception filter. 45 // its own unhandled exception filter.
35 #if !defined(ADDRESS_SANITIZER) 46 #if !defined(ADDRESS_SANITIZER)
36 elf_crash::DisableSetUnhandledExceptionFilter(); 47 elf_crash::DisableSetUnhandledExceptionFilter();
37 #endif // !defined (ADDRESS_SANITIZER) 48 #endif // !defined (ADDRESS_SANITIZER)
38 49
39 install_static::InitializeProcessType(); 50 install_static::InitializeProcessType();
40 51
41 __try { 52 __try {
42 blacklist::Initialize(false); // Don't force, abort if beacon is present. 53 blacklist::Initialize(false); // Don't force, abort if beacon is present.
43 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) { 54 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
44 } 55 }
45 } else if (reason == DLL_PROCESS_DETACH) { 56 } else if (reason == DLL_PROCESS_DETACH) {
46 elf_crash::ShutdownCrashReporting(); 57 elf_crash::ShutdownCrashReporting();
47 } 58 }
48 return TRUE; 59 return TRUE;
49 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698