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 e06b7693d6f0980b1db2fa3b9920c7a925ceb8be.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-31 23:11:13 +02:00
parent f98abfe0dc
commit c50463197f
8 changed files with 48 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch
View File

@@ -1,4 +1,4 @@
From 2578dfb02f0a8781970f5c7d967b1d07ae433e2f Mon Sep 17 00:00:00 2001
From 3868624c41bc318ee89c5c5183d3ca9ef483f6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 9 Mar 2017 16:27:23 +0100
Subject: ntdll: Fill process kernel and user time.
@@ -10,10 +10,10 @@ Subject: ntdll: Fill process kernel and user time.
3 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index fc8e3b1eb4..6b67397471 100644
index fbd0fdf51a9..cac95325541 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -1922,6 +1922,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -1927,6 +1927,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
{
SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
SYSTEM_PROCESS_INFORMATION* last = NULL;
@@ -21,7 +21,7 @@ index fc8e3b1eb4..6b67397471 100644
HANDLE hSnap = 0;
WCHAR procname[1024];
WCHAR* exename;
@@ -1959,7 +1960,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -1964,7 +1965,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (Length >= len + procstructlen)
{
@@ -30,7 +30,7 @@ index fc8e3b1eb4..6b67397471 100644
* vmCounters, ioCounters
*/
@@ -1977,6 +1978,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -1982,6 +1983,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
@@ -41,10 +41,10 @@ index fc8e3b1eb4..6b67397471 100644
len += procstructlen;
}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 5e4c39e8bd..443c86000d 100644
index c97b1e1f73f..260e7030dae 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -266,4 +266,7 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
@@ -245,4 +245,7 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*);
@@ -53,12 +53,12 @@ index 5e4c39e8bd..443c86000d 100644
+ LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN;
#endif
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 91a59517b3..29b6513f38 100644
index 00d03f103ce..1c6cab3aa28 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -71,6 +71,53 @@ static RTL_BITMAP tls_expansion_bitmap;
static RTL_BITMAP fls_bitmap;
static int nb_threads = 1;
@@ -80,6 +80,53 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
};
static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 };
+
+BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
@@ -110,7 +110,7 @@ index 91a59517b3..29b6513f38 100644
/***********************************************************************
* get_unicode_string
*
@@ -1009,42 +1056,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
@@ -989,42 +1036,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
#ifdef __linux__
/* only /proc provides exact values for a specific thread */
if (unix_pid != -1 && unix_tid != -1)
@@ -155,5 +155,5 @@ index 91a59517b3..29b6513f38 100644
/* get values for current process instead */
--
2.11.0
2.14.1