wine related fixes

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Feb 28, 2024 · 776c936 · 776c936
1 parent 1f6bcd0
commit 776c936
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Bridge Plugin
- * Copyright (C) 2012-2023 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2024 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -84,6 +84,11 @@ static void saveSignalHandler(int) noexcept
     gSaveNow = true;
 }
 #elif defined(CARLA_OS_WIN)
+static LONG WINAPI winExceptionFilter(_EXCEPTION_POINTERS*)
+{
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
 static BOOL WINAPI winSignalHandler(DWORD dwCtrlType) noexcept
 {
     if (dwCtrlType == CTRL_C_EVENT)
@@ -113,6 +118,8 @@ static void initSignalHandler()
     sigaction(SIGUSR1, &sig, nullptr);
 #elif defined(CARLA_OS_WIN)
     SetConsoleCtrlHandler(winSignalHandler, TRUE);
+    SetErrorMode(SEM_NOGPFAULTERRORBOX);
+    SetUnhandledExceptionFilter(winExceptionFilter);
 #endif
 }
 

diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
@@ -176,7 +176,7 @@ static void print_lib_error(const char* const filename)
 // --------------------------------------------------------------------------------------------------------------------
 // Do not show error message box on Windows
 
-static LONG win32ExceptionFilter(_EXCEPTION_POINTERS*)
+static LONG WINAPI winExceptionFilter(_EXCEPTION_POINTERS*)
 {
     return EXCEPTION_EXECUTE_HANDLER;
 }
@@ -2827,7 +2827,7 @@ int main(int argc, const char* argv[])
 
     // do not show error message box on Windows
     SetErrorMode(SEM_NOGPFAULTERRORBOX);
-    SetUnhandledExceptionFilter(win32ExceptionFilter);
+    SetUnhandledExceptionFilter(winExceptionFilter);
   #endif
 
     // ----------------------------------------------------------------------------------------------------------------

diff --git a/source/jackbridge/Makefile b/source/jackbridge/Makefile
@@ -28,6 +28,7 @@ WINE_32BIT_FLAGS = $(32BIT_FLAGS) -fpermissive
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -fpermissive
 WINE_BUILD_FLAGS = $(filter-out -flto,$(BUILD_CXX_FLAGS))
 WINE_LINK_FLAGS  = $(filter-out -flto -static-libgcc -static-libstdc++,$(LINK_FLAGS))
+WINE_LINK_FLAGS += -nostartfiles
 WINE_LINK_FLAGS += $(LIBDL_LIBS)
 WINE_LINK_FLAGS += -pthread
 WINE_LINK_FLAGS += -lpthread