rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'caramis-master'

This commit is contained in:
Xinyu Hou 2014-10-27 14:46:54 +00:00
parent 6a5da5aaac 74873d763e
commit 4d3fd14ada
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lib/platform/MSWindowsSession.cpp
View File

@ -21,7 +21,6 @@
#include "synergy/XSynergy.h" #include "synergy/XSynergy.h"
#include "base/Log.h" #include "base/Log.h"
#include <Tlhelp32.h>
#include <Wtsapi32.h> #include <Wtsapi32.h>
CMSWindowsSession::CMSWindowsSession() : CMSWindowsSession::CMSWindowsSession() :
@ -69,34 +68,29 @@ CMSWindowsSession::isProcessInSession(const char* name, PHANDLE process = NULL)
entry.th32ProcessID, &processSessionId); entry.th32ProcessID, &processSessionId);
if (!pidToSidRet) { if (!pidToSidRet) {
// if we can not acquire session associated with a specified process,
// simply ignore it
LOG((CLOG_ERR "could not get session id for process id %i", entry.th32ProcessID)); LOG((CLOG_ERR "could not get session id for process id %i", entry.th32ProcessID));
throw XArch(new XArchEvalWindows()); gotEntry = nextProcessEntry(snapshot, &entry);
continue;
} }
else {
// only pay attention to processes in the active session
if (processSessionId == m_activeSessionId) {
// only pay attention to processes in the active session // store the names so we can record them for debug
if (processSessionId == m_activeSessionId) { nameList.push_back(entry.szExeFile);
// store the names so we can record them for debug if (_stricmp(entry.szExeFile, name) == 0) {
nameList.push_back(entry.szExeFile); pid = entry.th32ProcessID;
}
if (_stricmp(entry.szExeFile, name) == 0) {
pid = entry.th32ProcessID;
} }
} }
} }
// now move on to the next entry (if we're not at the end) // now move on to the next entry (if we're not at the end)
gotEntry = Process32Next(snapshot, &entry); gotEntry = nextProcessEntry(snapshot, &entry);
if (!gotEntry) {
DWORD err = GetLastError();
if (err != ERROR_NO_MORE_FILES) {
// only worry about error if it's not the end of the snapshot
LOG((CLOG_ERR "could not get next process entry"));
throw XArch(new XArchEvalWindows());
}
}
} }
std::string nameListJoin; std::string nameListJoin;
@ -158,3 +152,22 @@ CMSWindowsSession::updateActiveSession()
{ {
m_activeSessionId = WTSGetActiveConsoleSessionId(); m_activeSessionId = WTSGetActiveConsoleSessionId();
} }
BOOL
CMSWindowsSession::nextProcessEntry(HANDLE snapshot, LPPROCESSENTRY32 entry)
{
BOOL gotEntry = Process32Next(snapshot, entry);
if (!gotEntry) {
DWORD err = GetLastError();
if (err != ERROR_NO_MORE_FILES) {
// only worry about error if it's not the end of the snapshot
LOG((CLOG_ERR "could not get next process entry"));
throw XArch(new XArchEvalWindows());
}
}
return gotEntry;
}

4
src/lib/platform/MSWindowsSession.h
View File

@ -19,6 +19,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#include <Tlhelp32.h>
class CMSWindowsSession { class CMSWindowsSession {
public: public:
@ -39,6 +40,9 @@ public:
void updateActiveSession(); void updateActiveSession();
private:
BOOL nextProcessEntry(HANDLE snapshot, LPPROCESSENTRY32 entry);
private: private:
DWORD m_activeSessionId; DWORD m_activeSessionId;
}; };