Changeset 2764 for trunk/synergy/lib/platform/CPMScreen.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/CPMScreen.cpp (modified) (2 diffs)

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