jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-capture: Better matching of internal UWP windows

Browse Source 
All strings were treated as partial matches before, which caused a
false positive with any executable beginning with "time", notably
affecting the game "Timelie" which used Timelie.exe.
This commit is contained in:
Richard Stanway 2020-05-23 01:50:38 +02:00
parent eee7862363
commit 50e1d17615
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
plugins/win-capture/window-helpers.c
View File

@ -127,24 +127,29 @@ void get_window_class(struct dstr *class, HWND hwnd)
dstr_from_wcs(class, temp);
}
/* not capturable or internal windows */
static const char *internal_microsoft_exes[] = {
"startmenuexperiencehost",
"applicationframehost",
"peopleexperiencehost",
"shellexperiencehost",
"microsoft.notes",
/* not capturable or internal windows, exact executable names */
static const char *internal_microsoft_exes_exact[] = {
"startmenuexperiencehost.exe",
"applicationframehost.exe",
"peopleexperiencehost.exe",
"shellexperiencehost.exe",
"microsoft.notes.exe",
"systemsettings.exe",
"textinputhost.exe",
"searchapp.exe",
"video.ui.exe",
"searchui.exe",
"lockapp.exe",
"cortana.exe",
"gamebar.exe",
"tabtip.exe",
"time.exe",
NULL,
};
/* partial matches start from the beginning of the executable name */
static const char *internal_microsoft_exes_partial[] = {
"windowsinternal",
"systemsettings",
"textinputhost",
"searchapp",
"video.ui",
"searchui",
"lockapp",
"cortana",
"gamebar",
"tabtip",
"time",
NULL,
};
@ -153,7 +158,13 @@ static bool is_microsoft_internal_window_exe(const char *exe)
if (!exe)
return false;
for (const char **vals = internal_microsoft_exes; *vals; vals++) {
for (const char **vals = internal_microsoft_exes_exact; *vals; vals++) {
if (astrcmpi(exe, *vals) == 0)
return true;
}
for (const char **vals = internal_microsoft_exes_partial; *vals;
vals++) {
if (astrcmpi_n(exe, *vals, strlen(*vals)) == 0)
return true;
}