DISTRHO
/
JUCE
mirror of https://github.com/DISTRHO/JUCE
1
0
Fork 0
Code Releases 1 Activity
Browse Source

MinGW: Fix warnings and errors emitted when building VST3 plugins

v6.1.6
reuk 4 years ago
parent
52e6c4f727
commit
900282ccf3
No known key found for this signature in database GPG Key ID: 9ADCD339CFC98A11
12 changed files with 125 additions and 104 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -5
      extras/Build/CMake/JUCEUtils.cmake
  2. +9
    -1
      modules/juce_audio_devices/midi_io/ump/juce_UMPDispatcher.h
  3. +16
    -14
      modules/juce_audio_devices/native/juce_win32_DirectSound.cpp
  4. +6
    -6
      modules/juce_audio_devices/native/juce_win32_Midi.cpp
  5. +19
    -19
      modules/juce_audio_devices/native/juce_win32_WASAPI.cpp
  6. +1
    -1
      modules/juce_audio_formats/juce_audio_formats.h
  7. +51
    -54
      modules/juce_audio_plugin_client/utility/juce_WindowsHooks.h
  8. +11
    -1
      modules/juce_audio_processors/format_types/juce_VST3Headers.h
  9. +2
    -0
      modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp
  10. +3
    -0
      modules/juce_core/native/juce_win32_SystemStats.cpp
  11. +1
    -1
      modules/juce_core/system/juce_CompilerWarnings.h
  12. +5
    -2
      modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp

+ 1
- 5
extras/Build/CMake/JUCEUtils.cmake View File

@@ -385,11 +385,7 @@ function(_juce_get_platform_plugin_kinds out)
endif()

if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
list(APPEND result AAX Unity VST)

if(NOT MINGW AND NOT MSYS)
list(APPEND result VST3)
endif()
list(APPEND result AAX Unity VST VST3)
endif()

set(${out} ${result} PARENT_SCOPE)


+ 9
- 1
modules/juce_audio_devices/midi_io/ump/juce_UMPDispatcher.h View File

@@ -108,7 +108,13 @@ public:
{
using CallbackPtr = decltype (std::addressof (callback));
struct Callback
#if JUCE_MINGW
#define JUCE_MINGW_HIDDEN_VISIBILITY __attribute__ ((visibility ("hidden")))
#else
#define JUCE_MINGW_HIDDEN_VISIBILITY
#endif
struct JUCE_MINGW_HIDDEN_VISIBILITY Callback
{
Callback (BytestreamToUMPDispatcher& d, CallbackPtr c)
: dispatch (d), callbackPtr (c) {}
@@ -127,6 +133,8 @@ public:
CallbackPtr callbackPtr = nullptr;
};
#undef JUCE_MINGW_HIDDEN_VISIBILITY
Callback inputCallback { *this, &callback };
concatenator.pushMidiData (begin, int (end - begin), timestamp, (void*) nullptr, inputCallback);
}


+ 16
- 14
modules/juce_audio_devices/native/juce_win32_DirectSound.cpp View File

