Commit b872c9ce authored by Tom Tan's avatar Tom Tan Committed by Commit Bot

Fix OS structure length for Windows ARM64

Chromium task manager static_asserts on Windows structure
SYSTEM_THREAD_INFORMATION and SYSTEM_PROCESS_INFORMATION,
but it assumes non-x64 is x86. Fix this for Windows ARM64.

Bug: 893460
Change-Id: I1face62bdb617c1d62fcdc3d1e2540eecaa45878
Reviewed-on: https://chromium-review.googlesource.com/c/1297394Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602482}
parent b2598b46
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include <windows.h> #include <windows.h>
#include <winternl.h> #include <winternl.h>
#include "build/build_config.h"
namespace task_manager { namespace task_manager {
// From <wdm.h> // From <wdm.h>
...@@ -60,7 +62,7 @@ struct SYSTEM_THREAD_INFORMATION { ...@@ -60,7 +62,7 @@ struct SYSTEM_THREAD_INFORMATION {
ULONG State; ULONG State;
KWAIT_REASON WaitReason; KWAIT_REASON WaitReason;
}; };
#if _M_X64 #if defined(ARCH_CPU_64_BITS)
static_assert(sizeof(SYSTEM_THREAD_INFORMATION) == 80, static_assert(sizeof(SYSTEM_THREAD_INFORMATION) == 80,
"Structure size mismatch"); "Structure size mismatch");
#else #else
...@@ -94,7 +96,7 @@ struct SYSTEM_PROCESS_INFORMATION { ...@@ -94,7 +96,7 @@ struct SYSTEM_PROCESS_INFORMATION {
IO_COUNTERS IoCounters; IO_COUNTERS IoCounters;
SYSTEM_THREAD_INFORMATION Threads[1]; SYSTEM_THREAD_INFORMATION Threads[1];
}; };
#if _M_X64 #if defined(ARCH_CPU_64_BITS)
static_assert(sizeof(SYSTEM_PROCESS_INFORMATION) == 336, static_assert(sizeof(SYSTEM_PROCESS_INFORMATION) == 336,
"Structure size mismatch"); "Structure size mismatch");
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment