From a45be29beb058c4f5901a5c34608830e420cb07a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 28 Dec 2006 15:41:28 +0000 Subject: [PATCH] Use only the wide character API here, too. 2006-12-28 Tor Lillqvist * glib/gutils.h (G_WIN32_DLLMAIN_FOR_DLL_NAME): Use only the wide character API here, too. --- ChangeLog | 3 +++ glib/gutils.h | 19 ++++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20fa508..a2f6445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-28 Tor Lillqvist + * glib/gutils.h (G_WIN32_DLLMAIN_FOR_DLL_NAME): Use only the wide + character API here, too. + * glib/gslice.c: Make it compile on Win32 without pthreads: Use a Win32 critical section instead. diff --git a/glib/gutils.h b/glib/gutils.h index bf7cb90..6a0ca47 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -407,25 +407,14 @@ DllMain (HINSTANCE hinstDLL, \ LPVOID lpvReserved) \ { \ wchar_t wcbfr[1000]; \ - char cpbfr[1000]; \ char *tem; \ switch (fdwReason) \ { \ case DLL_PROCESS_ATTACH: \ - if (GetVersion () < 0x80000000) \ - { \ - GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \ - tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL); \ - dll_name = g_path_get_basename (tem); \ - g_free (tem); \ - } \ - else \ - { \ - GetModuleFileNameA ((HMODULE) hinstDLL, cpbfr, G_N_ELEMENTS (cpbfr)); \ - tem = g_locale_to_utf8 (cpbfr, -1, NULL, NULL, NULL); \ - dll_name = g_path_get_basename (tem); \ - g_free (tem); \ - } \ + GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \ + tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL); \ + dll_name = g_path_get_basename (tem); \ + g_free (tem); \ break; \ } \ \ -- 2.7.4