重构获取窗口进程句柄 (Blinue#987)

* refactor getting process handle of window * log errors when failed to get process handle
eriforce · Sep 8, 2024 · 68a7ae2 · 68a7ae2
1 parent ef24841
commit 68a7ae2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/Magpie.App/ScalingService.cpp b/src/Magpie.App/ScalingService.cpp
@@ -342,16 +342,9 @@ void ScalingService::_ScaleForegroundWindow() {
 }
 
 static bool GetWindowIntegrityLevel(HWND hWnd, DWORD& integrityLevel) noexcept {
-	DWORD processId;
-	if (!GetWindowThreadProcessId(hWnd, &processId)) {
-		Logger::Get().Win32Error("GetWindowThreadProcessId 失败");
-		return false;
-	}
-
-	wil::unique_process_handle hProc(
-		OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId));
+	wil::unique_process_handle hProc = Win32Utils::GetWndProcessHandle(hWnd);
 	if (!hProc) {
-		Logger::Get().Win32Error("OpenProcess 失败");
+		Logger::Get().Error("GetWndProcessHandle 失败");
 		return false;
 	}
 

diff --git a/src/Shared/Win32Utils.cpp b/src/Shared/Win32Utils.cpp
@@ -34,7 +34,7 @@ std::wstring Win32Utils::GetWndTitle(HWND hWnd) noexcept {
 	return title;
 }
 
-std::wstring Win32Utils::GetPathOfWnd(HWND hWnd) noexcept {
+wil::unique_process_handle Win32Utils::GetWndProcessHandle(HWND hWnd) noexcept {
 	wil::unique_process_handle hProc;
 
 	if (DWORD dwProcId = 0; GetWindowThreadProcessId(hWnd, &dwProcId)) {
@@ -58,10 +58,16 @@ std::wstring Win32Utils::GetPathOfWnd(HWND hWnd) noexcept {
 				Logger::Get().Win32Error("GetProcessHandleFromHwnd 失败");
 			}
 		}
+	}
 
-		if (!hProc) {
-			return {};
-		}
+	return hProc;
+}
+
+std::wstring Win32Utils::GetPathOfWnd(HWND hWnd) noexcept {
+	wil::unique_process_handle hProc = GetWndProcessHandle(hWnd);
+	if (!hProc) {
+		Logger::Get().Error("GetWndProcessHandle 失败");
+		return {};
 	}
 
 	std::wstring fileName;

diff --git a/src/Shared/Win32Utils.h b/src/Shared/Win32Utils.h
@@ -14,6 +14,8 @@ struct Win32Utils {
 
 	static std::wstring GetWndTitle(HWND hWnd) noexcept;
 
+	static wil::unique_process_handle GetWndProcessHandle(HWND hWnd) noexcept;
+
 	static std::wstring GetPathOfWnd(HWND hWnd) noexcept;
 
 	static UINT GetWindowShowCmd(HWND hWnd) noexcept;