diff --git a/library/Hooks-windows.cpp b/library/Hooks-windows.cpp index 8f77865e8..b2d87984e 100644 --- a/library/Hooks-windows.cpp +++ b/library/Hooks-windows.cpp @@ -26,6 +26,7 @@ distribution. #include #include +#include #include #include #include "Core.h" @@ -40,8 +41,8 @@ distribution. // we don't know which of the SDL functions will be called first... so we // just catch the first one and init all our function pointers at that time -bool FirstCall(void); -bool inited = false; +void InitSDLPointers(void); +std::once_flag inited; /// wrappers for SDL 1.2 functions used in 40d16 /***** Condition variables @@ -612,8 +613,7 @@ DFhackCExport int SDL_NumJoysticks(void) static void (*_SDL_GL_SwapBuffers)(void) = 0; DFhackCExport void SDL_GL_SwapBuffers(void) { - if(!inited) - FirstCall(); + InitSDLPointers() _SDL_GL_SwapBuffers(); } @@ -621,16 +621,14 @@ DFhackCExport void SDL_GL_SwapBuffers(void) static int (*_SDL_Flip)(void * some_ptr) = 0; DFhackCExport int SDL_Flip(void * some_ptr) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_Flip(some_ptr); } static int (*_SDL_Init)(uint32_t flags) = 0; DFhackCExport int SDL_Init(uint32_t flags) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_Init(flags); } @@ -640,16 +638,14 @@ MORE CRAP static void * (*_SDL_CreateSemaphore)(uint32_t initial_value) = 0; DFhackCExport void *SDL_CreateSemaphore(uint32_t initial_value) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_CreateSemaphore(initial_value); } static vPtr (*_SDL_CreateThread)(int (*fn)(void *), void *data) = 0; DFhackCExport vPtr SDL_CreateThread(int (*fn)(void *), void *data) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_CreateThread(fn,data); } @@ -657,93 +653,81 @@ DFhackCExport vPtr SDL_CreateThread(int (*fn)(void *), void *data) static void (*_SDL_Delay)(uint32_t ms) = 0; DFhackCExport void SDL_Delay(uint32_t ms) { - if(!inited) - FirstCall(); + InitSDLPointers() _SDL_Delay(ms); } static void (*_SDL_DestroySemaphore)(void *sem) = 0; DFhackCExport void SDL_DestroySemaphore(void *sem) { - if(!inited) - FirstCall(); + InitSDLPointers() _SDL_DestroySemaphore(sem); } static uint8_t (*_SDL_GetAppState)(void) = 0; DFhackCExport uint8_t SDL_GetAppState(void) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_GetAppState(); } static uint8_t (*_SDL_GetMouseState)(int *, int *) = 0; DFhackCExport uint8_t SDL_GetMouseState(int *x, int *y) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_GetMouseState(x,y); } static int (*_SDL_InitSubSystem)(uint32_t flags) = 0; DFhackCExport int SDL_InitSubSystem(uint32_t flags) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_InitSubSystem(flags); } static int (*_SDL_SemPost)(void *sem) = 0; DFhackCExport int SDL_SemPost(void *sem) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_SemPost(sem); } static int (*_SDL_SemTryWait)(void *sem) = 0; DFhackCExport int SDL_SemTryWait(void *sem) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_SemTryWait(sem); } static int (*_SDL_SemWait)(void *sem) = 0; DFhackCExport int SDL_SemWait(void *sem) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_SemWait(sem); } static uint32_t (*_SDL_ThreadID)(void) = 0; DFhackCExport uint32_t SDL_ThreadID(void) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_ThreadID(); } static char* (*_SDL_getenv)(const char *name) = 0; DFhackCExport char* SDL_getenv(const char *name) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_getenv(name); } static size_t (*_SDL_strlcat)(char *dst, const char *src, size_t maxlen) = 0; DFhackCExport size_t SDL_strlcat(char *dst, const char *src, size_t maxlen) { - if(!inited) - FirstCall(); + InitSDLPointers() return _SDL_strlcat(dst, src, maxlen); } -// FIXME: this has to be thread-safe. -bool FirstCall() +void FirstCall() { // reroute stdout and stderr freopen("stdout.log", "w", stdout); @@ -836,6 +820,9 @@ bool FirstCall() _SDL_EnableUNICODE(1); fprintf(stderr,"Initized HOOKS!\n"); - inited = true; - return 1; +} + +void InitSDLPointers() +{ + std::call_once(inited, [](){ FirstCall(); }); }