| @@ -114,7 +114,7 @@ SystemStats::CPUFlags::CPUFlags() | |||||
| #endif | #endif | ||||
| SYSTEM_INFO systemInfo; | SYSTEM_INFO systemInfo; | ||||
| GetSystemInfo (&systemInfo); | |||||
| GetNativeSystemInfo (&systemInfo); | |||||
| numCpus = (int) systemInfo.dwNumberOfProcessors; | numCpus = (int) systemInfo.dwNumberOfProcessors; | ||||
| } | } | ||||
| @@ -344,7 +344,7 @@ bool Time::setSystemTimeToThisTime() const | |||||
| int SystemStats::getPageSize() | int SystemStats::getPageSize() | ||||
| { | { | ||||
| SYSTEM_INFO systemInfo; | SYSTEM_INFO systemInfo; | ||||
| GetSystemInfo (&systemInfo); | |||||
| GetNativeSystemInfo (&systemInfo); | |||||
| return (int) systemInfo.dwPageSize; | return (int) systemInfo.dwPageSize; | ||||
| } | } | ||||
| @@ -241,9 +241,9 @@ String URL::getDomain() const | |||||
| const int end1 = url.indexOfChar (start, '/'); | const int end1 = url.indexOfChar (start, '/'); | ||||
| const int end2 = url.indexOfChar (start, ':'); | const int end2 = url.indexOfChar (start, ':'); | ||||
| const int end = (end1 < 0 || end2 < 0) ? jmax (end1, end2) | |||||
| : jmin (end1, end2); | |||||
| const int end = (end1 < 0 && end2 < 0) ? std::numeric_limits<int>::max() | |||||
| : ((end1 < 0 || end2 < 0) ? jmax (end1, end2) | |||||
| : jmin (end1, end2)); | |||||
| return url.substring (start, end); | return url.substring (start, end); | ||||
| } | } | ||||
| @@ -226,12 +226,6 @@ public: | |||||
| CoUninitialize(); | CoUninitialize(); | ||||
| } | } | ||||
| //====================================================================== | |||||
| HWND getNativeWindowHandle() const | |||||
| { | |||||
| return nativeWindow != nullptr ? nativeWindow->getHandle() : 0; | |||||
| } | |||||
| //====================================================================== | //====================================================================== | ||||
| void updateWindowPosition (const Rectangle<int>& newBounds) | void updateWindowPosition (const Rectangle<int>& newBounds) | ||||
| { | { | ||||
| @@ -537,8 +531,6 @@ private: | |||||
| if (c != nullptr) | if (c != nullptr) | ||||
| { | { | ||||
| jassert (c->getNativeWindowHandle() == hwnd); | |||||
| switch (msg) | switch (msg) | ||||
| { | { | ||||
| case WM_ERASEBKGND: return 1; | case WM_ERASEBKGND: return 1; | ||||