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

remove references to immunekeys functions from outside synwinhk

This commit is contained in:
walker0643 2018-02-23 16:27:56 -05:00
parent b1be8227d2
commit d169555b28
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,7 +369,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
if (m_isPrimary && !m_noHooks) { if (m_isPrimary && !m_noHooks) {
m_install = (InstallFunc)GetProcAddress(hookLibrary, "install"); m_install = (InstallFunc)GetProcAddress(hookLibrary, "install");
m_uninstall = (UninstallFunc)GetProcAddress(hookLibrary, "uninstall"); m_uninstall = (UninstallFunc)GetProcAddress(hookLibrary, "uninstall");
m_setImmuneKeys = (SetImmuneKeysFunc)GetProcAddress(hookLibrary, "setImmuneKeys"); //m_setImmuneKeys = (SetImmuneKeysFunc)GetProcAddress(hookLibrary, "setImmuneKeys");
m_installScreensaver = m_installScreensaver =
(InstallScreenSaverFunc)GetProcAddress( (InstallScreenSaverFunc)GetProcAddress(
hookLibrary, "installScreenSaver"); hookLibrary, "installScreenSaver");
@ -379,7 +379,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
if (m_install == NULL || if (m_install == NULL ||
m_uninstall == NULL || m_uninstall == NULL ||
m_setImmuneKeys == NULL || //m_setImmuneKeys == NULL ||
m_installScreensaver == NULL || m_installScreensaver == NULL ||
m_uninstallScreensaver == NULL) { m_uninstallScreensaver == NULL) {
LOG((CLOG_ERR "Invalid hook library")); LOG((CLOG_ERR "Invalid hook library"));
@ -389,7 +389,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
else { else {
m_install = NULL; m_install = NULL;
m_uninstall = NULL; m_uninstall = NULL;
m_setImmuneKeys = NULL; //m_setImmuneKeys = NULL;
m_installScreensaver = NULL; m_installScreensaver = NULL;
m_uninstallScreensaver = NULL; m_uninstallScreensaver = NULL;
} }
@ -718,7 +718,7 @@ MSWindowsDesks::deskThread(void* vdesk)
// 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())); 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:
// we won't work on this desk // we won't work on this desk

2
src/lib/platform/MSWindowsDesks.h
View File

@ -286,7 +286,7 @@ private:
// hook library stuff // hook library stuff
InstallFunc m_install; InstallFunc m_install;
UninstallFunc m_uninstall; UninstallFunc m_uninstall;
SetImmuneKeysFunc m_setImmuneKeys; //SetImmuneKeysFunc m_setImmuneKeys;
InstallScreenSaverFunc InstallScreenSaverFunc
m_installScreensaver; m_installScreensaver;
UninstallScreenSaverFunc UninstallScreenSaverFunc

6
src/lib/synwinhk/synwinhk.cpp
View File

@ -86,12 +86,6 @@ setImmuneKeys(const DWORD *list, std::size_t size)
// //
#define NO_GRAB_KEYBOARD 0 #define NO_GRAB_KEYBOARD 0
// declare extended mouse hook struct. useable on win2k
typedef struct tagMOUSEHOOKSTRUCTWin2000 {
MOUSEHOOKSTRUCT mhs;
DWORD mouseData;
} MOUSEHOOKSTRUCTWin2000;
// //
// globals // globals
// //