Changeset 2764

Timestamp:

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

Author:

bird

Message:

Fixed that 'ing hook problem. ARG!!!

Location:

trunk/synergy

Files:

• Makefile.kmk (modified) (1 diff)
• lib/platform/CPMScreen.cpp (modified) (2 diffs)
• lib/platform/CPMSynergyHook.cpp (modified) (7 diffs)

trunk/synergy/Makefile.kmk

@@ -187 +187 @@
 
 PROGRAMS = \
-    synergys \
-        synergyc \
+        synergyc
+#    synergys \
 
 synergyc_SOURCES = \

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -691 +691 @@
 }
 
-HMODULE
-CPMScreen::openHookLibrary(const char* name)
-{
-        // load the hook library - try with qualified name first.
-        HMODULE hmod = NULLHANDLE;
-    APIRET rc = ERROR_FILE_NOT_FOUND;
-    char szFullName[CCHMAXPATH + 10];
-    if (!_execname(szFullName, CCHMAXPATH)) {
-        char *psz = strrchr(szFullName, '\\');
+/**
+ * Gets the path to the directory with the executable.
+ * Has trailing slash.
+ * 
+ * @returns pszBuf.
+ * @returns NULL on buffer overflow.
+ * @param   pszBuf      Where to store the path.
+ * @param   cchBuf      The buffer size.
+ */
+static char *
+getExecDir(char *pszBuf, size_t cchBuf)
+{
+    char *psz = NULL;
+    if (!_execname(pszBuf,cchBuf)) {
+        char *psz = strrchr(pszBuf, '\\');
         if (!psz || strrchr(psz, '/')) {
             psz = strrchr(psz, '/');
         }
         if (psz) {
-            strcat(strcpy(psz + 1, name), ".DLL");
+            psz[1] = '\0';
+            return pszBuf;
         }
-            rc = DosLoadModule(NULL, 0, (PCSZ)szFullName, &hmod);
     }
-
-    // if that failed, try with the bare name.
-    if (rc != NO_ERROR) {
-            rc = DosLoadModule(NULL, 0, (PCSZ)name, &hmod);
-    } else {
-        name = szFullName;
+    return NULL;
+}
+
+HMODULE
+CPMScreen::openHookLibrary(const char* name)
+{
+    //
+    // Load the hook dll as a global DLL. 
+    //
+    // The kernel/PM will fuck up if it's loaded with a path (i.e. non global).
+    // What happend was that the DLL wasn't actually loaded into the other 
+    // processes for some stupid reason, leading to nasty crashes and even 
+    // weirder behaviour.
+    //
+    char szPath[CCHMAXPATH + 10];
+    char szCwd[CCHMAXPATH];
+    if (    getcwd(szCwd, sizeof(szCwd)) == NULL
+        ||  getExecDir(szPath, sizeof(szPath)) == NULL
+        ||  chdir(szPath) != 0) {
+                LOG((CLOG_ERR "can't get cwd or exec dir or failed to change path to the exec dir!"));
+                throw XScreenOpenFailure();
     }
+        HMODULE hmod;
+    APIRET rc = DosLoadModule(NULL, 0, (PCSZ)name, &hmod);
+    chdir(szCwd);
         if (rc != NO_ERROR) {
                 LOG((CLOG_ERR "Failed to load hook library (%s), rc=%d ", name, rc));
@@ -720 +744 @@
         }
 
-        // look up functions
+        // resolve the functions
         if (    (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_fakeMsg",       (PPFN)&m_fakeMsg )) != NO_ERROR
         ||      (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_setSides",      (PPFN)&m_setSides)) != NO_ERROR

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;
 }