luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-10 11:14:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting: When g_module_open() fails, include the name of

Browse Source 
2008-09-26  Tor Lillqvist  <tml@novell.com>

	* gmodule-win32.c: Improve error reporting: When g_module_open()
	fails, include the name of the module passed to LoadLibrary() in
	what g_module_error() returns.


svn path=/trunk/; revision=7543
This commit is contained in:
Tor Lillqvist
2008-09-26 09:16:25 +00:00
committed by Tor Lillqvist
parent fc542a462a
commit 30f2323d62
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gmodule/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-09-26 Tor Lillqvist <tml@novell.com>
* gmodule-win32.c: Improve error reporting: When g_module_open()
fails, include the name of the module passed to LoadLibrary() in
what g_module_error() returns.
2008-09-17 Matthias Clasen <mclasen@redhat.com> 2008-09-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.18.1 === * === Released 2.18.1 ===

26
gmodule/gmodule-win32.c
View File

@@ -42,11 +42,25 @@
#endif #endif
static void static void
set_error (void) set_error (const gchar *format,
...)
{ {
gchar *error = g_win32_error_message (GetLastError ()); gchar *error;
gchar *detail;
gchar *message;
va_list args;
g_module_set_error (error); error = g_win32_error_message (GetLastError ());
va_start (args, format);
detail = g_strdup_vprintf (format, args);
va_end (args);
message = g_strconcat (detail, error, NULL);
g_module_set_error (message);
g_free (message);
g_free (detail);
g_free (error); g_free (error);
} }
@@ -70,7 +84,7 @@ _g_module_open (const gchar *file_name,
g_free (wfilename); g_free (wfilename);
if (!handle) if (!handle)
set_error (); set_error ("`%s': ", file_name);
return handle; return handle;
} }
@@ -90,7 +104,7 @@ _g_module_close (gpointer handle,
{ {
if (handle != null_module_handle) if (handle != null_module_handle)
if (!FreeLibrary (handle)) if (!FreeLibrary (handle))
set_error (); set_error ("");
} }
static gpointer static gpointer
@@ -219,7 +233,7 @@ _g_module_symbol (gpointer handle,
p = GetProcAddress (handle, symbol_name); p = GetProcAddress (handle, symbol_name);
if (!p) if (!p)
set_error (); set_error ("");
return p; return p;
} }