@@ -194,7 +194,9 @@ namespace
static type##functionName ds##functionName = nullptr;
#define DSOUND_FUNCTION_LOAD(functionName) \
ds##functionName = (type##functionName) GetProcAddress (h, #functionName); \
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wcast-function-type") \
ds##functionName = (type##functionName) GetProcAddress (h, #functionName); \
JUCE_END_IGNORE_WARNINGS_GCC_LIKE \
jassert (ds##functionName != nullptr);
typedef BOOL (CALLBACK *LPDSENUMCALLBACKW) (LPGUID, LPCWSTR, LPCWSTR, LPVOID);
@@ -295,10 +297,10 @@ public:
primaryDesc.dwSize = sizeof (DSBUFFERDESC);
primaryDesc.dwFlags = 1 /* DSBCAPS_PRIMARYBUFFER */;
primaryDesc.dwBufferBytes = 0;
primaryDesc.lpwfxFormat = 0;
primaryDesc.lpwfxFormat = nullptr;
JUCE_DS_LOG ("co-op level set");
hr = pDirectSound->CreateSoundBuffer (&primaryDesc, &pPrimaryBuffer, 0);
hr = pDirectSound->CreateSoundBuffer (&primaryDesc, &pPrimaryBuffer, nullptr);
JUCE_DS_LOG_ERROR (hr);
if (SUCCEEDED (hr))
@@ -324,7 +326,7 @@ public:
secondaryDesc.dwBufferBytes = (DWORD) totalBytesPerBuffer;
secondaryDesc.lpwfxFormat = &wfFormat;
hr = pDirectSound->CreateSoundBuffer (&secondaryDesc, &pOutputBuffer, 0);
hr = pDirectSound->CreateSoundBuffer (&secondaryDesc, &pOutputBuffer, nullptr);
JUCE_DS_LOG_ERROR (hr);
if (SUCCEEDED (hr))
@@ -335,14 +337,14 @@ public:
unsigned char* pDSBuffData;
hr = pOutputBuffer->Lock (0, (DWORD) totalBytesPerBuffer,
(LPVOID*) &pDSBuffData, &dwDataLen, 0, 0, 0);
(LPVOID*) &pDSBuffData, &dwDataLen, nullptr, nullptr, 0);
JUCE_DS_LOG_ERROR (hr);
if (SUCCEEDED (hr))
{
zeromem (pDSBuffData, dwDataLen);
hr = pOutputBuffer->Unlock (pDSBuffData, dwDataLen, 0, 0);
hr = pOutputBuffer->Unlock (pDSBuffData, dwDataLen, nullptr, 0);
if (SUCCEEDED (hr))
{
@@ -379,7 +381,7 @@ public:
bool service()
{
if (pOutputBuffer == 0)
if (pOutputBuffer == nullptr)
return true;
DWORD playCursor, writeCursor;
@@ -481,7 +483,7 @@ public:
jassertfalse;
}
writeOffset = (writeOffset + dwSize1 + dwSize2) % totalBytesPerBuffer;
writeOffset = (writeOffset + dwSize1 + dwSize2) % (DWORD) totalBytesPerBuffer;
pOutputBuffer->Unlock (buf1, dwSize1, buf2, dwSize2);
}
@@ -605,7 +607,7 @@ public:
captureDesc.lpwfxFormat = &wfFormat;
JUCE_DS_LOG ("object created");
hr = pDirectSoundCapture->CreateCaptureBuffer (&captureDesc, &pInputBuffer, 0);
hr = pDirectSoundCapture->CreateCaptureBuffer (&captureDesc, &pInputBuffer, nullptr);
if (SUCCEEDED (hr))
{
@@ -634,7 +636,7 @@ public:
bool service()
{
if (pInputBuffer == 0)
if (pInputBuffer == nullptr)
return true;
DWORD capturePos, readPos;
@@ -692,7 +694,7 @@ public:
jassertfalse;
}
readOffset = (readOffset + dwsize1 + dwsize2) % totalBytesPerBuffer;
readOffset = (readOffset + dwsize1 + dwsize2) % (DWORD) totalBytesPerBuffer;
pInputBuffer->Unlock (buf1, dwsize1, buf2, dwsize2);
}
@@ -932,8 +934,8 @@ public:
break;
}
const int latencyMs = (int) (bufferSizeSamples * 1000.0 / sampleRate);
const int maxTimeMS = jmax (5, 3 * latencyMs);
const auto latencyMs = (uint32) (bufferSizeSamples * 1000.0 / sampleRate);
const auto maxTimeMS = jmax ((uint32) 5, 3 * latencyMs);
while (! threadShouldExit())
{
@@ -1037,7 +1039,7 @@ struct DSoundDeviceList
outputGuids.clear();
inputGuids.clear();
if (dsDirectSoundEnumerateW != 0)
if (dsDirectSoundEnumerateW != nullptr)
{
dsDirectSoundEnumerateW (outputEnumProcW, this);
dsDirectSoundCaptureEnumerateW (inputEnumProcW, this);


+ 6
- 6
modules/juce_audio_devices/native/juce_win32_Midi.cpp View File

@@ -109,7 +109,7 @@ private:
{
stop();
if (deviceHandle != 0)
if (deviceHandle != nullptr)
{
for (int count = 5; --count >= 0;)
{
@@ -183,7 +183,7 @@ private:
void start()
{
if (deviceHandle != 0 && ! isStarted.load())
if (deviceHandle != nullptr && ! isStarted.load())
{
activeMidiCollectors.addIfNotAlreadyThere (this);
@@ -232,7 +232,7 @@ private:
}
MidiDeviceInfo deviceInfo;
HMIDIIN deviceHandle = 0;
HMIDIIN deviceHandle = nullptr;
private:
Win32MidiService& midiService;
@@ -413,7 +413,7 @@ private:
if (d.identifier == deviceIdentifier)
{
deviceID = i;
deviceID = (UINT) i;
deviceName = d.name;
break;
}
@@ -526,7 +526,7 @@ private:
if (d.identifier == deviceIdentifier)
{
deviceID = i;
deviceID = (UINT) i;
deviceName = d.name;
break;
}
@@ -554,7 +554,7 @@ private:
for (int i = 4; --i >= 0;)
{
HMIDIOUT h = 0;
HMIDIOUT h = nullptr;
auto res = midiOutOpen (&h, deviceID, 0, 0, CALLBACK_NULL);
if (res == MMSYSERR_NOERROR)


+ 19
- 19
modules/juce_audio_devices/native/juce_win32_WASAPI.cpp View File

@@ -632,10 +632,10 @@ private:
&minPeriod,
&maxPeriod)))
{
minBufferSize = minPeriod;
defaultBufferSize = defaultPeriod;
lowLatencyMaxBufferSize = maxPeriod;
lowLatencyBufferSizeMultiple = fundamentalPeriod;
minBufferSize = (int) minPeriod;
defaultBufferSize = (int) defaultPeriod;
lowLatencyMaxBufferSize = (int) maxPeriod;
lowLatencyBufferSizeMultiple = (int) fundamentalPeriod;
}
}
}
@@ -672,7 +672,7 @@ private:
: &nearestFormat)))
{
if (nearestFormat != nullptr)
rate = nearestFormat->nSamplesPerSec;
rate = (int) nearestFormat->nSamplesPerSec;
if (! rates.contains (rate))
rates.addUsingDefaultSort (rate);
@@ -780,7 +780,7 @@ private:
{
if (auto audioClient3 = client.getInterface<IAudioClient3>())
return check (audioClient3->InitializeSharedAudioStream (getStreamFlags(),
bufferSizeSamples,
(UINT32) bufferSizeSamples,
(WAVEFORMATEX*) &format,
nullptr));
@@ -822,7 +822,7 @@ private:
client = nullptr;
client = createClient();
defaultPeriod = samplesToRefTime (numFrames, format.Format.nSamplesPerSec);
defaultPeriod = samplesToRefTime ((int) numFrames, format.Format.nSamplesPerSec);
}
return false;
@@ -903,9 +903,9 @@ public:
bool start (int userBufferSize)
{
reservoirSize = actualBufferSize + userBufferSize;
reservoirSize = (int) (actualBufferSize + (UINT32) userBufferSize);
reservoirMask = nextPowerOfTwo (reservoirSize) - 1;
reservoir.setSize ((reservoirMask + 1) * bytesPerFrame, true);
reservoir.setSize ((size_t) ((reservoirMask + 1) * bytesPerFrame), true);
reservoirReadPos = 0;
reservoirWritePos = 0;
xruns = 0;
@@ -957,9 +957,9 @@ public:
void* reservoirPtr = addBytesToPointer (reservoir.getData(), localWrite * bytesPerFrame);
if ((flags & AUDCLNT_BUFFERFLAGS_SILENT) != 0)
zeromem (reservoirPtr, samplesToDoBytes);
zeromem (reservoirPtr, (size_t) samplesToDoBytes);
else
memcpy (reservoirPtr, inputData, samplesToDoBytes);
memcpy (reservoirPtr, inputData, (size_t) samplesToDoBytes);
reservoirWritePos += samplesToDo;
inputData += samplesToDoBytes;
@@ -983,7 +983,7 @@ public:
if (offset > 0)
{
for (int i = 0; i < numDestBuffers; ++i)
zeromem (destBuffers[i], offset * sizeof (float));
zeromem (destBuffers[i], (size_t) offset * sizeof (float));
bufferSize -= offset;
reservoirReadPos -= offset / 2;
@@ -1066,8 +1066,8 @@ public:
auto samplesToDo = getNumSamplesAvailableToCopy();
uint8* outputData;
if (check (renderClient->GetBuffer (samplesToDo, &outputData)))
renderClient->ReleaseBuffer (samplesToDo, AUDCLNT_BUFFERFLAGS_SILENT);
if (check (renderClient->GetBuffer ((UINT32) samplesToDo, &outputData)))
renderClient->ReleaseBuffer ((UINT32) samplesToDo, AUDCLNT_BUFFERFLAGS_SILENT);
if (! check (client->Start()))
return false;
@@ -1087,10 +1087,10 @@ public:
UINT32 padding = 0;
if (check (client->GetCurrentPadding (&padding)))
return actualBufferSize - (int) padding;
return (int) actualBufferSize - (int) padding;
}
return actualBufferSize;
return (int) actualBufferSize;
}
void copyBuffers (const float** srcBuffers, int numSrcBuffers, int bufferSize,
@@ -1334,8 +1334,8 @@ public:
return lastError;
}
currentBufferSizeSamples = outputDevice != nullptr ? outputDevice->actualBufferSize
: inputDevice->actualBufferSize;
currentBufferSizeSamples = (int) (outputDevice != nullptr ? outputDevice->actualBufferSize
: inputDevice->actualBufferSize);
}
if (inputDevice != nullptr) ResetEvent (inputDevice->clientEvent);
@@ -1435,7 +1435,7 @@ public:
JUCE_LOAD_WINAPI_FUNCTION (dll, AvSetMmThreadCharacteristicsW, avSetMmThreadCharacteristics, HANDLE, (LPCWSTR, LPDWORD))
JUCE_LOAD_WINAPI_FUNCTION (dll, AvSetMmThreadPriority, avSetMmThreadPriority, HANDLE, (HANDLE, AVRT_PRIORITY))
if (avSetMmThreadCharacteristics != 0 && avSetMmThreadPriority != 0)
if (avSetMmThreadCharacteristics != nullptr && avSetMmThreadPriority != nullptr)
{
DWORD dummy = 0;


+ 1
- 1
modules/juce_audio_formats/juce_audio_formats.h View File

@@ -104,7 +104,7 @@
#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1
#endif
#if ! JUCE_WINDOWS
#if ! JUCE_WINDOWS || JUCE_MINGW
#undef JUCE_USE_WINDOWS_MEDIA_FORMAT
#define JUCE_USE_WINDOWS_MEDIA_FORMAT 0
#endif


+ 51
- 54
modules/juce_audio_plugin_client/utility/juce_WindowsHooks.h View File

@@ -31,79 +31,76 @@ namespace juce
// This function is in juce_win32_Windowing.cpp
extern bool offerKeyMessageToJUCEWindow (MSG&);
namespace
{
static HHOOK mouseWheelHook = 0, keyboardHook = 0;
static int numHookUsers = 0;
static HHOOK mouseWheelHook = nullptr, keyboardHook = nullptr;
static int numHookUsers = 0;
struct WindowsHooks
struct WindowsHooks
{
WindowsHooks()
{
WindowsHooks()
if (numHookUsers++ == 0)
{
if (numHookUsers++ == 0)
{
mouseWheelHook = SetWindowsHookEx (WH_MOUSE, mouseWheelHookCallback,
(HINSTANCE) juce::Process::getCurrentModuleInstanceHandle(),
GetCurrentThreadId());
mouseWheelHook = SetWindowsHookEx (WH_MOUSE, mouseWheelHookCallback,
(HINSTANCE) juce::Process::getCurrentModuleInstanceHandle(),
GetCurrentThreadId());
keyboardHook = SetWindowsHookEx (WH_GETMESSAGE, keyboardHookCallback,
(HINSTANCE) juce::Process::getCurrentModuleInstanceHandle(),
GetCurrentThreadId());
}
keyboardHook = SetWindowsHookEx (WH_GETMESSAGE, keyboardHookCallback,
(HINSTANCE) juce::Process::getCurrentModuleInstanceHandle(),
GetCurrentThreadId());
}
}
~WindowsHooks()
~WindowsHooks()
{
if (--numHookUsers == 0)
{
if (--numHookUsers == 0)
if (mouseWheelHook != nullptr)
{
if (mouseWheelHook != 0)
{
UnhookWindowsHookEx (mouseWheelHook);
mouseWheelHook = 0;
}
if (keyboardHook != 0)
{
UnhookWindowsHookEx (keyboardHook);
keyboardHook = 0;
}
UnhookWindowsHookEx (mouseWheelHook);
mouseWheelHook = nullptr;
}
}
static LRESULT CALLBACK mouseWheelHookCallback (int nCode, WPARAM wParam, LPARAM lParam)
{
if (nCode >= 0 && wParam == WM_MOUSEWHEEL)
if (keyboardHook != nullptr)
{
// using a local copy of this struct to support old mingw libraries
struct MOUSEHOOKSTRUCTEX_ : public MOUSEHOOKSTRUCT { DWORD mouseData; };
UnhookWindowsHookEx (keyboardHook);
keyboardHook = nullptr;
}
}
}
auto& hs = *(MOUSEHOOKSTRUCTEX_*) lParam;
static LRESULT CALLBACK mouseWheelHookCallback (int nCode, WPARAM wParam, LPARAM lParam)
{
if (nCode >= 0 && wParam == WM_MOUSEWHEEL)
{
// using a local copy of this struct to support old mingw libraries
struct MOUSEHOOKSTRUCTEX_ : public MOUSEHOOKSTRUCT { DWORD mouseData; };
if (auto* comp = Desktop::getInstance().findComponentAt ({ hs.pt.x, hs.pt.y }))
if (comp->getWindowHandle() != 0)
return PostMessage ((HWND) comp->getWindowHandle(), WM_MOUSEWHEEL,
hs.mouseData & 0xffff0000, (hs.pt.x & 0xffff) | (hs.pt.y << 16));
}
auto& hs = *(MOUSEHOOKSTRUCTEX_*) lParam;
return CallNextHookEx (mouseWheelHook, nCode, wParam, lParam);
if (auto* comp = Desktop::getInstance().findComponentAt ({ hs.pt.x, hs.pt.y }))
if (comp->getWindowHandle() != nullptr)
return PostMessage ((HWND) comp->getWindowHandle(), WM_MOUSEWHEEL,
hs.mouseData & 0xffff0000, (hs.pt.x & 0xffff) | (hs.pt.y << 16));
}
static LRESULT CALLBACK keyboardHookCallback (int nCode, WPARAM wParam, LPARAM lParam)
{
MSG& msg = *(MSG*) lParam;
return CallNextHookEx (mouseWheelHook, nCode, wParam, lParam);
}
if (nCode == HC_ACTION && wParam == PM_REMOVE
&& offerKeyMessageToJUCEWindow (msg))
{
zerostruct (msg);
msg.message = WM_USER;
return 1;
}
static LRESULT CALLBACK keyboardHookCallback (int nCode, WPARAM wParam, LPARAM lParam)
{
MSG& msg = *(MSG*) lParam;
return CallNextHookEx (keyboardHook, nCode, wParam, lParam);
if (nCode == HC_ACTION && wParam == PM_REMOVE
&& offerKeyMessageToJUCEWindow (msg))
{
zerostruct (msg);
msg.message = WM_USER;
return 1;
}
};
}
return CallNextHookEx (keyboardHook, nCode, wParam, lParam);
}
};
} // namespace juce


