diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 18:42:32 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 18:42:32 +0000 |
| commit | 7ca81cba118057063ce36aa32ef514489a34756c (patch) | |
| tree | 54ed79c8ef2290ddc541c9b8e3a3b159213c83bb /sandbox/win | |
| parent | 6829aa139a2ed3ff94d84ca8a10c839e84fb5d54 (diff) | |
| download | chromium_src-7ca81cba118057063ce36aa32ef514489a34756c.zip chromium_src-7ca81cba118057063ce36aa32ef514489a34756c.tar.gz chromium_src-7ca81cba118057063ce36aa32ef514489a34756c.tar.bz2 | |
Fix a bug which caused the OpenEventA function in kernelbase to not get patched. We were patching OpenEventW twice.
BUG=305815
R=rvargas@chromium.org, rvargas
Review URL: https://codereview.chromium.org/27256007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/win')
| -rw-r--r-- | sandbox/win/src/sync_dispatcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sandbox/win/src/sync_dispatcher.cc b/sandbox/win/src/sync_dispatcher.cc index b80e338..6897dac 100644 --- a/sandbox/win/src/sync_dispatcher.cc +++ b/sandbox/win/src/sync_dispatcher.cc @@ -36,12 +36,12 @@ SyncDispatcher::SyncDispatcher(PolicyBase* policy_base) bool SyncDispatcher::SetupService(InterceptionManager* manager, int service) { bool ret = false; + // We need to intercept kernelbase.dll on Windows 7 and beyond and + // kernel32.dll for earlier versions. static const wchar_t* kWin32SyncDllName = base::win::GetVersion() >= base::win::VERSION_WIN7 ? kKernelBasedllName : kKerneldllName; - // We need to intercept kernelbase.dll on Windows 8 and beyond and - // kernel32.dll for earlier versions. if (IPC_CREATEEVENT_TAG == service) { ret = INTERCEPT_EAT(manager, kWin32SyncDllName, CreateEventW, CREATE_EVENTW_ID, 20); @@ -53,7 +53,7 @@ bool SyncDispatcher::SetupService(InterceptionManager* manager, ret = INTERCEPT_EAT(manager, kWin32SyncDllName, OpenEventW, OPEN_EVENTW_ID, 16); if (ret) { - ret = INTERCEPT_EAT(manager, kWin32SyncDllName, OpenEventW, + ret = INTERCEPT_EAT(manager, kWin32SyncDllName, OpenEventA, OPEN_EVENTA_ID, 16); } } |