Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by hyperion＠svn.reactos.com

fixes for Visual C++: - repositioned __stdcall in several declarations - replaced __attribute__ with __declspec when possible - reimplemented some inline assembly - use RESTRICTED_POINTER instead of __restrict - change some w32api conditional compilation to take Visual C++ in consideration - fixed RVA macro - moved variable declarations to the beginning of the scope block - corrected mismatching DLL linkage for exported symbols in ntoskrnl - corrected some non-standard casts - do PVOID arithmetic with the RVA macro - removed (unused) nested function - corrected wrong macro definitions that took a parameter when they shouldn't - use the appropriate _M_XXX macros for architecture-specific conditional compilation - miscellaneous hacks tagged with /* ROX-U */ Deleted: branches/rox-u/reactos/include/ddk/ntifs.h Modified: branches/rox-u/reactos/include/napi/teb.h Modified: branches/rox-u/reactos/include/ntdll/ldr.h Modified: branches/rox-u/reactos/include/ntos/rtl.h Modified: branches/rox-u/reactos/include/ntos.h Modified: branches/rox-u/reactos/ntoskrnl/cc/copy.c Modified: branches/rox-u/reactos/ntoskrnl/cc/fs.c Modified: branches/rox-u/reactos/ntoskrnl/cm/ntfunc.c Modified: branches/rox-u/reactos/ntoskrnl/ex/evtpair.c Modified: branches/rox-u/reactos/ntoskrnl/ex/init.c Modified: branches/rox-u/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/rox-u/reactos/ntoskrnl/ex/time.c Modified: branches/rox-u/reactos/ntoskrnl/fs/name.c Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/ke.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/mm.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/ps.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/debug.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ex.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/i386/ke.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ke.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ps.h Modified: branches/rox-u/reactos/ntoskrnl/include/ntoskrnl.h Modified: branches/rox-u/reactos/ntoskrnl/io/bootlog.c Modified: branches/rox-u/reactos/ntoskrnl/io/driver.c Modified: branches/rox-u/reactos/ntoskrnl/io/file.c Modified: branches/rox-u/reactos/ntoskrnl/io/iomgr.c Modified: branches/rox-u/reactos/ntoskrnl/io/irp.c Modified: branches/rox-u/reactos/ntoskrnl/io/wmi.c Modified: branches/rox-u/reactos/ntoskrnl/ke/ipi.c Modified: branches/rox-u/reactos/ntoskrnl/ke/kqueue.c Modified: branches/rox-u/reactos/ntoskrnl/ke/main.c Modified: branches/rox-u/reactos/ntoskrnl/ke/process.c Modified: branches/rox-u/reactos/ntoskrnl/ke/profile.c Modified: branches/rox-u/reactos/ntoskrnl/ldr/loader.c Modified: branches/rox-u/reactos/ntoskrnl/ldr/resource.c Modified: branches/rox-u/reactos/ntoskrnl/mm/iospace.c Modified: branches/rox-u/reactos/ntoskrnl/mm/process.c Modified: branches/rox-u/reactos/ntoskrnl/mm/section.c Modified: branches/rox-u/reactos/ntoskrnl/ob/handle.c Modified: branches/rox-u/reactos/ntoskrnl/ob/object.c Modified: branches/rox-u/reactos/ntoskrnl/ps/kill.c Modified: branches/rox-u/reactos/ntoskrnl/ps/psmgr.c Modified: branches/rox-u/reactos/ntoskrnl/se/acl.c Modified: branches/rox-u/reactos/ntoskrnl/se/luid.c Modified: branches/rox-u/reactos/ntoskrnl/se/semgr.c Modified: branches/rox-u/reactos/ntoskrnl/se/token.c Modified: branches/rox-u/reactos/w32api/include/ddk/batclass.h Modified: branches/rox-u/reactos/w32api/include/ddk/ntddk.h Modified: branches/rox-u/reactos/w32api/include/ddk/ntifs.h Modified: branches/rox-u/reactos/w32api/include/ddk/ntpoapi.h Modified: branches/rox-u/reactos/w32api/include/ddk/winddk.h Modified: branches/rox-u/reactos/w32api/include/ntdef.h Modified: branches/rox-u/reactos/w32api/include/windef.h Modified: branches/rox-u/reactos/w32api/include/winnt.h _____ Deleted: branches/rox-u/reactos/include/ddk/ntifs.h --- branches/rox-u/reactos/include/ddk/ntifs.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/include/ddk/ntifs.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -1,20 +0,0 @@ -#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H - -#include_next <ddk/ntifs.h> - -NTSTATUS STDCALL -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); -NTSTATUS STDCALL -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - -#define FSCTL_ROS_QUERY_LCN_MAPPING \ - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _ROS_QUERY_LCN_MAPPING -{ - LARGE_INTEGER LcnDiskOffset; -} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; - -#endif /* __INCLUDE_DDK_NTIFS_H */ _____ Modified: branches/rox-u/reactos/include/napi/teb.h --- branches/rox-u/reactos/include/napi/teb.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/include/napi/teb.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -239,6 +239,7 @@ PVOID WineDebugInfo; /* Needed for WINE DLL's */ } TEB, *PTEB; +#if 0 /* ROX-U */ #if (!defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) /* FIXME: at least NtCurrentTeb should be defined in winnt.h */ @@ -331,4 +332,6 @@ #define NtCurrentPeb() (NtCurrentTeb()->Peb) #endif +#endif + #endif /* __INCLUDE_INTERNAL_TEB */ _____ Modified: branches/rox-u/reactos/include/ntdll/ldr.h --- branches/rox-u/reactos/include/ntdll/ldr.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/include/ntdll/ldr.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -1,7 +1,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_LDR_H #define __NTOSKRNL_INCLUDE_INTERNAL_LDR_H -#include <roscfg.h> +/*#include <roscfg.h>*/ #ifndef _NTNDK_ #include <napi/teb.h> #endif @@ -85,7 +85,7 @@ } LDR_SYMBOL_INFO, *PLDR_SYMBOL_INFO; -#define RVA(m, b) ((ULONG)b + m) +#define RVA(m, b) ((PVOID)((ULONG)b + (PBYTE)m)) #if defined(KDBG) || defined(DBG) _____ Modified: branches/rox-u/reactos/include/ntos/rtl.h --- branches/rox-u/reactos/include/ntos/rtl.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/include/ntos/rtl.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -2182,7 +2182,7 @@ ACL_INFORMATION_CLASS InformationClass); NTSTATUS STDCALL -RtlQueryTimeZoneInformation (IN OUT PTIME_ZONE_INFORMATION TimeZoneInformation); +RtlQueryTimeZoneInformation (IN OUT TIME_ZONE_INFORMATION * TimeZoneInformation); VOID STDCALL RtlRaiseException (IN PEXCEPTION_RECORD ExceptionRecord); @@ -2375,7 +2375,7 @@ PUCHAR RMControl); NTSTATUS STDCALL -RtlSetTimeZoneInformation (IN OUT PTIME_ZONE_INFORMATION TimeZoneInformation); +RtlSetTimeZoneInformation (IN OUT TIME_ZONE_INFORMATION * TimeZoneInformation); ULONG STDCALL RtlSizeHeap( _____ Modified: branches/rox-u/reactos/include/ntos.h --- branches/rox-u/reactos/include/ntos.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/include/ntos.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -75,7 +75,6 @@ #include "ntos/registry.h" #include "ntos/security.h" #include "ntos/synch.h" -#include "ntos/time.h" #include "napi/i386/segment.h" #include "napi/types.h" #include "napi/dbg.h" _____ Modified: branches/rox-u/reactos/ntoskrnl/cc/copy.c --- branches/rox-u/reactos/ntoskrnl/cc/copy.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/cc/copy.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -136,7 +136,7 @@ while (current2 != NULL && !current2->Valid && current_size < MAX_RW_LENGTH) { PVOID address = current2->BaseAddress; - for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address += PAGE_SIZE) + for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address = RVA(address, PAGE_SIZE)) { *MdlPages++ = MmGetPfnForProcess(NULL, address); } _____ Modified: branches/rox-u/reactos/ntoskrnl/cc/fs.c --- branches/rox-u/reactos/ntoskrnl/cc/fs.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/cc/fs.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -39,9 +39,8 @@ IN PVOID Context2 ) { - UNIMPLEMENTED; - LARGE_INTEGER i; + UNIMPLEMENTED; i.QuadPart = 0; return i; } @@ -69,9 +68,8 @@ OUT PLARGE_INTEGER OldestLsn OPTIONAL ) { - UNIMPLEMENTED; - LARGE_INTEGER i; + UNIMPLEMENTED; i.QuadPart = 0; return i; } _____ Modified: branches/rox-u/reactos/ntoskrnl/cm/ntfunc.c --- branches/rox-u/reactos/ntoskrnl/cm/ntfunc.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/cm/ntfunc.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -121,8 +121,8 @@ DPRINT("current %S\n",current); CurrentHeader = BODY_TO_HEADER(CurrentObject); - DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->Type->TypeName); + /*DPRINT("Current ObjectType %wZ\n", + &CurrentHeader->Type->TypeName);*/ /* ROX-U */ if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) { _____ Modified: branches/rox-u/reactos/ntoskrnl/ex/evtpair.c --- branches/rox-u/reactos/ntoskrnl/ex/evtpair.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ex/evtpair.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -18,7 +18,7 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE EXPORTED ExEventPairObjectType = NULL; +POBJECT_TYPE ExEventPairObjectType = NULL; static GENERIC_MAPPING ExEventPairMapping = { STANDARD_RIGHTS_READ, _____ Modified: branches/rox-u/reactos/ntoskrnl/ex/init.c --- branches/rox-u/reactos/ntoskrnl/ex/init.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ex/init.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -496,7 +496,7 @@ KeCreateApplicationProcessorIdleThread(KeNumberProcessors); /* Allocate a stack for use when booting the processor */ - ProcessorStack = Ki386InitialStackArray[((int)KeNumberProcessors)] + MM_STACK_SIZE; + ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], MM_STACK_SIZE); /* Tell HAL a new CPU is being started */ HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA)); _____ Modified: branches/rox-u/reactos/ntoskrnl/ex/sysinfo.c --- branches/rox-u/reactos/ntoskrnl/ex/sysinfo.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ex/sysinfo.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -835,6 +835,10 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { + PEPROCESS pr, syspr; + int curSize, i = 0; + ULONG hCount = 0; + PSYSTEM_HANDLE_INFORMATION Shi = (PSYSTEM_HANDLE_INFORMATION) Buffer; @@ -848,10 +852,6 @@ DPRINT("SystemHandleInformation 1\n"); - PEPROCESS pr, syspr; - int curSize, i = 0; - ULONG hCount = 0; - /* First Calc Size from Count. */ syspr = PsGetNextProcess(NULL); pr = syspr; @@ -937,6 +937,7 @@ /* Class 18 - Information */ QSI_DEF(SystemPageFileInformation) { + UNICODE_STRING FileName; /* FIXME */ SYSTEM_PAGEFILE_INFORMATION *Spfi = (SYSTEM_PAGEFILE_INFORMATION *) Buffer; if (Size < sizeof (SYSTEM_PAGEFILE_INFORMATION)) @@ -945,7 +946,6 @@ return (STATUS_INFO_LENGTH_MISMATCH); } - UNICODE_STRING FileName; /* FIXME */ RtlInitUnicodeString(&FileName, NULL); /* FIXME */ /* FIXME */ @@ -1321,7 +1321,7 @@ return STATUS_INFO_LENGTH_MISMATCH; } - return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); + return ExpSetTimeZoneInformation((TIME_ZONE_INFORMATION *)Buffer); } _____ Modified: branches/rox-u/reactos/ntoskrnl/ex/time.c --- branches/rox-u/reactos/ntoskrnl/ex/time.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ex/time.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -76,7 +76,7 @@ NTSTATUS -ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) +ExpSetTimeZoneInformation(TIME_ZONE_INFORMATION * TimeZoneInformation) { LARGE_INTEGER LocalTime; LARGE_INTEGER SystemTime; _____ Modified: branches/rox-u/reactos/ntoskrnl/fs/name.c --- branches/rox-u/reactos/ntoskrnl/fs/name.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/fs/name.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -149,7 +149,7 @@ FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL /* 0x7f */ }; -PUCHAR EXPORTED FsRtlLegalAnsiCharacterArray = LegalAnsiCharacterArray; +PUCHAR FsRtlLegalAnsiCharacterArray = LegalAnsiCharacterArray; /* FUNCTIONS *****************************************************************/ _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/ke.h --- branches/rox-u/reactos/ntoskrnl/include/internal/arch/ke.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/arch/ke.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H -#ifdef i386 +#ifdef _M_IX86 #include "../i386/ke.h" #else #error "Unknown processor" _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/mm.h --- branches/rox-u/reactos/ntoskrnl/include/internal/arch/mm.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/arch/mm.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H -#ifdef i386 +#ifdef _M_IX86 #include <internal/i386/mm.h> #else #error "Unknown processor" _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/arch/ps.h --- branches/rox-u/reactos/ntoskrnl/include/internal/arch/ps.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/arch/ps.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -19,7 +19,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_PS_H -#ifdef i386 +#ifdef _M_IX86 #include <internal/i386/ps.h> #define KiArchContextSwitch KiSwapContext #define KiArchInitThreadWithContext Ke386InitThreadWithContext _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/debug.h --- branches/rox-u/reactos/ntoskrnl/include/internal/debug.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/debug.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -81,8 +81,8 @@ #else /* DBG */ -#define CPRINT(args...) -#define DPRINT1(args...) +/*#define CPRINT(args...) +#define DPRINT1(args...)*/ /* ROX-U */ #ifndef __USE_W32API #define assert(x) #define ASSERT(x) _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ex.h --- branches/rox-u/reactos/ntoskrnl/include/internal/ex.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/ex.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -185,7 +185,7 @@ PLONGLONG Exchange); NTSTATUS -ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation); +ExpSetTimeZoneInformation(TIME_ZONE_INFORMATION * TimeZoneInformation); NTSTATUS ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId); _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/i386/ke.h --- branches/rox-u/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -189,8 +189,7 @@ typedef VOID -STDCALL -(*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, +(STDCALL*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, PVOID StartContext); VOID @@ -215,7 +214,7 @@ #define LOCK "lock ; " #else #define LOCK "" -#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) +#define KeGetCurrentIrql() (((PKPCR)KPCR_BASE)->Irql) #endif #if defined(__GNUC__) _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ke.h --- branches/rox-u/reactos/ntoskrnl/include/internal/ke.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/ke.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -224,13 +224,13 @@ /* MACROS ************************************************************************ */ -#define KeEnterCriticalRegion(X) \ +#define KeEnterCriticalRegion() \ { \ PKTHREAD _Thread = KeGetCurrentThread(); \ if (_Thread) _Thread->KernelApcDisable--; \ } -#define KeLeaveCriticalRegion(X) \ +#define KeLeaveCriticalRegion() \ { \ PKTHREAD _Thread = KeGetCurrentThread(); \ if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ @@ -354,8 +354,8 @@ VOID STDCALL DbgBreakPointNoBugCheck(VOID); +VOID STDCALL -VOID KeInitializeProfile(struct _KPROFILE* Profile, struct _KPROCESS* Process, PVOID ImageBase, @@ -364,21 +364,22 @@ KPROFILE_SOURCE ProfileSource, KAFFINITY Affinity); + +VOID STDCALL -VOID KeStartProfile(struct _KPROFILE* Profile, PVOID Buffer); +VOID STDCALL -VOID KeStopProfile(struct _KPROFILE* Profile); +ULONG STDCALL -ULONG KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource); +VOID STDCALL -VOID KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource, ULONG Interval); _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ntoskrnl.h --- branches/rox-u/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -10,10 +10,17 @@ /* * Use these to place a function in a specific section of the executable */ +#ifdef __GNUC__ #define PLACE_IN_SECTION(s) __attribute__((section (s))) #define INIT_FUNCTION PLACE_IN_SECTION("init") #define PAGE_LOCKED_FUNCTION PLACE_IN_SECTION("pagelk") #define PAGE_UNLOCKED_FUNCTION PLACE_IN_SECTION("pagepo") +#else /* TODO */ /* ROX-U */ +#define PLACE_IN_SECTION(s) +#define INIT_FUNCTION +#define PAGE_LOCKED_FUNCTION +#define PAGE_UNLOCKED_FUNCTION +#endif #include <pshpack1.h> /* _____ Modified: branches/rox-u/reactos/ntoskrnl/include/internal/ps.h --- branches/rox-u/reactos/ntoskrnl/include/internal/ps.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/internal/ps.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -160,7 +160,7 @@ ULONG OwnsSessionWorkingSetShared:1; ULONG ApcNeeded:1; }; - ULONG SameThreadPassiveFlags; /* 248 */ + ULONG SameThreadApcFlags; /* 248 */ }; UCHAR ForwardClusterOnly; /* 24C */ UCHAR DisablePageFaultClustering; /* 24D */ _____ Modified: branches/rox-u/reactos/ntoskrnl/include/ntoskrnl.h --- branches/rox-u/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-21 00:23:09 UTC (rev 16198) @@ -14,7 +14,7 @@ #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ -#include <roscfg.h> +/*#include <roscfg.h>*/ /* ROX-U */ #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> @@ -78,4 +78,18 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #endif +NTSTATUS STDCALL +CcRosInitializeFileCache (PFILE_OBJECT FileObject, + ULONG CacheSegmentSize); +NTSTATUS STDCALL +CcRosReleaseFileCache (PFILE_OBJECT FileObject); + +#define FSCTL_ROS_QUERY_LCN_MAPPING \ + CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _ROS_QUERY_LCN_MAPPING +{ + LARGE_INTEGER LcnDiskOffset; +} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; + #endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: branches/rox-u/reactos/ntoskrnl/io/bootlog.c --- branches/rox-u/reactos/ntoskrnl/io/bootlog.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/bootlog.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -311,7 +311,11 @@ return; } - Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR); +#if 0 /* ROX-U */ + Status = IopWriteLogFile(L"ReactOS " KERNEL_VERSION_WSTR); +#else + Status = IopWriteLogFile(L"ReactOS"); +#endif if (!NT_SUCCESS(Status)) { DPRINT1("IopWriteLogFile() failed (Status %lx)\n", Status); _____ Modified: branches/rox-u/reactos/ntoskrnl/io/driver.c --- branches/rox-u/reactos/ntoskrnl/io/driver.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/driver.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -337,8 +337,8 @@ IopDisplayLoadingMessage(PVOID ServiceName, BOOLEAN Unicode) { + CHAR TextBuffer[256]; if (SetupMode) return; - CHAR TextBuffer[256]; if (Unicode) { sprintf(TextBuffer, "Loading %S...\n", (PWCHAR)ServiceName); _____ Modified: branches/rox-u/reactos/ntoskrnl/io/file.c --- branches/rox-u/reactos/ntoskrnl/io/file.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/file.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -71,10 +71,10 @@ if (ParentObjectType != IoDeviceObjectType && ParentObjectType != IoFileObjectType) { - DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", + /* ROX-U */ /*DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", &BODY_TO_HEADER(Parent)->NameInfo->Name, BODY_TO_HEADER(Parent)->Type->Name.Buffer, - RemainingPath); + RemainingPath);*/ return(STATUS_UNSUCCESSFUL); } @@ -427,7 +427,7 @@ ExFreePool (LocalInfo); return Status; } - DPRINT ("Device path: %wZ\n", &LocalInfo->Name); + /*DPRINT ("Device path: %wZ\n", &LocalInfo->Name);*/ /* Write Device Path */ Status = RtlAppendUnicodeStringToString(&ObjectNameInfo->Name, _____ Modified: branches/rox-u/reactos/ntoskrnl/io/iomgr.c --- branches/rox-u/reactos/ntoskrnl/io/iomgr.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/iomgr.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -15,16 +15,16 @@ /* DATA ********************************************************************/ -POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL; -POBJECT_TYPE EXPORTED IoFileObjectType = NULL; +POBJECT_TYPE IoDeviceObjectType = NULL; +POBJECT_TYPE IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; -ULONG EXPORTED IoReadOperationCount = 0; -LARGE_INTEGER EXPORTED IoReadTransferCount = {{0, 0}}; -ULONG EXPORTED IoWriteOperationCount = 0; -LARGE_INTEGER EXPORTED IoWriteTransferCount = {{0, 0}}; -ULONG IoOtherOperationCount = 0; -LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; -KSPIN_LOCK EXPORTED IoStatisticsLock = 0; +ULONG IoReadOperationCount = 0; +LARGE_INTEGER IoReadTransferCount = {{0, 0}}; +ULONG IoWriteOperationCount = 0; +LARGE_INTEGER IoWriteTransferCount = {{0, 0}}; +ULONG IoOtherOperationCount = 0; +LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; +KSPIN_LOCK IoStatisticsLock = 0; GENERIC_MAPPING IopFileMapping = { FILE_GENERIC_READ, _____ Modified: branches/rox-u/reactos/ntoskrnl/io/irp.c --- branches/rox-u/reactos/ntoskrnl/io/irp.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/irp.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -618,14 +618,6 @@ AccessType = IoReadAccess; } - /* Probe and Lock */ - _SEH_FILTER(FreeAndGoOn) - { - /* Free the IRP and its MDL */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - return EXCEPTION_CONTINUE_SEARCH; - } _SEH_TRY { /* Do the probe */ _____ Modified: branches/rox-u/reactos/ntoskrnl/io/wmi.c --- branches/rox-u/reactos/ntoskrnl/io/wmi.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/io/wmi.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -19,8 +19,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIRegistrationControl( IN PDEVICE_OBJECT DeviceObject, IN ULONG Action @@ -33,8 +33,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIAllocateInstanceIds( IN GUID *Guid, IN ULONG InstanceCount, @@ -48,8 +48,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISuggestInstanceName( IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN PUNICODE_STRING SymbolicLinkName OPTIONAL, @@ -64,8 +64,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIWriteEvent( IN PVOID WnodeEventItem ) @@ -77,8 +77,8 @@ /* * @unimplemented */ -STDCALL -NTSTATUS IoWMIOpenBlock( +NTSTATUS +STDCALL IoWMIOpenBlock( IN GUID *DataBlockGuid, IN ULONG DesiredAccess, OUT PVOID *DataBlockObject @@ -91,8 +91,8 @@ /* * @unimplemented */ -STDCALL -NTSTATUS IoWMIQueryAllData( +NTSTATUS +STDCALL IoWMIQueryAllData( IN PVOID DataBlockObject, IN OUT ULONG *InOutBufferSize, OUT PVOID OutBuffer @@ -105,8 +105,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQueryAllDataMultiple( IN PVOID *DataBlockObjectList, IN ULONG ObjectCount, @@ -121,8 +121,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQuerySingleInstance( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -137,8 +137,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIQuerySingleInstanceMultiple( IN PVOID *DataBlockObjectList, IN PUNICODE_STRING InstanceNames, @@ -154,8 +154,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetSingleInstance( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -171,8 +171,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetSingleItem( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -189,8 +189,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIExecuteMethod( IN PVOID DataBlockObject, IN PUNICODE_STRING InstanceName, @@ -207,8 +207,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMISetNotificationCallback( IN PVOID Object, IN WMI_NOTIFICATION_CALLBACK Callback, @@ -222,8 +222,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIHandleToInstanceName( IN PVOID DataBlockObject, IN HANDLE FileHandle, @@ -237,8 +237,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS IoWMIDeviceObjectToInstanceName( IN PVOID DataBlockObject, IN PDEVICE_OBJECT DeviceObject, _____ Modified: branches/rox-u/reactos/ntoskrnl/ke/ipi.c --- branches/rox-u/reactos/ntoskrnl/ke/ipi.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ke/ipi.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -89,7 +89,7 @@ #endif } } - ((VOID STDCALL(*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->C urrentPacket[0]); + ((VOID (STDCALL*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->C urrentPacket[0]); Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), &Prcb->SignalDone->TargetSet); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { @@ -116,7 +116,7 @@ VOID STDCALL -KiIpiSendPacket(ULONG TargetSet, VOID STDCALL (*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) +KiIpiSendPacket(ULONG TargetSet, VOID (STDCALL*WorkerRoutine)(PVOID), PVOID Argument, ULONG Count, BOOLEAN Synchronize) { ULONG i, Processor, CurrentProcessor; PKPRCB Prcb, CurrentPrcb; _____ Modified: branches/rox-u/reactos/ntoskrnl/ke/kqueue.c --- branches/rox-u/reactos/ntoskrnl/ke/kqueue.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ke/kqueue.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -245,8 +245,8 @@ /* * @unimplemented */ +PKDEVICE_QUEUE_ENTRY STDCALL -PKDEVICE_QUEUE_ENTRY KeRemoveByKeyDeviceQueueIfBusy(IN PKDEVICE_QUEUE DeviceQueue, IN ULONG SortKey) { _____ Modified: branches/rox-u/reactos/ntoskrnl/ke/main.c --- branches/rox-u/reactos/ntoskrnl/ke/main.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ke/main.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -82,7 +82,9 @@ } VOID +#ifdef __GNUC__ __attribute((noinline)) +#endif KiSystemStartup(BOOLEAN BootProcessor) { DPRINT("KiSystemStartup(%d)\n", BootProcessor); _____ Modified: branches/rox-u/reactos/ntoskrnl/ke/process.c --- branches/rox-u/reactos/ntoskrnl/ke/process.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ke/process.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -203,7 +203,9 @@ { /* FIXME: Write this in ASM. Much easier */ DPRINT("Switching CR3 to: %x\n", NewProcess->DirectoryTableBase.u.LowPart); +#if 0 /* ROX-U */ Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); +#endif } /* _____ Modified: branches/rox-u/reactos/ntoskrnl/ke/profile.c --- branches/rox-u/reactos/ntoskrnl/ke/profile.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ke/profile.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -22,8 +22,8 @@ /* FUNCTIONS *****************************************************************/ +VOID STDCALL -VOID KeInitializeProfile(PKPROFILE Profile, PKPROCESS Process, PVOID ImageBase, @@ -40,14 +40,14 @@ Profile->Process = Process; Profile->RegionStart = ImageBase; Profile->BucketShift = BucketSize - 2; /* See ntinternals.net -- Alex */ - Profile->RegionEnd = (PVOID)(ULONG_PTR)ImageBase + ImageSize; + Profile->RegionEnd = (PVOID)((ULONG_PTR)ImageBase + ImageSize); Profile->Active = FALSE; Profile->Source = ProfileSource; Profile->Affinity = Affinity; } +VOID STDCALL -VOID KeStartProfile(PKPROFILE Profile, PVOID Buffer) { @@ -133,8 +133,8 @@ if (!FreeBuffer) ExFreePool(SourceBuffer); } +VOID STDCALL -VOID KeStopProfile(PKPROFILE Profile) { KIRQL OldIrql; @@ -178,8 +178,8 @@ if (CurrentSource) ExFreePool(CurrentSource); } +ULONG STDCALL -ULONG KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource) { /* Check if this is the timer profile */ @@ -200,8 +200,8 @@ } } +VOID STDCALL -VOID KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource, ULONG Interval) { @@ -224,8 +224,8 @@ /* * @implemented */ +VOID STDCALL -VOID KeProfileInterrupt(PKTRAP_FRAME TrapFrame) { /* Called from HAL for Timer Profiling */ @@ -257,7 +257,7 @@ } /* Get the Pointer to the Bucket Value representing this EIP */ - BucketValue = (PULONG)(((ULONG_PTR)(Profile->Buffer + + BucketValue = (PULONG)((((ULONG_PTR)Profile->Buffer + (TrapFrame->Eip - (ULONG_PTR)Profile->RegionStart)) >> Profile->BucketShift) &~ 0x3); @@ -276,8 +276,8 @@ * from the trap frame into the buffer, while using buckets and * shifting like we specified. -- Alex */ +VOID STDCALL -VOID KeProfileInterruptWithSource(IN PKTRAP_FRAME TrapFrame, IN KPROFILE_SOURCE Source) { @@ -291,8 +291,8 @@ /* * @implemented */ +VOID STDCALL -VOID KeSetProfileIrql(IN KIRQL ProfileIrql) { /* Set the IRQL at which Profiling will run */ _____ Modified: branches/rox-u/reactos/ntoskrnl/ldr/loader.c --- branches/rox-u/reactos/ntoskrnl/ldr/loader.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ldr/loader.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -910,7 +910,7 @@ Protect = PAGE_EXECUTE_READWRITE; } #endif - if (PageAddress < DriverBase + DriverSize) + if (PageAddress < RVA(DriverBase, DriverSize)) { MmSetPageProtect(NULL, PageAddress, Protect); } @@ -937,14 +937,14 @@ PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); while ((ULONG_PTR)PageAddress + PAGE_SIZE < (ULONG_PTR)BaseAddress + Length) { - if (PageAddress < DriverBase + DriverSize) + if (PageAddress < RVA(DriverBase, DriverSize)) { MmSetPageProtect(NULL, PageAddress, Protect); } PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); } if (PageAddress < (PVOID)((ULONG_PTR)BaseAddress + Length) && - PageAddress < DriverBase + DriverSize) + PageAddress < RVA(DriverBase, DriverSize)) { Protect = LdrLookupPageProtection(PageAddress, DriverBase, &PENtHeaders->FileHeader, PESectionHeaders); MmSetPageProtect(NULL, PageAddress, Protect); @@ -1214,20 +1214,20 @@ Delta = (ULONG_PTR)DriverBase - NtHeaders->OptionalHeader.ImageBase; RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)DriverBase + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); - MaxAddress = DriverBase + DriverSize; + MaxAddress = RVA(DriverBase, DriverSize); while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); - Address = DriverBase + RelocationDir->VirtualAddress; + Address = RVA(DriverBase, RelocationDir->VirtualAddress); TypeOffset = (PUSHORT)(RelocationDir + 1); for (i = 0; i < Count; i++) { Offset = *TypeOffset & 0xFFF; Type = *TypeOffset >> 12; - ShortPtr = (PUSHORT)(Address + Offset); + ShortPtr = (PUSHORT)(RVA(Address, Offset)); /* Don't relocate after the end of the loaded driver */ if ((PVOID)ShortPtr >= MaxAddress) @@ -1277,6 +1277,10 @@ return STATUS_SUCCESS; } +#ifndef PATH_MAX +#define PATH_MAX 260 +#endif + static NTSTATUS LdrPEGetOrLoadModule ( PMODULE_OBJECT Module, @@ -1552,16 +1556,16 @@ } /* Get the import address list. */ - ImportAddressList = (PVOID*)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); + ImportAddressList = (PVOID*)RVA(DriverBase, ImportModuleDirectory->FirstThunk); /* Get the list of functions to import. */ if (ImportModuleDirectory->OriginalFirstThunk != 0) { - FunctionNameList = (PULONG) (DriverBase + (ULONG_PTR)ImportModuleDirectory->OriginalFirstThunk); + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); } else { - FunctionNameList = (PULONG)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); } /* Walk through function list and fixup addresses. */ _____ Modified: branches/rox-u/reactos/ntoskrnl/ldr/resource.c --- branches/rox-u/reactos/ntoskrnl/ldr/resource.c 2005-06-20 22:54:01 UTC (rev 16197) +++ branches/rox-u/reactos/ntoskrnl/ldr/resource.c 2005-06-21 00:23:09 UTC (rev 16198) @@ -195,8 +195,8 @@ /* * @unimplemented */ +NTSTATUS STDCALL -NTSTATUS LdrFindResourceDirectory_U( IN PVOID BaseAddress, IN PLDR_RESOURCE_INFO ResourceInfo, @@ -211,8 +211,8 @@ /* * @unimplemented */ [truncated at 1000 lines; 632 more skipped]

