| @@ -180,18 +180,19 @@ String SystemStats::getOperatingSystemName() | |||||
| bool SystemStats::isOperatingSystem64Bit() | bool SystemStats::isOperatingSystem64Bit() | ||||
| { | { | ||||
| #ifdef _WIN64 | |||||
| #if JUCE_64BIT | |||||
| return true; | return true; | ||||
| #else | #else | ||||
| typedef BOOL (WINAPI* LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); | typedef BOOL (WINAPI* LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); | ||||
| LPFN_ISWOW64PROCESS fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress (GetModuleHandle (_T("kernel32")), "IsWow64Process"); | |||||
| LPFN_ISWOW64PROCESS fnIsWow64Process | |||||
| = (LPFN_ISWOW64PROCESS) GetProcAddress (GetModuleHandleA ("kernel32"), "IsWow64Process"); | |||||
| BOOL isWow64 = FALSE; | BOOL isWow64 = FALSE; | ||||
| return fnIsWow64Process != 0 | |||||
| return fnIsWow64Process != nullptr | |||||
| && fnIsWow64Process (GetCurrentProcess(), &isWow64) | && fnIsWow64Process (GetCurrentProcess(), &isWow64) | ||||
| && (isWow64 != FALSE); | |||||
| && isWow64 != FALSE; | |||||
| #endif | #endif | ||||
| } | } | ||||
| @@ -287,7 +287,7 @@ static void* currentModuleHandle = nullptr; | |||||
| void* Process::getCurrentModuleInstanceHandle() noexcept | void* Process::getCurrentModuleInstanceHandle() noexcept | ||||
| { | { | ||||
| if (currentModuleHandle == nullptr) | if (currentModuleHandle == nullptr) | ||||
| currentModuleHandle = GetModuleHandle (0); | |||||
| currentModuleHandle = GetModuleHandleA (nullptr); | |||||
| return currentModuleHandle; | return currentModuleHandle; | ||||
| } | } | ||||
| @@ -319,8 +319,8 @@ void Process::terminate() | |||||
| bool juce_IsRunningInWine() | bool juce_IsRunningInWine() | ||||
| { | { | ||||
| HMODULE ntdll = GetModuleHandle (_T("ntdll.dll")); | |||||
| return ntdll != 0 && GetProcAddress (ntdll, "wine_get_version") != 0; | |||||
| HMODULE ntdll = GetModuleHandleA ("ntdll"); | |||||
| return ntdll != 0 && GetProcAddress (ntdll, "wine_get_version") != nullptr; | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| @@ -27,7 +27,7 @@ | |||||
| #define __JUCE_THREADLOCALVALUE_JUCEHEADER__ | #define __JUCE_THREADLOCALVALUE_JUCEHEADER__ | ||||
| // (NB: on win32, native thread-locals aren't possible in a dynamically loaded DLL in XP). | // (NB: on win32, native thread-locals aren't possible in a dynamically loaded DLL in XP). | ||||
| #if ! ((JUCE_MSVC && (defined (_WIN64) || ! defined (JucePlugin_PluginCode))) \ | |||||
| #if ! ((JUCE_MSVC && (JUCE_64BIT || ! defined (JucePlugin_PluginCode))) \ | |||||
| || (JUCE_MAC && JUCE_CLANG && defined (MAC_OS_X_VERSION_10_7) \ | || (JUCE_MAC && JUCE_CLANG && defined (MAC_OS_X_VERSION_10_7) \ | ||||
| && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)) | && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)) | ||||
| #define JUCE_NO_COMPILER_THREAD_LOCAL 1 | #define JUCE_NO_COMPILER_THREAD_LOCAL 1 | ||||