[PATCH 0/2] MR5809: winecrt0, msvcrt: Implement static constructor support.

[PATCH 1/2] winecrt0: Implement static constructors support.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winecrt0/crt_dllmain.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/dlls/winecrt0/crt_dllmain.c b/dlls/winecrt0/crt_dllmain.c
index 181760c884a..57b71d60311 100644
--- a/dlls/winecrt0/crt_dllmain.c
+++ b/dlls/winecrt0/crt_dllmain.c
@@ -25,8 +25,37 @@
 #include "windef.h"
 #include "winbase.h"

+#if defined(_MSC_VER)
+#define _CRTALLOC(x) __declspec(allocate(x))
+#elif defined(__GNUC__)
+#define _CRTALLOC(x) __attribute__((section(x)))
+#else
+#error Your compiler is not supported.
+#endif
+
+_CRTALLOC(".CRT$XIA") void (*__xi_a)(void) = 0;
+_CRTALLOC(".CRT$XIZ") void (*__xi_z)(void) = 0;
+_CRTALLOC(".CRT$XCA") void (*__xc_a)(void) = 0;
+_CRTALLOC(".CRT$XCZ") void (*__xc_z)(void) = 0;
+
+#if defined(__GNUC__)
+extern void (*__CTOR_LIST__[])(void) __attribute__((weak));
+extern void (*__DTOR_LIST__[])(void) __attribute__((weak));
+#endif
+
+static void _CRT_INIT(void)
+{
+    void (**ctor)(void);
+    if ((ctor = &__xi_a)) while (++ctor != &__xi_z && *ctor) (*ctor)();
+    if ((ctor = &__xc_a)) while (++ctor != &__xc_z && *ctor) (*ctor)();
+#if defined(__GNUC__)
+    if ((ctor = __CTOR_LIST__) && *ctor == (void *)-1) while (++ctor != __DTOR_LIST__ && *ctor) (*ctor)();
+#endif
+}
+
 BOOL WINAPI DllMainCRTStartup( HINSTANCE inst, DWORD reason, void *reserved )
 {
+    if (reason == DLL_PROCESS_ATTACH) _CRT_INIT();
     return DllMain( inst, reason, reserved );
 }

[PATCH 2/2] msvcrt: Implement static constructors support.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/msvcrt/crt_main.c  | 29 +++++++++++++++++++++++++++++
 dlls/msvcrt/crt_wmain.c | 29 +++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c
index eb785e30bb0..f6e9ccc919c 100644
--- a/dlls/msvcrt/crt_main.c
+++ b/dlls/msvcrt/crt_main.c
@@ -30,6 +30,34 @@
 #include "winbase.h"
 #include "winternl.h"

+#if defined(_MSC_VER)
+#define _CRTALLOC(x) __declspec(allocate(x))
+#elif defined(__GNUC__)
+#define _CRTALLOC(x) __attribute__((section(x)))
+#else
+#error Your compiler is not supported.
+#endif
+
+_CRTALLOC(".CRT$XIA") void (*__xi_a)(void) = 0;
+_CRTALLOC(".CRT$XIZ") void (*__xi_z)(void) = 0;
+_CRTALLOC(".CRT$XCA") void (*__xc_a)(void) = 0;
+_CRTALLOC(".CRT$XCZ") void (*__xc_z)(void) = 0;
+
+#if defined(__GNUC__)
+extern void (*__CTOR_LIST__[])(void) __attribute__((weak));
+extern void (*__DTOR_LIST__[])(void) __attribute__((weak));
+#endif
+
+static void _CRT_INIT(void)
+{
+    void (**ctor)(void);
+    if ((ctor = &__xi_a)) while (++ctor != &__xi_z && *ctor) (*ctor)();
+    if ((ctor = &__xc_a)) while (++ctor != &__xc_z && *ctor) (*ctor)();
+#if defined(__GNUC__)
+    if ((ctor = __CTOR_LIST__) && *ctor == (void *)-1) while (++ctor != __DTOR_LIST__ && *ctor) (*ctor)();
+#endif
+}
+
 int __cdecl main(int argc, char **argv, char **env);

static const IMAGE_NT_HEADERS *get_nt_header( void )
@@ -55,6 +83,7 @@ int __cdecl mainCRTStartup(void)
 #endif
     _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app);

+    _CRT_INIT();
     ret = main(argc, argv, env);

exit(ret);
diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c
index 79755d1a6e9..a179a557652 100644
--- a/dlls/msvcrt/crt_wmain.c
+++ b/dlls/msvcrt/crt_wmain.c
@@ -30,6 +30,34 @@
 #include "winbase.h"
 #include "winternl.h"

+#if defined(_MSC_VER)
+#define _CRTALLOC(x) __declspec(allocate(x))
+#elif defined(__GNUC__)
+#define _CRTALLOC(x) __attribute__((section(x)))
+#else
+#error Your compiler is not supported.
+#endif
+
+_CRTALLOC(".CRT$XIA") void (*__xi_a)(void) = 0;
+_CRTALLOC(".CRT$XIZ") void (*__xi_z)(void) = 0;
+_CRTALLOC(".CRT$XCA") void (*__xc_a)(void) = 0;
+_CRTALLOC(".CRT$XCZ") void (*__xc_z)(void) = 0;
+
+#if defined(__GNUC__)
+extern void (*__CTOR_LIST__[])(void) __attribute__((weak));
+extern void (*__DTOR_LIST__[])(void) __attribute__((weak));
+#endif
+
+static void _CRT_INIT(void)
+{
+    void (**ctor)(void);
+    if ((ctor = &__xi_a)) while (++ctor != &__xi_z && *ctor) (*ctor)();
+    if ((ctor = &__xc_a)) while (++ctor != &__xc_z && *ctor) (*ctor)();
+#if defined(__GNUC__)
+    if ((ctor = __CTOR_LIST__) && *ctor == (void *)-1) while (++ctor != __DTOR_LIST__ && *ctor) (*ctor)();
+#endif
+}
+
 int __cdecl wmain(int argc, WCHAR **argv, WCHAR **env);

static const IMAGE_NT_HEADERS *get_nt_header( void )
@@ -55,6 +83,7 @@ int __cdecl wmainCRTStartup(void)
 #endif
     _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app);

+    _CRT_INIT();
     ret = wmain(argc, argv, env);

exit(ret);