fix a buffer overflow

[libpicofe.git] / menu.h

diff --git a/menu.h b/menu.h
index 79b8278..4dfe130 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -8,6 +8,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#ifndef LIBPICOFE_MENU_H
+#define LIBPICOFE_MENU_H
+
 typedef enum
 {
        MB_NONE = 1,            /* no auto processing */
@@ -85,8 +88,11 @@ typedef struct
 #define mee_onoff_cust(name, id, var, mask, name_func) \
        { name, MB_OPT_CUSTONOFF, id, &(var), mask, 0, 0, 1, 1, 1, NULL, name_func, NULL, NULL }
 
+#define mee_range_cust_h(name, id, var, min, max, name_func, help) \
+       { name, MB_OPT_CUSTRANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, name_func, NULL, help }
+
 #define mee_range_cust(name, id, var, min, max, name_func) \
-       { name, MB_OPT_CUSTRANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, name_func, NULL, NULL }
+       mee_range_cust_h(name, id, var, min, max, name_func, NULL)
 
 #define mee_enum_h(name, id, var, names_list, help) \
        { name, MB_OPT_ENUM, id, &(var), 0, 0, 0, 1, 1, 1, NULL, NULL, names_list, help }
@@ -109,24 +115,16 @@ extern me_bind_action emuctrl_actions[];  // platform code
 extern void *g_menubg_src_ptr;
 extern void *g_menubg_ptr;
 extern void *g_menuscreen_ptr;
-#if MSCREEN_SIZE_FIXED
-#define g_menuscreen_w MSCREEN_WIDTH
-#define g_menuscreen_h MSCREEN_HEIGHT
-#else
 extern int g_menuscreen_w;
 extern int g_menuscreen_h;
-#endif
 
-void menu_init(void);
-void text_out16(int x, int y, const char *texto, ...);
-void me_update_msg(const char *msg);
+extern int g_autostateld_opt;
 
-void menu_romload_prepare(const char *rom_name);
-void menu_romload_end(void);
-
-void menu_loop(void);
-int  menu_loop_tray(void);
+void menu_init_base(void);
+void menu_update_msg(const char *msg);
+void text_out16(int x, int y, const char *texto, ...);
 
 menu_entry *me_list_get_first(void);
 menu_entry *me_list_get_next(void);
 
+#endif // LIBPICOFE_MENU_H