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

Refactor glib/glib-init.c to isolate init/deinit steps in isolated functions

Browse Source
This commit is contained in:
Loic Le Page 2022-01-20 16:24:44 +01:00
parent 4fdbfcc9b7
commit 2ff2c9eb5b
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
glib/glib-init.c
View File

@ -342,12 +342,36 @@ glib_init (void)
#ifdef G_PLATFORM_WIN32 #ifdef G_PLATFORM_WIN32
HMODULE glib_dll = NULL;
static void
glib_win32_init (void)
{
g_crash_handler_win32_init ();
#ifdef THREADS_WIN32
g_thread_win32_init ();
#endif
g_clock_win32_init ();
glib_init ();
/* must go after glib_init */
g_console_win32_init ();
}
static void
glib_win32_deinit (gboolean detach_thread)
{
#ifdef THREADS_WIN32
if (detach_thread)
g_thread_win32_process_detach ();
#endif
g_crash_handler_win32_deinit ();
}
BOOL WINAPI DllMain (HINSTANCE hinstDLL, BOOL WINAPI DllMain (HINSTANCE hinstDLL,
DWORD fdwReason, DWORD fdwReason,
LPVOID lpvReserved); LPVOID lpvReserved);
HMODULE glib_dll;
BOOL WINAPI BOOL WINAPI
DllMain (HINSTANCE hinstDLL, DllMain (HINSTANCE hinstDLL,
DWORD fdwReason, DWORD fdwReason,
@ -357,14 +381,7 @@ DllMain (HINSTANCE hinstDLL,
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
glib_dll = hinstDLL; glib_dll = hinstDLL;
g_crash_handler_win32_init (); glib_win32_init ();
g_clock_win32_init ();
#ifdef THREADS_WIN32
g_thread_win32_init ();
#endif
glib_init ();
/* must go after glib_init */
g_console_win32_init ();
break; break;
case DLL_THREAD_DETACH: case DLL_THREAD_DETACH:
@ -374,11 +391,7 @@ DllMain (HINSTANCE hinstDLL,
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
#ifdef THREADS_WIN32 glib_win32_deinit (lpvReserved == NULL);
if (lpvReserved == NULL)
g_thread_win32_process_detach ();
#endif
g_crash_handler_win32_deinit ();
break; break;
default: default:
@ -389,7 +402,7 @@ DllMain (HINSTANCE hinstDLL,
return TRUE; return TRUE;
} }
#elif defined (G_HAS_CONSTRUCTORS) #elif defined(G_HAS_CONSTRUCTORS) /* && !G_PLATFORM_WIN32 */
#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_init_ctor) #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_init_ctor)
@ -402,6 +415,6 @@ glib_init_ctor (void)
glib_init (); glib_init ();
} }
#else #else /* !G_PLATFORM_WIN32 && !G_HAS_CONSTRUCTORS */
# error Your platform/compiler is missing constructor support # error Your platform/compiler is missing constructor support
#endif #endif /* G_PLATFORM_WIN32 */