From 48a5f3280fed8def764c6d8406a252155964eea1 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Mar 2025 17:26:44 +0100 Subject: [PATCH 1/5] device_t: Increase the selection array to 64 elements. --- src/include/86box/device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/86box/device.h b/src/include/86box/device.h index fb86d2adc..91ff2daa6 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -153,7 +153,7 @@ typedef struct _device_config_ { int default_int; const char *file_filter; const device_config_spinner_t spinner; - const device_config_selection_t selection[32]; + const device_config_selection_t selection[64]; const device_config_bios_t bios[32]; } device_config_t; From 8a2d841322c2af189acad170a678cad70cd11c24 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Mar 2025 17:29:42 +0100 Subject: [PATCH 2/5] OpenGL Renderer: Mark reloadRendererOption() as override, fixes compile on Mac. --- src/qt/qt_openglrenderer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_openglrenderer.hpp b/src/qt/qt_openglrenderer.hpp index 9db1e7307..4d1f68acb 100644 --- a/src/qt/qt_openglrenderer.hpp +++ b/src/qt/qt_openglrenderer.hpp @@ -70,7 +70,7 @@ public: void finalize() override final; bool hasOptions() const override { return true; } QDialog *getOptions(QWidget *parent) override; - bool reloadRendererOption() { return true; } + bool reloadRendererOption() override { return true; } signals: void initialized(); From c763c6db169c2b4f2ed9d1f8177d36d67166edfa Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Mar 2025 17:31:18 +0100 Subject: [PATCH 3/5] INI: Include so iswspace() is also found in Linux. --- src/ini.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ini.c b/src/ini.c index 503b17ae3..f5dfdef46 100644 --- a/src/ini.c +++ b/src/ini.c @@ -33,6 +33,7 @@ #include #include #include +#include #define HAVE_STDARG_H #include <86box/86box.h> #include <86box/ini.h> From 6fa39b3a67a0818f3d6a2535e5074d5901558cc1 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Mar 2025 17:32:46 +0100 Subject: [PATCH 4/5] OpenGL Renderer: Explicitly cast const char * to char *. --- src/qt/qt_openglrenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_openglrenderer.cpp b/src/qt/qt_openglrenderer.cpp index 97a782f57..860b5d303 100644 --- a/src/qt/qt_openglrenderer.cpp +++ b/src/qt/qt_openglrenderer.cpp @@ -174,7 +174,7 @@ OpenGLRenderer::compile_shader(GLenum shader_type, const char *prepend, const ch const char *source[3]; char version[50]; int ver = 0; - char *version_loc = strstr(program, "#version"); + char *version_loc = (char *) strstr(program, "#version"); if (version_loc) ver = (int) strtol(version_loc + 8, (char **) &program, 10); else { From df85868e00cd3d8e71300f8d89323d8fd0be5631 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Mar 2025 17:34:33 +0100 Subject: [PATCH 5/5] Config: Brought the strncpy() in load_gl3_shaders() in line with the other stncpy()'s. --- src/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config.c b/src/config.c index e5fbe59b4..f68b23c37 100644 --- a/src/config.c +++ b/src/config.c @@ -1740,7 +1740,10 @@ load_gl3_shaders(void) if (general) { p = ini_section_get_string(general, "video_gl_shader", NULL); if (p) { - strncpy(gl3_shader_file[0], p, 512); + if (strlen(p) > 511) + fatal("Configuration: Length of video_gl_shadr is more than 511\n"); + else + strncpy(gl3_shader_file[0], p, 511); ini_delete_var(config, general, "video_gl_shader"); return; }