Changeset 2764 for trunk/synergy/lib/platform/CPMSynergyHook.cpp

Timestamp:

Aug 13, 2006, 10:58:34 PM (19 years ago)

Author:

bird

Message:

Fixed that 'ing hook problem. ARG!!!

File:

• trunk/synergy/lib/platform/CPMSynergyHook.cpp (modified) (7 diffs)

trunk/synergy/lib/platform/CPMSynergyHook.cpp

@@ -92 +92 @@
 /** Error description. */
 const char          *g_pszErrorMsg;
-/** Set if the dummy hook is installed. */
-bool                 g_fDummyHook;
 /** @} */
 
@@ -288 +286 @@
 
 
-#define NO_DUMMY_HOOK 1
-#ifndef NO_DUMMY_HOOK
-/**
- * Dummy hook.
- */
-static VOID EXPENTRY SendMsgHook(HAB hab, PSMHSTRUCT psmh, BOOL fInterTask)
-{
-    /* nop */
-}
-#endif 
-
-
-
 //
 // external functions
@@ -382 +367 @@
     }
 
-#ifndef NO_DUMMY_HOOK
-    /*
-     * Install the fake hook.
-     */
-    if (g_fDummyHook)
-        WinReleaseHook(WinQueryAnchorBlock(HWND_DESKTOP), NULLHANDLE, HK_SENDMSG, (PFN)SendMsgHook, g_hmod);
-    g_fDummyHook = WinSetHook(WinQueryAnchorBlock(HWND_DESKTOP), NULLHANDLE, HK_SENDMSG, (PFN)SendMsgHook, g_hmod);
-    if (!g_fDummyHook) {
-        return false;
-    }
-#endif 
-
     g_fSynergyInitialized = true;
     return true;
@@ -420 +393 @@
     /* parnaoia */
     uninstall(hab);
-
-#ifndef NO_DUMMY_HOOK
-    // release the dummy hook.
-    if (WinReleaseHook(hab, NULLHANDLE, HK_SENDMSG, (PFN)SendMsgHook, g_hmod))
-        g_fDummyHook = false;
-#endif 
 
     g_hmqSynergy = NULLHANDLE;
@@ -564 +531 @@
 
 
+//
+// Message faking.
+//
+
 /**
  * Hook callback used to insert message into the system queue.
@@ -579 +550 @@
 static BOOL EXPENTRY MsgInputHook(HAB hab, PQMSG pqmsg, BOOL fSkip, PBOOL pfNoRecord)
 {
-    /*
-     * FUCKING HELL!
-     *
-     * For whatever fucking reason, PM fails to load the hook dll into 
-     * a bunch of processes. We still get here for some peculiar reasons, 
-     * and thus we can try deal with it...
-     */
-    BOOL fUnload = FALSE;
-    HMODULE hmod;
-    ULONG offObj, iObj;
-    APIRET rc = DosQueryModFromEIP(&hmod, &iObj, 0, NULL, &offObj, (ULONG)&MsgInputHook);
-    if (rc != NO_ERROR) {
-        if (DosLoadModule(NULL, 0, (PCSZ)"d:/coding/libc/trunk/out/os2.x86/debug/dist/bin/synrgyhk.dll", &hmod)) {
-            return FALSE;
-        }
-        fUnload = TRUE;
-    }
-
     /*
      * We've only got one message, so everything is dead simple.
@@ -616 +569 @@
     }
 
-    /* 
-     * If we loaded the dll we must unload it.
-     * Don't wanna have any DLLs stuck in foreign processes.
-     */
-    if (fUnload)
-        DosFreeModule(hmod);
     return TRUE;
 }