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

Unified Diff: sandbox/win/src/handle_dispatcher.cc

Issue 382613002: Fixes for re-enabling more MSVC level 4 warnings: sandbox/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments + cleanup Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/win/src/handle_closer_test.cc ('k') | sandbox/win/src/handle_interception.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/handle_dispatcher.cc
diff --git a/sandbox/win/src/handle_dispatcher.cc b/sandbox/win/src/handle_dispatcher.cc
index 6acb6f9ceb3029ad1c95456d4ee3c04a0c46e2aa..fda7aacaaef351f480f821c58753b07088a35be3 100644
--- a/sandbox/win/src/handle_dispatcher.cc
+++ b/sandbox/win/src/handle_dispatcher.cc
@@ -44,7 +44,6 @@ bool HandleDispatcher::DuplicateHandleProxy(IPCInfo* ipc,
DWORD target_process_id,
DWORD desired_access,
DWORD options) {
- NTSTATUS error;
static NtQueryObject QueryObject = NULL;
if (!QueryObject)
ResolveNTFunctionPtr("NtQueryObject", &QueryObject);
@@ -65,9 +64,10 @@ bool HandleDispatcher::DuplicateHandleProxy(IPCInfo* ipc,
OBJECT_TYPE_INFORMATION* type_info =
reinterpret_cast<OBJECT_TYPE_INFORMATION*>(buffer);
ULONG size = sizeof(buffer) - sizeof(wchar_t);
- error = QueryObject(handle, ObjectTypeInformation, type_info, size, &size);
+ NTSTATUS error =
+ QueryObject(handle, ObjectTypeInformation, type_info, size, &size);
if (!NT_SUCCESS(error)) {
- ipc->return_info.win32_result = error;
+ ipc->return_info.nt_status = error;
return false;
}
type_info->Name.Buffer[type_info->Name.Length / sizeof(wchar_t)] = L'\0';
« no previous file with comments | « sandbox/win/src/handle_closer_test.cc ('k') | sandbox/win/src/handle_interception.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698