15 modified files
reactos/include/ntdll
diff -u -r1.50 -r1.51
--- rtl.h 5 Oct 2004 10:40:13 -0000 1.50
+++ rtl.h 30 Oct 2004 22:18:16 -0000 1.51
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.50 2004/10/05 10:40:13 ekohl Exp $
+/* $Id: rtl.h,v 1.51 2004/10/30 22:18:16 weiden Exp $
*
*/
@@ -91,20 +91,6 @@
ULONG NumberOfExclusiveWaiters;
} DEBUG_LOCK_INFORMATION, *PDEBUG_LOCK_INFORMATION;
-
-typedef struct _LOCK_INFORMATION
-{
- ULONG LockCount;
- DEBUG_LOCK_INFORMATION LockEntry[1];
-} LOCK_INFORMATION, *PLOCK_INFORMATION;
-
-typedef struct _HEAP_INFORMATION
-{
- ULONG HelpCount;
- DEBUG_HEAP_INFORMATION HeapEntry[1];
-} HEAP_INFORMATION, *PHEAP_INFORMATION;
-
-
typedef struct _CRITICAL_SECTION_DEBUG
{
USHORT Type;
@@ -135,6 +121,18 @@
#endif /* !__USE_W32API */
+typedef struct _LOCK_INFORMATION
+{
+ ULONG LockCount;
+ DEBUG_LOCK_INFORMATION LockEntry[1];
+} LOCK_INFORMATION, *PLOCK_INFORMATION;
+
+typedef struct _HEAP_INFORMATION
+{
+ ULONG HeapCount;
+ DEBUG_HEAP_INFORMATION HeapEntry[1];
+} HEAP_INFORMATION, *PHEAP_INFORMATION;
+
typedef struct _RTL_PROCESS_INFO
{
ULONG Size;
reactos/include/ntos
diff -u -r1.40 -r1.41
--- zwtypes.h 24 Oct 2004 16:49:48 -0000 1.40
+++ zwtypes.h 30 Oct 2004 22:18:16 -0000 1.41
@@ -336,6 +336,53 @@
ULONG SystemCalls;
} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
+// SystemProcessThreadInfo (5)
+typedef struct _SYSTEM_THREAD_INFORMATION
+{
+ TIME KernelTime;
+ TIME UserTime;
+ TIME CreateTime;
+ ULONG WaitTime;
+ PVOID StartAddress;
+ CLIENT_ID ClientId;
+ KPRIORITY Priority;
+ LONG BasePriority;
+ ULONG ContextSwitches;
+ ULONG ThreadState;
+ KWAIT_REASON WaitReason;
+} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
+
+typedef struct SYSTEM_PROCESS_INFORMATION
+{
+ ULONG NextEntryOffset;
+ ULONG NumberOfThreads;
+ LARGE_INTEGER SpareLi1;
+ LARGE_INTEGER SpareLi2;
+ LARGE_INTEGER SpareLi3;
+ TIME CreateTime;
+ TIME UserTime;
+ TIME KernelTime;
+ UNICODE_STRING ImageName;
+ ULONG BasePriority;
+ HANDLE UniqueProcessId;
+ HANDLE InheritedFromUniqueProcessId;
+ ULONG HandleCount;
+ ULONG SessionId;
+ ULONG SpareUl3;
+ ULONG PeakVirtualSize;
+ ULONG VirtualSize;
+ ULONG PageFaultCount;
+ ULONG PeakWorkingSetSize;
+ ULONG WorkingSetSize;
+ ULONG QuotaPeakPagedPoolUsage;
+ ULONG QuotaPagedPoolUsage;
+ ULONG QuotaPeakNonPagedPoolUsage;
+ ULONG QuotaNonPagedPoolUsage;
+ ULONG PagefileUsage;
+ ULONG PeakPagefileUsage;
+ ULONG PrivatePageCount;
+} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION;
+
// SystemModuleInformation (11)
typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY {
ULONG Unknown1;
reactos/lib/kernel32/file
diff -u -r1.6 -r1.7
--- backup.c 23 Jan 2004 16:37:11 -0000 1.6
+++ backup.c 30 Oct 2004 22:18:17 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: backup.c,v 1.6 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: backup.c,v 1.7 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -12,6 +12,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/* FUNCTIONS ****************************************************************/
/*
reactos/lib/kernel32/file
diff -u -r1.1 -r1.2
--- bintype.c 2 May 2004 14:47:05 -0000 1.1
+++ bintype.c 30 Oct 2004 22:18:17 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: bintype.c,v 1.1 2004/05/02 14:47:05 weiden Exp $
+/* $Id: bintype.c,v 1.2 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -13,7 +13,6 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-#include <ddk/ntifs.h>
#define NDEBUG
#include "../include/debug.h"
reactos/lib/kernel32/file
diff -u -r1.58 -r1.59
--- file.c 22 Sep 2004 09:31:01 -0000 1.58
+++ file.c 30 Oct 2004 22:18:17 -0000 1.59
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.58 2004/09/22 09:31:01 weiden Exp $
+/* $Id: file.c,v 1.59 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -13,7 +13,6 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-#include <ddk/ntifs.h>
#define NDEBUG
#include "../include/debug.h"
reactos/lib/kernel32/file
diff -u -r1.3 -r1.4
--- hardlink.c 2 Oct 2004 20:56:54 -0000 1.3
+++ hardlink.c 30 Oct 2004 22:18:17 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: hardlink.c,v 1.3 2004/10/02 20:56:54 weiden Exp $
+/* $Id: hardlink.c,v 1.4 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -12,7 +12,6 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-#include <ddk/ntifs.h>
#define NDEBUG
#include "../include/debug.h"
reactos/lib/kernel32/file
diff -u -r1.14 -r1.15
--- iocompl.c 13 Jun 2004 20:04:55 -0000 1.14
+++ iocompl.c 30 Oct 2004 22:18:17 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: iocompl.c,v 1.14 2004/06/13 20:04:55 navaraf Exp $
+/* $Id: iocompl.c,v 1.15 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -11,6 +11,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/*
* @implemented
reactos/lib/kernel32/file
diff -u -r1.10 -r1.11
--- lfile.c 28 Aug 2004 22:08:54 -0000 1.10
+++ lfile.c 30 Oct 2004 22:18:17 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: lfile.c,v 1.10 2004/08/28 22:08:54 navaraf Exp $
+/* $Id: lfile.c,v 1.11 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -11,6 +11,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/*
* @implemented
reactos/lib/kernel32
diff -u -r1.10 -r1.11
--- k32.h 19 Sep 2004 14:36:47 -0000 1.10
+++ k32.h 30 Oct 2004 22:18:17 -0000 1.11
@@ -13,6 +13,7 @@
#include <ddk/ntddbeep.h>
#include <ddk/ntddser.h>
#include <windows.h>
+#include <tlhelp32.h>
#include <ntdll/base.h>
#include <ntdll/rtl.h>
#include <ntdll/dbg.h>
@@ -27,6 +28,11 @@
#include <rosrtl/thread.h>
#include <rosrtl/string.h>
#include <ntos/ldrtypes.h>
+#include <ntos/zwtypes.h>
#include <ddk/ldrfuncs.h>
+#include <ddk/ntifs.h>
+
+#include <rosrtl/string.h>
+#include <rosrtl/registry.h>
#include "include/kernel32.h"
reactos/lib/kernel32/mem
diff -u -r1.27 -r1.28
--- global.c 28 Aug 2004 22:16:27 -0000 1.27
+++ global.c 30 Oct 2004 22:18:17 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: global.c,v 1.27 2004/08/28 22:16:27 navaraf Exp $
+/* $Id: global.c,v 1.28 2004/10/30 22:18:17 weiden Exp $
*
* Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
* These functions included in Win32 for compatibility with 16 bit Windows
@@ -10,7 +10,6 @@
*/
#include <k32.h>
-#include <time.h>
#define NDEBUG
#include "../include/debug.h"
reactos/lib/kernel32/mem
diff -u -r1.8 -r1.9
--- procmem.c 13 Jun 2004 20:04:55 -0000 1.8
+++ procmem.c 30 Oct 2004 22:18:17 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: procmem.c,v 1.8 2004/06/13 20:04:55 navaraf Exp $
+/* $Id: procmem.c,v 1.9 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -11,6 +11,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/* FUNCTIONS *****************************************************************/
/*
reactos/lib/kernel32/mem
diff -u -r1.2 -r1.3
--- resnotify.c 24 Oct 2004 12:55:19 -0000 1.2
+++ resnotify.c 30 Oct 2004 22:18:17 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: resnotify.c,v 1.2 2004/10/24 12:55:19 weiden Exp $
+/* $Id: resnotify.c,v 1.3 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -11,6 +11,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/* stolen from include/ntos/synch.h */
#define EVENT_QUERY_STATE (1)
reactos/lib/kernel32/mem
diff -u -r1.14 -r1.15
--- virtual.c 10 Jul 2004 13:08:02 -0000 1.14
+++ virtual.c 30 Oct 2004 22:18:17 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: virtual.c,v 1.14 2004/07/10 13:08:02 hbirr Exp $
+/* $Id: virtual.c,v 1.15 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -11,6 +11,9 @@
#include <k32.h>
+#define NDEBUG
+#include "../include/debug.h"
+
/* FUNCTIONS *****************************************************************/
/*
reactos/lib/kernel32/misc
diff -u -r1.6 -r1.7
--- computername.c 15 Feb 2004 07:07:11 -0000 1.6
+++ computername.c 30 Oct 2004 22:18:17 -0000 1.7
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: computername.c,v 1.6 2004/02/15 07:07:11 arty Exp $
+/* $Id: computername.c,v 1.7 2004/10/30 22:18:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -28,8 +28,6 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
-#include <rosrtl/string.h>
-#include <rosrtl/registry.h>
#define NDEBUG
#include "../include/debug.h"
reactos/w32api/include/ddk
diff -u -r1.8 -r1.9
--- ntapi.h 24 Oct 2004 20:37:27 -0000 1.8
+++ ntapi.h 30 Oct 2004 22:18:17 -0000 1.9
@@ -652,6 +652,52 @@
SYSTEM_MEMORY_USAGE MemoryUsage[1];
} SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION;
+typedef struct _SYSTEM_THREAD_INFORMATION
+{
+ LARGE_INTEGER KernelTime;
+ LARGE_INTEGER UserTime;
+ LARGE_INTEGER CreateTime;
+ ULONG WaitTime;
+ PVOID StartAddress;
+ CLIENT_ID ClientId;
+ KPRIORITY Priority;
+ LONG BasePriority;
+ ULONG ContextSwitches;
+ ULONG ThreadState;
+ KWAIT_REASON WaitReason;
+} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
+
+typedef struct SYSTEM_PROCESS_INFORMATION
+{
+ ULONG NextEntryOffset;
+ ULONG NumberOfThreads;
+ LARGE_INTEGER SpareLi1;
+ LARGE_INTEGER SpareLi2;
+ LARGE_INTEGER SpareLi3;
+ LARGE_INTEGER CreateTime;
+ LARGE_INTEGER UserTime;
+ LARGE_INTEGER KernelTime;
+ UNICODE_STRING ImageName;
+ ULONG BasePriority;
+ HANDLE UniqueProcessId;
+ HANDLE InheritedFromUniqueProcessId;
+ ULONG HandleCount;
+ ULONG SessionId;
+ ULONG SpareUl3;
+ ULONG PeakVirtualSize;
+ ULONG VirtualSize;
+ ULONG PageFaultCount;
+ ULONG PeakWorkingSetSize;
+ ULONG WorkingSetSize;
+ ULONG QuotaPeakPagedPoolUsage;
+ ULONG QuotaPagedPoolUsage;
+ ULONG QuotaPeakNonPagedPoolUsage;
+ ULONG QuotaNonPagedPoolUsage;
+ ULONG PagefileUsage;
+ ULONG PeakPagefileUsage;
+ ULONG PrivatePageCount;
+} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION;
+
NTOSAPI
NTSTATUS
NTAPI
CVSspam 0.2.8