+ 11
- 1
modules/juce_audio_processors/format_types/juce_VST3Headers.h View File

@@ -61,7 +61,9 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wnon-virtual-dtor",
"-Wextra",
"-Wclass-memaccess",
"-Wmissing-prototypes",
"-Wtype-limits")
"-Wtype-limits",
"-Wcpp",
"-W#warnings")
#undef DEVELOPMENT
#define DEVELOPMENT 0 // This avoids a Clang warning in Steinberg code about unused values
@@ -112,6 +114,14 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wnon-virtual-dtor",
#include <base/source/fstreamer.cpp>
#include <base/source/fstring.cpp>
// The following shouldn't leak from fstring.cpp
#undef stricmp
#undef strnicmp
#undef snprintf
#undef vsnprintf
#undef snwprintf
#undef vsnwprintf
#if VST_VERSION >= 0x030608
#include <base/thread/source/flock.cpp>
#include <pluginterfaces/base/coreiids.cpp>


+ 2
- 0
modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp View File

@@ -28,6 +28,8 @@
#include "juce_VST3Headers.h"
#include "juce_VST3Common.h"
#include <unordered_map>
namespace juce
{


+ 3
- 0
modules/juce_core/native/juce_win32_SystemStats.cpp View File

@@ -291,8 +291,11 @@ String SystemStats::getOperatingSystemName()
case MacOSX_10_12: JUCE_FALLTHROUGH
case MacOSX_10_13: JUCE_FALLTHROUGH
case MacOSX_10_14: JUCE_FALLTHROUGH
case MacOSX_10_15: JUCE_FALLTHROUGH
case MacOS_11: JUCE_FALLTHROUGH
case UnknownOS: JUCE_FALLTHROUGH
case WASM: JUCE_FALLTHROUGH
default: jassertfalse; break; // !! new type of OS?
}


