OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2009 Apple Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "platform/win/SystemInfo.h" | 27 #include "platform/win/SystemInfo.h" |
28 | 28 |
29 #if _WIN32_WINNT_WINBLUE | 29 #include <windows.h> |
| 30 |
| 31 #if _WIN32_WINNT >= 0x0603 |
30 #include <versionhelpers.h> | 32 #include <versionhelpers.h> |
31 #endif | 33 #endif |
32 | 34 |
33 #include <windows.h> | |
34 | |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 #ifndef _WIN32_WINNT_WINBLUE | 37 #if _WIN32_WINNT < 0x0603 |
38 static bool IsWindowsVistaOrGreater() | 38 static bool IsWindowsVistaOrGreater() |
39 { | 39 { |
40 OSVERSIONINFOEXW osvi = { }; | 40 OSVERSIONINFOEXW osvi = { }; |
41 osvi.dwOSVersionInfoSize = sizeof(osvi); | 41 osvi.dwOSVersionInfoSize = sizeof(osvi); |
42 osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA); | 42 osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA); |
43 osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA); | 43 osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA); |
44 DWORDLONG conditoin = 0; | 44 DWORDLONG condition = 0; |
45 VER_SET_CONDITION(conditoin, VER_MAJORVERSION, VER_GREATER_EQUAL); | 45 VER_SET_CONDITION(condition, VER_MAJORVERSION, VER_GREATER_EQUAL); |
46 VER_SET_CONDITION(conditoin, VER_MINORVERSION, VER_GREATER_EQUAL); | 46 VER_SET_CONDITION(condition, VER_MINORVERSION, VER_GREATER_EQUAL); |
47 return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, co
nditoin); | 47 return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, co
ndition); |
48 } | 48 } |
49 #endif | 49 #endif |
50 | 50 |
51 bool isWindowsVistaOrGreater() | 51 bool isWindowsVistaOrGreater() |
52 { | 52 { |
53 static bool initialized = false; | 53 static bool initialized = false; |
54 static bool cachedIsWindowsVistaOrGreater; | 54 static bool cachedIsWindowsVistaOrGreater; |
55 | 55 |
56 if (!initialized) { | 56 if (!initialized) { |
57 initialized = true; | 57 initialized = true; |
58 cachedIsWindowsVistaOrGreater = IsWindowsVistaOrGreater(); | 58 cachedIsWindowsVistaOrGreater = IsWindowsVistaOrGreater(); |
59 } | 59 } |
60 return cachedIsWindowsVistaOrGreater; | 60 return cachedIsWindowsVistaOrGreater; |
61 } | 61 } |
62 | 62 |
63 } // namespace blink | 63 } // namespace blink |
OLD | NEW |