From d169555b2825b9f1eecf0f45e6331e51ff375a5d Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Fri, 23 Feb 2018 16:27:56 -0500
Subject: [PATCH] remove references to immunekeys functions from outside
 synwinhk

---
 src/lib/platform/MSWindowsDesks.cpp | 8 ++++----
 src/lib/platform/MSWindowsDesks.h   | 2 +-
 src/lib/synwinhk/synwinhk.cpp       | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp
index dead5eeb..f5c9ee2a 100644
--- a/src/lib/platform/MSWindowsDesks.cpp
+++ b/src/lib/platform/MSWindowsDesks.cpp
@@ -369,7 +369,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
     if (m_isPrimary && !m_noHooks) {
         m_install   = (InstallFunc)GetProcAddress(hookLibrary, "install");
         m_uninstall = (UninstallFunc)GetProcAddress(hookLibrary, "uninstall");
-        m_setImmuneKeys = (SetImmuneKeysFunc)GetProcAddress(hookLibrary, "setImmuneKeys");
+        //m_setImmuneKeys = (SetImmuneKeysFunc)GetProcAddress(hookLibrary, "setImmuneKeys");
         m_installScreensaver   =
                   (InstallScreenSaverFunc)GetProcAddress(
                                 hookLibrary, "installScreenSaver");
@@ -379,7 +379,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
 
         if (m_install              == NULL ||
             m_uninstall            == NULL ||
-            m_setImmuneKeys        == NULL ||
+            //m_setImmuneKeys        == NULL ||
             m_installScreensaver   == NULL ||
             m_uninstallScreensaver == NULL) {
             LOG((CLOG_ERR "Invalid hook library"));
@@ -389,7 +389,7 @@ MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
     else {
         m_install              = NULL;
         m_uninstall            = NULL;
-        m_setImmuneKeys        = NULL;
+        //m_setImmuneKeys        = NULL;
         m_installScreensaver   = NULL;
         m_uninstallScreensaver = NULL;
     }
@@ -718,7 +718,7 @@ MSWindowsDesks::deskThread(void* vdesk)
                 // before the hooks are activated
                 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()) {
                 case kHOOK_FAILED:
                     // we won't work on this desk
diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h
index 6fde3537..11073005 100644
--- a/src/lib/platform/MSWindowsDesks.h
+++ b/src/lib/platform/MSWindowsDesks.h
@@ -286,7 +286,7 @@ private:
     // hook library stuff
     InstallFunc            m_install;
     UninstallFunc        m_uninstall;
-    SetImmuneKeysFunc    m_setImmuneKeys;
+    //SetImmuneKeysFunc    m_setImmuneKeys;
     InstallScreenSaverFunc
                         m_installScreensaver;
     UninstallScreenSaverFunc
diff --git a/src/lib/synwinhk/synwinhk.cpp b/src/lib/synwinhk/synwinhk.cpp
index 6b07cbe5..a2102978 100644
--- a/src/lib/synwinhk/synwinhk.cpp
+++ b/src/lib/synwinhk/synwinhk.cpp
@@ -86,12 +86,6 @@ setImmuneKeys(const DWORD *list, std::size_t size)
 //
 #define NO_GRAB_KEYBOARD 0
 
-// declare extended mouse hook struct.  useable on win2k
-typedef struct tagMOUSEHOOKSTRUCTWin2000 {
-    MOUSEHOOKSTRUCT mhs;
-    DWORD mouseData;
-} MOUSEHOOKSTRUCTWin2000;
-
 //
 // globals
 //