+ 1
- 1
modules/juce_core/system/juce_CompilerWarnings.h View File

@@ -127,7 +127,7 @@
/** Quote the argument, turning it into a string. */
#define JUCE_TO_STRING(x) #x
#if JUCE_CLANG || JUCE_GCC
#if JUCE_CLANG || JUCE_GCC || JUCE_MINGW
#define JUCE_IGNORE_GCC_IMPL_(compiler, warning)
#define JUCE_IGNORE_GCC_IMPL_0(compiler, warning)
#define JUCE_IGNORE_GCC_IMPL_1(compiler, warning) \


+ 5
- 2
modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp View File

@@ -275,7 +275,7 @@ private:
{
LPTSTR messageBuffer = nullptr;
auto size = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, statusCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
nullptr, (DWORD) statusCode, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR) &messageBuffer, 0, nullptr);
String message (messageBuffer, size);
@@ -306,6 +306,9 @@ private:
void componentPeerChanged() override {}
void componentVisibilityChanged() override { owner.visibilityChanged(); }
using ComponentMovementWatcher::componentVisibilityChanged;
using ComponentMovementWatcher::componentMovedOrResized;
private:
WebBrowserComponent& owner;
@@ -872,7 +875,7 @@ void WebBrowserComponent::checkWindowAssociation()
// page to avoid this..
blankPageShown = true;
browser->getInternalWebView().goToURL ("about:blank", 0, 0);
browser->getInternalWebView().goToURL ("about:blank", nullptr, nullptr);
}
}
}


Write Preview
Loading…
Cancel
Save