From: Tor Lillqvist <tml@src.gnome.org>
Date: Wed, 22 Mar 2000 22:51:54 +0000 (+0000)
Subject: In the "null" module case _g_module_symbol should still first search the main
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=dd781b91ec5322358cab4ff3e217b616cf2bc62b;p=dana%2Fcg-glib.git

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 b40bbfd8..4be78001 100644
--- 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 6bcef9ff..099f96a2 100644
--- 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);