Error codes are now also reported with messages, detailed codes added.

Author: zoltanvb

cores/libretro-net-retropad/net_retropad_core.c

@@ -394,6 +394,8 @@ static bool input_test_file_read(const char* file_path)
             (int)rjson_get_source_line(parser),
             (int)rjson_get_source_column(parser),
             (*rjson_get_error(parser) ? rjson_get_error(parser) : "format error"));
+      if (last_test_step > MAX_TEST_STEPS)
+         last_test_step = 0;
    }
 
    /* Free parser */
@@ -412,6 +414,12 @@ static bool input_test_file_read(const char* file_path)
    {
       NETRETROPAD_CORE_PREFIX(log_cb)(RETRO_LOG_WARN,"[Remote RetroPad]: too long test input json, maximum size: %d\n",MAX_TEST_STEPS);
    }
+   if (last_test_step == 0)
+   {
+      NETRETROPAD_CORE_PREFIX(log_cb)(RETRO_LOG_WARN,"[Remote RetroPad]: no steps in input json\n");
+      success = false;
+   }
+
    for (current_test_step = 0; current_test_step < last_test_step; current_test_step++)
    {
       NETRETROPAD_CORE_PREFIX(log_cb)(RETRO_LOG_DEBUG,
@@ -564,7 +572,7 @@ unsigned NETRETROPAD_CORE_PREFIX(retro_api_version)(void)
 void NETRETROPAD_CORE_PREFIX(retro_set_controller_port_device)(
       unsigned port, unsigned device)
 {
-   const char msg[] = "Device type change is not supported!";
+   const char msg[] = "Input device type change is not supported!";
    struct retro_error_message e;
    e.code = RETROE_UNSUPPORTED_ACTION | ((port & 0xFF) << 8) | (device & 0xFF);
    e.message = msg;
@@ -1392,13 +1400,16 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
 
 bool NETRETROPAD_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
 {
+   bool load_result = true;
+
    netretropad_check_variables();
    open_UDP_socket();
 
    /* If a .ratst file is given (only possible via command line),
     * initialize test sequence. */
    if (info)
-      input_test_file_read(info->path);
+      load_result = input_test_file_read(info->path);
+
    if (last_test_step > MAX_TEST_STEPS)
       current_test_step = last_test_step;
    else
@@ -1409,7 +1420,25 @@ bool NETRETROPAD_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info
       NETRETROPAD_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_MESSAGE, &message);
    }
 
-   return true;
+   if (!load_result)
+   {
+      const char msg[] = "Invalid test input file!";
+      struct retro_error_message e;
+      e.code = RETROE_UNSUPPORTED_CONTENT_FORMAT;
+      e.message = msg;
+      NETRETROPAD_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_ERROR_CODE, &e);
+   }
+
+   if (false)
+   {
+      const char msg[] = "Simulated load error - BIOS!";
+      struct retro_error_message e;
+      e.code = RETROE_MISSING_BIOS | 0x4321;
+      e.message = msg;
+      NETRETROPAD_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_ERROR_CODE, &e);
+      load_result = false;
+   }
+   return load_result;
 }
 
 void NETRETROPAD_CORE_PREFIX(retro_unload_game)(void) { }

libretro-common/include/libretro.h

@@ -711,15 +711,48 @@ enum retro_mod
    RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
 };
 
-/* Error codes that can be reported by the core. */
+/**
+ * Error code ranges and specific errors that may be reported by cores.
+ * Explicitly listed errors within a range may have localized error
+ * messages maintained by the frontend. The first item in the range
+ * acts as a generic error indication for that kind of error.
+ * @see RETRO_ENVIRONMENT_SET_ERROR_CODE
+ */
 enum retro_error
 {
    RETROE_NONE           = 0x00000000,
 
-   RETROE_UNSUPPORTED_CONTENT_FORMAT       = 0x00010000,
-   RETROE_MISSING_BIOS                     = 0x00020000,
-   RETROE_HARDWARE_RENDERING_NOT_AVAILABLE = 0x00030000,
-   RETROE_UNSUPPORTED_ACTION               = 0x00040000,
+   RETROE_UNSUPPORTED_CONTENT              = 0x01000000,
+   RETROE_UNSUPPORTED_CONTENT_ISO_FORMAT_ERROR     = 0x01010000,
+   RETROE_UNSUPPORTED_CONTENT_CHD_FORMAT_ERROR     = 0x01020000,
+   RETROE_UNSUPPORTED_CONTENT_CUE_FORMAT_ERROR     = 0x01030000,
+   RETROE_UNSUPPORTED_CONTENT_BIN_FORMAT_ERROR     = 0x01040000,
+   RETROE_UNSUPPORTED_CONTENT_ZIP_FORMAT_ERROR     = 0x01050000,
+   RETROE_UNSUPPORTED_CONTENT_7Z_FORMAT_ERROR      = 0x01060000,
+   RETROE_UNSUPPORTED_CONTENT_FORMAT               = 0x01100000,
+   RETROE_UNSUPPORTED_CONTENT_RANGE_END    = 0x01FFFFFF,
+   RETROE_MISSING_BIOS                     = 0x02000000,
+   RETROE_MISSING_BIOS_REGION_PAL                  = 0x02010000,
+   RETROE_MISSING_BIOS_REGION_NTSC                 = 0x02020000,
+   RETROE_MISSING_BIOS_REGION_WORLD                = 0x02030000,
+   RETROE_MISSING_BIOS_REGION_COUNTRY              = 0x02030000,
+   RETROE_MISSING_BIOS_RANGE_END           = 0x02FFFFFF,
+   RETROE_HARDWARE_RENDERING               = 0x03000000,
+   RETROE_HARDWARE_RENDERING_VULKAN_NOT_AVAILABLE  = 0x03010000,
+   RETROE_HARDWARE_RENDERING_VULKAN_VERSION_ERROR  = 0x03020000,
+   RETROE_HARDWARE_RENDERING_OPENGL_NOT_AVAILABLE  = 0x03030000,
+   RETROE_HARDWARE_RENDERING_OPENGL_VERSION_ERROR  = 0x03040000,
+   RETROE_HARDWARE_RENDERING_DX11_NOT_AVAILABLE    = 0x03050000,
+   RETROE_HARDWARE_RENDERING_DX12_NOT_AVAILABLE    = 0x03060000,
+   RETROE_HARDWARE_RENDERING_PXFMT_XRGB8888_UNSUPP = 0x03110000,
+   RETROE_HARDWARE_RENDERING_PXFMT_RGB565_UNSUPP   = 0x03120000,
+   RETROE_HARDWARE_RENDERING_RANGE_END     = 0x03FFFFFF,
+   RETROE_UNSUPPORTED_ACTION               = 0x04000000,
+   RETROE_UNSUPPORTED_ACTION_SERIALIZE             = 0x04010000,
+   RETROE_UNSUPPORTED_ACTION_UNSERIALIZE           = 0x04020000,
+   RETROE_UNSUPPORTED_ACTION_UNSERIALIZE_FORMAT    = 0x04030000,
+   RETROE_UNSUPPORTED_ACTION_CORE_OPTION_COMBI     = 0x04040000,
+   RETROE_UNSUPPORTED_ACTION_RANGE_END     = 0x04FFFFFF,
 
    RETROE_DUMMY         = INT_MAX     /* Ensure sizeof(enum) == sizeof(int) */
 };