Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: sandbox/src/sandbox_utils.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/src/sandbox_utils.h ('k') | sandbox/src/security_level.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/src/sandbox_utils.cc
diff --git a/sandbox/src/sandbox_utils.cc b/sandbox/src/sandbox_utils.cc
deleted file mode 100644
index 3bfa696f2946a5005901a3baa3d9ca5df70b260c..0000000000000000000000000000000000000000
--- a/sandbox/src/sandbox_utils.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "sandbox/src/sandbox_utils.h"
-
-#include <windows.h>
-
-#include "base/logging.h"
-#include "base/win/windows_version.h"
-#include "sandbox/src/internal_types.h"
-#include "sandbox/src/nt_internals.h"
-
-namespace sandbox {
-
-bool GetModuleHandleHelper(DWORD flags, const wchar_t* module_name,
- HMODULE* module) {
- DCHECK(module);
-
- HMODULE kernel32_base = ::GetModuleHandle(kKerneldllName);
- if (!kernel32_base) {
- NOTREACHED();
- return false;
- }
-
- GetModuleHandleExFunction get_module_handle_ex = reinterpret_cast<
- GetModuleHandleExFunction>(::GetProcAddress(kernel32_base,
- "GetModuleHandleExW"));
- if (get_module_handle_ex) {
- BOOL ret = get_module_handle_ex(flags, module_name, module);
- return (ret ? true : false);
- }
-
- if (!flags) {
- *module = ::LoadLibrary(module_name);
- } else if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) {
- NOTREACHED();
- return false;
- } else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) {
- DCHECK((flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) ==
- GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT);
-
- *module = ::GetModuleHandle(module_name);
- } else {
- DCHECK((flags & (GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
- GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) ==
- (GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
- GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS));
-
- MEMORY_BASIC_INFORMATION info = {0};
- size_t returned = VirtualQuery(module_name, &info, sizeof(info));
- if (sizeof(info) != returned)
- return false;
- *module = reinterpret_cast<HMODULE>(info.AllocationBase);
- }
- return true;
-}
-
-bool IsXPSP2OrLater() {
- base::win::Version version = base::win::GetVersion();
- return (version > base::win::VERSION_XP) ||
- ((version == base::win::VERSION_XP) &&
- (base::win::OSInfo::GetInstance()->service_pack().major >= 2));
-}
-
-void InitObjectAttribs(const std::wstring& name, ULONG attributes, HANDLE root,
- OBJECT_ATTRIBUTES* obj_attr, UNICODE_STRING* uni_name) {
- static RtlInitUnicodeStringFunction RtlInitUnicodeString;
- if (!RtlInitUnicodeString) {
- HMODULE ntdll = ::GetModuleHandle(kNtdllName);
- RtlInitUnicodeString = reinterpret_cast<RtlInitUnicodeStringFunction>(
- GetProcAddress(ntdll, "RtlInitUnicodeString"));
- DCHECK(RtlInitUnicodeString);
- }
- RtlInitUnicodeString(uni_name, name.c_str());
- InitializeObjectAttributes(obj_attr, uni_name, attributes, root, NULL);
-}
-
-}; // namespace sandbox
« no previous file with comments | « sandbox/src/sandbox_utils.h ('k') | sandbox/src/security_level.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698