Get more libs to compile. Only rtl left Modified: branches/new_headers/reactos/include/ndk/zwtypes.h Modified: branches/new_headers/reactos/lib/epsapi/enum/drivers.c Modified: branches/new_headers/reactos/lib/epsapi/enum/modules.c Modified: branches/new_headers/reactos/lib/epsapi/enum/processes.c Modified: branches/new_headers/reactos/lib/libwine/debug.c _____
Modified: branches/new_headers/reactos/include/ndk/zwtypes.h --- branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:41:15 UTC (rev 15114) @@ -527,37 +527,67 @@
PVOID Buffer; /* same format as in SystemProcessInformation */ } SYSTEM_SESSION_PROCESSES_INFORMATION, * PSYSTEM_SESSION_PROCESSES_INFORMATION;
-typedef struct _SYSTEM_THREADS { - LARGE_INTEGER KernelTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER CreateTime; - ULONG WaitTime; - PVOID StartAddress; - CLIENT_ID ClientId; - KPRIORITY Priority; - KPRIORITY BasePriority; - ULONG ContextSwitchCount; - THREAD_STATE State; - KWAIT_REASON WaitReason; -} SYSTEM_THREADS, *PSYSTEM_THREADS; +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; + ULONG WaitReason; +} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
-typedef struct _SYSTEM_PROCESSES { - ULONG NextEntryDelta; - ULONG ThreadCount; - ULONG Reserved1[6]; - LARGE_INTEGER CreateTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER KernelTime; - UNICODE_STRING ProcessName; - KPRIORITY BasePriority; - ULONG ProcessId; - ULONG InheritedFromProcessId; - ULONG HandleCount; - ULONG Reserved2[2]; - VM_COUNTERS VmCounters; - IO_COUNTERS IoCounters; - SYSTEM_THREADS Threads[1]; -} SYSTEM_PROCESSES, *PSYSTEM_PROCESSES; +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; + KPRIORITY BasePriority; + HANDLE UniqueProcessId; + HANDLE InheritedFromUniqueProcessId; + ULONG HandleCount; + ULONG SessionId; + ULONG PageDirectoryFrame; + + /* + * This part corresponds to VM_COUNTERS_EX. + * NOTE: *NOT* THE SAME AS VM_COUNTERS! + */ + ULONG PeakVirtualSize; + ULONG VirtualSize; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + ULONG QuotaPeakPagedPoolUsage; + ULONG QuotaPagedPoolUsage; + ULONG QuotaPeakNonPagedPoolUsage; + ULONG QuotaNonPagedPoolUsage; + ULONG PagefileUsage; + ULONG PeakPagefileUsage; + ULONG PrivateUsage; + + /* This part corresponds to IO_COUNTERS */ + LARGE_INTEGER ReadOperationCount; + LARGE_INTEGER WriteOperationCount; + LARGE_INTEGER OtherOperationCount; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + + /* Finally, the array of Threads */ + SYSTEM_THREAD_INFORMATION TH[1]; +} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION;
// memory information typedef enum _MEMORY_INFORMATION_CLASS { _____
Modified: branches/new_headers/reactos/lib/epsapi/enum/drivers.c --- branches/new_headers/reactos/lib/epsapi/enum/drivers.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/drivers.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -13,15 +13,16 @@
* isolated in its own library to clear the confusion * and improve reusability */ +#include <windows.h> +#include <stddef.h>
-#include <stddef.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h>
#define NDEBUG -#include <debug.h> +#include <reactos/debug.h>
-#include <epsapi.h> +#include <reactos/epsapi.h>
NTSTATUS NTAPI PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, _____
Modified: branches/new_headers/reactos/lib/epsapi/enum/modules.c --- branches/new_headers/reactos/lib/epsapi/enum/modules.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/modules.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -19,13 +19,15 @@
* and improve reusability */
+#include <windows.h> + #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h>
#define NDEBUG -#include <debug.h> +#include <reactos/debug.h>
-#include <epsapi.h> +#include <reactos/epsapi.h>
NTSTATUS NTAPI PsaEnumerateProcessModules(IN HANDLE ProcessHandle, _____
Modified: branches/new_headers/reactos/lib/epsapi/enum/processes.c --- branches/new_headers/reactos/lib/epsapi/enum/processes.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/processes.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -30,13 +30,17 @@
* isolated in its own library to clear the confusion * and improve reusability */ - -#include <ddk/ntddk.h> -#include <debug.h> +#include <windows.h> #include <stddef.h>
-#include <epsapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h>
+#define NDEBUG +#include <reactos/debug.h> + +#include <reactos/epsapi.h> + NTSTATUS NTAPI PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION *ProcessesAndThreads) { _____
Modified: branches/new_headers/reactos/lib/libwine/debug.c --- branches/new_headers/reactos/lib/libwine/debug.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/libwine/debug.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -19,6 +19,8 @@
*/
#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <stdlib.h> #include <stdio.h> #include <tchar.h>
-
ion＠svn.reactos.com