Clean up code

Author: crosire

examples/09-depth/generic_depth_addon.cpp

@@ -1163,25 +1163,25 @@ static void draw_settings_overlay(effect_runtime *runtime)
 {
 	bool force_reset = false;
 
-	const char *const draw_stats_heuristics_items[] = {
+	const char *const draw_stats_heuristic_items[] = {
 		"Default",
 		"Higher vertices",
 		"Higher draw calls"
 	};
-	if (ImGui::Combo("Draw stats heuristic", reinterpret_cast<int *>(&s_draw_stats_heuristic), draw_stats_heuristics_items, static_cast<int>(std::size(draw_stats_heuristics_items))))
+	if (ImGui::Combo("Draw stats heuristic", reinterpret_cast<int *>(&s_draw_stats_heuristic), draw_stats_heuristic_items, static_cast<int>(std::size(draw_stats_heuristic_items))))
 	{
 		reshade::set_config_value(nullptr, "DEPTH", "DrawStatsHeuristic", static_cast<unsigned int>(s_draw_stats_heuristic));
 		force_reset = true;
 	}
 
-	const char *const aspect_ratio_heuristics_items[] = {
+	const char *const aspect_ratio_heuristic_items[] = {
 		"None",
 		"Similar aspect ratio",
 		"Multiples of resolution (for DLSS or resolution scaling)",
 		"Match resolution exactly",
 		"Match custom width and height exactly"
 	};
-	if (ImGui::Combo("Aspect ratio heuristic", reinterpret_cast<int *>(&s_aspect_ratio_heuristic), aspect_ratio_heuristics_items, static_cast<int>(std::size(aspect_ratio_heuristics_items))))
+	if (ImGui::Combo("Aspect ratio heuristic", reinterpret_cast<int *>(&s_aspect_ratio_heuristic), aspect_ratio_heuristic_items, static_cast<int>(std::size(aspect_ratio_heuristic_items))))
 	{
 		reshade::set_config_value(nullptr, "DEPTH", "UseAspectRatioHeuristics", static_cast<unsigned int>(s_aspect_ratio_heuristic));
 		force_reset = true;

include/reshade_api.hpp

@@ -510,7 +510,7 @@ namespace reshade { namespace api
 		/// Binds new shader resource views to all texture variables that use the specified <paramref name="semantic"/>.
 		/// </summary>
 		/// <remarks>
-		/// The resource the shader resource views point to has to be in the <see cref="resource_usage::shader_resource"/> state at the time <see cref="render_effects"/> is executed.
+		/// The resource the shader resource views point to has to be in the <see cref="resource_usage::shader_resource"/> state at the time <see cref="render_effects"/> or <see cref="render_technique"/> is executed.
 		/// </remarks>
 		/// <param name="semantic">ReShade FX semantic to filter textures to update by (<c>texture name : SEMANTIC</c>).</param>
 		/// <param name="srv">Shader resource view to use for samplers with <c>SRGBTexture</c> state set to <see langword="false"/> (this should be a shader resource view of the target resource, created with a non-sRGB format variant).</param>

source/input.cpp

@@ -942,13 +942,12 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExA(int idHook, HOOKPROC lpfn, HINSTAN
 	reshade::log::message(reshade::log::level::info, "Redirecting SetWindowsHookExA(idHook = %d, lpfn = %p, hmod = %p, dwThreadId = %lu) ...", idHook, lpfn, hmod, dwThreadId);
 #endif
 
-	HHOOK *hook = nullptr;
+	HOOKPROC orig_hook_proc = lpfn;
 	const UINT64 thread_lookup_key = dwThreadId | (static_cast<UINT64>(idHook) << 32);
 
 	if (const auto it = s_windows_hooks.find(thread_lookup_key);
 		it == s_windows_hooks.end() || it->second.first == nullptr)
 	{
-		HOOKPROC orig_hook_proc = lpfn;
 		switch (idHook)
 		{
 		case WH_MOUSE:
@@ -964,12 +963,6 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExA(int idHook, HOOKPROC lpfn, HINSTAN
 			lpfn = &handle_windows_hook<WH_KEYBOARD_LL, reshade::input::is_blocking_any_keyboard_input>;
 			break;
 		}
-
-		if (orig_hook_proc != lpfn)
-		{
-			s_windows_hooks[thread_lookup_key] = std::make_pair(nullptr, orig_hook_proc);
-			hook = &s_windows_hooks[thread_lookup_key].first;
-		}
 	}
 	else
 	{
@@ -981,13 +974,13 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExA(int idHook, HOOKPROC lpfn, HINSTAN
 	static const auto trampoline = reshade::hooks::call(HookSetWindowsHookExA);
 	const HHOOK result = trampoline(idHook, lpfn, hmod, dwThreadId);
 
-	if (hook != nullptr)
+	if (result != nullptr && lpfn != orig_hook_proc)
 	{
 #if RESHADE_VERBOSE_LOG
 		reshade::log::message(reshade::log::level::info, "Windows hook function of type %d registered for thread %lu.", idHook, dwThreadId);
 #endif
 
-		*hook = result;
+		s_windows_hooks[thread_lookup_key] = std::make_pair(result, orig_hook_proc);
 	}
 
 	return result;
@@ -998,13 +991,12 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExW(int idHook, HOOKPROC lpfn, HINSTAN
 	reshade::log::message(reshade::log::level::info, "Redirecting SetWindowsHookExW(idHook = %d, lpfn = %p, hmod = %p, dwThreadId = %lu) ...", idHook, lpfn, hmod, dwThreadId);
 #endif
 
-	HHOOK *hook = nullptr;
+	HOOKPROC orig_hook_proc = lpfn;
 	const UINT64 thread_lookup_key = dwThreadId | (static_cast<UINT64>(idHook) << 32);
 
 	if (const auto it = s_windows_hooks.find(thread_lookup_key);
 		it == s_windows_hooks.end() || it->second.first == nullptr)
 	{
-		HOOKPROC orig_hook_proc = lpfn;
 		switch (idHook)
 		{
 		case WH_MOUSE:
@@ -1020,12 +1012,6 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExW(int idHook, HOOKPROC lpfn, HINSTAN
 			lpfn = &handle_windows_hook<WH_KEYBOARD_LL, reshade::input::is_blocking_any_keyboard_input>;
 			break;
 		}
-
-		if (orig_hook_proc != lpfn)
-		{
-			s_windows_hooks[thread_lookup_key] = std::make_pair(nullptr, orig_hook_proc);
-			hook = &s_windows_hooks[thread_lookup_key].first;
-		}
 	}
 	else
 	{
@@ -1037,13 +1023,13 @@ extern "C" HHOOK WINAPI HookSetWindowsHookExW(int idHook, HOOKPROC lpfn, HINSTAN
 	static const auto trampoline = reshade::hooks::call(HookSetWindowsHookExW);
 	const HHOOK result = trampoline(idHook, lpfn, hmod, dwThreadId);
 
-	if (hook != nullptr)
+	if (result != nullptr && lpfn != orig_hook_proc)
 	{
 #if RESHADE_VERBOSE_LOG
 		reshade::log::message(reshade::log::level::info, "Windows hook function of type %d registered for thread %lu.", idHook, dwThreadId);
 #endif
 
-		*hook = result;
+		s_windows_hooks[thread_lookup_key] = std::make_pair(result, orig_hook_proc);
 	}
 
 	return result;