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

Side by Side Diff: sandbox/src/sandbox_nt_util.h

Issue 2870017: Fix compiler error in sandbox util in case exception is enabled.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | sandbox/src/sandbox_nt_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SANDBOX_SRC_SANDBOX_NT_UTIL_H_ 5 #ifndef SANDBOX_SRC_SANDBOX_NT_UTIL_H_
6 #define SANDBOX_SRC_SANDBOX_NT_UTIL_H_ 6 #define SANDBOX_SRC_SANDBOX_NT_UTIL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "sandbox/src/nt_internals.h" 9 #include "sandbox/src/nt_internals.h"
10 #include "sandbox/src/sandbox_nt_types.h" 10 #include "sandbox/src/sandbox_nt_types.h"
11 11
12 // Placement new and delete to be used from ntdll interception code. 12 // Placement new and delete to be used from ntdll interception code.
13 void* __cdecl operator new(size_t size, sandbox::AllocationType type, 13 void* __cdecl operator new(size_t size, sandbox::AllocationType type,
14 void* near_to = NULL); 14 void* near_to = NULL);
15 void __cdecl operator delete(void* memory, sandbox::AllocationType type); 15 void __cdecl operator delete(void* memory, sandbox::AllocationType type);
16 // Add operator delete that matches the placement form of the operator new
17 // above. This is required by compiler to generate code to call operator delete
18 // in case the object's constructor throws an exception.
19 // See http://msdn.microsoft.com/en-us/library/cxdxz3x6.aspx
20 void __cdecl operator delete(void* memory, sandbox::AllocationType type,
21 void* near_to);
16 22
17 // Regular placement new and delete 23 // Regular placement new and delete
18 void* __cdecl operator new(size_t size, void* buffer, 24 void* __cdecl operator new(size_t size, void* buffer,
19 sandbox::AllocationType type); 25 sandbox::AllocationType type);
20 void __cdecl operator delete(void* memory, void* buffer, 26 void __cdecl operator delete(void* memory, void* buffer,
21 sandbox::AllocationType type); 27 sandbox::AllocationType type);
22 28
23 // DCHECK_NT is defined to be pretty much an assert at this time because we 29 // DCHECK_NT is defined to be pretty much an assert at this time because we
24 // don't have logging from the ntdll layer on the child. 30 // don't have logging from the ntdll layer on the child.
25 // 31 //
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 164
159 // Returns true if the file_rename_information structure is supported by our 165 // Returns true if the file_rename_information structure is supported by our
160 // rename handler. 166 // rename handler.
161 bool IsSupportedRenameCall(FILE_RENAME_INFORMATION* file_info, DWORD length, 167 bool IsSupportedRenameCall(FILE_RENAME_INFORMATION* file_info, DWORD length,
162 uint32 file_info_class); 168 uint32 file_info_class);
163 169
164 } // namespace sandbox 170 } // namespace sandbox
165 171
166 172
167 #endif // SANDBOX_SRC_SANDBOX_NT_UTIL_H__ 173 #endif // SANDBOX_SRC_SANDBOX_NT_UTIL_H__
OLDNEW
« no previous file with comments | « no previous file | sandbox/src/sandbox_nt_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698