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

Unified Diff: third_party/crashpad/crashpad/util/win/nt_internals.cc

Issue 2585883002: Update Crashpad to 0567536f86fb10f9663fb30d6ebf08a7c35b975d (Closed)
Patch Set: Created 4 years 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 | « third_party/crashpad/crashpad/util/win/nt_internals.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/crashpad/crashpad/util/win/nt_internals.cc
diff --git a/third_party/crashpad/crashpad/util/win/nt_internals.cc b/third_party/crashpad/crashpad/util/win/nt_internals.cc
index 12201620e8334945959db5b1ab0fe8f495878060..97eba68b07e8b20e8d9a5c4be2ea84a74049a0d2 100644
--- a/third_party/crashpad/crashpad/util/win/nt_internals.cc
+++ b/third_party/crashpad/crashpad/util/win/nt_internals.cc
@@ -42,7 +42,9 @@ NTSTATUS NTAPI NtSuspendProcess(HANDLE);
NTSTATUS NTAPI NtResumeProcess(HANDLE);
-void* NTAPI RtlGetUnloadEventTrace();
+VOID NTAPI RtlGetUnloadEventTraceEx(PULONG* ElementSize,
+ PULONG* ElementCount,
+ PVOID* EventTrace);
namespace crashpad {
@@ -145,12 +147,12 @@ NTSTATUS NtResumeProcess(HANDLE handle) {
return nt_resume_process(handle);
}
-template <class Traits>
-RTL_UNLOAD_EVENT_TRACE<Traits>* RtlGetUnloadEventTrace() {
- static const auto rtl_get_unload_event_trace =
- GET_FUNCTION_REQUIRED(L"ntdll.dll", ::RtlGetUnloadEventTrace);
- return reinterpret_cast<RTL_UNLOAD_EVENT_TRACE<Traits>*>(
- rtl_get_unload_event_trace());
+void RtlGetUnloadEventTraceEx(ULONG** element_size,
+ ULONG** element_count,
+ void** event_trace) {
+ static const auto rtl_get_unload_event_trace_ex =
+ GET_FUNCTION_REQUIRED(L"ntdll.dll", ::RtlGetUnloadEventTraceEx);
+ rtl_get_unload_event_trace_ex(element_size, element_count, event_trace);
}
// Explicit instantiations with the only 2 valid template arguments to avoid
@@ -169,10 +171,4 @@ template NTSTATUS NtOpenThread<process_types::internal::Traits64>(
const process_types::CLIENT_ID<process_types::internal::Traits64>*
client_id);
-template RTL_UNLOAD_EVENT_TRACE<process_types::internal::Traits32>*
-RtlGetUnloadEventTrace<process_types::internal::Traits32>();
-
-template RTL_UNLOAD_EVENT_TRACE<process_types::internal::Traits64>*
-RtlGetUnloadEventTrace<process_types::internal::Traits64>();
-
} // namespace crashpad
« no previous file with comments | « third_party/crashpad/crashpad/util/win/nt_internals.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698