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

Unified Diff: snapshot/win/process_reader_win.h

Issue 1349313003: win: support x64 reading x86 (wow64) (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: mac Created 5 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « snapshot/win/exception_snapshot_win_test.cc ('k') | snapshot/win/process_reader_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: snapshot/win/process_reader_win.h
diff --git a/snapshot/win/process_reader_win.h b/snapshot/win/process_reader_win.h
index f23d0d5375d496e94357b543747ff9abb753ed27..73ad1c610078de46d090ddef07c99b5fb75a324a 100644
--- a/snapshot/win/process_reader_win.h
+++ b/snapshot/win/process_reader_win.h
@@ -20,6 +20,7 @@
#include <vector>
+#include "build/build_config.h"
#include "util/misc/initialization_state_dcheck.h"
#include "util/win/address_types.h"
#include "util/win/process_info.h"
@@ -43,7 +44,12 @@ class ProcessReaderWin {
Thread();
~Thread() {}
- CONTEXT context;
+ union {
+ CONTEXT native;
+#if defined(ARCH_CPU_64_BITS)
+ WOW64_CONTEXT wow64;
+#endif;
+ } context;
uint64_t id;
WinVMAddress teb;
WinVMAddress stack_region_address;
@@ -108,7 +114,7 @@ class ProcessReaderWin {
private:
template <class Traits>
- void ReadThreadData();
+ void ReadThreadData(bool is_64_reading_32);
HANDLE process_;
ProcessInfo process_info_;
« no previous file with comments | « snapshot/win/exception_snapshot_win_test.cc ('k') | snapshot/win/process_reader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698