19 years, 6 months

[ion] 16197: Make scsi header um friendly

by ion＠svn.reactos.com

Make scsi header um friendly Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h _____ Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h --- trunk/reactos/w32api/include/ddk/ntddscsi.h 2005-06-20 22:51:54 UTC (rev 16196) +++ trunk/reactos/w32api/include/ddk/ntddscsi.h 2005-06-20 22:54:01 UTC (rev 16197) @@ -156,7 +156,7 @@ #define SCSI_IOCTL_DATA_UNSPECIFIED 2 typedef struct _DUMP_POINTERS { - PADAPTER_OBJECT AdapterObject; + struct _ADAPTER_OBJECT *AdapterObject; PVOID MappedRegisterBase; PVOID DumpData; PVOID CommonBufferVa;

19 years, 6 months

[ion] 16196: Remove rosrtl usage from usetup

by ion＠svn.reactos.com

Remove rosrtl usage from usetup Modified: trunk/reactos/subsys/system/usetup/registry.c Modified: trunk/reactos/subsys/system/usetup/usetup.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/subsys/system/usetup/registry.c --- trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:51:54 UTC (rev 16196) @@ -604,14 +604,12 @@ SetInstallPathValue(PUNICODE_STRING InstallPath) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); HANDLE KeyHandle; NTSTATUS Status; - /* Create the 'secret' InstallPath key */ - RtlRosInitUnicodeStringFromLiteral (&KeyName, - L"\\Registry\\Machine\\HARDWARE"); + /* Create the 'secret' InstallPath key */ InitializeObjectAttributes (&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -626,8 +624,6 @@ return FALSE; } - RtlRosInitUnicodeStringFromLiteral (&ValueName, - L"InstallPath"); Status = NtSetValueKey (KeyHandle, &ValueName, 0, _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:51:54 UTC (rev 16196) @@ -3705,10 +3705,9 @@ { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString; + UNICODE_STRING UnicodeString = RTL_CONSTANT_STRING(L"\\ReactOSInitDone"); HANDLE ReactOSInitEvent; - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, L"\\ReactOSInitDone"); InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, EVENT_ALL_ACCESS, _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:51:54 UTC (rev 16196) @@ -42,9 +42,6 @@ /* FIXME: Put outside of DDK */ #include <ddk/ntddblue.h> -/* FIXME: KILL ROSRTL */ -#include <rosrtl/string.h> - /* Helper Header */ #include <reactos/helper.h>

19 years, 6 months

[ion] 16195: Build usetup with NDK

by ion＠svn.reactos.com

Build usetup with NDK Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/system/usetup/cabinet.c Modified: trunk/reactos/subsys/system/usetup/console.c Modified: trunk/reactos/subsys/system/usetup/console.h Modified: trunk/reactos/subsys/system/usetup/drivesup.c Modified: trunk/reactos/subsys/system/usetup/filequeue.c Modified: trunk/reactos/subsys/system/usetup/filesup.c Modified: trunk/reactos/subsys/system/usetup/format.c Modified: trunk/reactos/subsys/system/usetup/fslist.c Modified: trunk/reactos/subsys/system/usetup/genlist.c Modified: trunk/reactos/subsys/system/usetup/infcache.c Modified: trunk/reactos/subsys/system/usetup/inicache.c Modified: trunk/reactos/subsys/system/usetup/keytrans.c Modified: trunk/reactos/subsys/system/usetup/keytrans.h Modified: trunk/reactos/subsys/system/usetup/partlist.c Deleted: trunk/reactos/subsys/system/usetup/precomp.h Modified: trunk/reactos/subsys/system/usetup/progress.c Modified: trunk/reactos/subsys/system/usetup/registry.c Modified: trunk/reactos/subsys/system/usetup/settings.c Modified: trunk/reactos/subsys/system/usetup/usetup.c Modified: trunk/reactos/subsys/system/usetup/usetup.h Modified: trunk/reactos/subsys/system/usetup/usetup.xml _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -24,14 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" -#include <ntdll/rtl.h> -#include <ddk/ntdddisk.h> /* FIXME: NDK */ - #include "usetup.h" -#include "inicache.h" -#include "filesup.h" -#include "bootsup.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -8,12 +8,8 @@ * CSH 15/08-2003 Created */ -#include <ntos.h> -#include <stdio.h> -#include <string.h> -#include <zlib.h> -#include "cabinet.h" #include "usetup.h" +#include <zlib.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/console.c --- trunk/reactos/subsys/system/usetup/console.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/console.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,13 +26,7 @@ /* INCLUDES ******************************************************************/ -#include "precomp.h" -#include <ddk/ntddblue.h> -#include <ddk/ntddkbd.h> - #include "usetup.h" -#include "console.h" -#include "keytrans.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/console.h --- trunk/reactos/subsys/system/usetup/console.h 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/console.h 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,8 +27,6 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ -#include <ntos/keyboard.h> - #define AllocConsole ConAllocConsole #define FreeConsole ConFreeConsole #define ReadConsoleOutputCharacters ConReadConsoleOutputCharacters _____ Modified: trunk/reactos/subsys/system/usetup/drivesup.c --- trunk/reactos/subsys/system/usetup/drivesup.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/drivesup.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,12 +26,10 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> - #include "usetup.h" -#include "drivesup.h" +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/filequeue.c --- trunk/reactos/subsys/system/usetup/filequeue.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/filequeue.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,12 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> - #include "usetup.h" -#include "filesup.h" -#include "filequeue.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/filesup.c --- trunk/reactos/subsys/system/usetup/filesup.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/filesup.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,12 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> - #include "usetup.h" -#include "filesup.h" -#include "cabinet.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/format.c --- trunk/reactos/subsys/system/usetup/format.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/format.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> -#include <fslib/vfatlib.h> - #include "usetup.h" -#include "console.h" -#include "progress.h" #define NDEBUG #include <debug.h> - PPROGRESSBAR ProgressBar = NULL; /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/fslist.c --- trunk/reactos/subsys/system/usetup/fslist.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/fslist.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -25,14 +25,10 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -#include "precomp.h" -#include <ddk/ntddscsi.h> -#include <ntdll/rtl.h> - #include "usetup.h" -#include "console.h" -#include "fslist.h" +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/genlist.c --- trunk/reactos/subsys/system/usetup/genlist.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/genlist.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> -#include <ntos/minmax.h> - #include "usetup.h" -#include "console.h" -#include "genlist.h" #define NDEBUG #include <debug.h> - /* FUNCTIONS ****************************************************************/ PGENERIC_LIST _____ Modified: trunk/reactos/subsys/system/usetup/infcache.c --- trunk/reactos/subsys/system/usetup/infcache.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/infcache.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,9 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" #include "usetup.h" -#include "infcache.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/inicache.c --- trunk/reactos/subsys/system/usetup/inicache.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/inicache.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,9 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" #include "usetup.h" -#include "inicache.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/usetup/keytrans.c --- trunk/reactos/subsys/system/usetup/keytrans.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/keytrans.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -25,14 +25,11 @@ * * NB: Hardcoded to US keyboard */ +#include "usetup.h" + #define NDEBUG #include <debug.h> -#include "precomp.h" -#include <ddk/ntddblue.h> -#include <ddk/ntddkbd.h> -#include <windows.h> - static WORD KeyTable[] = { /* 0x00 */ 0x00, VK_ESCAPE, 0x31, 0x32, _____ Modified: trunk/reactos/subsys/system/usetup/keytrans.h --- trunk/reactos/subsys/system/usetup/keytrans.h 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/keytrans.h 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,6 +27,8 @@ #ifndef __KEYTRANS_H__ #define __KEYTRANS_H__ +#include <ddk/ntddkbd.h> + NTSTATUS IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event); _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -25,19 +25,7 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -#include "precomp.h" -#include <ddk/ntddscsi.h> /* FIXME: NDK */ -#include <ddk/ntdddisk.h> /* FIXME: NDK */ - -#include <ntdll/rtl.h> - -#include <ntos/minmax.h> - #include "usetup.h" -#include "console.h" -#include "partlist.h" -#include "drivesup.h" -#include "bootsup.h" #define NDEBUG #include <debug.h> _____ Deleted: trunk/reactos/subsys/system/usetup/precomp.h --- trunk/reactos/subsys/system/usetup/precomp.h 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/precomp.h 2005-06-20 22:49:45 UTC (rev 16195) @@ -1 +0,0 @@ -#include <ntos.h> _____ Modified: trunk/reactos/subsys/system/usetup/progress.c --- trunk/reactos/subsys/system/usetup/progress.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/progress.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -1,13 +1,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> - #include "usetup.h" -#include "progress.h" -#include "console.h" +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/registry.c --- trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> -#include <rosrtl/string.h> - #include "usetup.h" -#include "registry.h" -#include "infcache.h" #define NDEBUG #include <debug.h> - #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 #define FLG_ADDREG_DELVAL 0x00000004 _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/settings.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -26,20 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include <ntdll/rtl.h> -#include <ntos/minmax.h> -#include <rosrtl/string.h> - #include "usetup.h" -#include "infcache.h" -#include "genlist.h" -#include "settings.h" #define NDEBUG #include <debug.h> - /* FUNCTIONS ****************************************************************/ PGENERIC_LIST _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:49:45 UTC (rev 16195) @@ -25,36 +25,11 @@ * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ - -#include "precomp.h" -#include <ntdll/rtl.h> -#include <ddk/ntdddisk.h> /* FIXME: NDK */ - -#include <ntos/minmax.h> -#include <reactos/resource.h> -#include <rosrtl/string.h> - #include "usetup.h" -#include "console.h" -#include "partlist.h" -#include "inicache.h" -#include "infcache.h" -#include "filequeue.h" -#include "progress.h" -#include "bootsup.h" -#include "registry.h" -#include "format.h" -#include "fslist.h" -#include "cabinet.h" -#include "filesup.h" -#include "drivesup.h" -#include "genlist.h" -#include "settings.h" #define NDEBUG #include <debug.h> - typedef enum _PAGE_NUMBER { START_PAGE, @@ -1549,7 +1524,7 @@ return SELECT_FILE_SYSTEM_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_C) /* C */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'c') /* C */ { if (PartitionList->CurrentPartition->Unpartitioned == FALSE) { @@ -1565,7 +1540,7 @@ return CREATE_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_D) /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ { if (PartitionList->CurrentPartition->Unpartitioned == TRUE) { @@ -2075,7 +2050,7 @@ { return SELECT_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_D) /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ { DeleteCurrentPartition (PartitionList); _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:49:45 UTC (rev 16195) @@ -27,16 +27,51 @@ #ifndef __USETUP_H__ #define __USETUP_H__ -#ifdef assert -#undef assert -#endif -#define assert(x) +/* PSDK/NDK */ +#include <windows.h> +#include <fmifs.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +/* VFAT */ +#include <fslib/vfatlib.h> + +/* DDK Disk Headers */ +#include <ddk/ntddscsi.h> + +/* FIXME: Put outside of DDK */ +#include <ddk/ntddblue.h> + +/* FIXME: KILL ROSRTL */ +#include <rosrtl/string.h> + +/* Helper Header */ +#include <reactos/helper.h> + +/* ReactOS Version */ +#include <reactos/buildno.h> + +/* Internal Headers */ +#include "console.h" +#include "partlist.h" +#include "inicache.h" +#include "infcache.h" +#include "filequeue.h" +#include "progress.h" +#include "bootsup.h" +#include "keytrans.h" +#include "registry.h" +#include "format.h" +#include "fslist.h" +#include "cabinet.h" +#include "filesup.h" +#include "drivesup.h" +#include "genlist.h" +#include "settings.h" + extern HANDLE ProcessHeap; - extern UNICODE_STRING SourceRootPath; - #endif /* __USETUP_H__*/ /* EOF */ _____ Modified: trunk/reactos/subsys/system/usetup/usetup.xml --- trunk/reactos/subsys/system/usetup/usetup.xml 2005-06-20 22:48:50 UTC (rev 16194) +++ trunk/reactos/subsys/system/usetup/usetup.xml 2005-06-20 22:49:45 UTC (rev 16195) @@ -9,7 +9,7 @@ <library>zlib</library> <library>vfatlib</library> <library>ntdll</library> - <pch>precomp.h</pch> + <pch>usetup.h</pch> <file>bootsup.c</file> <file>cabinet.c</file> <file>console.c</file>

19 years, 6 months

[navaraf] 16194: Remove some non-__USE_W32API guarded blocks.

by navaraf＠svn.reactos.com

Remove some non-__USE_W32API guarded blocks. Modified: trunk/reactos/include/ddk/ddrawi.h Modified: trunk/reactos/include/napi/shared_data.h Modified: trunk/reactos/include/napi/teb.h Modified: trunk/reactos/include/napi/types.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/include/win32k/dc.h _____ Modified: trunk/reactos/include/ddk/ddrawi.h --- trunk/reactos/include/ddk/ddrawi.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/ddk/ddrawi.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -616,9 +616,6 @@ /*********************************************************************** ****** * high-level ddraw implementation structures */ -#ifndef __USE_W32API -typedef DWORD IUnknown; /* FIXME: implement proper definition */ -#endif typedef struct _IUNKNOWN_LIST { struct _IUNKNOWN_LIST * lpLink; LPGUID lpGuid; _____ Modified: trunk/reactos/include/napi/shared_data.h --- trunk/reactos/include/napi/shared_data.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/shared_data.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -13,69 +13,6 @@ #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#ifndef __USE_W32API - -#ifndef __ASM__ - -typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE -{ - StandardDesign, - NEC98x86, - EndAlternatives -} ALTERNATIVE_ARCHITECTURE_TYPE; - -typedef struct _KSYSTEM_TIME -{ - ULONG LowPart; - LONG High1Time; - LONG High2Time; -} KSYSTEM_TIME, *PKSYSTEM_TIME; - -#define PROCESSOR_FEATURE_MAX 64 -typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; - ULONG TraceLogging; - ULONGLONG Fill0; - UCHAR SystemCall[16]; - union { - volatile KSYSTEM_TIME TickCount; - volatile ULONG64 TickCountQuad; - }; -} KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; - -#endif -#endif - /* Values for DosDeviceDriveType */ #define DOSDEVICE_DRIVE_UNKNOWN 0 #define DOSDEVICE_DRIVE_CALCULATE 1 @@ -85,21 +22,10 @@ #define DOSDEVICE_DRIVE_CDROM 5 #define DOSDEVICE_DRIVE_RAMDISK 6 -/* Values for TimeZoneId */ -#ifndef __USE_W32API -#define TIME_ZONE_ID_INVALID ((ULONG) -1) -#define TIME_ZONE_ID_UNKNOWN (0) -#define TIME_ZONE_ID_STANDARD (1) -#define TIME_ZONE_ID_DAYLIGHT (2) -#endif - #define KERNEL_SHARED_DATA (0xFFDF0000) #define USER_SHARED_DATA (0x7FFE0000) #if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__) -#ifndef __USE_W32API -#define KI_USER_SHARED_DATA (0xFFDF0000) -#endif #ifdef SharedUserData #undef SharedUserData #endif _____ Modified: trunk/reactos/include/napi/teb.h --- trunk/reactos/include/napi/teb.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/teb.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -9,60 +9,6 @@ #include <ddk/ntapi.h> #endif /* !__USE_W32API */ -#ifndef __USE_W32API - -typedef struct _CLIENT_ID -{ - HANDLE UniqueProcess; - HANDLE UniqueThread; -} CLIENT_ID, *PCLIENT_ID; - -typedef struct _RTL_USER_PROCESS_PARAMETERS { - ULONG AllocationSize; - ULONG Size; - ULONG Flags; - ULONG DebugFlags; - HANDLE hConsole; - ULONG ProcessGroup; - HANDLE hStdInput; - HANDLE hStdOutput; - HANDLE hStdError; - UNICODE_STRING CurrentDirectoryName; - HANDLE CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - PWSTR Environment; - ULONG dwX; - ULONG dwY; - ULONG dwXSize; - ULONG dwYSize; - ULONG dwXCountChars; - ULONG dwYCountChars; - ULONG dwFillAttribute; - ULONG dwFlags; - ULONG wShowWindow; - UNICODE_STRING WindowTitle; - UNICODE_STRING DesktopInfo; - UNICODE_STRING ShellInfo; - UNICODE_STRING RuntimeInfo; -} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; - -typedef struct _NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD* ExceptionList; /* 00h */ - PVOID StackBase; /* 04h */ - PVOID StackLimit; /* 08h */ - PVOID SubSystemTib; /* 0Ch */ - union { - PVOID FiberData; /* 10h */ - ULONG Version; /* 10h */ - }; - PVOID ArbitraryUserPointer; /* 14h */ - struct _NT_TIB *Self; /* 18h */ -} NT_TIB, *PNT_TIB; - -#endif /* !__USE_W32API */ - typedef struct _CURDIR { UNICODE_STRING DosPath; @@ -162,12 +108,6 @@ UNICODE_STRING CSDVersion; /* 1DCh */ } PEB; -#ifndef __USE_W32API - -typedef PEB *PPEB; - -#endif /* !__USE_W32API */ - typedef struct _GDI_TEB_BATCH { ULONG Offset; @@ -239,66 +179,6 @@ PVOID WineDebugInfo; /* Needed for WINE DLL's */ } TEB, *PTEB; -#if (!defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) - -/* FIXME: at least NtCurrentTeb should be defined in winnt.h */ - -#ifndef NtCurrentTeb - -#if defined(_M_IX86) -/* on the x86, the TEB is contained in the FS segment */ -static inline struct _TEB * NtCurrentTeb(void) -{ - struct _TEB * pTeb; - -#if defined(__GNUC__) - /* FIXME: instead of hardcoded offsets, use offsetof() - if possible */ - __asm__ __volatile__ - ( - "movl %%fs:0x18, %0\n" /* fs:18h == Teb->Tib.Self */ - : "=r" (pTeb) /* can't have two memory operands */ - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:0x18 - __asm mov pTeb, eax -#else -#error Unknown compiler for inline assembler -#endif - - return pTeb; -} -#define NtCurrentTeb NtCurrentTeb - -#elif defined(_M_ALPHA) - -void * __rdteb(void); -#pragma intrinsic(__rdteb) - -/* on the Alpha AXP, we call the rdteb PAL to retrieve the address of the TEB */ -#define NtCurrentTeb() ((struct _TEB *)__rdteb()) - -#elif defined(_M_MIPS) - -/* on the MIPS R4000, the TEB is loaded at a fixed address */ -#define NtCurrentTeb() ((struct _TEB *)0x7FFFF4A8) - -#elif defined(_M_PPC) - -unsigned __gregister_get(unsigned const regnum); -#pragma intrinsic(__gregister_get) - -/* on the PowerPC, the TEB is pointed to by GPR 13 */ -#define NtCurrentTeb() ((struct _TEB *)__gregister_get(13)) - -#else -struct _TEB * NtCurrentTeb(void); -#endif - -#endif - -#endif /* !defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */ - #ifdef _M_IX86 static inline struct _PEB * NtCurrentPeb(void) _____ Modified: trunk/reactos/include/napi/types.h --- trunk/reactos/include/napi/types.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/types.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -3,17 +3,6 @@ /* these should be moved to a file like ntdef.h */ -#ifndef __USE_W32API -enum -{ - DIRECTORY_QUERY, - DIRECTORY_TRAVERSE, - DIRECTORY_CREATE_OBJECT, - DIRECTORY_CREATE_SUBDIRECTORY, - DIRECTORY_ALL_ACCESS, -}; - - /* * General type for status information */ @@ -27,63 +16,4 @@ #endif typedef ULARGE_INTEGER TIME, *PTIME; -#ifndef __USE_W32API - -typedef const int CINT; -typedef LONG NTSTATUS, *PNTSTATUS; -typedef ULONG DEVICE_TYPE; - -/* File information for IRP_MJ_QUERY_INFORMATION (and SET) */ -typedef enum _FILE_INFORMATION_CLASS -{ - FileDirectoryInformation = 1, - FileFullDirectoryInformation, - FileBothDirectoryInformation, - FileBasicInformation, - FileStandardInformation, - FileInternalInformation, - FileEaInformation, - FileAccessInformation, - FileNameInformation, - FileRenameInformation, - FileLinkInformation, - FileNamesInformation, - FileDispositionInformation, - FilePositionInformation, - FileFullEaInformation, - FileModeInformation, - FileAlignmentInformation, - FileAllInformation, - FileAllocationInformation, - FileEndOfFileInformation, - FileAlternateNameInformation, - FileStreamInformation, - FilePipeInformation, - FilePipeLocalInformation, - FilePipeRemoteInformation, - FileMailslotQueryInformation, - FileMailslotSetInformation, - FileCompressionInformation, - FileObjectIdInformation, - FileCompletionInformation, - FileMoveClusterInformation, - FileQuotaInformation, - FileReparsePointInformation, - FileNetworkOpenInformation, - FileAttributeTagInformation, - FileTrackingInformation, - FileIdBothDirectoryInformation, - FileIdFullDirectoryInformation, - FileValidDataLengthInformation, - FileShortNameInformation, - FileMaximumInformation -} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; - -typedef enum _SECTION_INHERIT { - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; - -#endif /* !__USE_W32API */ - #endif /* __INCLUDE_NAPI_TYPES_H */ _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -108,39 +108,6 @@ #endif -#ifndef __USE_W32API -typedef struct _CRITICAL_SECTION_DEBUG -{ - USHORT Type; - USHORT CreatorBackTraceIndex; - struct _CRITICAL_SECTION *CriticalSection; - LIST_ENTRY ProcessLocksList; - ULONG EntryCount; - ULONG ContentionCount; - PVOID Spare[2]; -} CRITICAL_SECTION_DEBUG, *PCRITICAL_SECTION_DEBUG; - - -typedef struct _CRITICAL_SECTION -{ - PCRITICAL_SECTION_DEBUG DebugInfo; - LONG LockCount; - LONG RecursionCount; - HANDLE OwningThread; - HANDLE LockSemaphore; - ULONG_PTR SpinCount; -} CRITICAL_SECTION, *PCRITICAL_SECTION, *LPCRITICAL_SECTION; - -#define RTL_CRITSECT_TYPE 0 - -typedef CRITICAL_SECTION RTL_CRITICAL_SECTION; -typedef PCRITICAL_SECTION PRTL_CRITICAL_SECTION; -typedef LPCRITICAL_SECTION LPRTL_CRITICAL_SECTION; -typedef CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG; -typedef PCRITICAL_SECTION_DEBUG PRTL_CRITICAL_SECTION_DEBUG; - -#endif /* !__USE_W32API */ - #ifndef _NTNDK_ typedef struct _RTL_PROCESS_INFO { @@ -747,11 +714,7 @@ /* Timer Queue functions */ -#ifdef __USE_W32API #include <winnt.h> -#else /* __USE_W32API */ -typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); -#endif /* __USE_W32API */ NTSTATUS STDCALL _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/win32k/dc.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -189,11 +189,6 @@ INT cbInput, LPCSTR lpszInData); -#ifndef __USE_W32API -/* FIXME: this typedef should go somewhere else... */ -typedef VOID (*GOBJENUMPROC)(PVOID, LPARAM); -#endif - INT STDCALL NtGdiEnumObjects(HDC hDC, INT ObjectType, GOBJENUMPROC ObjectFunc,

19 years, 6 months

[ion] 16193: Build winlogon with NDK

by ion＠svn.reactos.com

Build winlogon with NDK Modified: trunk/reactos/subsys/system/winlogon/sas.c Modified: trunk/reactos/subsys/system/winlogon/winlogon.c Modified: trunk/reactos/subsys/system/winlogon/winlogon.h Modified: trunk/reactos/subsys/system/winlogon/wlx.c _____ Modified: trunk/reactos/subsys/system/winlogon/sas.c --- trunk/reactos/subsys/system/winlogon/sas.c 2005-06-20 22:15:59 UTC (rev 16192) +++ trunk/reactos/subsys/system/winlogon/sas.c 2005-06-20 22:19:18 UTC (rev 16193) @@ -9,18 +9,7 @@ * Created 28/03/2004 */ -#define NTOS_MODE_USER -#include <ntos.h> -#include <windows.h> -#include <stdio.h> -#include <ntsecapi.h> -#include <wchar.h> -#include <userenv.h> -#include <reactos/winlogon.h> - -#include "setup.h" #include "winlogon.h" -#include "resource.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.c --- trunk/reactos/subsys/system/winlogon/winlogon.c 2005-06-20 22:15:59 UTC (rev 16192) +++ trunk/reactos/subsys/system/winlogon/winlogon.c 2005-06-20 22:19:18 UTC (rev 16193) @@ -10,18 +10,7 @@ */ /* INCLUDES *****************************************************************/ - -#define NTOS_MODE_USER -#include <ntos.h> -#include <windows.h> -#include <stdio.h> -#include <ntsecapi.h> -#include <wchar.h> -#include <userenv.h> - -#include "setup.h" #include "winlogon.h" -#include "resource.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.h --- trunk/reactos/subsys/system/winlogon/winlogon.h 2005-06-20 22:15:59 UTC (rev 16192) +++ trunk/reactos/subsys/system/winlogon/winlogon.h 2005-06-20 22:19:18 UTC (rev 16193) @@ -27,8 +27,18 @@ #ifndef __WINLOGON_MAIN_H__ #define __WINLOGON_MAIN_H__ +#include <windows.h> +#include <ntsecapi.h> +#include <userenv.h> #include <winwlx.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <reactos/winlogon.h> + +#include "setup.h" +#include "resource.h" + VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext); VOID WINAPI WlxSasNotify(HANDLE hWlx, DWORD dwSasType); _____ Modified: trunk/reactos/subsys/system/winlogon/wlx.c --- trunk/reactos/subsys/system/winlogon/wlx.c 2005-06-20 22:15:59 UTC (rev 16192) +++ trunk/reactos/subsys/system/winlogon/wlx.c 2005-06-20 22:19:18 UTC (rev 16193) @@ -11,16 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <windows.h> -#include <stdio.h> -#include <winwlx.h> -#include <wchar.h> -#include <reactos/winlogon.h> - -#include "setup.h" #include "winlogon.h" -#include "resource.h" #define NDEBUG #include <debug.h>

19 years, 6 months

[ion] 16192: Build taskmgr with NDK

by ion＠svn.reactos.com

Build taskmgr with NDK Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.h Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Modified: trunk/reactos/subsys/system/taskmgr/procpage.c _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-20 21:50:02 UTC (rev 16191) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-20 22:15:59 UTC (rev 16192) @@ -871,7 +871,7 @@ ULONG CurrentSizeIncludingTransitionInPages; ULONG PeakSizeIncludingTransitionInPages; ULONG Unused[2]; -} SYSTEM_CACHE_INFORMATION; +} SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; /* Class 22 */ typedef struct _SYSTEM_POOLTAG _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-06-20 21:50:02 UTC (rev 16191) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-06-20 22:15:59 UTC (rev 16192) @@ -91,13 +91,13 @@ return; /* Get system cache information */ - status = NtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL); + status = NtQuerySystemInformation(SystemFileCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL); if (status != NO_ERROR) return; /* Get processor time information */ - SysProcessorTimeInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)HeapAlloc(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors); - status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors, &ulSize); + SysProcessorTimeInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)HeapAlloc(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberOfProcessors); + status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberOfProcessors, &ulSize); if (status != NO_ERROR) return; @@ -163,7 +163,7 @@ memcpy(&SystemHandleInfo, SysHandleInfoData, sizeof(SYSTEM_HANDLE_INFORMATION)); HeapFree(GetProcessHeap(), 0, SysHandleInfoData); - for (CurrentKernelTime=0, Idx=0; Idx<SystemBasicInfo.NumberProcessors; Idx++) { + for (CurrentKernelTime=0, Idx=0; Idx<SystemBasicInfo.NumberOfProcessors; Idx++) { CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].KernelTime); CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].DpcTime); CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].InterruptTime); @@ -172,7 +172,7 @@ /* If it's a first call - skip idle time calcs */ if (liOldIdleTime.QuadPart != 0) { /* CurrentValue = NewValue - OldValue */ - dbIdleTime = Li2Double(SysPerfInfo.IdleTime) - Li2Double(liOldIdleTime); + dbIdleTime = Li2Double(SysPerfInfo.IdleProcessTime) - Li2Double(liOldIdleTime); dbKernelTime = CurrentKernelTime - OldKernelTime; dbSystemTime = Li2Double(SysTimeInfo.CurrentTime) - Li2Double(liOldSystemTime); @@ -181,12 +181,12 @@ dbKernelTime = dbKernelTime / dbSystemTime; /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ - dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ - dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ + dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ + dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ } /* Store new CPU's idle and system time */ - liOldIdleTime = SysPerfInfo.IdleTime; + liOldIdleTime = SysPerfInfo.IdleProcessTime; liOldSystemTime = SysTimeInfo.CurrentTime; OldKernelTime = CurrentKernelTime; @@ -237,7 +237,7 @@ double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); double CpuTime = (CurTime - OldTime) / dbSystemTime; - CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; /* + 0.5; */ + CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ pPerfData[Idx].CPUUsage = (ULONG)CpuTime; } pPerfData[Idx].CPUTime.QuadPart = pSPI->UserTime.QuadPart + pSPI->KernelTime.QuadPart; @@ -253,7 +253,7 @@ else pPerfData[Idx].PageFaultCountDelta = 0; pPerfData[Idx].VirtualMemorySizeBytes = pSPI->VirtualSize; - pPerfData[Idx].PagedPoolUsagePages = pSPI->QuotaPagedPoolUsage; + pPerfData[Idx].PagedPoolUsagePages = pSPI->QuotaPeakPagedPoolUsage; pPerfData[Idx].NonPagedPoolUsagePages = pSPI->QuotaPeakNonPagedPoolUsage; pPerfData[Idx].BasePriority = pSPI->BasePriority; pPerfData[Idx].HandleCount = pSPI->HandleCount; @@ -416,9 +416,9 @@ return CpuUsage; } -TIME PerfDataGetCPUTime(ULONG Index) +LARGE_INTEGER PerfDataGetCPUTime(ULONG Index) { - TIME CpuTime = {{0,0}}; + LARGE_INTEGER CpuTime = {{0,0}}; EnterCriticalSection(&PerfDataCriticalSection); @@ -528,34 +528,34 @@ ULONG PerfDataGetPagedPoolUsagePages(ULONG Index) { - ULONG PagedPoolUsagePages; + ULONG PagedPoolUsage; EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - PagedPoolUsagePages = pPerfData[Index].PagedPoolUsagePages; + PagedPoolUsage = pPerfData[Index].PagedPoolUsagePages; else - PagedPoolUsagePages = 0; + PagedPoolUsage = 0; LeaveCriticalSection(&PerfDataCriticalSection); - return PagedPoolUsagePages; + return PagedPoolUsage; } ULONG PerfDataGetNonPagedPoolUsagePages(ULONG Index) { - ULONG NonPagedPoolUsagePages; + ULONG NonPagedPoolUsage; EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - NonPagedPoolUsagePages = pPerfData[Index].NonPagedPoolUsagePages; + NonPagedPoolUsage = pPerfData[Index].NonPagedPoolUsagePages; else - NonPagedPoolUsagePages = 0; + NonPagedPoolUsage = 0; LeaveCriticalSection(&PerfDataCriticalSection); - return NonPagedPoolUsagePages; + return NonPagedPoolUsage; } ULONG PerfDataGetBasePriority(ULONG Index) @@ -664,8 +664,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemPerfInfo.TotalCommittedPages; - PageSize = SystemBasicInfo.PhysicalPageSize; + Total = SystemPerfInfo.CommittedPages; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -681,8 +681,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Limit = SystemPerfInfo.TotalCommitLimit; - PageSize = SystemBasicInfo.PhysicalPageSize; + Limit = SystemPerfInfo.CommitLimit; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -699,7 +699,7 @@ EnterCriticalSection(&PerfDataCriticalSection); Peak = SystemPerfInfo.PeakCommitment; - PageSize = SystemBasicInfo.PhysicalPageSize; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -717,9 +717,9 @@ EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PagedPoolUsage; - NonPaged = SystemPerfInfo.NonPagedPoolUsage; - PageSize = SystemBasicInfo.PhysicalPageSize; + Paged = SystemPerfInfo.PagedPoolPages; + NonPaged = SystemPerfInfo.NonPagedPoolPages; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -738,8 +738,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PagedPoolUsage; - PageSize = SystemBasicInfo.PhysicalPageSize; + Paged = SystemPerfInfo.PagedPoolPages; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -755,8 +755,8 @@ EnterCriticalSection(&PerfDataCriticalSection); - NonPaged = SystemPerfInfo.NonPagedPoolUsage; - PageSize = SystemBasicInfo.PhysicalPageSize; + NonPaged = SystemPerfInfo.NonPagedPoolPages; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -773,7 +773,7 @@ EnterCriticalSection(&PerfDataCriticalSection); Total = SystemBasicInfo.NumberOfPhysicalPages; - PageSize = SystemBasicInfo.PhysicalPageSize; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -790,7 +790,7 @@ EnterCriticalSection(&PerfDataCriticalSection); Available = SystemPerfInfo.AvailablePages; - PageSize = SystemBasicInfo.PhysicalPageSize; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); @@ -807,7 +807,7 @@ EnterCriticalSection(&PerfDataCriticalSection); SystemCache = SystemCacheInfo.CurrentSize; - PageSize = SystemBasicInfo.PhysicalPageSize; + PageSize = SystemBasicInfo.PageSize; LeaveCriticalSection(&PerfDataCriticalSection); _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.h --- trunk/reactos/subsys/system/taskmgr/perfdata.h 2005-06-20 21:50:02 UTC (rev 16191) +++ trunk/reactos/subsys/system/taskmgr/perfdata.h 2005-06-20 22:15:59 UTC (rev 16192) @@ -36,7 +36,7 @@ WCHAR UserName[MAX_PATH]; ULONG SessionId; ULONG CPUUsage; - TIME CPUTime; + LARGE_INTEGER CPUTime; ULONG WorkingSetSizeBytes; ULONG PeakWorkingSetSizeBytes; ULONG WorkingSetSizeDelta; @@ -52,8 +52,8 @@ ULONG GDIObjectCount; IO_COUNTERS IOCounters; - TIME UserTime; - TIME KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; } PERFDATA, *PPERFDATA; BOOL PerfDataInitialize(void); @@ -69,7 +69,7 @@ BOOL PerfDataGetUserName(ULONG Index, LPTSTR lpUserName, int nMaxCount); ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); -TIME PerfDataGetCPUTime(ULONG Index); +LARGE_INTEGER PerfDataGetCPUTime(ULONG Index); ULONG PerfDataGetWorkingSetSizeBytes(ULONG Index); ULONG PerfDataGetPeakWorkingSetSizeBytes(ULONG Index); ULONG PerfDataGetWorkingSetSizeDelta(ULONG Index); _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2005-06-20 21:50:02 UTC (rev 16191) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2005-06-20 22:15:59 UTC (rev 16192) @@ -1,6 +1,6 @@ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <windows.h> +#include <ndk/ntndk.h> #include <commctrl.h> #include <shellapi.h> #include <stdlib.h> _____ Modified: trunk/reactos/subsys/system/taskmgr/procpage.c --- trunk/reactos/subsys/system/taskmgr/procpage.c 2005-06-20 21:50:02 UTC (rev 16191) +++ trunk/reactos/subsys/system/taskmgr/procpage.c 2005-06-20 22:15:59 UTC (rev 16192) @@ -158,7 +158,7 @@ ULONG Index; ULONG ColumnIndex; IO_COUNTERS iocounters; - TIME time; + LARGE_INTEGER time; idctrl = (int) wParam; pnmh = (LPNMHDR) lParam;

