Better relocation.

diff --git a/.gitignore b/.gitignore
index a41bfddb2d59efeab0157aecb60b7c3a61d37fdd..7315df947d5edbe015d20b99588f4d5e64731b49 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ INSTALL
 Makefile
 aclocal.m4
 autom4te.cache/
 Makefile
 aclocal.m4
 autom4te.cache/

+compile

 config.guess
 config.log
 config.status
 config.guess
 config.log
 config.status


@@ -28,4 +29,4 @@ stamp-h1
 tests/test
 tools/aute-db-mkpwd
 *.tar.gz
 tests/test
 tools/aute-db-mkpwd
 *.tar.gz

-*.exe
\ No newline at end of file
+*.exe

diff --git a/src/aute_smbldap.c b/src/aute_smbldap.c
index 526ac263b439cc0cb922e64379ca2305ada9ee23..7e9b634391065a1b992711373b8461d2541074d2 100644 (file)
--- a/src/aute_smbldap.c
+++ b/src/aute_smbldap.c
@@ -20,6 +20,10 @@
        #include "config.h"
 #endif
   
        #include "config.h"
 #endif
   

+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+

 #include <gtk/gtk.h>
 #include <ldap.h>
 #include <libssh/libssh.h>
 #include <gtk/gtk.h>
 #include <ldap.h>
 #include <libssh/libssh.h>


@@ -82,6 +86,31 @@ enum
 };
 
 /* PRIVATE */
 };
 
 /* PRIVATE */

+#ifdef G_OS_WIN32
+static HMODULE backend_dll = NULL;
+
+BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved);
+
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+         DWORD     fdwReason,
+         LPVOID    lpReserved)
+{
+       switch (fdwReason)
+               {
+                       case DLL_PROCESS_ATTACH:
+                               backend_dll = (HMODULE) hinstDLL;
+                               break;
+                       case DLL_THREAD_ATTACH:
+                       case DLL_THREAD_DETACH:
+                       case DLL_PROCESS_DETACH:
+                               break;
+               }
+       return TRUE;
+}
+#endif
+
+

 #ifdef HAVE_LIBCONFI
 static gboolean
 get_connection_parameters_from_confi (Confi *confi, gchar **user_field)
 #ifdef HAVE_LIBCONFI
 static gboolean
 get_connection_parameters_from_confi (Confi *confi, gchar **user_field)


@@ -887,7 +916,7 @@ gchar
        gchar *moddir;
        gchar *p;
 
        gchar *moddir;
        gchar *p;
 

-       moddir = g_win32_get_package_installation_directory_of_module (NULL);
+       moddir = g_win32_get_package_installation_directory_of_module (backend_dll);

 
        p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR));
        if (p != NULL
 
        p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR));
        if (p != NULL