/*
* MT safe
*/
+#include "config.h"
#include <stdio.h>
#include <windows.h>
#endif
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);
}
gboolean bind_local)
{
HINSTANCE handle;
+ wchar_t *wfilename;
#ifdef G_WITH_CYGWIN
gchar tmp[MAX_PATH];
cygwin_conv_to_win32_path(file_name, tmp);
file_name = tmp;
#endif
-
- handle = LoadLibrary (file_name);
+ wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL);
+
+ handle = LoadLibraryW (wfilename);
+ g_free (wfilename);
+
if (!handle)
- set_error ();
+ set_error ("`%s': ", file_name);
return handle;
}
{
if (handle != null_module_handle)
if (!FreeLibrary (handle))
- set_error ();
+ set_error ("");
}
static gpointer
p = GetProcAddress (handle, symbol_name);
if (!p)
- set_error ();
+ set_error ("");
return p;
}