Reland the ULONG -> SIZE_T change from 317177

Testing shows that this change is correct, but there was no evidence supporting the other change. Will manually run the x64 dbg test try bot for this change.

TBR=thakis@chromium.org,jvoung@chromium.org
BUG=458690,460563

Review URL: https://codereview.chromium.org/942003008

Cr-Commit-Position: refs/heads/master@{#318160}

3 files changed, 6 insertions, 6 deletions

diff --git a/chrome_elf/blacklist/blacklist_interceptions.cc b/chrome_elf/blacklist/blacklist_interceptions.cc
index 28eb692..07825ec 100644
--- a/chrome_elf/blacklist/blacklist_interceptions.cc
+++ b/chrome_elf/blacklist/blacklist_interceptions.cc
@@ -51,7 +51,7 @@ base::string16 GetBackingModuleFilePath(PVOID address) {
   DCHECK_NT(g_nt_query_virtual_memory_func);
 
   // We'll start with something close to max_path characters for the name.
-  ULONG buffer_bytes = MAX_PATH * 2;
+  SIZE_T buffer_bytes = MAX_PATH * 2;
   std::vector<BYTE> buffer_data(buffer_bytes);
 
   for (;;) {
@@ -61,7 +61,7 @@ base::string16 GetBackingModuleFilePath(PVOID address) {
     if (!section_name)
       break;
 
-    ULONG returned_bytes;
+    SIZE_T returned_bytes;
     NTSTATUS ret = g_nt_query_virtual_memory_func(
         NtCurrentProcess, address, MemorySectionName, section_name,
         buffer_bytes, &returned_bytes);
diff --git a/sandbox/win/src/nt_internals.h b/sandbox/win/src/nt_internals.h
index 8b22e0e..2fe27aa 100644
--- a/sandbox/win/src/nt_internals.h
+++ b/sandbox/win/src/nt_internals.h
@@ -450,8 +450,8 @@ typedef NTSTATUS (WINAPI *NtQueryVirtualMemoryFunction)(
   IN PVOID BaseAddress,
   IN MEMORY_INFORMATION_CLASS MemoryInformationClass,
   OUT PVOID MemoryInformation,
-  IN ULONG MemoryInformationLength,
-  OUT PULONG ReturnLength OPTIONAL);
+  IN SIZE_T MemoryInformationLength,
+  OUT PSIZE_T ReturnLength OPTIONAL);
 
 typedef NTSTATUS (WINAPI *NtProtectVirtualMemoryFunction)(
   IN HANDLE ProcessHandle,
diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc
index cc446e5..64fd1f1 100644
--- a/sandbox/win/src/sandbox_nt_util.cc
+++ b/sandbox/win/src/sandbox_nt_util.cc
@@ -469,7 +469,7 @@ UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32* flags) {
 
 UNICODE_STRING* GetBackingFilePath(PVOID address) {
   // We'll start with something close to max_path charactes for the name.
-  ULONG buffer_bytes = MAX_PATH * 2;
+  SIZE_T buffer_bytes = MAX_PATH * 2;
 
   for (;;) {
     MEMORY_SECTION_NAME* section_name = reinterpret_cast<MEMORY_SECTION_NAME*>(
@@ -478,7 +478,7 @@ UNICODE_STRING* GetBackingFilePath(PVOID address) {
     if (!section_name)
       return NULL;
 
-    ULONG returned_bytes;
+    SIZE_T returned_bytes;
     NTSTATUS ret = g_nt.QueryVirtualMemory(NtCurrentProcess, address,
                                            MemorySectionName, section_name,
                                            buffer_bytes, &returned_bytes);