Index: src/client/windows/crash_generation/crash_generation_client.cc |
=================================================================== |
--- src/client/windows/crash_generation/crash_generation_client.cc (revision 592) |
+++ src/client/windows/crash_generation/crash_generation_client.cc (working copy) |
@@ -271,7 +271,8 @@ |
return crash_event_ != NULL; |
} |
-bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info) { |
+bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info, |
+ MDRawAssertionInfo* assert_info) { |
if (!IsRegistered()) { |
return false; |
} |
@@ -279,33 +280,23 @@ |
exception_pointers_ = ex_info; |
thread_id_ = GetCurrentThreadId(); |
- assert_info_.line = 0; |
- assert_info_.type = 0; |
- assert_info_.expression[0] = 0; |
- assert_info_.file[0] = 0; |
- assert_info_.function[0] = 0; |
- |
- return SignalCrashEventAndWait(); |
-} |
- |
-bool CrashGenerationClient::RequestDump(MDRawAssertionInfo* assert_info) { |
- if (!IsRegistered()) { |
- return false; |
- } |
- |
- exception_pointers_ = NULL; |
- |
if (assert_info) { |
memcpy(&assert_info_, assert_info, sizeof(assert_info_)); |
} else { |
memset(&assert_info_, 0, sizeof(assert_info_)); |
} |
- thread_id_ = GetCurrentThreadId(); |
- |
return SignalCrashEventAndWait(); |
} |
+bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info) { |
+ return RequestDump(ex_info, NULL); |
+} |
+ |
+bool CrashGenerationClient::RequestDump(MDRawAssertionInfo* assert_info) { |
+ return RequestDump(NULL, assert_info); |
+} |
+ |
bool CrashGenerationClient::SignalCrashEventAndWait() { |
assert(crash_event_); |
assert(crash_generated_); |