wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 88d30985ddd534e8bafed531e619846bc8d10839

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-11-08 10:13:27 +11:00
parent e1ac8f20fe
commit 0a469905c2
18 changed files with 147 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ntdll-ThreadTime/0006-ntdll-Fill-process-virtual-memory-counters-in-NtQuer.patch
View File

@@ -1,4 +1,4 @@
From d9078607a8e6b8ff82df648b94b5340e6736b923 Mon Sep 17 00:00:00 2001
From 9374f7ab587fe60c0e3436d15adf917a44e08711 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
@@ -13,10 +13,10 @@ FIXME: fill_VM_COUNTERS now uses a different method ... which one is better?
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 2b2d3df89f..a8fb48a83d 100644
index 8382b61f2cb..c224fab14f9 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2561,8 +2561,11 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2659,8 +2659,11 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
if (reply->unix_pid != -1)
@@ -29,10 +29,10 @@ index 2b2d3df89f..a8fb48a83d 100644
}
len += procstructlen;
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 425ede4486..51965eccaf 100644
index f258bb601c2..7ceb3132a7c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -270,6 +270,7 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
@@ -272,6 +272,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,10 +41,10 @@ index 425ede4486..51965eccaf 100644
/* string functions */
int __cdecl NTDLL_tolower( int c );
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index c7e2cdb1b7..b1f529fb3d 100644
index 9e5c0d39e78..9eecacb6728 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -188,7 +188,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
@@ -206,7 +206,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
{
@@ -54,11 +54,11 @@ index c7e2cdb1b7..b1f529fb3d 100644
#endif
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 8b6c937df2..863b337024 100644
index bb18a22bad5..d010c018102 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -314,6 +314,42 @@ void thread_init(void)
NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
@@ -362,6 +362,42 @@ TEB *thread_init(void)
return teb;
}
+BOOL read_process_memory_stats(int unix_pid, VM_COUNTERS *pvmi)
@@ -101,5 +101,5 @@ index 8b6c937df2..863b337024 100644
/***********************************************************************
* free_thread_data
--
2.23.0
2.17.1