LuaFAR plugins: the timer queue is closed in DllMain/DLL_PROCESS_DETACH

Was: in ExitFARW
FarGroup · Jan 22, 2025 · 4d9cf65 · 4d9cf65 · shmuz · Jan 22, 2025
1 parent 4494671
commit 4d9cf65
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 862 },
+    Version       = { 3, 0, 0, 863 },
     MinFarVersion = { 3, 0, 0, 6380 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,3 +1,9 @@
+shmuel 2025-01-22 20:36:47+02:00 - build 863
+
+1. LuaFAR plugins: the timer queue is closed in DllMain/DLL_PROCESS_DETACH.
+   Was: in ExitFARW.
+
+
 shmuel 2025-01-21 21:18:49+02:00 - build 862
 
 1. Force garbage collection on reloading macrofiles

diff --git a/plugins/luamacro/luafar/exported.c b/plugins/luamacro/luafar/exported.c
@@ -1251,22 +1251,24 @@ intptr_t LF_SetFindList(lua_State* L, const struct SetFindListInfo *Info)
 	return ret;
 }
 
-void LF_ExitFAR(lua_State* L, const struct ExitInfo *Info)
+void LF_DoFinalCleanup(lua_State* L)
 {
-	HANDLE hQueue;
-	(void)Info;
-
-	if (GetExportFunction(L, "ExitFAR"))    //+1: Func
-		pcall_msg(L, 0, 0);                  //+0
-
-	hQueue = GetLuaStateTimerQueue(L);     //+0
+	HANDLE hQueue = GetLuaStateTimerQueue(L);
 	if (hQueue)
 	{
 		DeleteLuaStateTimerQueue(L);
 		DeleteTimerQueueEx(hQueue, NULL);
 	}
 }
 
+void LF_ExitFAR(lua_State* L, const struct ExitInfo *Info)
+{
+	(void)Info;
+
+	if (GetExportFunction(L, "ExitFAR"))    //+1: Func
+		pcall_msg(L, 0, 0);                  //+0
+}
+
 void getPluginMenuItems(lua_State* L, struct PluginMenuItem *pmi, const char* namestrings,
                         const char* nameguids, int cpos)
 {

diff --git a/plugins/luamacro/luafar/luafar.h b/plugins/luamacro/luafar/luafar.h
@@ -153,6 +153,7 @@ DLLFUNC intptr_t LF_SetFindList(lua_State* L, const struct SetFindListInfo *Info
 DLLFUNC intptr_t LF_GetContentFields(lua_State* L, const struct GetContentFieldsInfo *Info);
 DLLFUNC intptr_t LF_GetContentData(lua_State* L, struct GetContentDataInfo *Info);
 DLLFUNC void     LF_FreeContentData(lua_State* L, const struct GetContentDataInfo *Info);
+DLLFUNC void     LF_DoFinalCleanup(lua_State* L);
 
 #ifdef __cplusplus
 }

diff --git a/plugins/luamacro/luafar/luaplug.c b/plugins/luamacro/luafar/luaplug.c
@@ -110,8 +110,10 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
 
 	if (DLL_PROCESS_ATTACH == dwReason && hDll)
 		InitGlobal(&G, (HINSTANCE)hDll);
-	else if (DLL_PROCESS_DETACH == dwReason)
+	else if (DLL_PROCESS_DETACH == dwReason) {
+		LF_DoFinalCleanup(G.LS);
 		DestroyGlobal(&G);
+	}
 
 	return TRUE;
 }

diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 862
+#define PLUGIN_BUILD 863