Rebase against d82f06c07556408e9584d2a1f8b275df39c93d74

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

@@ -1,4 +1,4 @@
-From 6416e68e4d81d9b37d24076d446115f08f99bf81 Mon Sep 17 00:00:00 2001
+From 06a283fc4f686ee3c3cf33fec4f7e7b2c3f64bc4 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 2cd2ab327..c3250746b 100644
+index 91d504f90aa..9c138726d68 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -2384,6 +2384,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
+@@ -2600,6 +2600,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
          {
              SYSTEM_PROCESS_INFORMATION* spi = SystemInformation;
              SYSTEM_PROCESS_INFORMATION* last = NULL;
@@ -21,7 +21,7 @@ index 2cd2ab327..c3250746b 100644
              HANDLE hSnap = 0;
              WCHAR procname[1024];
              WCHAR* exename;
-@@ -2421,7 +2422,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
+@@ -2637,7 +2638,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
  
                          if (Length >= len + procstructlen)
                          {
@@ -30,7 +30,7 @@ index 2cd2ab327..c3250746b 100644
                               * vmCounters, ioCounters
                               */
   
-@@ -2439,6 +2440,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
+@@ -2655,6 +2656,9 @@ NTSTATUS WINAPI NtQuerySystemInformation(
  
                              /* spi->ti will be set later on */
  
@@ -41,10 +41,10 @@ index 2cd2ab327..c3250746b 100644
                          len += procstructlen;
                      }
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 3463ebd38..78831cf37 100644
+index 70707bec042..db7f00359cf 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -265,6 +265,10 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
+@@ -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);
  
@@ -56,13 +56,13 @@ index 3463ebd38..78831cf37 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 70320afe7..8dac11393 100644
+index c6b70c557b4..029d94d8a38 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -149,6 +149,53 @@ static ULONG_PTR get_image_addr(void)
- }
+@@ -153,6 +153,53 @@ static ULONG_PTR get_image_addr(void)
  #endif
  
+ 
 +
 +BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
 +                       LARGE_INTEGER *kernel, LARGE_INTEGER *user)
@@ -111,9 +111,9 @@ index 70320afe7..8dac11393 100644
 +
 +
  /***********************************************************************
-  *           thread_init
+  *           set_process_name
   *
-@@ -902,42 +949,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
+@@ -975,42 +1022,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 70320afe7..8dac11393 100644
  
                  /* get values for current process instead */
 -- 
-2.21.0
+2.23.0
 

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

@@ -1,4 +1,4 @@
-From d2f9bcfc14a960a4b365406a8610f9ab96f78e9b Mon Sep 17 00:00:00 2001
+From d9078607a8e6b8ff82df648b94b5340e6736b923 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 3c2838f365e..5092b97d252 100644
+index 2b2d3df89f..a8fb48a83d 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -2510,8 +2510,11 @@ NTSTATUS WINAPI NtQuerySystemInformation(
+@@ -2561,8 +2561,11 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                              /* spi->ti will be set later on */
  
                              if (reply->unix_pid != -1)
@@ -29,10 +29,10 @@ index 3c2838f365e..5092b97d252 100644
                          }
                          len += procstructlen;
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 40bf66f1d24..5ec14a399cc 100644
+index 425ede4486..51965eccaf 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -263,6 +263,7 @@ void     WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
+@@ -270,6 +270,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 40bf66f1d24..5ec14a399cc 100644
  /* string functions */
  int __cdecl NTDLL_tolower( int c );
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 34051c2ef93..94e8df8d8d1 100644
+index c7e2cdb1b7..b1f529fb3d 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -203,7 +203,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
+@@ -188,7 +188,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
  
  static void fill_VM_COUNTERS(VM_COUNTERS* pvmi)
  {
@@ -54,11 +54,11 @@ index 34051c2ef93..94e8df8d8d1 100644
  
  #endif
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 4279ae77099..0f90291e222 100644
+index 8b6c937df2..863b337024 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -195,6 +195,42 @@ BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
-     return FALSE;
+@@ -314,6 +314,42 @@ void thread_init(void)
+     NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
  }
  
 +BOOL read_process_memory_stats(int unix_pid, VM_COUNTERS *pvmi)
@@ -99,7 +99,7 @@ index 4279ae77099..0f90291e222 100644
 +}
  
  /***********************************************************************
-  *           thread_init
+  *           free_thread_data
 -- 
-2.20.1
+2.23.0