Merge remote-tracking branch 'origin/master' into cdrom_changes

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;
             }

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;
 

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 {

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();

src/utils/ini.c

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/ini.h>