diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp index fb95a5205e..a558964550 100644 --- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp @@ -97,7 +97,7 @@ namespace FlacNamespace #define FLAC__NO_DLL 1 - JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4267 4127 4244 4996 4100 4701 4702 4013 4133 4206 4312 4505 4365 4005 4334 181 111 6340 6308 6297 6001) + JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4267 4127 4244 4996 4100 4701 4702 4013 4133 4206 4312 4505 4365 4005 4334 181 111 6340 6308 6297 6001 6320) #if ! JUCE_MSVC #define HAVE_LROUND 1 #endif diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index a571bc0d06..c078b4ba02 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -1023,7 +1023,7 @@ namespace AAXClasses || transport.GetTimelineSelectionStartPosition (&info.timeInSamples) != AAX_SUCCESS) check (transport.GetCurrentNativeSampleLocation (&info.timeInSamples)); - info.timeInSeconds = info.timeInSamples / sampleRate; + info.timeInSeconds = (float) info.timeInSamples / sampleRate; int64_t ticks = 0; @@ -1032,13 +1032,13 @@ namespace AAXClasses else check (transport.GetCurrentTickPosition (&ticks)); - info.ppqPosition = ticks / 960000.0; + info.ppqPosition = (double) ticks / 960000.0; info.isLooping = false; int64_t loopStartTick = 0, loopEndTick = 0; check (transport.GetCurrentLoopPosition (&info.isLooping, &loopStartTick, &loopEndTick)); - info.ppqLoopStart = loopStartTick / 960000.0; - info.ppqLoopEnd = loopEndTick / 960000.0; + info.ppqLoopStart = (double) loopStartTick / 960000.0; + info.ppqLoopEnd = (double) loopEndTick / 960000.0; info.editOriginTime = 0; info.frameRate = AudioPlayHead::fpsUnknown; diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index c718d2b5dd..8a4fa28384 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -153,11 +153,11 @@ namespace { const int frameThickness = GetSystemMetrics (SM_CYFIXEDFRAME); - while (w != 0) + while (w != nullptr) { auto parent = getWindowParent (w); - if (parent == 0) + if (parent == nullptr) break; TCHAR windowType[32] = { 0 }; @@ -1176,11 +1176,11 @@ public: HWND w = (HWND) getWindowHandle(); - while (w != 0) + while (w != nullptr) { HWND parent = getWindowParent (w); - if (parent == 0) + if (parent == nullptr) break; TCHAR windowType [32] = { 0 }; @@ -1194,7 +1194,7 @@ public: GetWindowRect (parent, &parentPos); if (w != (HWND) getWindowHandle()) - SetWindowPos (w, 0, 0, 0, newWidth + dw, newHeight + dh, + SetWindowPos (w, nullptr, 0, 0, newWidth + dw, newHeight + dh, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER); dw = (parentPos.right - parentPos.left) - (windowPos.right - windowPos.left); @@ -1206,11 +1206,11 @@ public: break; if (dw > 100 || dh > 100) - w = 0; + w = nullptr; } - if (w != 0) - SetWindowPos (w, 0, 0, 0, newWidth + dw, newHeight + dh, + if (w != nullptr) + SetWindowPos (w, nullptr, 0, 0, newWidth + dw, newHeight + dh, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER); #endif } diff --git a/modules/juce_core/native/juce_win32_SystemStats.cpp b/modules/juce_core/native/juce_win32_SystemStats.cpp index a7719753f4..6ac2db7395 100644 --- a/modules/juce_core/native/juce_win32_SystemStats.cpp +++ b/modules/juce_core/native/juce_win32_SystemStats.cpp @@ -330,8 +330,16 @@ bool SystemStats::isOperatingSystem64Bit() #else typedef BOOL (WINAPI* LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); + const auto moduleHandle = GetModuleHandleA ("kernel32"); + + if (moduleHandle == nullptr) + { + jassertfalse; + return false; + } + LPFN_ISWOW64PROCESS fnIsWow64Process - = (LPFN_ISWOW64PROCESS) GetProcAddress (GetModuleHandleA ("kernel32"), "IsWow64Process"); + = (LPFN_ISWOW64PROCESS) GetProcAddress (moduleHandle, "IsWow64Process"); BOOL isWow64 = FALSE;