properly handle reload with addon trigered client_unload

Author: megai2

loader_core/gw2al_api_impl.cpp

@@ -1,14 +1,21 @@
 #include "stdafx.h"
 
 FILE* logFile = NULL;
+bool firstInit = true;
 
-void gw2al_core__init()
+bool gw2al_core__init()
 {
+	if (!firstInit)
+		return false;
+
 	gw2al_core__init_func_registry();
 	gw2al_core__init_addon_registry();
 	gw2al_core__init_events();
 
 	logFile = fopen("gw2al_log.txt", "wb");
+
+	firstInit = false;
+	return true;
 }
 
 gw2al_hashed_name gw2al_core__hash_name(wchar_t * name)
@@ -37,8 +44,11 @@ void gw2al_core__client_unload()
 	if (logFile)
 	{
 		fflush(logFile);
-		fclose(logFile);
-		logFile = NULL;
+		//megai2: no reliable way to detect client unload
+		//log will be populated with new data, not created again and closed by OS on dll unload
+		//so we are kinda fine to keep it opened 
+		//fclose(logFile);
+		//logFile = NULL;
 	}
 }
 

loader_core/gw2al_api_impl.h

@@ -23,7 +23,7 @@ typedef struct gw2al_event_dsc {
 	gw2al_event_subscriber* subs;
 } gw2al_event_dsc;
 
-void gw2al_core__init();
+bool gw2al_core__init();
 void gw2al_core__init_func_registry();
 void gw2al_core__init_addon_registry();
 void gw2al_core__init_events();

loader_core/loader_core.cpp

@@ -91,9 +91,10 @@ IDirect3D9 * loader_core::OnD3DCreate(UINT sdkVer)
 {
 	if (SwitchState(LDR_ADDON_LOAD))
 	{
-		gw2al_core__init();
+		bool isFirstLoad = gw2al_core__init();
 
-		LOG_INFO(L"core", L"Addon loader v%u.%u (%S) initialized", LOADER_CORE_VER_MAJOR, LOADER_CORE_VER_MINOR, LOADER_CORE_VER_NAME);
+		LOG_INFO(L"core", L"Addon loader v%u.%u (%S) %S", LOADER_CORE_VER_MAJOR, LOADER_CORE_VER_MINOR, LOADER_CORE_VER_NAME, 
+			isFirstLoad ? "initialized" : "reinit");
 	}
 	else {
 		LOG_WARNING(L"core", L"D3DCreate called twice without proper unload. Trying to unload addons.");