From 68a8a5bf2b50f9b454d3d3d82a24bd89a18fd4a2 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Fri, 16 Dec 2016 02:04:06 -0800
Subject: [PATCH] win-capture: Do not fall back to other windows for UWP
 windows

If capturing a UWP window, do not fall back to matching windows with the
same window class if the exact window is not found, as this will get any
other UWP window on the system (due to the fact that they all have the
same window class name).
---
 plugins/win-capture/window-helpers.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/win-capture/window-helpers.c b/plugins/win-capture/window-helpers.c
index 5c5f4d7a9..6c2e5d8f1 100644
--- a/plugins/win-capture/window-helpers.c
+++ b/plugins/win-capture/window-helpers.c
@@ -285,7 +285,8 @@ static int window_rating(HWND window,
 		enum window_priority priority,
 		const char *class,
 		const char *title,
-		const char *exe)
+		const char *exe,
+		bool uwp_window)
 {
 	struct dstr cur_class = {0};
 	struct dstr cur_title = {0};
@@ -307,12 +308,18 @@ static int window_rating(HWND window,
 	else
 		exe_val += 3;
 
-	if (dstr_cmpi(&cur_class, class) == 0)
-		total += class_val;
-	if (dstr_cmpi(&cur_title, title) == 0)
-		total += title_val;
-	if (dstr_cmpi(&cur_exe, exe) == 0)
-		total += exe_val;
+	if (uwp_window) {
+		if (dstr_cmpi(&cur_title, title) == 0 &&
+		    dstr_cmpi(&cur_exe, exe) == 0)
+			total += exe_val + title_val + class_val;
+	} else {
+		if (dstr_cmpi(&cur_class, class) == 0)
+			total += class_val;
+		if (dstr_cmpi(&cur_title, title) == 0)
+			total += title_val;
+		if (dstr_cmpi(&cur_exe, exe) == 0)
+			total += exe_val;
+	}
 
 	dstr_free(&cur_class);
 	dstr_free(&cur_title);
@@ -331,9 +338,11 @@ HWND find_window(enum window_search_mode mode,
 	HWND window      = first_window(mode, &parent);
 	HWND best_window = NULL;
 	int  best_rating = 0;
+	bool uwp_window  = strcmp(class, "Windows.UI.Core.CoreWindow") == 0;
 
 	while (window) {
-		int rating = window_rating(window, priority, class, title, exe);
+		int rating = window_rating(window, priority, class, title, exe,
+				uwp_window);
 		if (rating > best_rating) {
 			best_rating = rating;
 			best_window = window;