X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Ffst%2Fvstwin.c;h=ba3187684b2da2dbafd2cc2ce138899d54ec39ae;hb=d50df82799665e4bbf7c9d8cf2a7c2af866f0da2;hp=4c4e2888f55e6ccbaeedeb405b4a48167eadc498;hpb=912f07b919c1ec44f0cdd5278d74a9bc29b91846;p=ardour.git

diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c
index 4c4e2888f5..ba3187684b 100644
--- a/libs/fst/vstwin.c
+++ b/libs/fst/vstwin.c
@@ -2,16 +2,16 @@
 #include <string.h>
 #include <windows.h>
 
+#define fst_error(...) fprintf(stderr, __VA_ARGS__)
+
 #ifdef PLATFORM_WINDOWS
 
 #include <pthread.h>
 static UINT_PTR idle_timer_id   = 0;
-extern char *basename(char *path);
 
 #else /* linux + wine */
 
 #include <linux/limits.h> // PATH_MAX
-#include <libgen.h> // basename
 #include <winnt.h>
 #include <wine/exception.h>
 #include <pthread.h>
@@ -20,7 +20,10 @@ static unsigned int idle_id = 0;
 
 #endif
 
+#ifndef COMPILER_MSVC
 extern char * strdup (const char *);
+#endif
+
 #include <glib.h>
 #include "fst.h"
 
@@ -223,7 +226,7 @@ fst_new (void)
 	fst->n_pending_keys = 0;
 	fst->has_editor = 0;
 #ifdef PLATFORM_WINDOWS
-	fst->voffset = 36;
+	fst->voffset = 50;
 	fst->hoffset = 0;
 #else /* linux + wine */
 	fst->voffset = 24;
@@ -371,10 +374,13 @@ fst_exit (void)
 int
 fst_run_editor (VSTState* fst, void* window_parent)
 {
+	/* For safety, remove any pre-existing editor window */ 
+	fst_destroy_editor (fst);
+	
 	if (fst->windows_window == NULL) {
 		HMODULE hInst;
 		HWND window;
-		struct ERect* er;
+		struct ERect* er = NULL;
 
 		if (!(fst->plugin->flags & effFlagsHasEditor)) {
 			fst_error ("Plugin \"%s\" has no editor", fst->handle->name);
@@ -421,9 +427,10 @@ fst_run_editor (VSTState* fst, void* window_parent)
 		fst->plugin->dispatcher (fst->plugin, effEditOpen, 0, 0, fst->windows_window, 0 );
 		fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
 
-		fst->width =  er->right-er->left;
-		fst->height =  er->bottom-er->top;
-
+		if (er != NULL) {
+			fst->width = er->right - er->left;
+			fst->height = er->bottom - er->top;
+		}
 
 		fst->been_activated = TRUE;
 
@@ -465,7 +472,7 @@ fst_move_window_into_view (VSTState* fst)
 {
 	if (fst->windows_window) {
 #ifdef PLATFORM_WINDOWS
-		SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width, fst->height, 0);
+		SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
 #else /* linux + wine */
 		SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
 #endif
@@ -489,9 +496,8 @@ fst_load (const char *path)
 	if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
 	{
 		char* period;
-		fhandle->nameptr = strdup (path);
 		fhandle->path = strdup (path);
-		fhandle->name = basename(fhandle->nameptr);
+		fhandle->name = g_path_get_basename(path);
 		if ((period = strrchr (fhandle->name, '.'))) {
 			*period = '\0';
 		}
@@ -502,10 +508,10 @@ fst_load (const char *path)
 			return NULL;
 		}
 
-		fhandle->main_entry = (main_entry_t) GetProcAddress (fhandle->dll, "main");
+		fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "main");
 
 		if (fhandle->main_entry == 0) {
-			if ((fhandle->main_entry = (main_entry_t) GetProcAddress (fhandle->dll, "VSTPluginMain"))) {
+			if ((fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "VSTPluginMain"))) {
 				fprintf(stderr, "VST >= 2.4 plugin '%s'\n", path);
 				//PBD::warning << path << _(": is a VST >= 2.4 - this plugin may or may not function correctly with this version of Ardour.") << endmsg;
 			}
@@ -540,9 +546,8 @@ fst_unload (VSTHandle** fhandle)
 		(*fhandle)->path = NULL;
 	}
 
-	if ((*fhandle)->nameptr) {
-		free ((*fhandle)->nameptr);
-		(*fhandle)->nameptr = NULL;
+	if ((*fhandle)->name) {
+		free ((*fhandle)->name);
 		(*fhandle)->name = NULL;
 	}