luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-23 17:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and G_HARDCODED_PATH_WRAPPER.

Browse Source 
2001-10-23  Tor Lillqvist  <tml@iki.fi>

	* glib/gutils.h: Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and
	G_HARDCODED_PATH_WRAPPER. These are used to avoid hardcoding path
	names into Windows DLLs.

	* glib/gutils.c: Use them for GLIB_LOCALEDIR.

	* glib/gwin32.c (get_package_directory_from_module): Plug a small
	memory leak. Minor code reordering.
	(g_win32_get_package_installation_subdirectory):  Allow empty subdir.
This commit is contained in:
Tor Lillqvist
2001-10-22 23:19:19 +00:00
committed by Tor Lillqvist
parent a0b08581c0
commit 3984621bd3
11 changed files with 171 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
glib/gutils.c
View File

@@ -1093,43 +1093,8 @@ g_get_codeset (void)
#include <libintl.h>
#ifdef G_OS_WIN32
/* DllMain function needed to tuck away the GLib DLL name */
static char dll_name[MAX_PATH];
BOOL WINAPI
DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
GetModuleFileName ((HMODULE) hinstDLL, dll_name, sizeof (dll_name));
break;
}
return TRUE;
}
/* On Windows we don't want any hard-coded path names */
#undef GLIB_LOCALE_DIR
/* It's OK to leak the g_win32_get_...() and g_path_get_basename() results
* below, as this macro is called only once.
* Use the actual DLL name of the GLib DLL, i.e. don't assume the
* GLib DLL has a certain name.
*/
#define GLIB_LOCALE_DIR \
g_win32_get_package_installation_subdirectory \
(GETTEXT_PACKAGE, \
g_path_get_basename (dll_name), \
"share\\locale")
#endif /* !G_OS_WIN32 */
G_WIN32_DLLMAIN_FOR_DLL_NAME (static, dll_name)
G_HARDCODED_PATH_WRAPPER (GLIB_LOCALE_DIR, GETTEXT_PACKAGE, _glib_get_locale_dir, dll_name, "lib/locale")
G_CONST_RETURN gchar *
_glib_gettext (const gchar *str)
@@ -1138,7 +1103,7 @@ _glib_gettext (const gchar *str)
if (!_glib_gettext_initialized)
{
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
bindtextdomain(GETTEXT_PACKAGE, _glib_get_locale_dir ());
_glib_gettext_initialized = TRUE;
}