diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:39:46 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:39:46 +0000 |
| commit | 72d1e597c85fbf6b45756e3c753696370c48c042 (patch) | |
| tree | d01609d62295e34aa3a5721d4109f815d0fd23ad /sandbox | |
| parent | 9475d1d189c03a0626c4855b38f6004bfe7c5bb8 (diff) | |
| download | chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.zip chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.gz chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.bz2 | |
Slight code change to make some global variables const.
Fix >80 cols lines.
Review URL: http://codereview.chromium.org/42013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/sandbox_poc/pocdll/invasive.cc | 5 | ||||
| -rw-r--r-- | sandbox/src/service_resolver.cc | 11 | ||||
| -rw-r--r-- | sandbox/tools/finder/stdafx.h | 4 | ||||
| -rw-r--r-- | sandbox/tools/launcher/stdafx.h | 4 |
4 files changed, 13 insertions, 11 deletions
diff --git a/sandbox/sandbox_poc/pocdll/invasive.cc b/sandbox/sandbox_poc/pocdll/invasive.cc index 9118294..1bac7c1 100644 --- a/sandbox/sandbox_poc/pocdll/invasive.cc +++ b/sandbox/sandbox_poc/pocdll/invasive.cc @@ -172,7 +172,9 @@ BOOL CALLBACK EnumWindowCallback(HWND hwnd, LPARAM output) { wchar_t window_title[100 + 1] = {0}; ::GetWindowText(hwnd, window_title, 100); fprintf(reinterpret_cast<FILE*>(output), - "[GRANTED] Found window 0x%p with title %S\r\n", hwnd, window_title); + "[GRANTED] Found window 0x%p with title %S\r\n", + hwnd, + window_title); ::CloseWindow(hwnd); } @@ -192,4 +194,3 @@ void POCDLL_API TestCloseHWND(HANDLE log) { // before returning. ::Sleep(3000); } - diff --git a/sandbox/src/service_resolver.cc b/sandbox/src/service_resolver.cc index a052299..5b8683c 100644 --- a/sandbox/src/service_resolver.cc +++ b/sandbox/src/service_resolver.cc @@ -236,11 +236,13 @@ bool ServiceResolverThunk::IsFunctionAService(void* local_thunk) const { // able to patch a buffer in memory, so target_ is not inside ntdll. module_2 = ntdll_base_; } else { - if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | - GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - reinterpret_cast<const wchar_t*>(target_), - &module_2)) + if (!GetModuleHandleHelper( + GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + reinterpret_cast<const wchar_t*>(target_), + &module_2)) { return false; + } } if (module_1 != module_2) @@ -397,4 +399,3 @@ bool Win2kResolverThunk::IsFunctionAService(void* local_thunk) const { } } // namespace sandbox - diff --git a/sandbox/tools/finder/stdafx.h b/sandbox/tools/finder/stdafx.h index eb1e5f8..f5b821b 100644 --- a/sandbox/tools/finder/stdafx.h +++ b/sandbox/tools/finder/stdafx.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_TOOLS_FINDER_STDAFX_H__ #define SANDBOX_TOOLS_FINDER_STDAFX_H__ -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0501 #endif #include <stdio.h> diff --git a/sandbox/tools/launcher/stdafx.h b/sandbox/tools/launcher/stdafx.h index 29742d7..297195c 100644 --- a/sandbox/tools/launcher/stdafx.h +++ b/sandbox/tools/launcher/stdafx.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_TOOLS_LAUNCHER_STDAFX_H__ #define SANDBOX_TOOLS_LAUNCHER_STDAFX_H__ -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0501 #endif #include <stdio.h> |