cabi: pass NWNXCPlugin_InitInfo as pointer + reordered content

Author: CromFr

include/nwnx_cplugin.h

@@ -12,6 +12,8 @@ struct NWNXCPlugin_InitInfo {
 	/// Path to the NWNX4 user directory, where config files are stored and log files should be
 	/// written.
 	const char* nwnx_user_path;
+	/// Path to the NWNX4 user directory, where nwnx4_controller.exe is located.
+	const char* nwnx_install_path;
 	/// Path to the NWN2 installation directory, where nwn2server.exe is located.
 	const char* nwn2_install_path;
 	/// Path to the NWN2 home folder, usually 'Documents\Neverwinter Nights 2'
@@ -20,8 +22,6 @@ struct NWNXCPlugin_InitInfo {
 	/// Note: this value depends on the parameters list in nwnx.ini. If the server has not been
 	/// started with -module or -moduledir, this value is set to NULL.
 	const char* nwn2_module_path;
-	/// Path to the NWNX4 user directory, where nwnx4_controller.exe is located.
-	const char* nwnx_install_path;
 	/// Function pointers to interact with the nwn2server instance
 	const struct NWNXCPlugin_NWN2Hooks* nwn2_hooks;
 };
@@ -93,7 +93,7 @@ __declspec(dllexport) extern const uint32_t nwnxcplugin_abi_version;
 /// @return A user data pointer (to a struct or object) containing the plugin runtime data
 /// (prefer storing plugin data inside this struct rather than global variables). NULL if the
 /// plugin failed to be initialized.
-__declspec(dllexport) void* __cdecl NWNXCPlugin_New(NWNXCPlugin_InitInfo info);
+__declspec(dllexport) void* __cdecl NWNXCPlugin_New(const NWNXCPlugin_InitInfo* info);
 
 //
 // OPTIONAL FUNCTIONS TO IMPLEMENT:

src/hook/CPlugin.cpp

@@ -64,23 +64,23 @@ CPlugin::CPlugin(HINSTANCE hDLL, const CPlugin::InitInfo& initInfo)
 
 		auto newPlugin
 		    = reinterpret_cast<CompatV1::NewPluginFn*>(GetProcAddress(hDLL, "NWNXCPlugin_New"));
-		m_dll.newPlugin = [newPlugin](InitInfo info) {
+		m_dll.newPlugin = [newPlugin](const InitInfo* info) {
 			auto hooks = CompatV1::NWN2Hooks {
 			    .ExecuteScript            = CompatV1::ExecuteScript,
 			    .ExecuteScriptEnhanced    = CompatV1::ExecuteScriptEnhanced,
-			    .AddScriptParameterInt    = info.nwn2_hooks->AddScriptParameterInt,
-			    .AddScriptParameterString = info.nwn2_hooks->AddScriptParameterString,
-			    .AddScriptParameterFloat  = info.nwn2_hooks->AddScriptParameterFloat,
-			    .AddScriptParameterObject = info.nwn2_hooks->AddScriptParameterObject,
-			    .ClearScriptParams        = info.nwn2_hooks->ClearScriptParams,
+			    .AddScriptParameterInt    = info->nwn2_hooks->AddScriptParameterInt,
+			    .AddScriptParameterString = info->nwn2_hooks->AddScriptParameterString,
+			    .AddScriptParameterFloat  = info->nwn2_hooks->AddScriptParameterFloat,
+			    .AddScriptParameterObject = info->nwn2_hooks->AddScriptParameterObject,
+			    .ClearScriptParams        = info->nwn2_hooks->ClearScriptParams,
 			};
 			auto initInfo = CompatV1::InitInfo {
-			    .dll_path          = info.dll_path,
-			    .nwnx_user_path    = info.nwnx_user_path,
-			    .nwn2_install_path = info.nwn2_install_path,
-			    .nwn2_home_path    = info.nwn2_home_path,
-			    .nwn2_module_path  = info.nwn2_module_path,
-			    .nwnx_install_path = info.nwnx_install_path,
+			    .dll_path          = info->dll_path,
+			    .nwnx_user_path    = info->nwnx_user_path,
+			    .nwn2_install_path = info->nwn2_install_path,
+			    .nwn2_home_path    = info->nwn2_home_path,
+			    .nwn2_module_path  = info->nwn2_module_path,
+			    .nwnx_install_path = info->nwnx_install_path,
 			    .nwn2_hooks        = &hooks,
 			};
 			return newPlugin(initInfo);
@@ -161,7 +161,7 @@ CPlugin::CPlugin(HINSTANCE hDLL, const CPlugin::InitInfo& initInfo)
 	}
 
 	// Initialize instance
-	m_instancePtr = m_dll.newPlugin(initInfo);
+	m_instancePtr = m_dll.newPlugin(&initInfo);
 	if (m_instancePtr == nullptr) {
 		logger->Err("NWNXCPlugin_New returned null");
 		return;

src/hook/CPlugin.h

@@ -29,10 +29,10 @@ class CPlugin {
 	struct InitInfo {
 		const char* dll_path;
 		const char* nwnx_user_path;
+		const char* nwnx_install_path;
 		const char* nwn2_install_path;
 		const char* nwn2_home_path;
 		const char* nwn2_module_path;
-		const char* nwnx_install_path;
 		const struct NWN2Hooks* nwn2_hooks;
 	};
 
@@ -118,7 +118,7 @@ class CPlugin {
 	void* m_instancePtr = nullptr;
 
 	// clang-format off
-	typedef void*       (__cdecl NewPluginFn)   (InitInfo info);
+	typedef void*       (__cdecl NewPluginFn)   (const InitInfo* info);
 	typedef void        (__cdecl DeletePluginFn)(void* cplugin);
 	typedef const char* (__cdecl GetInfoFn)     ();
 	typedef const char* (__cdecl GetVersionFn)  ();

src/hook/hook.cpp

@@ -788,10 +788,10 @@ void loadPlugins()
 				CPlugin::InitInfo initInfo {
 				    .dll_path          = pluginPathStr.c_str(),
 				    .nwnx_user_path    = nwnxUserDirStr.c_str(),
+				    .nwnx_install_path = nwnxInstallDirStr.c_str(),
 				    .nwn2_install_path = nwn2InstallDir.c_str(),
 				    .nwn2_home_path    = nwn2HomeDir.c_str(),
 				    .nwn2_module_path  = nwn2ModulePathCStr,
-				    .nwnx_install_path = nwnxInstallDirStr.c_str(),
 				    .nwn2_hooks        = &hooks,
 				};