From 1c8d7c570678c2f4f3bf61529489336f9d085f8d Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sun, 15 Sep 2019 23:09:44 +0200
Subject: Fix minor MIDI issues

---
 plugin.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'plugin.c')

diff --git a/plugin.c b/plugin.c
index a452559..dd99041 100644
--- a/plugin.c
+++ b/plugin.c
@@ -24,7 +24,6 @@ static int plugin_attach(char* path, char* file){
 	plugin_init init = NULL;
 	void* handle = NULL;
 	char* lib = NULL;
-	char* error = NULL;
 
 	lib = calloc(strlen(path) + strlen(file) + 1, sizeof(char));
 	if(!lib){
@@ -36,16 +35,15 @@ static int plugin_attach(char* path, char* file){
 	handle = dlopen(lib, RTLD_NOW);
 	if(!handle){
 		#ifdef _WIN32
+		char* error = NULL;
 		FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
 			NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &error, 0, NULL);
-		#else
-		error = dlerror();
-		#endif
 		fprintf(stderr, "Failed to load plugin %s: %s\n", lib, error);
-		free(lib);
-		#ifdef _WIN32
 		LocalFree(error);
+		#else
+		fprintf(stderr, "Failed to load plugin %s: %s\n", lib, dlerror());
 		#endif
+		free(lib);
 		return 0;
 	}
 
@@ -156,10 +154,22 @@ load_done:
 
 int plugins_close(){
 	size_t u;
+
 	for(u = 0; u < plugins; u++){
+#ifdef _WIN32
+		char* error = NULL;
+		//FreeLibrary returns the inverse of dlclose
+		if(!FreeLibrary(plugin_handle[u])){
+			FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+				NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &error, 0, NULL);
+			fprintf(stderr, "Failed to unload plugin: %s\n", error);
+			LocalFree(error);
+		}
+#else
 		if(dlclose(plugin_handle[u])){
 			fprintf(stderr, "Failed to unload plugin: %s\n", dlerror());
 		}
+#endif
 	}
 
 	free(plugin_handle);
-- 
cgit v1.2.3