Rebase against 3cc3b445752902e07231900befc296f74ad6576e.

This commit is contained in:
Zebediah Figura
2020-06-05 15:06:03 -05:00
parent f12808c094
commit f1917e904a
8 changed files with 41 additions and 360 deletions

View File

@@ -1,4 +1,4 @@
From 4fd43a8364333519e777718b66e628ace1ad9fff Mon Sep 17 00:00:00 2001
From ee29bbfa7e10de295db39ab6b89f2175d00692c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 9 Mar 2017 22:56:45 +0100
Subject: [PATCH] ntdll: Fill process virtual memory counters in
@@ -29,10 +29,10 @@ index cbb7937631d..bb078c1aa21 100644
}
len += procstructlen;
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 3ea0dd81349..3e2fa3642c1 100644
index 6e77694d87b..d725a678246 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -249,6 +249,7 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
@@ -248,6 +248,7 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
/* process / thread time */
extern BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN;
@@ -41,7 +41,7 @@ index 3ea0dd81349..3e2fa3642c1 100644
/* string functions */
int __cdecl NTDLL_tolower( int c );
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index f47d3c4bc6c..b36fc037dc5 100644
index 35937ce6026..b4f2dbc8160 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -192,7 +192,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
@@ -54,11 +54,11 @@ index f47d3c4bc6c..b36fc037dc5 100644
#endif
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index cd1b65a210c..71051adc8b0 100644
index 14198d77b7b..8ae8251f975 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -355,6 +355,42 @@ void WINAPI RtlExitUserThread( ULONG status )
for (;;) unix_funcs->exit_thread( status );
@@ -381,6 +381,42 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT
flags, zero_bits, stack_commit, stack_reserve, attr_list );
}
+BOOL read_process_memory_stats(int unix_pid, VM_COUNTERS *pvmi)
@@ -99,7 +99,7 @@ index cd1b65a210c..71051adc8b0 100644
+}
/***********************************************************************
* call_thread_entry_point
* RtlCreateUserThread (NTDLL.@)
--
2.26.2