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 07e249e431c5009fa6ab8d274b4a8fe62a286358

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-05-17 08:58:11 +10:00
parent 1b7ebd3bb8
commit 071fe01910
6 changed files with 155 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,19 @@
From 91682accdd60ed9d3aac6492acbf6deff814e820 Mon Sep 17 00:00:00 2001
From e4983ad839806d62c4fce982c5d5c24466adffa3 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.
---
dlls/ntdll/nt.c | 6 ++-
dlls/ntdll/nt.c | 6 +++-
dlls/ntdll/ntdll_misc.h | 5 +++
dlls/ntdll/thread.c | 84 +++++++++++++++++++++++------------------
dlls/ntdll/thread.c | 84 ++++++++++++++++++++++++++++---------------------
3 files changed, 58 insertions(+), 37 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index d2a4b1d35af..258798fcdee 100644
index 4f1ff61..454f209 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2451,6 +2451,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2482,6 +2482,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
{
SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
SYSTEM_PROCESS_INFORMATION* last = NULL;
@@ -21,7 +21,7 @@ index d2a4b1d35af..258798fcdee 100644
HANDLE hSnap = 0;
WCHAR procname[1024];
WCHAR* exename;
@@ -2488,7 +2489,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2519,7 +2520,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (Length >= len + procstructlen)
{
@@ -30,7 +30,7 @@ index d2a4b1d35af..258798fcdee 100644
* vmCounters, ioCounters
*/
@@ -2506,6 +2507,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2537,6 +2538,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
@@ -41,10 +41,10 @@ index d2a4b1d35af..258798fcdee 100644
len += procstructlen;
}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 4835885d6c5..40bf66f1d24 100644
index ff2bb82..38f7f23 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -260,7 +260,12 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
@@ -268,6 +268,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);
@@ -55,10 +55,14 @@ index 4835885d6c5..40bf66f1d24 100644
/* string functions */
int __cdecl NTDLL_tolower( int c );
int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
@@ -275,4 +279,5 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
/* time functions */
ULONGLONG WINAPI get_tick_count64( void );
#define NtGetTickCount get_tick_count64
+
#endif
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index e4336ab1237..4279ae77099 100644
index 70320af..8dac113 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -149,6 +149,53 @@ static ULONG_PTR get_image_addr(void)
@@ -115,7 +119,7 @@ index e4336ab1237..4279ae77099 100644
/***********************************************************************
* thread_init
*
@@ -908,42 +955,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
@@ -902,42 +949,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)
@@ -160,5 +164,5 @@ index e4336ab1237..4279ae77099 100644
/* get values for current process instead */
--
2.20.1
1.9.1