Consolidate utility functions that resolve paths

Author: crosire

source/dll_main.cpp

@@ -21,6 +21,8 @@ std::filesystem::path g_reshade_dll_path;
 std::filesystem::path g_reshade_base_path;
 std::filesystem::path g_target_executable_path;
 
+extern bool resolve_path(std::filesystem::path &path, std::error_code &ec, const std::filesystem::path &base);
+
 /// <summary>
 /// Checks whether the current application is an UWP app.
 /// </summary>
@@ -47,42 +49,22 @@ bool is_windows7()
 	return VerifyVersionInfo(&verinfo_windows7, VER_MAJORVERSION | VER_MINORVERSION, condition) != FALSE;
 }
 
-/// <summary>
-/// Expands any environment variables in the path (like "%USERPROFILE%") and checks whether it points towards an existing directory.
-/// </summary>
-static bool resolve_env_path(std::filesystem::path &path, const std::filesystem::path &base = g_reshade_dll_path.parent_path())
-{
-	if (path.empty())
-		return false;
-
-	WCHAR buf[4096];
-	if (ExpandEnvironmentStringsW(path.c_str(), buf, ARRAYSIZE(buf)))
-		path = buf;
-	else
-		return false;
-
-	path = base / path;
-
-	std::error_code ec;
-	path = std::filesystem::canonical(path, ec);
-	return !ec && std::filesystem::is_directory(path, ec);
-}
-
 /// <summary>
 /// Returns the path that should be used as base for relative paths.
 /// </summary>
 std::filesystem::path get_base_path(bool default_to_target_executable_path = false)
 {
+	std::error_code ec;
 	std::filesystem::path path_override;
 
 	// Cannot use global config here yet, since it uses base path for look up, so look at config file next to target executable instead
 	if (reshade::ini_file::load_cache(g_target_executable_path.parent_path() / L"ReShade.ini").get("INSTALL", "BasePath", path_override) &&
-		resolve_env_path(path_override))
+		resolve_path(path_override, ec, g_reshade_dll_path.parent_path()) && std::filesystem::is_directory(path_override, ec))
 		return path_override;
 
 	WCHAR buf[4096];
 	path_override.assign(buf, buf + GetEnvironmentVariableW(L"RESHADE_BASE_PATH_OVERRIDE", buf, ARRAYSIZE(buf)));
-	if (resolve_env_path(path_override))
+	if (resolve_path(path_override, ec, g_reshade_dll_path.parent_path()) && std::filesystem::is_directory(path_override, ec))
 		return path_override;
 
 	return default_to_target_executable_path ? g_target_executable_path.parent_path() : g_reshade_dll_path.parent_path();

source/imgui_widgets.cpp

@@ -13,11 +13,11 @@
 
 extern std::filesystem::path g_reshade_base_path;
 
-extern bool resolve_path(std::filesystem::path &path, std::error_code &ec);
+extern bool resolve_path(std::filesystem::path &path, std::error_code &ec, const std::filesystem::path &base = g_reshade_base_path);
 extern std::string expand_macro_string(const std::string &input, std::vector<std::pair<std::string, std::string>> macros = {});
 
 // Resolve environment variables in input text widgets when tab is pressed
-static int  resolve_macros(ImGuiInputTextCallbackData *data)
+static auto resolve_macros(ImGuiInputTextCallbackData *data) -> int
 {
 	const std::string text(data->Buf, data->BufTextLen);
 	const std::string resolved = expand_macro_string(text);

source/runtime.cpp

@@ -155,14 +155,14 @@ std::string expand_macro_string(const std::string &input, std::vector<std::pair<
 	return expand_macro_string(input, macros);
 }
 
-bool resolve_path(std::filesystem::path &path, std::error_code &ec)
+bool resolve_path(std::filesystem::path &path, std::error_code &ec, const std::filesystem::path &base = g_reshade_base_path)
 {
 	path = std::filesystem::u8path(expand_macro_string(path.u8string()));
 
 	// First convert path to an absolute path
 	// Ignore the working directory and instead start relative paths at the DLL location
 	if (path.is_relative())
-		path = g_reshade_base_path / path;
+		path = base / path;
 	// Finally try to canonicalize the path too
 	if (std::filesystem::path canonical_path = std::filesystem::canonical(path, ec); !ec)
 		path = std::move(canonical_path);

source/runtime_api.cpp

@@ -10,7 +10,7 @@
 #include "input.hpp"
 #include <algorithm> // std::all_of, std::find, std::find_if, std::for_each, std::remove_if
 
-extern bool resolve_path(std::filesystem::path &path, std::error_code &ec);
+extern bool resolve_path(std::filesystem::path &path, std::error_code &ec, const std::filesystem::path &base = g_reshade_base_path);
 extern bool resolve_preset_path(std::filesystem::path &path, std::error_code &ec);
 
 bool reshade::runtime::is_key_down(uint32_t keycode) const

source/runtime_gui.cpp

@@ -24,7 +24,7 @@
 #include <cstring> // std::memcmp, std::memcpy
 #include <algorithm> // std::any_of, std::count_if, std::find, std::find_if, std::max, std::min, std::replace, std::rotate, std::search, std::swap, std::transform
 
-extern bool resolve_path(std::filesystem::path &path, std::error_code &ec);
+extern bool resolve_path(std::filesystem::path &path, std::error_code &ec, const std::filesystem::path &base = g_reshade_base_path);
 
 static bool string_contains(const std::string_view text, const std::string_view filter)
 {