dnrops
/
barrier
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove annoying LOG statement; add a small bit of debugging info

This commit is contained in:
walker0643 2018-02-23 14:02:38 -05:00
parent 07dad10251
commit 4571f4cc6e
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clean_build.bat
View File

@ -18,6 +18,9 @@ set BONJOUR_SDK_HOME=%B_BONJOUR%
REM full path to Qt stuff we need REM full path to Qt stuff we need
set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC% set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
echo Bonjour: %BONJOUR_SDK_HOME%
echo Qt: %B_QT_FULLPATH%
rmdir /q /s build rmdir /q /s build
mkdir build mkdir build
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed

1
src/lib/arch/win32/ArchMultithreadWindows.cpp
View File

@ -232,6 +232,7 @@ ArchMultithreadWindows::waitCondVar(ArchCond cond,
unlockMutex(mutex); unlockMutex(mutex);
// wait for a signal or broadcast // wait for a signal or broadcast
// TODO: this doesn't always signal when kill signals are sent
DWORD result = WaitForMultipleObjects(3, handles, FALSE, winTimeout); DWORD result = WaitForMultipleObjects(3, handles, FALSE, winTimeout);
// cancel takes priority // cancel takes priority

3
src/lib/platform/MSWindowsDesks.cpp
View File

@ -126,7 +126,7 @@ MSWindowsDesks::MSWindowsDesks(
m_events(events), m_events(events),
m_stopOnDeskSwitch(stopOnDeskSwitch) m_stopOnDeskSwitch(stopOnDeskSwitch)
{ {
LOG((CLOG_DEBUG "Immune Keys Path: %s", ImmuneKeysPath)); LOG((CLOG_DEBUG "Immune Keys Path: %s", ImmuneKeysPath.c_str()));
if (hookLibrary != NULL) if (hookLibrary != NULL)
queryHookLibrary(hookLibrary); queryHookLibrary(hookLibrary);
@ -717,6 +717,7 @@ MSWindowsDesks::deskThread(void* vdesk)
// populate immune keys list in the DLL's shared memory // populate immune keys list in the DLL's shared memory
// before the hooks are activated // before the hooks are activated
auto list = immune_keys_list(); auto list = immune_keys_list();
LOG((CLOG_DEBUG "Found %u immune keys", list.size()));
m_setImmuneKeys(list.data(), list.size()); m_setImmuneKeys(list.data(), list.size());
switch (m_install()) { switch (m_install()) {
case kHOOK_FAILED: case kHOOK_FAILED:

1
src/lib/server/Server.cpp
View File

@ -422,7 +422,6 @@ Server::isLockedToScreen() const
{ {
// locked if we say we're locked // locked if we say we're locked
if (isLockedToScreenServer()) { if (isLockedToScreenServer()) {
LOG((CLOG_NOTE "Cursor is locked to screen, check Scroll Lock key"));
return true; return true;
} }