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

UI/updater: Use better function for getting process names

Browse Source 
EnumProcessModules may not work correctly cross-arch, so use
GetProcessImageFileName instead to ensure no issues in that case.
This commit is contained in:
jp9000
2017-03-06 18:21:53 -08:00
parent 48df41b5b7
commit bc9a58174b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
UI/win-update/updater/updater.cpp
View File

@@ -480,8 +480,9 @@ try {
static inline DWORD WaitIfOBS(DWORD id, const wchar_t *expected)
{
wchar_t name[MAX_PATH];
*name = 0;
wchar_t path[MAX_PATH];
wchar_t *name;
*path = 0;
WinHandle proc = OpenProcess(
PROCESS_QUERY_INFORMATION |
@@ -491,13 +492,14 @@ static inline DWORD WaitIfOBS(DWORD id, const wchar_t *expected)
if (!proc.Valid())
return WAITIFOBS_WRONG_PROCESS;
HMODULE mod;
DWORD temp;
if (!EnumProcessModules(proc, &mod, sizeof(mod), &temp))
if (!GetProcessImageFileName(proc, path, _countof(path)))
return WAITIFOBS_WRONG_PROCESS;
GetModuleBaseName(proc, mod, name, _countof(name));
name = wcsrchr(path, L'\\');
if (name)
name += 1;
else
name = path;
if (_wcsnicmp(name, expected, 5) == 0) {
HANDLE hWait[2];
@@ -505,7 +507,6 @@ static inline DWORD WaitIfOBS(DWORD id, const wchar_t *expected)
hWait[1] = cancelRequested;
int i = WaitForMultipleObjects(2, hWait, false, INFINITE);
DWORD err = GetLastError();
if (i == WAIT_OBJECT_0 + 1)
return WAITIFOBS_CANCELLED;