In the "null" module case _g_module_symbol should still first search the main

program before searching all the loaded DLLs.

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index b40bbfd..4be7800 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -11,6 +11,9 @@
        the latter on Win9x and Win2k. Check which one works, and use
        that.
 
+       First check for the symbol in the main program, and if not found
+       there, in all the modules.
+
        Code for using PSAPI and Toolhelp was borrowed from the Dr. Mingw
        tool written by José Fonseca <em96115@fe.up.pt>. Thanks.
 

diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c
index 6bcef9f..099f96a 100644 (file)
--- a/gmodule/gmodule-win32.c
+++ b/gmodule/gmodule-win32.c
@@ -195,7 +195,10 @@ _g_module_symbol (gpointer     handle,
   gpointer p;
   
   if (handle == null_module_handle)
-    p = find_in_any_module (symbol_name);
+    {
+      if ((p = GetProcAddress (GetModuleHandle (NULL), symbol_name)) == NULL)
+       p = find_in_any_module (symbol_name);
+    }
   else
     p = GetProcAddress (handle, symbol_name);