From 497367ebeaa7d5c1bddeed3627797fdbfa0e572e Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 23 May 2025 15:12:29 +0200 Subject: [PATCH 1/2] feat: `crashpad_wait_for_upload` Windows support --- CHANGELOG.md | 1 + external/crashpad | 2 +- include/sentry.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 530d3b729..cb21b2a78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Provide `before_send_transaction` callback. ([#1236](https://github.com/getsentry/sentry-native/pull/1236)) - Add support for capturing events with local scopes. ([#1248](https://github.com/getsentry/sentry-native/pull/1248)) +- Add Windows support for the `crashpad_wait_for_upload` flag. ([#1255](https://github.com/getsentry/sentry-native/pull/1255), [crashpad#126](https://github.com/getsentry/crashpad/pull/126)) **Fixes**: diff --git a/external/crashpad b/external/crashpad index a17b30d42..a119dcb4b 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit a17b30d42ec667c92a99285429e4edf2f7196698 +Subproject commit a119dcb4bb572a22df8a2c2889a61687407cf721 diff --git a/include/sentry.h b/include/sentry.h index b9d37fa2a..7c3c8b8e5 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -1374,7 +1374,8 @@ SENTRY_API void sentry_options_set_system_crash_reporter_enabled( * Enables a wait for the crash report upload to be finished before shutting * down. This is disabled by default. * - * This setting only has an effect when using the `crashpad` backend on Linux. + * This setting only has an effect when using the `crashpad` backend on Linux + * and Windows. */ SENTRY_API void sentry_options_set_crashpad_wait_for_upload( sentry_options_t *opts, int wait_for_upload); From d6ae15aaba4a7f74e92a5cd42fbfc9ac3b4d2e5c Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Thu, 5 Jun 2025 14:14:52 +0200 Subject: [PATCH 2/2] update `crashpad` after merge to fork's `getsentry` branch --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index a119dcb4b..b2653919b 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit a119dcb4bb572a22df8a2c2889a61687407cf721 +Subproject commit b2653919b42cf310482a9e33620cf82e952b5d2d