support for set_filereader passthrough

RetroAchievements · Jul 25, 2024 · 377222d · 377222d
1 parent 411a6bd
commit 377222d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/rcheevos b/rcheevos
diff --git a/src/rcheevos.vcxproj b/src/rcheevos.vcxproj
@@ -201,6 +201,7 @@
     <ClCompile Include="..\rcheevos\src\rc_compat.c" />
     <ClCompile Include="..\rcheevos\src\rc_util.c" />
     <ClCompile Include="..\rcheevos\src\rhash\aes.c" />
+    <ClCompile Include="..\rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="..\rcheevos\src\rhash\hash.c">
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

diff --git a/src/rcheevos.vcxproj.filters b/src/rcheevos.vcxproj.filters
@@ -136,6 +136,9 @@
     <ClCompile Include="..\rcheevos\src\rhash\aes.c">
       <Filter>rhash</Filter>
     </ClCompile>
+    <ClCompile Include="..\rcheevos\src\rhash\cdreader.c">
+      <Filter>rhash</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lua">

diff --git a/src/services/AchievementRuntimeExports.cpp b/src/services/AchievementRuntimeExports.cpp
@@ -164,6 +164,18 @@ class AchievementRuntimeExports : private AchievementRuntime
         return rc_client_get_spectator_mode_enabled(pClient.GetClient());
     }
 
+    static void set_filereader(const struct rc_hash_filereader* pFileReader, const struct rc_hash_cdreader* pCdReader)
+    {
+        auto& pClient = ra::services::ServiceLocator::GetMutable<ra::services::AchievementRuntime>();
+        rc_client_set_filereader(pClient.GetClient(), pFileReader, pCdReader);
+    }
+
+    static void get_default_cdreader(struct rc_hash_cdreader* pCdReader)
+    {
+        auto& pClient = ra::services::ServiceLocator::GetMutable<ra::services::AchievementRuntime>();
+        rc_client_get_default_cdreader(pClient.GetClient(), pCdReader);
+    }
+
     static void abort_async(rc_client_async_handle_t* handle)
     {
         const auto& pClient = ra::services::ServiceLocator::Get<ra::services::AchievementRuntime>();
@@ -973,6 +985,12 @@ static void GetExternalClientV1(rc_client_external_t* pClientExternal) noexcept
     pClientExternal->deserialize_progress = ra::services::AchievementRuntimeExports::deserialize_progress;
 }
 
+static void GetExternalClientV2(rc_client_external_t* pClientExternal) noexcept
+{
+    pClientExternal->set_filereader = ra::services::AchievementRuntimeExports::set_filereader;
+    pClientExternal->get_default_cdreader = ra::services::AchievementRuntimeExports::get_default_cdreader;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -985,6 +1003,10 @@ API int CCONV _Rcheevos_GetExternalClient(rc_client_external_t* pClientExternal,
             RA_LOG_WARN("Unknown rc_client_external interface version: %s", nVersion);
             __fallthrough;
 
+        case 2:
+            GetExternalClientV2(pClientExternal);
+            __fallthrough;
+
         case 1:
             GetExternalClientV1(pClientExternal);
             break;
+10 −0		CHANGELOG.md
+14 −0		include/rc_client.h
+9 −0		include/rc_hash.h
+5 −2		src/rapi/rc_api_common.c
+9 −3		src/rapi/rc_api_runtime.c
+99 −24		src/rc_client.c
+13 −1		src/rc_client_external.h
+12 −0		src/rc_client_internal.h
+8 −0		src/rc_client_raintegration.c
+1 −1		src/rc_version.h
+11 −5		src/rcheevos/consoleinfo.c
+2 −0		src/rcheevos/rc_validate.c
+2 −2		src/rcheevos/runtime.c
+1 −0		src/rcheevos/runtime_progress.c
+35 −0		src/rhash/cdreader.c
+34 −20		src/rhash/hash.c
+44 −0		test/rapi/test_rc_api_info.c
+90 −0		test/rapi/test_rc_api_runtime.c
+2 −2		test/rcheevos/test_consoleinfo.c
+12 −7		test/rhash/mock_filereader.c
+3 −0		test/rhash/mock_filereader.h
+95 −0		test/test_rc_client.c
+32 −0		test/test_rc_client_external.c
+24 −15		test/test_rc_libretro.c