From c35ab347744adae6d8f2466464c4cc1c3b503c7d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Mar 2000 09:44:10 +0000 Subject: [PATCH] New function that returns the message string for a Win32 error code. 2000-03-04 Tor Lillqvist * gwin32.c (g_win32_error_message): New function that returns the message string for a Win32 error code. * glib.h: Declare it. * glib.def: Export it, plus g_node_copy. * gmodule-win32.c: Call g_win32_error_message() to get the error message strings. * libgplugin_a.c * libgplugin_b.c * gmodule.c: Remove LibMain functions that were needed by LCC, which is not a supported compiler. * testgmodule.c (main): Test for G_MODULE_IMPL == G_MODULE_IMPL_WIN32, not G_OS_WIN32. * gmoduleconf.h.win32: Remove LCC stuff from here, too. --- glib.h | 6 ++++++ glib/glib.h | 6 ++++++ gmodule/ChangeLog | 15 +++++++++++++++ gmodule/testgmodule.c | 6 +++--- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/glib.h b/glib.h index 463cd9a05..071453489 100644 --- a/glib.h +++ b/glib.h @@ -2905,6 +2905,12 @@ gint g_win32_closedir (DIR *dir); */ gchar * g_win32_getlocale (void); +/* Translate a Win32 error code (as returned by GetLastError()) into + * the corresponding message. The returned string should be deallocated + * with g_free(). + */ +gchar * g_win32_error_message (gint error); + #endif /* G_OS_WIN32 */ diff --git a/glib/glib.h b/glib/glib.h index 463cd9a05..071453489 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -2905,6 +2905,12 @@ gint g_win32_closedir (DIR *dir); */ gchar * g_win32_getlocale (void); +/* Translate a Win32 error code (as returned by GetLastError()) into + * the corresponding message. The returned string should be deallocated + * with g_free(). + */ +gchar * g_win32_error_message (gint error); + #endif /* G_OS_WIN32 */ diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 2095d835f..fa58bd49b 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,18 @@ +2000-03-04 Tor Lillqvist + + * gmodule-win32.c: Call g_win32_error_message() to get the error + message strings. + + * libgplugin_a.c + * libgplugin_b.c + * gmodule.c: Remove LibMain functions that were needed by LCC, + which is not a supported compiler. + + * testgmodule.c (main): Test for G_MODULE_IMPL == + G_MODULE_IMPL_WIN32, not G_OS_WIN32. + + * gmoduleconf.h.win32: Remove LCC stuff from here, too. + Wed Mar 1 05:34:47 2000 Tim Janik * gmodule-beos.c (_g_module_symbol): do not return NULL symbols. diff --git a/gmodule/testgmodule.c b/gmodule/testgmodule.c index 70ebe2d3a..85f4c8db5 100644 --- a/gmodule/testgmodule.c +++ b/gmodule/testgmodule.c @@ -53,16 +53,16 @@ main (int arg, string = g_get_current_dir (); g_print ("testgmodule (%s):\n", string); -#ifdef G_OS_WIN32 +#if (G_MODULE_IMPL == G_MODULE_IMPL_WIN32) plugin_a = g_strconcat (string, "\\libgplugin_a.dll", NULL); plugin_b = g_strconcat (string, "\\libgplugin_b.dll", NULL); #elif (G_MODULE_IMPL == G_MODULE_IMPL_DLD) plugin_a = g_strconcat (string, "/.libs/", "libgplugin_a.sl", NULL); plugin_b = g_strconcat (string, "/.libs/", "libgplugin_b.sl", NULL); -#else /* G_MODULE_IMPL != G_MODULE_IMPL_DLD && !G_OS_WIN32 */ +#else /* neither DLD nor WIN32 */ plugin_a = g_strconcat (string, "/.libs/", "libgplugin_a.so", NULL); plugin_b = g_strconcat (string, "/.libs/", "libgplugin_b.so", NULL); -#endif /* G_OS_WIN32 */ +#endif g_free (string); /* module handles