mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 07:07:05 +02:00
Code Issues Releases Wiki Activity

Comment out _set_purecall_handler to prevent the no-entry-point-error, let's find out the consequences :P

Browse Source
This commit is contained in:
Dominik Schmidt
2011-10-04 02:24:15 +02:00
parent 53acf6420e
commit 0aa65e2d95
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
thirdparty/breakpad/client/windows/handler/exception_handler.cc vendored
View File

@@ -223,8 +223,8 @@ void ExceptionHandler::Initialize(const wstring& dump_path,
previous_iph_ = _set_invalid_parameter_handler(HandleInvalidParameter); previous_iph_ = _set_invalid_parameter_handler(HandleInvalidParameter);
#endif // _MSC_VER >= 1400 #endif // _MSC_VER >= 1400
if (handler_types & HANDLER_PURECALL) // if (handler_types & HANDLER_PURECALL)
previous_pch_ = _set_purecall_handler(HandlePureVirtualCall); // previous_pch_ = _set_purecall_handler(HandlePureVirtualCall);
LeaveCriticalSection(&handler_stack_critical_section_); LeaveCriticalSection(&handler_stack_critical_section_);
} }
@@ -250,8 +250,8 @@ ExceptionHandler::~ExceptionHandler() {
_set_invalid_parameter_handler(previous_iph_); _set_invalid_parameter_handler(previous_iph_);
#endif // _MSC_VER >= 1400 #endif // _MSC_VER >= 1400
if (handler_types_ & HANDLER_PURECALL) // if (handler_types_ & HANDLER_PURECALL)
_set_purecall_handler(previous_pch_); // _set_purecall_handler(previous_pch_);
if (handler_stack_->back() == this) { if (handler_stack_->back() == this) {
handler_stack_->pop_back(); handler_stack_->pop_back();
@@ -380,7 +380,7 @@ class AutoExceptionHandler {
#if _MSC_VER >= 1400 // MSVC 2005/8 #if _MSC_VER >= 1400 // MSVC 2005/8
_set_invalid_parameter_handler(handler_->previous_iph_); _set_invalid_parameter_handler(handler_->previous_iph_);
#endif // _MSC_VER >= 1400 #endif // _MSC_VER >= 1400
_set_purecall_handler(handler_->previous_pch_); // _set_purecall_handler(handler_->previous_pch_);
} }
~AutoExceptionHandler() { ~AutoExceptionHandler() {
@@ -389,7 +389,7 @@ class AutoExceptionHandler {
#if _MSC_VER >= 1400 // MSVC 2005/8 #if _MSC_VER >= 1400 // MSVC 2005/8
_set_invalid_parameter_handler(ExceptionHandler::HandleInvalidParameter); _set_invalid_parameter_handler(ExceptionHandler::HandleInvalidParameter);
#endif // _MSC_VER >= 1400 #endif // _MSC_VER >= 1400
_set_purecall_handler(ExceptionHandler::HandlePureVirtualCall); // _set_purecall_handler(ExceptionHandler::HandlePureVirtualCall);
--ExceptionHandler::handler_stack_index_; --ExceptionHandler::handler_stack_index_;
LeaveCriticalSection(&ExceptionHandler::handler_stack_critical_section_); LeaveCriticalSection(&ExceptionHandler::handler_stack_critical_section_);
@@ -775,7 +775,7 @@ bool ExceptionHandler::WriteMinidumpWithException(
if (exinfo) { if (exinfo) {
// Find a memory region of 256 bytes centered on the // Find a memory region of 256 bytes centered on the
// faulting instruction pointer. // faulting instruction pointer.
const ULONG64 instruction_pointer = const ULONG64 instruction_pointer =
#if defined(_M_IX86) #if defined(_M_IX86)
exinfo->ContextRecord->Eip; exinfo->ContextRecord->Eip;
#elif defined(_M_AMD64) #elif defined(_M_AMD64)
@@ -854,7 +854,7 @@ BOOL CALLBACK ExceptionHandler::MinidumpWriteDumpCallback(
callback_context->finished = true; callback_context->finished = true;
return TRUE; return TRUE;
} }
// Include all modules. // Include all modules.
case IncludeModuleCallback: case IncludeModuleCallback:
case ModuleCallback: case ModuleCallback: