From aac890314cf98b314dcf54d5ac72054d8a53d788 Mon Sep 17 00:00:00 2001
From: Leonid Yuriev <leo@yuriev.ru>
Date: Sun, 9 Nov 2025 12:26:28 +0300
Subject: [PATCH] mdbx-windows: refine assertion handling for debug builds.

---
 mdbx.h                  |  5 ++++-
 src/logging_and_debug.h |  5 ++++-
 src/osal.c              | 18 ++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/mdbx.h b/mdbx.h
index cdf6f046..f957eee0 100644
--- a/mdbx.h
+++ b/mdbx.h
@@ -1012,7 +1012,10 @@ MDBX_NORETURN LIBMDBX_API void mdbx_panic(const char *fmt, ...) MDBX_PRINTF_ARGS
 
 /** \brief Panics with asserton failed message and causes abnormal process
  * termination. */
-MDBX_NORETURN LIBMDBX_API void mdbx_assert_fail(const MDBX_env *env, const char *msg, const char *func, unsigned line);
+#if !((defined(_WIN32) || defined(_WIN64)) && !MDBX_WITHOUT_MSVC_CRT)
+MDBX_NORETURN
+#endif /* MDBX_WITHOUT_MSVC_CRT */
+LIBMDBX_API void mdbx_assert_fail(const MDBX_env *env, const char *msg, const char *func, unsigned line);
 /** end of c_debug @} */
 
 /** \brief Environment flags
diff --git a/src/logging_and_debug.h b/src/logging_and_debug.h
index 3141f3cd..61e49c82 100644
--- a/src/logging_and_debug.h
+++ b/src/logging_and_debug.h
@@ -86,7 +86,10 @@ MDBX_INTERNAL void debug_log_va(int level, const char *function, int line, const
 #if MDBX_DEBUG
 #define ASSERT_FAIL(env, msg, func, line) mdbx_assert_fail(env, msg, func, line)
 #else /* MDBX_DEBUG */
-MDBX_NORETURN __cold void assert_fail(const char *msg, const char *func, unsigned line);
+#if !((defined(_WIN32) || defined(_WIN64)) && defined(_DEBUG) && !MDBX_WITHOUT_MSVC_CRT)
+MDBX_NORETURN
+#endif
+__cold void assert_fail(const char *msg, const char *func, unsigned line);
 #define ASSERT_FAIL(env, msg, func, line)                                                                              \
   do {                                                                                                                 \
     (void)(env);                                                                                                       \
diff --git a/src/osal.c b/src/osal.c
index ec823d32..bd62a0c2 100644
--- a/src/osal.c
+++ b/src/osal.c
@@ -205,7 +205,7 @@ __cold void mdbx_assert_fail(const MDBX_env *env, const char *msg, const char *f
   assert_fail(msg, func, line);
 }
 
-MDBX_NORETURN __cold void assert_fail(const char *msg, const char *func, unsigned line) {
+__cold void assert_fail(const char *msg, const char *func, unsigned line) {
 #endif /* MDBX_DEBUG */
 
   if (globals.logger.ptr)
@@ -224,13 +224,19 @@ MDBX_NORETURN __cold void assert_fail(const char *msg, const char *func, unsigne
 
   while (1) {
 #if defined(_WIN32) || defined(_WIN64)
-#if !MDBX_WITHOUT_MSVC_CRT && defined(_DEBUG)
-    _CrtDbgReport(_CRT_ASSERT, func ? func : "unknown", line, "libmdbx", "assertion failed: %s", msg);
+#if defined(_DEBUG) && !MDBX_WITHOUT_MSVC_CRT
+    if (_CrtDbgReport(_CRT_ASSERT, func ? func : "unknown", line, "libmdbx", "assertion failed: %s", msg) == 0)
+      return /* user chooses the "Continue" button */;
+    else {
+      /* user chooses the "Retry" button */
+      if (IsDebuggerPresent())
+        DebugBreak();
+    }
 #else
     if (IsDebuggerPresent())
       DebugBreak();
-#endif
     FatalExit(STATUS_ASSERTION_FAILURE);
+#endif
 #else
     abort();
 #endif
@@ -252,14 +258,14 @@ __cold void mdbx_panic(const char *fmt, ...) {
 
   while (1) {
 #if defined(_WIN32) || defined(_WIN64)
-#if !MDBX_WITHOUT_MSVC_CRT && defined(_DEBUG)
+#if defined(_DEBUG) && !MDBX_WITHOUT_MSVC_CRT
     _CrtDbgReport(_CRT_ASSERT, "mdbx.c", 0, "libmdbx", "panic: %s", const_message);
 #else
     OutputDebugStringA("\r\nMDBX-PANIC: ");
     OutputDebugStringA(const_message);
+#endif
     if (IsDebuggerPresent())
       DebugBreak();
-#endif
     FatalExit(ERROR_UNHANDLED_ERROR);
 #else
     __assert_fail(const_message, "mdbx-panic", 0, const_message);