Sandbox: Update for Windows 8.1

sandbox/win/src/app_container.cc

 // Copyright (c) 2012 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/win/src/app_container.h"
 
 #include <Sddl.h>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/startup_information.h"
 #include "sandbox/win/src/internal_types.h"
 
 namespace {
 
 // Converts the passed in sid string to a PSID that must be relased with
 // LocalFree.
 PSID ConvertSid(const string16& sid) {
   PSID local_sid;
   if (!ConvertStringSidToSid(sid.c_str(), &local_sid))
     return NULL;
   return local_sid;
 }
 
+template <typename T>
+T BindFunction(const char* name) {
+  HMODULE module = GetModuleHandle(sandbox::kKerneldllName);
+  void* function = GetProcAddress(module, name);
+  if (!function) {
+    module = GetModuleHandle(sandbox::kKernelBasedllName);
+    function = GetProcAddress(module, name);
+  }
+  return reinterpret_cast<T>(function);
+}
+
 }  // namespace
 
 namespace sandbox {
 
 AppContainerAttributes::AppContainerAttributes() {
   memset(&capabilities_, 0, sizeof(capabilities_));
 }
 
 AppContainerAttributes::~AppContainerAttributes() {
   for (size_t i = 0; i < attributes_.size(); i++)
@@ skipping 51 matching lines @@
   PSID local_sid;
   if (!ConvertStringSidToSid(sid.c_str(), &local_sid))
     return SBOX_ERROR_INVALID_APP_CONTAINER;
 
   typedef HRESULT (WINAPI* AppContainerRegisterSidPtr)(PSID sid,
                                                        LPCWSTR moniker,
                                                        LPCWSTR display_name);
   static AppContainerRegisterSidPtr AppContainerRegisterSid = NULL;
 
   if (!AppContainerRegisterSid) {
-    HMODULE module = GetModuleHandle(kKerneldllName);
-    AppContainerRegisterSid = reinterpret_cast<AppContainerRegisterSidPtr>(
-        GetProcAddress(module, "AppContainerRegisterSid"));
+    AppContainerRegisterSid =
+        BindFunction<AppContainerRegisterSidPtr>("AppContainerRegisterSid");
   }
 
   ResultCode operation_result = SBOX_ERROR_GENERIC;
   if (AppContainerRegisterSid) {
     HRESULT rv = AppContainerRegisterSid(local_sid, name.c_str(), name.c_str());
     if (SUCCEEDED(rv))
       operation_result = SBOX_ALL_OK;
     else
       DLOG(ERROR) << "AppContainerRegisterSid error:" << std::hex << rv;
   }
   LocalFree(local_sid);
   return operation_result;
 }
 
 ResultCode DeleteAppContainer(const string16& sid) {
   PSID local_sid;
   if (!ConvertStringSidToSid(sid.c_str(), &local_sid))
     return SBOX_ERROR_INVALID_APP_CONTAINER;
 
   typedef HRESULT (WINAPI* AppContainerUnregisterSidPtr)(PSID sid);
   static AppContainerUnregisterSidPtr AppContainerUnregisterSid = NULL;
 
   if (!AppContainerUnregisterSid) {
-    HMODULE module = GetModuleHandle(kKerneldllName);
-    AppContainerUnregisterSid = reinterpret_cast<AppContainerUnregisterSidPtr>(
-        GetProcAddress(module, "AppContainerUnregisterSid"));
+    AppContainerUnregisterSid =
+        BindFunction<AppContainerUnregisterSidPtr>("AppContainerUnregisterSid");
   }
 
   ResultCode operation_result = SBOX_ERROR_GENERIC;
   if (AppContainerUnregisterSid) {
     HRESULT rv = AppContainerUnregisterSid(local_sid);
     if (SUCCEEDED(rv))
       operation_result = SBOX_ALL_OK;
     else
       DLOG(ERROR) << "AppContainerUnregisterSid error:" << std::hex << rv;
   }
   LocalFree(local_sid);
   return operation_result;
 }
 
 string16 LookupAppContainer(const string16& sid) {
   PSID local_sid;
   if (!ConvertStringSidToSid(sid.c_str(), &local_sid))
     return string16();
 
   typedef HRESULT (WINAPI* AppContainerLookupMonikerPtr)(PSID sid,
                                                          LPWSTR* moniker);
   typedef BOOLEAN (WINAPI* AppContainerFreeMemoryPtr)(void* ptr);
 
   static AppContainerLookupMonikerPtr AppContainerLookupMoniker = NULL;
   static AppContainerFreeMemoryPtr AppContainerFreeMemory = NULL;
 
   if (!AppContainerLookupMoniker || !AppContainerFreeMemory) {
-    HMODULE module = GetModuleHandle(kKerneldllName);
-    AppContainerLookupMoniker = reinterpret_cast<AppContainerLookupMonikerPtr>(
-        GetProcAddress(module, "AppContainerLookupMoniker"));
-    AppContainerFreeMemory = reinterpret_cast<AppContainerFreeMemoryPtr>(
-        GetProcAddress(module, "AppContainerFreeMemory"));
+    AppContainerLookupMoniker =
+        BindFunction<AppContainerLookupMonikerPtr>("AppContainerLookupMoniker");
+    AppContainerFreeMemory =
+        BindFunction<AppContainerFreeMemoryPtr>("AppContainerFreeMemory");
   }
 
   if (!AppContainerLookupMoniker || !AppContainerFreeMemory)
     return string16();
 
   wchar_t* buffer = NULL;
   HRESULT rv = AppContainerLookupMoniker(local_sid, &buffer);
   if (FAILED(rv))
     return string16();
 
   string16 name(buffer);
   if (!AppContainerFreeMemory(buffer))
     NOTREACHED();
   return name;
 }
 
 }  // namespace sandbox