19 years, 6 months

[ion] 16191: Build autochk with NDK

by ion＠svn.reactos.com

Build autochk with NDK Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/subsys/system/autochk/autochk.c _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-20 21:49:00 UTC (rev 16190) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-20 21:50:02 UTC (rev 16191) @@ -24,6 +24,15 @@ #define EVENT_PAIR_ALL_ACCESS (0x1F0000L) +/* For ProcessDeviceMap */ +#define DOSDEVICE_DRIVE_UNKNOWN 0 +#define DOSDEVICE_DRIVE_CALCULATE 1 +#define DOSDEVICE_DRIVE_REMOVABLE 2 +#define DOSDEVICE_DRIVE_FIXED 3 +#define DOSDEVICE_DRIVE_REMOTE 4 +#define DOSDEVICE_DRIVE_CDROM 5 +#define DOSDEVICE_DRIVE_RAMDISK 6 + /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/subsys/system/autochk/autochk.c --- trunk/reactos/subsys/system/autochk/autochk.c 2005-06-20 21:49:00 UTC (rev 16190) +++ trunk/reactos/subsys/system/autochk/autochk.c 2005-06-20 21:50:02 UTC (rev 16191) @@ -27,8 +27,9 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> -#include <napi/shared_data.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> /* FUNCTIONS ****************************************************************/

