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

Side by Side Diff: chrome_elf/chrome_elf_main.cc

Issue 2487783002: Make Crashpad use the user data dir, rather than always default location (Closed)
Patch Set: install_static for swarming Created 4 years 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_details.h"
11 #include "chrome/install_static/install_util.h" 11 #include "chrome/install_static/install_util.h"
12 #include "chrome/install_static/product_install_details.h" 12 #include "chrome/install_static/product_install_details.h"
13 #include "chrome/install_static/user_data_dir.h"
13 #include "chrome_elf/blacklist/blacklist.h" 14 #include "chrome_elf/blacklist/blacklist.h"
14 #include "chrome_elf/crash/crash_helper.h" 15 #include "chrome_elf/crash/crash_helper.h"
15 16
16 // This function is a temporary workaround for https://crbug.com/655788. We 17 // 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 18 // need to come up with a better way to initialize crash reporting that can
18 // happen inside DllMain(). 19 // happen inside DllMain().
19 void SignalInitializeCrashReporting() { 20 void SignalInitializeCrashReporting() {
20 if (!elf_crash::InitializeCrashReporting()) { 21 if (!elf_crash::InitializeCrashReporting()) {
21 #ifdef _DEBUG 22 #ifdef _DEBUG
22 assert(false); 23 assert(false);
23 #endif // _DEBUG 24 #endif // _DEBUG
24 } 25 }
25 } 26 }
26 27
27 void SignalChromeElf() { 28 void SignalChromeElf() {
28 blacklist::ResetBeacon(); 29 blacklist::ResetBeacon();
29 } 30 }
30 31
32 extern "C" void GetUserDataDirectoryThunk(wchar_t* user_data_dir,
33 size_t user_data_dir_length,
34 wchar_t* invalid_user_data_dir,
35 size_t invalid_user_data_dir_length) {
36 std::wstring user_data_dir_str, invalid_user_data_dir_str;
37 bool ret = install_static::GetUserDataDirectory(&user_data_dir_str,
38 &invalid_user_data_dir_str);
39 assert(ret);
40 install_static::IgnoreUnused(ret);
41 wcsncpy_s(user_data_dir, user_data_dir_length, user_data_dir_str.c_str(),
42 _TRUNCATE);
43 wcsncpy_s(invalid_user_data_dir, invalid_user_data_dir_length,
44 invalid_user_data_dir_str.c_str(), _TRUNCATE);
45 }
46
31 // Returns the payload for the ELF's InstallDetails instance. For use by 47 // Returns the payload for the ELF's InstallDetails instance. For use by
32 // install_static::InstallDetails::InitializeFromPrimaryModule. 48 // install_static::InstallDetails::InitializeFromPrimaryModule.
33 extern "C" const install_static::InstallDetails::Payload* 49 extern "C" const install_static::InstallDetails::Payload*
34 GetInstallDetailsPayload() { 50 GetInstallDetailsPayload() {
35 return install_static::InstallDetails::Get().GetPayload(); 51 return install_static::InstallDetails::Get().GetPayload();
36 } 52 }
37 53
38 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { 54 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
39 if (reason == DLL_PROCESS_ATTACH) { 55 if (reason == DLL_PROCESS_ATTACH) {
40 install_static::InitializeProductDetailsForPrimaryModule(); 56 install_static::InitializeProductDetailsForPrimaryModule();
41 57
42 // CRT on initialization installs an exception filter which calls
43 // 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
45 // its own unhandled exception filter.
46 #if !defined(ADDRESS_SANITIZER) 58 #if !defined(ADDRESS_SANITIZER)
59 // CRT on initialization installs an exception filter which calls
60 // TerminateProcess. We need to hook CRT's attempt to set an exception.
61 // NOTE: Do not hook if ASan is present, or ASan will fail to install
62 // its own unhandled exception filter.
47 elf_crash::DisableSetUnhandledExceptionFilter(); 63 elf_crash::DisableSetUnhandledExceptionFilter();
48 #endif // !defined (ADDRESS_SANITIZER) 64 #endif // !defined (ADDRESS_SANITIZER)
49 65
50 install_static::InitializeProcessType(); 66 install_static::InitializeProcessType();
51 67
52 __try { 68 __try {
53 blacklist::Initialize(false); // Don't force, abort if beacon is present. 69 blacklist::Initialize(false); // Don't force, abort if beacon is present.
54 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) { 70 } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
55 } 71 }
56 } else if (reason == DLL_PROCESS_DETACH) { 72 } else if (reason == DLL_PROCESS_DETACH) {
57 elf_crash::ShutdownCrashReporting(); 73 elf_crash::ShutdownCrashReporting();
58 } 74 }
59 return TRUE; 75 return TRUE;
60 } 76 }
OLDNEW
« chrome/install_static/user_data_dir_win_unittest.cc ('K') | « chrome_elf/chrome_elf.def ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698