Merge pull request #12683 from LillyJadeKatrin/retroachievements-submodule-update

Update rcheevos submodule to newest master.
Merge pull request #12685 from JosJuice/get-pointer-for-range-zero-size
2024-04-04 21:14:44 +02:00 · 2024-04-04 21:08:53 +02:00 · 2024-04-04 18:56:17 +02:00 · 2024-04-03 15:03:36 -04:00
6 changed files with 6 additions and 3 deletions
--- a/Externals/rcheevos/CMakeLists.txt
+++ b/Externals/rcheevos/CMakeLists.txt
@ -59,6 +59,7 @@ add_library(rcheevos
 target_include_directories(rcheevos PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rcheevos/include")
 target_include_directories(rcheevos INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 target_compile_definitions(rcheevos PRIVATE "RC_DISABLE_LUA=1" "RCHEEVOS_URL_SSL")
+target_compile_definitions(rcheevos PRIVATE "RC_CLIENT_SUPPORTS_HASH")
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 	target_compile_definitions(rcheevos PRIVATE "_CRT_SECURE_NO_WARNINGS")
 endif()
--- a/Externals/rcheevos/rcheevos
+++ b/Externals/rcheevos/rcheevos
@ -1 +1 @@
-Subproject commit b64ac2b25038bc9feb94ca759b5ba4d02642b3af
+Subproject commit a6cdbb4a529d85b74777597fcff037dde7bef66b
--- a/Externals/rcheevos/rcheevos.vcxproj
+++ b/Externals/rcheevos/rcheevos.vcxproj
@ -76,7 +76,7 @@
  </ItemGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <PreprocessorDefinitions>RC_DISABLE_LUA;RCHEEVOS_URL_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RC_DISABLE_LUA;RCHEEVOS_URL_SSL;RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(ProjectDir)rcheevos\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@ -776,4 +776,5 @@ endif()
 if(USE_RETRO_ACHIEVEMENTS)
  target_link_libraries(core PRIVATE rcheevos)
  target_compile_definitions(core PRIVATE -DUSE_RETRO_ACHIEVEMENTS)
+  target_compile_definitions(core PRIVATE -DRC_CLIENT_SUPPORTS_HASH)
 endif()
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@ -409,7 +409,7 @@ u8* MemoryManager::GetPointerForRange(u32 address, size_t size) const

  // Check that the beginning and end of the range are valid
  u8* pointer = GetPointer(address);
-  if (!pointer || !GetPointer(address + u32(size) - 1))
+  if (pointer == nullptr || (size != 0 && GetPointer(address + u32(size) - 1) == nullptr))
  {
    // A panic alert has already been raised by GetPointer
    return nullptr;
--- a/Source/VSProps/Base.Dolphin.props
+++ b/Source/VSProps/Base.Dolphin.props
@ -46,6 +46,7 @@
      <PreprocessorDefinitions>HAVE_SDL2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(Steam)'=='true'">STEAM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions>USE_RETRO_ACHIEVEMENTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <!-- Warnings one may want to ignore when using Level4.
      4201  nonstandard extension used : nameless struct/union
Author	SHA1	Message	Date
Admiral H. Curtiss	db8b2942aa	Merge pull request #12683 from LillyJadeKatrin/retroachievements-submodule-update Update rcheevos submodule to newest master.	2024-04-04 21:14:44 +02:00
Admiral H. Curtiss	0aa92f7a56	Merge pull request #12685 from JosJuice/get-pointer-for-range-zero-size Memmap: Don't show panic alert for 0 length range	2024-04-04 21:08:53 +02:00
JosJuice	fad57b648f	Memmap: Don't show panic alert for 0 length range IOS::HLE::IOCtlVRequest::Dump sometimes tries to call GetPointerForRange with an address of 0 and a size of 0. Address 0 is valid, but we were mistakenly also trying to check that address 3FFFFFFF is valid, which it isn't. Fixes https://bugs.dolphin-emu.org/issues/13514.	2024-04-04 18:56:17 +02:00
LillyJadeKatrin	225a6da074	Update rcheevos submodule to newest master.	2024-04-03 15:03:36 -04:00