diff options
Diffstat (limited to 'src/client/windows/handler')
| -rw-r--r-- | src/client/windows/handler/exception_handler.cc | 18 | ||||
| -rw-r--r-- | src/client/windows/handler/exception_handler.h | 12 |
2 files changed, 14 insertions, 16 deletions
diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc index 14c2cf86..3a2f824c 100644 --- a/src/client/windows/handler/exception_handler.cc +++ b/src/client/windows/handler/exception_handler.cc @@ -96,7 +96,7 @@ ExceptionHandler::ExceptionHandler(const wstring& dump_path, pipe_handle, NULL, // crash_generation_client custom_info); -} +} ExceptionHandler::ExceptionHandler( const wstring& dump_path, @@ -104,19 +104,19 @@ ExceptionHandler::ExceptionHandler( MinidumpCallback callback, void* callback_context, int handler_types, - MINIDUMP_TYPE dump_type, - CrashGenerationClient* crash_generation_client, - const CustomClientInfo* custom_info) { + CrashGenerationClient* crash_generation_client) { + // The dump_type, pipe_name and custom_info that are passed in to Initialize() + // are not used. The ones set in crash_generation_client are used instead. Initialize(dump_path, filter, callback, callback_context, handler_types, - MiniDumpNormal, - NULL, // pipe_name - NULL, // pipe_handle + MiniDumpNormal, // dump_type - not used + NULL, // pipe_name - not used + NULL, // pipe_handle crash_generation_client, - custom_info); + NULL); // custom_info - not used } ExceptionHandler::ExceptionHandler(const wstring &dump_path, @@ -875,7 +875,7 @@ BOOL CALLBACK ExceptionHandler::MinidumpWriteDumpCallback( callback_context->iter++; return TRUE; } - + // Include all modules. case IncludeModuleCallback: case ModuleCallback: diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h index 2c8ff7d9..539c6662 100644 --- a/src/client/windows/handler/exception_handler.h +++ b/src/client/windows/handler/exception_handler.h @@ -61,9 +61,9 @@ #include <DbgHelp.h> #include <rpc.h> -#pragma warning( push ) +#pragma warning(push) // Disable exception handler warnings. -#pragma warning( disable : 4530 ) +#pragma warning(disable:4530) #include <list> #include <string> @@ -212,9 +212,7 @@ class ExceptionHandler { MinidumpCallback callback, void* callback_context, int handler_types, - MINIDUMP_TYPE dump_type, - CrashGenerationClient* crash_generation_client, - const CustomClientInfo* custom_info); + CrashGenerationClient* crash_generation_client); ~ExceptionHandler(); @@ -497,7 +495,7 @@ class ExceptionHandler { static CRITICAL_SECTION handler_stack_critical_section_; // The number of instances of this class. - volatile static LONG instance_count_; + static volatile LONG instance_count_; // disallow copy ctor and operator= explicit ExceptionHandler(const ExceptionHandler &); @@ -506,6 +504,6 @@ class ExceptionHandler { } // namespace google_breakpad -#pragma warning( pop ) +#pragma warning(pop) #endif // CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__ |