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 1d9a3f6d12322891a2af4aadd66a92ea66479233.

Browse Source
This commit is contained in:
Zebediah Figura
2019-05-30 22:27:25 -05:00
parent cd1862609a
commit 197e08b441
9 changed files with 213 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,19 @@
From e4983ad839806d62c4fce982c5d5c24466adffa3 Mon Sep 17 00:00:00 2001
From 6416e68e4d81d9b37d24076d446115f08f99bf81 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/ntdll_misc.h | 5 +++
dlls/ntdll/thread.c | 84 ++++++++++++++++++++++++++++---------------------
3 files changed, 58 insertions(+), 37 deletions(-)
dlls/ntdll/nt.c | 6 ++-
dlls/ntdll/ntdll_misc.h | 4 ++
dlls/ntdll/thread.c | 84 +++++++++++++++++++++++------------------
3 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 4f1ff61..454f209 100644
index 2cd2ab327..c3250746b 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2482,6 +2482,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2384,6 +2384,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
{
SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
SYSTEM_PROCESS_INFORMATION* last = NULL;
@@ -21,7 +21,7 @@ index 4f1ff61..454f209 100644
HANDLE hSnap = 0;
WCHAR procname[1024];
WCHAR* exename;
@@ -2519,7 +2520,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2421,7 +2422,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (Length >= len + procstructlen)
{
@@ -30,7 +30,7 @@ index 4f1ff61..454f209 100644
* vmCounters, ioCounters
*/
@@ -2537,6 +2538,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
@@ -2439,6 +2440,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
@@ -41,10 +41,10 @@ index 4f1ff61..454f209 100644
len += procstructlen;
}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index ff2bb82..38f7f23 100644
index 3463ebd38..78831cf37 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -268,6 +268,10 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
@@ -265,6 +265,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,14 +55,8 @@ index ff2bb82..38f7f23 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 70320af..8dac113 100644
index 70320afe7..8dac11393 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -149,6 +149,53 @@ static ULONG_PTR get_image_addr(void)
@@ -164,5 +158,5 @@ index 70320af..8dac113 100644
/* get values for current process instead */
--
1.9.1
2.21.0