From 63f106a0fd888d994dfae60244e36ae718a01551 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 22 Mar 2025 00:49:20 +0100
Subject: [PATCH] Added plat_break() for raising breakpoints and warning() and
 log_warning() to raise visible non-fatal warnings to the user.

---
 src/86box.c               | 69 +++++++++++++++++++++++++++++++++++++++
 src/include/86box/86box.h |  7 ++--
 src/include/86box/log.h   |  1 +
 src/include/86box/plat.h  |  1 +
 src/qt/qt_platform.cpp    | 10 ++++++
 src/utils/log.c           | 25 ++++++++++++++
 6 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/src/86box.c b/src/86box.c
index 310d0b5d3..dbf58a70e 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -440,6 +440,75 @@ fatal_ex(const char *fmt, va_list ap)
     fflush(stdlog);
 }
 
+/* Log a warning error, and display a UI message without exiting. */
+void
+warning(const char *fmt, ...)
+{
+    char    temp[1024];
+    va_list ap;
+    char   *sp;
+
+    va_start(ap, fmt);
+
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+
+    vsprintf(temp, fmt, ap);
+    fprintf(stdlog, "%s", temp);
+    fflush(stdlog);
+    va_end(ap);
+
+    /* Make sure the message does not have a trailing newline. */
+    if ((sp = strchr(temp, '\n')) != NULL)
+        *sp = '\0';
+
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_ANSI, temp);
+
+    fflush(stdlog);
+
+    do_pause(0);
+}
+
+void
+warning_ex(const char *fmt, va_list ap)
+{
+    char  temp[1024];
+    char *sp;
+
+    if (stdlog == NULL) {
+        if (log_path[0] != '\0') {
+            stdlog = plat_fopen(log_path, "w");
+            if (stdlog == NULL)
+                stdlog = stdout;
+        } else
+            stdlog = stdout;
+    }
+
+    vsprintf(temp, fmt, ap);
+    fprintf(stdlog, "%s", temp);
+    fflush(stdlog);
+
+    /* Make sure the message does not have a trailing newline. */
+    if ((sp = strchr(temp, '\n')) != NULL)
+        *sp = '\0';
+
+    do_pause(2);
+
+    ui_msgbox(MBX_ERROR | MBX_ANSI, temp);
+
+    fflush(stdlog);
+
+    do_pause(0);
+}
+
 #ifdef ENABLE_PC_LOG
 int pc_do_log = ENABLE_PC_LOG;
 
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index 40e1f7927..174685c34 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -194,15 +194,12 @@ extern __thread int is_cpu_thread; /* Is this the CPU thread? */
 #ifdef HAVE_STDARG_H
 extern void pclog_ex(const char *fmt, va_list ap);
 extern void fatal_ex(const char *fmt, va_list ap);
+extern void warning_ex(const char *fmt, va_list ap);
 #endif
 extern void pclog_toggle_suppr(void);
-#ifdef _MSC_VER
-extern void pclog(const char *fmt, ...);
-extern void fatal(const char *fmt, ...);
-#else
 extern void pclog(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 extern void fatal(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-#endif
+extern void warning(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 extern void set_screen_size(int x, int y);
 extern void set_screen_size_monitor(int x, int y, int monitor_index);
 extern void reset_screen_size(void);
diff --git a/src/include/86box/log.h b/src/include/86box/log.h
index a37bdec4f..e247ef9c5 100644
--- a/src/include/86box/log.h
+++ b/src/include/86box/log.h
@@ -36,6 +36,7 @@ extern void log_out(void *priv, const char *fmt, va_list);
 extern void log_out_cyclic(void* priv, const char *fmt, va_list);
 #endif /*RELEASE_BUILD*/
 extern void log_fatal(void *priv, const char *fmt, ...);
+extern void log_warning(void *priv, const char *fmt, ...);
 extern void *log_open(const char *dev_name);
 extern void *log_open_cyclic(const char *dev_name);
 extern void  log_close(void *priv);
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 81874685e..7ed6e80d4 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -164,6 +164,7 @@ extern uint32_t plat_language_code(char *langcode);
 extern void     plat_language_code_r(uint32_t lcid, char *outbuf, int len);
 extern void     plat_get_cpu_string(char *outbuf, uint8_t len);
 extern void     plat_set_thread_name(void *thread, const char *name);
+extern void     plat_break(void);
 
 /* Resource management. */
 extern wchar_t *plat_get_string(int id);
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp
index ebd6dc30c..1364750b1 100644
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -842,3 +842,13 @@ plat_set_thread_name(void *thread, const char *name)
 #    endif
 #endif
 }
+
+void
+plat_break(void)
+{
+#ifdef Q_OS_WINDOWS
+    DebugBreak();
+#else
+    raise(SIGTRAP);
+#endif
+}
diff --git a/src/utils/log.c b/src/utils/log.c
index c8dddf62e..257029b51 100644
--- a/src/utils/log.c
+++ b/src/utils/log.c
@@ -294,6 +294,31 @@ log_fatal(void *priv, const char *fmt, ...)
     exit(-1);
 }
 
+void
+log_warning(void *priv, const char *fmt, ...)
+{
+    log_t  *log = (log_t *) priv;
+    char    temp[1024];
+    char    fmt2[1024];
+    va_list ap;
+
+    if (log == NULL)
+        return;
+
+    if (log->cyclic_buff != NULL) {
+        for (int i = 0; i < LOG_SIZE_BUFFER_CYCLIC_LINES; i++)
+            if (log->cyclic_buff[i] != NULL)
+                free(log->cyclic_buff[i]);
+        free(log->cyclic_buff);
+    }
+
+    va_start(ap, fmt);
+    log_copy(log, fmt2, fmt, 1024);
+    vsprintf(temp, fmt2, ap);
+    warning_ex(fmt2, ap);
+    va_end(ap);
+}
+
 static void *
 log_open_common(const char *dev_name, const int cyclic)
 {