Fix VST application console and messaging.

Author: Archie3d

source/qvst/common/dllmain.cpp

@@ -65,7 +65,11 @@ BOOL WINAPI DllMain (HINSTANCE hInst, DWORD dwReason, LPVOID /*lpvReserved*/)
 		}
 
         // Initialize QVst application instance
-        QVstApplication::createInstance(hInst);
+        QVstApplication::Flags flags = QVstApplication::Flag_None;
+#ifdef QVST_CONSOLE
+        flags |= QVstApplication::Flag_CreateConsole;
+#endif
+        QVstApplication::createInstance(hInst, flags);
     } else if (dwReason == DLL_PROCESS_DETACH) {
         // Delete QVst application instance
         delete qApp;

source/qvst/include/QVstApplication.h

@@ -9,7 +9,12 @@ class QVstApplication : public QApplication
     Q_OBJECT
 public:
 
-    static QVstApplication* createInstance(Qt::HANDLE handle);
+    enum Flags {
+        Flag_None = 0,
+        Flag_CreateConsole = 1
+    };
+
+    static QVstApplication* createInstance(Qt::HANDLE handle, Flags flags = Flag_None);
     static QVstApplication* instance();
 
     ~QVstApplication();
@@ -20,7 +25,7 @@ class QVstApplication : public QApplication
 
     struct Private;
 
-    QVstApplication(int &argc, char **argv, Qt::HANDLE handle);
+    QVstApplication(int &argc, char **argv, Qt::HANDLE handle, Flags flags = Flag_None);
 
     Private *m;
 };

source/qvst/src/QVstApplication.cpp

@@ -11,7 +11,7 @@ static HHOOK s_hHook;
 LRESULT CALLBACK msgFilterProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
     if (qApp) {
-        qApp->sendPostedEvents(0, -1);
+        qApp->sendPostedEvents();
     }
     return CallNextHookEx(s_hHook, nCode, wParam, lParam);
 }
@@ -41,16 +41,19 @@ static void msgHandler(QtMsgType type, const QMessageLogContext &contect, const
     }
 }
 
-QVstApplication* QVstApplication::createInstance(Qt::HANDLE handle)
+QVstApplication* QVstApplication::createInstance(Qt::HANDLE handle, Flags flags)
 {
     QApplication *pGuiApp = qApp;
     if (pGuiApp) {
         return static_cast<QVstApplication*>(pGuiApp);
     }
 
     int argc = 0;
-    QVstApplication *pInstance = new QVstApplication(argc, nullptr, handle);
-    qInstallMessageHandler(msgHandler);
+    QVstApplication *pInstance = new QVstApplication(argc, nullptr, handle, flags);
+    if ((flags & Flag_CreateConsole) != 0) {
+        // Install log messages handler only if there is a console
+        qInstallMessageHandler(msgHandler);
+    }
 
     return pInstance;
 }
@@ -60,15 +63,15 @@ QVstApplication* QVstApplication::instance()
     return static_cast<QVstApplication*>(qApp);
 }
 
-QVstApplication::QVstApplication(int &argc, char **argv, Qt::HANDLE handle)
+QVstApplication::QVstApplication(int &argc, char **argv, Qt::HANDLE handle, Flags flags)
     : QApplication(argc, argv)
 {
     m = new Private;
     m->handle = handle;
     m->pConsole = nullptr;
-#ifdef QVST_CONSOLE
-    m->pConsole = new QVstConsole(this);
-#endif
+    if ((flags & Flag_CreateConsole) != 0) {
+        m->pConsole = new QVstConsole(this);
+    }
 
 #ifdef WIN32
     s_hHook = SetWindowsHookEx(WH_GETMESSAGE, msgFilterProc, 0, GetCurrentThreadId());