diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 03:23:38 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 03:23:38 +0000 |
| commit | 2e3d9e4cd2b473f6f6a53999c6af0b1e50c3fa5d (patch) | |
| tree | aaa3aba360667a34aa1cb14ac1ab2ab4de4a7564 /content | |
| parent | a808bc552ee2d41473f4aead58fd22a4d92e09a3 (diff) | |
| download | chromium_src-2e3d9e4cd2b473f6f6a53999c6af0b1e50c3fa5d.zip chromium_src-2e3d9e4cd2b473f6f6a53999c6af0b1e50c3fa5d.tar.gz chromium_src-2e3d9e4cd2b473f6f6a53999c6af0b1e50c3fa5d.tar.bz2 | |
Preload setupapi.dll in GPU process.
It can't be loaded on some systems once the sandbox is enabled.
BUG=114011,112205
Review URL: http://codereview.chromium.org/9389013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/gpu/gpu_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index c15cab2..b1d6629 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -82,6 +82,9 @@ int GpuMain(const content::MainFunctionParams& parameters) { base::win::ScopedCOMInitializer com_initializer; #if defined(OS_WIN) + // Preload this DLL because the sandbox prevents it from loading. + LoadLibrary(L"setupapi.dll"); + sandbox::TargetServices* target_services = parameters.sandbox_info->target_services; // Initialize H/W video decoding stuff which fails in the sandbox. |