dep/rcheevos: Bump to 74860c9

2024-01-13 14:24:04 +10:00
parent ecbd693d22
commit e2e85a06cd
42 changed files with 1126 additions and 505 deletions
--- a/dep/rcheevos/src/rc_client_raintegration.c
+++ b/dep/rcheevos/src/rc_client_raintegration.c
@@ -65,13 +65,19 @@ static void rc_client_raintegration_load_dll(rc_client_t* client,
  memset(raintegration, 0, sizeof(*raintegration));
  raintegration->hDLL = hDLL;

-  raintegration->get_version = (rc_client_raintegration_get_string_func)GetProcAddress(hDLL, "_RA_IntegrationVersion");
-  raintegration->get_host_url = (rc_client_raintegration_get_string_func)GetProcAddress(hDLL, "_RA_HostUrl");
-  raintegration->init_client = (rc_client_raintegration_init_client_func)GetProcAddress(hDLL, "_RA_InitClient");
-  raintegration->init_client_offline = (rc_client_raintegration_init_client_func)GetProcAddress(hDLL, "_RA_InitOffline");
-  raintegration->shutdown = (rc_client_raintegration_action_func)GetProcAddress(hDLL, "_RA_Shutdown");
+  raintegration->get_version = (rc_client_raintegration_get_string_func_t)GetProcAddress(hDLL, "_RA_IntegrationVersion");
+  raintegration->get_host_url = (rc_client_raintegration_get_string_func_t)GetProcAddress(hDLL, "_RA_HostUrl");
+  raintegration->init_client = (rc_client_raintegration_init_client_func_t)GetProcAddress(hDLL, "_RA_InitClient");
+  raintegration->init_client_offline = (rc_client_raintegration_init_client_func_t)GetProcAddress(hDLL, "_RA_InitOffline");
+  raintegration->shutdown = (rc_client_raintegration_action_func_t)GetProcAddress(hDLL, "_RA_Shutdown");

-  raintegration->get_external_client = (rc_client_raintegration_get_external_client)GetProcAddress(hDLL, "_Rcheevos_GetExternalClient");
+  raintegration->update_main_window_handle = (rc_client_raintegration_hwnd_action_func_t)GetProcAddress(hDLL, "_RA_UpdateHWnd");
+
+  raintegration->get_external_client = (rc_client_raintegration_get_external_client_func_t)GetProcAddress(hDLL, "_Rcheevos_GetExternalClient");
+  raintegration->get_menu = (rc_client_raintegration_get_menu_func_t)GetProcAddress(hDLL, "_Rcheevos_RAIntegrationGetMenu");
+  raintegration->activate_menu_item = (rc_client_raintegration_activate_menuitem_func_t)GetProcAddress(hDLL, "_Rcheevos_ActivateRAIntegrationMenuItem");
+  raintegration->set_write_memory_function = (rc_client_raintegration_set_write_memory_func_t)GetProcAddress(hDLL, "_Rcheevos_SetRAIntegrationWriteMemoryFunction");
+  raintegration->set_event_handler = (rc_client_raintegration_set_event_handler_func_t)GetProcAddress(hDLL, "_Rcheevos_SetRAIntegrationEventHandler");

  if (!raintegration->get_version ||
      !raintegration->init_client ||
@@ -135,7 +141,7 @@ int rc_client_version_less(const char* left, const char* right)
 static void rc_client_init_raintegration(rc_client_t* client,
    rc_client_version_validation_callback_data_t* version_validation_callback_data)
 {
-  rc_client_raintegration_init_client_func init_func = client->state.raintegration->init_client;
+  rc_client_raintegration_init_client_func_t init_func = client->state.raintegration->init_client;

  if (client->state.raintegration->get_host_url) {
    const char* host_url = client->state.raintegration->get_host_url();
@@ -195,6 +201,8 @@ static void rc_client_init_raintegration(rc_client_t* client,
      /* attach the external client and call the callback */
      client->state.external_client = external_client;

+      client->state.raintegration->bIsInited = 1;
+
      version_validation_callback_data->callback(RC_OK, NULL,
         client, version_validation_callback_data->callback_userdata);
    }
@@ -339,6 +347,127 @@ rc_client_async_handle_t* rc_client_begin_load_raintegration(rc_client_t* client
  return &callback_data->async_handle;
 }

+void rc_client_raintegration_update_main_window_handle(rc_client_t* client, HWND main_window_handle)
+{
+   if (client && client->state.raintegration &&
+       client->state.raintegration->bIsInited &&
+       client->state.raintegration->update_main_window_handle)
+   {
+      client->state.raintegration->update_main_window_handle(main_window_handle);
+   }
+}
+
+void rc_client_raintegration_set_write_memory_function(rc_client_t* client, rc_client_raintegration_write_memory_func_t handler)
+{
+  if (client && client->state.raintegration && client->state.raintegration->set_write_memory_function)
+    client->state.raintegration->set_write_memory_function(client, handler);
+}
+
+void rc_client_raintegration_set_event_handler(rc_client_t* client,
+    rc_client_raintegration_event_handler_t handler)
+{
+  if (client && client->state.raintegration && client->state.raintegration->set_event_handler)
+    client->state.raintegration->set_event_handler(client, handler);
+}
+
+const rc_client_raintegration_menu_t* rc_client_raintegration_get_menu(const rc_client_t* client)
+{
+  if (!client || !client->state.raintegration ||
+      !client->state.raintegration->bIsInited ||
+      !client->state.raintegration->get_menu)
+  {
+    return NULL;
+  }
+
+  return client->state.raintegration->get_menu();
+}
+
+void rc_client_raintegration_rebuild_submenu(rc_client_t* client, HMENU hMenu)
+{
+   HMENU hPopupMenu = NULL;
+   const rc_client_raintegration_menu_t* menu;
+
+   if (!client || !client->state.raintegration)
+      return;
+
+   /* destroy the existing menu */
+   if (client->state.raintegration->hPopupMenu)
+      DestroyMenu(client->state.raintegration->hPopupMenu);
+
+   /* create the popup menu */
+   hPopupMenu = CreatePopupMenu();
+
+   menu = rc_client_raintegration_get_menu(client);
+   if (menu && menu->num_items)
+   {
+      const rc_client_raintegration_menu_item_t* menuitem = menu->items;
+      const rc_client_raintegration_menu_item_t* stop = menu->items + menu->num_items;
+
+      for (; menuitem < stop; ++menuitem)
+      {
+         if (menuitem->id == 0)
+            AppendMenuA(hPopupMenu, MF_SEPARATOR, 0U, NULL);
+         else
+         {
+            UINT flags = MF_STRING;
+            if (menuitem->checked)
+               flags |= MF_CHECKED;
+            if (!menuitem->enabled)
+               flags |= MF_DISABLED | MF_GRAYED;
+
+            AppendMenuA(hPopupMenu, flags, menuitem->id, menuitem->label);
+         }
+      }
+   }
+
+   /* add/update the item containing the popup menu */
+   {
+      int nIndex = GetMenuItemCount(hMenu);
+      const char* menuText = "&RetroAchievements";
+      char buffer[64];
+
+      UINT flags = MF_POPUP | MF_STRING;
+      if (!menu || !menu->num_items)
+         flags |= MF_DISABLED | MF_GRAYED;
+
+      while (--nIndex >= 0)
+      {
+         if (GetMenuStringA(hMenu, nIndex, buffer, sizeof(buffer) - 1, MF_BYPOSITION))
+         {
+            if (strcmp(buffer, menuText) == 0)
+               break;
+         }
+      }
+
+      if (nIndex == -1)
+         AppendMenuA(hMenu, flags, (UINT_PTR)hPopupMenu, menuText);
+      else
+         ModifyMenuA(hMenu, nIndex, flags | MF_BYPOSITION, (UINT_PTR)hPopupMenu, menuText);
+   }
+
+   client->state.raintegration->hPopupMenu = hPopupMenu;
+}
+
+void rc_client_raintegration_update_menu_item(const rc_client_t* client, const rc_client_raintegration_menu_item_t* menuitem)
+{
+   if (client && client->state.raintegration && client->state.raintegration->hPopupMenu)
+   {
+      UINT flags = MF_STRING;
+      if (menuitem->checked)
+         flags |= MF_CHECKED;
+
+      CheckMenuItem(client->state.raintegration->hPopupMenu, menuitem->id, flags | MF_BYCOMMAND);
+   }
+}
+
+int rc_client_raintegration_activate_menu_item(const rc_client_t* client, uint32_t nMenuItemId)
+{
+   if (!client || !client->state.raintegration || !client->state.raintegration->activate_menu_item)
+      return 0;
+
+   return client->state.raintegration->activate_menu_item(nMenuItemId);
+}
+
 void rc_client_unload_raintegration(rc_client_t* client)
 {
  HINSTANCE hDLL;
@@ -348,17 +477,8 @@ void rc_client_unload_raintegration(rc_client_t* client)

  RC_CLIENT_LOG_INFO(client, "Unloading RA_Integration")

-  if (client->state.raintegration->shutdown) {
-#ifdef __cplusplus
-    try {
-#endif
-      client->state.raintegration->shutdown();
-#ifdef __cplusplus
-    }
-    catch (std::runtime_error&) {
-    }
-#endif
-  }
+  if (client->state.raintegration->shutdown)
+    client->state.raintegration->shutdown();

  rc_mutex_lock(&client->state.mutex);
  hDLL = client->state.raintegration->hDLL;