Externals/rcheevos/CMakeLists.txt

@@ -59,7 +59,6 @@ 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()

Externals/rcheevos/rcheevos

@@ -1 +1 @@
-Subproject commit a6cdbb4a529d85b74777597fcff037dde7bef66b
+Subproject commit b64ac2b25038bc9feb94ca759b5ba4d02642b3af

Externals/rcheevos/rcheevos.vcxproj

@@ -76,7 +76,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>RC_DISABLE_LUA;RCHEEVOS_URL_SSL;RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RC_DISABLE_LUA;RCHEEVOS_URL_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)rcheevos\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

Source/Core/Core/CMakeLists.txt

@@ -776,5 +776,4 @@ 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()

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 == nullptr || (size != 0 && GetPointer(address + u32(size) - 1) == nullptr))
+  if (!pointer || !GetPointer(address + u32(size) - 1))
   {
     // A panic alert has already been raised by GetPointer
     return nullptr;

Source/VSProps/Base.Dolphin.props

@@ -46,7 +46,6 @@
       <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