fix: make GetProcPath throw if result is 0

Starfield-Reverse-Engineering · Sep 21, 2024 · 0895432 · 0895432
1 parent 55214e3
commit 0895432
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/REX/W32/KERNEL32.h b/include/REX/W32/KERNEL32.h
@@ -495,7 +495,7 @@ namespace REX::W32
 	std::uint32_t         GetPrivateProfileStringA(const char* a_app, const char* a_key, const char* a_default, char* a_buf, std::uint32_t a_bufLen, const char* a_name) noexcept;
 	std::uint32_t         GetPrivateProfileStringW(const wchar_t* a_app, const wchar_t* a_key, const wchar_t* a_default, wchar_t* a_buf, std::uint32_t a_bufLen, const wchar_t* a_name) noexcept;
 	void*                 GetProcAddress(HMODULE a_module, const char* a_name) noexcept;
-	std::string_view      GetProcPath(HMODULE a_handle) noexcept;
+	std::string_view      GetProcPath(HMODULE a_handle);
 	void                  GetSystemInfo(SYSTEM_INFO* a_info) noexcept;
 	bool                  IMAGE_SNAP_BY_ORDINAL64(std::uint64_t a_ordinal) noexcept;
 	IMAGE_SECTION_HEADER* IMAGE_FIRST_SECTION(const IMAGE_NT_HEADERS64* a_header) noexcept;

diff --git a/src/REX/W32.cpp b/src/REX/W32.cpp
@@ -398,16 +398,14 @@ namespace REX::W32
 		return ::W32_IMPL_GetProcAddress(a_module, a_name);
 	}
 
-	std::string_view GetProcPath(HMODULE a_handle) noexcept
+	std::string_view GetProcPath(HMODULE a_handle)
 	{
 		// I don't like this function...
 		static std::string fileName(MAX_PATH + 1, ' ');
 		auto               res = GetModuleFileNameA(a_handle, fileName.data(), MAX_PATH + 1);
 
-		if (res == 0) {
-			fileName = "[ProcessHost]";
-			res = 13;
-		}
+		if (res == 0)
+			throw std::system_error(static_cast<int>(GetLastError()), std::system_category());
 
 		return { fileName.c_str(), res };
 	}