Revert of Remove kuint16max.

sandbox/win/src/sandbox_nt_util.h

 // Copyright (c) 2010 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.
 
 #ifndef SANDBOX_SRC_SANDBOX_NT_UTIL_H_
 #define SANDBOX_SRC_SANDBOX_NT_UTIL_H_
 
 #include <intrin.h>
-#include <stdint.h>
 
-#include "base/macros.h"
+#include "base/basictypes.h"
 #include "sandbox/win/src/nt_internals.h"
 #include "sandbox/win/src/sandbox_nt_types.h"
 
 // Placement new and delete to be used from ntdll interception code.
 void* __cdecl operator new(size_t size, sandbox::AllocationType type,
                            void* near_to = NULL);
 void __cdecl operator delete(void* memory, sandbox::AllocationType type);
 // Add operator delete that matches the placement form of the operator new
 // above. This is required by compiler to generate code to call operator delete
 // in case the object's constructor throws an exception.
@@ skipping 73 matching lines @@
 // or write.
 // Note that write intent implies destruction of the buffer content (we actually
 // write)
 bool ValidParameter(void* buffer, size_t size, RequiredAccess intent);
 
 // Copies data from a user buffer to our buffer. Returns the operation status.
 NTSTATUS CopyData(void* destination, const void* source, size_t bytes);
 
 // Copies the name from an object attributes.
 NTSTATUS AllocAndCopyName(const OBJECT_ATTRIBUTES* in_object,
-                          wchar_t** out_name,
-                          uint32_t* attributes,
-                          HANDLE* root);
+                          wchar_t** out_name, uint32* attributes, HANDLE* root);
 
 // Determine full path name from object root and path.
 NTSTATUS AllocAndGetFullPath(HANDLE root,
                              wchar_t* path,
                              wchar_t** full_path);
 
 // Initializes our ntdll level heap
 bool InitHeap();
 
 // Returns true if the provided handle refers to the current process.
@@ skipping 12 matching lines @@
 // The returned buffer must be freed with a placement delete from the ntdll
 // level allocator:
 //
 // UNICODE_STRING* name = GetPEImageInfoFromModule(HMODULE module, &flags);
 // if (!name) {
 //   // probably not a valid dll
 //   return;
 // }
 // InsertYourLogicHere(name);
 // operator delete(name, NT_ALLOC);
-UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32_t* flags);
+UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32* flags);
 
 // Returns the full path and filename for a given dll.
 // May return NULL if the provided address is not backed by a named section, or
 // if the current OS version doesn't support the call. The returned buffer must
 // be freed with a placement delete (see GetImageNameFromModule example).
 UNICODE_STRING* GetBackingFilePath(PVOID address);
 
 // Returns the last component of a path that contains the module name.
 // It will return NULL if the path ends with the path separator. The returned
 // buffer must be freed with a placement delete (see GetImageNameFromModule
@@ skipping 27 matching lines @@
   bool changed_;
   void* address_;
   size_t bytes_;
   ULONG old_protect_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoProtectMemory);
 };
 
 // Returns true if the file_rename_information structure is supported by our
 // rename handler.
-bool IsSupportedRenameCall(FILE_RENAME_INFORMATION* file_info,
-                           DWORD length,
-                           uint32_t file_info_class);
+bool IsSupportedRenameCall(FILE_RENAME_INFORMATION* file_info, DWORD length,
+                           uint32 file_info_class);
 
 }  // namespace sandbox
 
 
 #endif  // SANDBOX_SRC_SANDBOX_NT_UTIL_H__