Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/win/windows_version.h" | 5 #include "base/win/windows_version.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 | 10 |
| 11 namespace base { | 11 namespace base { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 GetVersionEx(reinterpret_cast<OSVERSIONINFOW*>(&version_info)); | 61 GetVersionEx(reinterpret_cast<OSVERSIONINFOW*>(&version_info)); |
| 62 service_pack_major = version_info.wServicePackMajor; | 62 service_pack_major = version_info.wServicePackMajor; |
| 63 service_pack_minor = version_info.wServicePackMinor; | 63 service_pack_minor = version_info.wServicePackMinor; |
| 64 checked_version = true; | 64 checked_version = true; |
| 65 } | 65 } |
| 66 | 66 |
| 67 *major = service_pack_major; | 67 *major = service_pack_major; |
| 68 *minor = service_pack_minor; | 68 *minor = service_pack_minor; |
| 69 } | 69 } |
| 70 | 70 |
| 71 WOW64Status GetWOW64Status() { | |
| 72 static WOW64Status wow64_status = | |
| 73 GetWOW64StatusForProcess(GetCurrentProcess()); | |
| 74 return wow64_status; | |
| 75 } | |
| 76 | |
| 77 WOW64Status GetWOW64StatusForProcess(HANDLE process_handle) { | |
| 78 typedef BOOL (WINAPI* IsWow64ProcessFunc)(HANDLE, PBOOL); | |
| 79 IsWow64ProcessFunc is_wow64_process = reinterpret_cast<IsWow64ProcessFunc>( | |
| 80 GetProcAddress(GetModuleHandle(L"kernel32.dll"), "IsWow64Process")); | |
|
rvargas (doing something else)
2011/03/04 00:12:18
Can we save this pointer? GetProcAddress is not th
Peter Kasting
2011/03/04 01:11:48
But the entire return value is cached in GetWOW64S
rvargas (doing something else)
2011/03/04 01:21:49
Even better :)
| |
| 81 if (!is_wow64_process) | |
| 82 return WOW64_DISABLED; | |
| 83 BOOL is_wow64 = FALSE; | |
| 84 if (!(*is_wow64_process)(process_handle, &is_wow64)) | |
| 85 return WOW64_UNKNOWN; | |
| 86 return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED; | |
| 87 } | |
| 88 | |
| 71 } // namespace win | 89 } // namespace win |
| 72 } // namespace base | 90 } // namespace base |
| OLD | NEW |