19 years, 6 months

[navaraf] 16190: Fix build.

by navaraf＠svn.reactos.com

Fix build. Deleted: trunk/reactos/lib/iphlpapi/debug.h Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Deleted: trunk/reactos/lib/iphlpapi/debug.h --- trunk/reactos/lib/iphlpapi/debug.h 2005-06-20 21:45:19 UTC (rev 16189) +++ trunk/reactos/lib/iphlpapi/debug.h 2005-06-20 21:49:00 UTC (rev 16190) @@ -1,59 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 Helper DLL for TCP/IP - * FILE: include/debug.h - * PURPOSE: Debugging support macros - * DEFINES: DBG - Enable debug output - * NASSERT - Disable assertions - */ -#ifndef __DEBUG_H -#define __DEBUG_H - -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 - -#define DEBUG_ULTRA 0xFFFFFFFF - -#ifdef DBG - -extern DWORD DebugTraceLevel; - -#define WSH_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_; \ - } - -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { WSH_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); ExitProcess(0); } -#endif /* NASSERT */ - -#endif - -#else /* DBG */ - -#define WSH_DbgPrint(_t_, _x_) - -/*#define ASSERT(x)*/ - -#endif /* DBG */ - -#define CHECKPOINT \ - WSH_DbgPrint(MIN_TRACE, ("\n")); - -#define CP CHECKPOINT - -#endif /* __DEBUG_H */ - -/* EOF */ _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-06-20 21:45:19 UTC (rev 16189) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-06-20 21:49:00 UTC (rev 16190) @@ -38,9 +38,10 @@ */ #include "iphlpapi_private.h" #include "ifenum.h" +#include <assert.h> #define NDEBUG -#include <debug.h> +#include "debug.h" /* Globals */ const PWCHAR TcpFileName = L"\\Device\\Tcp"; @@ -155,7 +156,7 @@ * stabilizes. */ do { - ASSERT( !entitySet ); /* We must not have an entity set allocated */ + assert( !entitySet ); /* We must not have an entity set allocated */ status = DeviceIoControl( tcpFile, IOCTL_TCP_QUERY_INFORMATION_EX, &req,

19 years, 6 months

[ion] 16189: Build dhcp with ndk

by ion＠svn.reactos.com

Build dhcp with ndk Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-06-20 21:43:14 UTC (rev 16188) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-06-20 21:45:19 UTC (rev 16189) @@ -3,6 +3,8 @@ #include <roscfg.h> #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <winnt.h> #include <iprtrmib.h> #include <iphlpapi.h> @@ -27,8 +29,6 @@ #define RRF_RT_REG_SZ 2 typedef void *VOIDPTR; -#define NTOS_MODE_USER -#include <ntos.h> typedef u_int32_t uintTIME; #define TIME uintTIME #include "dhcpd.h"

19 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005