wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 4e2ad334b5881af7661be4d6df3c51aae92ca4a2

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-05-05 09:11:37 +10:00
committed by Zebediah Figura
parent d4918b4305
commit 76ba9d2387
27 changed files with 209 additions and 302 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 097c8310c57f8f5cbcd83da40436a35703f9c1cf Mon Sep 17 00:00:00 2001
From 50638bb08f56b290bf0763181a25aa1b78c9fa19 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: [PATCH] ntdll: Fill process kernel and user time.
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Fill process kernel and user time.
3 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 9ab9be4d0ce..81ed188c8bb 100644
index 91362a21a767..8198e0298922 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2645,6 +2645,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2742,6 +2742,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
{
SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
SYSTEM_PROCESS_INFORMATION* last = NULL;
@@ -21,7 +21,7 @@ index 9ab9be4d0ce..81ed188c8bb 100644
HANDLE hSnap = 0;
WCHAR procname[1024];
WCHAR* exename;
@@ -2682,7 +2683,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2779,7 +2780,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (Length >= len + procstructlen)
{
@@ -30,7 +30,7 @@ index 9ab9be4d0ce..81ed188c8bb 100644
* vmCounters, ioCounters
*/
@@ -2700,6 +2701,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2797,6 +2798,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
@@ -41,12 +41,12 @@ index 9ab9be4d0ce..81ed188c8bb 100644
len += procstructlen;
}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 20feabf56b8..9a487a0520d 100644
index 514956e2d073..f45b6a08b978 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -270,6 +270,10 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*);
void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
@@ -302,6 +302,10 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp)
#endif
+/* process / thread time */
+extern BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
@@ -56,10 +56,10 @@ index 20feabf56b8..9a487a0520d 100644
int __cdecl NTDLL_tolower( int c );
int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 73e530da4f5..711a8bb1898 100644
index aa706beb2127..b79eb9791048 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -153,6 +153,53 @@ static ULONG_PTR get_image_addr(void)
@@ -156,6 +156,53 @@ static ULONG_PTR get_image_addr(void)
#endif
@@ -113,7 +113,7 @@ index 73e530da4f5..711a8bb1898 100644
/***********************************************************************
* set_process_name
*
@@ -963,42 +1010,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
@@ -1025,42 +1072,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)
@@ -158,5 +158,5 @@ index 73e530da4f5..711a8bb1898 100644
/* get values for current process instead */
--
2.25.1
2.26.2