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

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: . 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
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..30b5e05c761921f9158d28e372deb0ac878f85d5 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,14 @@ class ProcessReaderWin {
Thread();
~Thread() {}
- CONTEXT context;
+#if defined(ARCH_CPU_64_BITS)
+ union {
+ CONTEXT context_native;
+ WOW64_CONTEXT context_wow64;
+ };
+#else
+ CONTEXT context_native;
Mark Mentovai 2015/09/18 15:44:07 Fix indentation.
scottmg 2015/09/18 19:45:26 Done.
+#endif // ARCH_CPU_64_BITS
uint64_t id;
WinVMAddress teb;
WinVMAddress stack_region_address;
@@ -108,7 +116,7 @@ class ProcessReaderWin {
private:
template <class Traits>
- void ReadThreadData();
+ void ReadThreadData(bool is_wow64);
HANDLE process_;
ProcessInfo process_info_;

Powered by Google App Engine
This is Rietveld 408576698