Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15138: Fix some CRT includes to make it build

by ion＠svn.reactos.com

Fix some CRT includes to make it build Modified: branches/new_headers/reactos/lib/crt/except/exhand2.c Modified: branches/new_headers/reactos/lib/crt/except/matherr.c Modified: branches/new_headers/reactos/lib/crt/except/unwind.c Modified: branches/new_headers/reactos/lib/crt/include/internal/debug.h Modified: branches/new_headers/reactos/lib/crt/include/internal/tls.h Modified: branches/new_headers/reactos/lib/crt/stdio/vfwprint.c Modified: branches/new_headers/reactos/lib/crt/stdlib/rand.c Modified: branches/new_headers/reactos/lib/crt/wine/heap.c Modified: branches/new_headers/reactos/lib/crt/wine/scanf.c Modified: branches/new_headers/reactos/lib/crt/wine/thread.c Modified: branches/new_headers/reactos/lib/tgetopt/getopt.c _____ Modified: branches/new_headers/reactos/lib/crt/except/exhand2.c --- branches/new_headers/reactos/lib/crt/except/exhand2.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/except/exhand2.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -1,5 +1,6 @@ #include "precomp.h" -#include <excpt.h> +#include <ndk/umtypes.h> +#include <ndk/rtltypes.h> #ifdef __GNUC__ #else _____ Modified: branches/new_headers/reactos/lib/crt/except/matherr.c --- branches/new_headers/reactos/lib/crt/except/matherr.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/except/matherr.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -1,6 +1,5 @@ #include "precomp.h" #include <math.h> -#include <ntos/except.h> int _matherr(struct _exception* e) _____ Modified: branches/new_headers/reactos/lib/crt/except/unwind.c --- branches/new_headers/reactos/lib/crt/except/unwind.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/except/unwind.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -1,6 +1,7 @@ #include "precomp.h" -#include <excpt.h> -#include <wine/winternl.h> +#include <ndk/umtypes.h> +#include <ndk/rtltypes.h> +#include <ndk/rtlfuncs.h> /* * @implemented _____ Modified: branches/new_headers/reactos/lib/crt/include/internal/debug.h --- branches/new_headers/reactos/lib/crt/include/internal/debug.h 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/include/internal/debug.h 2005-05-08 17:35:17 UTC (rev 15138) @@ -75,12 +75,6 @@ #endif -/* ULONG CDECL DbgPrint(PCH Format, ...); */ -ULONG DbgPrint(PCH Format,...); -/* unsigned long DbgPrint(const char* Format, ...); */ - - - /* #define TRACE 0 ? (void)0 : Trace */ /* void Trace(TCHAR* lpszFormat, ...); */ _____ Modified: branches/new_headers/reactos/lib/crt/include/internal/tls.h --- branches/new_headers/reactos/lib/crt/include/internal/tls.h 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/include/internal/tls.h 2005-05-08 17:35:17 UTC (rev 15138) @@ -9,14 +9,13 @@ #include <winbase.h> #include <winnt.h> -#include <msvcrt/crttypes.h> #include <stddef.h> typedef struct _ThreadData { int terrno; /* *nix error code */ unsigned long tdoserrno; /* Win32 error code (for I/O only) */ - unsigned LONGLONG tnext; /* used by rand/srand */ + unsigned long long tnext; /* used by rand/srand */ char *lasttoken; /* used by strtok */ wchar_t *wlasttoken; /* used by wcstok */ _____ Modified: branches/new_headers/reactos/lib/crt/stdio/vfwprint.c --- branches/new_headers/reactos/lib/crt/stdio/vfwprint.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/stdio/vfwprint.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -7,8 +7,9 @@ #include <malloc.h> #include <internal/file.h> -#include <ntdef.h> +#include <ndk/umtypes.h> + int _isnanl(double x); int _isinfl(double x); int _isnan(double x); _____ Modified: branches/new_headers/reactos/lib/crt/stdlib/rand.c --- branches/new_headers/reactos/lib/crt/stdlib/rand.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/stdlib/rand.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -11,11 +11,7 @@ { PTHREADDATA ThreadData = GetThreadData(); -#ifdef HAVE_LONGLONG ThreadData->tnext = ThreadData->tnext * 0x5deece66dLL + 11; -#else - ThreadData->tnext = ThreadData->tnext * 0x5deece66dL + 11; -#endif return (int)((ThreadData->tnext >> 16) & RAND_MAX); } _____ Modified: branches/new_headers/reactos/lib/crt/wine/heap.c --- branches/new_headers/reactos/lib/crt/wine/heap.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/wine/heap.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -28,9 +28,11 @@ #include <stdlib.h> #include <internal/mtdll.h> -#include "wine/debug.h" +#define NDEBUG +#include <internal/debug.h> +//#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +//WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* MT */ #define LOCK_HEAP _mlock( _HEAP_LOCK ) _____ Modified: branches/new_headers/reactos/lib/crt/wine/scanf.c --- branches/new_headers/reactos/lib/crt/wine/scanf.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/wine/scanf.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -23,44 +23,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -/* #include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "msvcrt.h" -*/ - -//#include <ntdll/ntdll.h> -#include <ntdll/rtl.h> -//#include <ddk/ntddk.h> -//#include <ntos/heap.h> -#include <stdarg.h> #include <wchar.h> #include <stdio.h> #include <conio.h> #include <ctype.h> #include <internal/file.h> -//#include <ntos/heap.h> +#include <ndk/umtypes.h> +#include <ndk/rtlfuncs.h> #define NDEBUG #include <internal/debug.h> - -/* -This is so ugly. I tried including anything/everything, but no matter -what i did i got complaints about RtlGetProcessHeap etc. being undefined. --Gunnar (i hate headers) -*/ -#define RtlFreeHeap HeapFree -#define RtlAllocateHeap HeapAlloc -#define RtlGetProcessHeap GetProcessHeap -//#include "wine/debug.h" - #define WARN DPRINT1 //WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); _____ Modified: branches/new_headers/reactos/lib/crt/wine/thread.c --- branches/new_headers/reactos/lib/crt/wine/thread.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/crt/wine/thread.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -24,9 +24,11 @@ #include <malloc.h> #include <process.h> -#include "wine/debug.h" +#define NDEBUG +#include <internal/debug.h> +//#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +//WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); void _amsg_exit (int errnum); /* Index to TLS */ _____ Modified: branches/new_headers/reactos/lib/tgetopt/getopt.c --- branches/new_headers/reactos/lib/tgetopt/getopt.c 2005-05-08 17:34:37 UTC (rev 15137) +++ branches/new_headers/reactos/lib/tgetopt/getopt.c 2005-05-08 17:35:17 UTC (rev 15138) @@ -11,8 +11,6 @@ #include <string.h> #include <stdio.h> -#include "tgetopt.h" - int _topterr = 1; int _toptind = 1; int _toptopt;

19 years, 4 months

[ion] 15137: Add some missing headers, fix some things so CRT can build

by ion＠svn.reactos.com

Add some missing headers, fix some things so CRT can build Deleted: branches/new_headers/reactos/include/ddk/ntapi.h Added: branches/new_headers/reactos/include/debug.h Modified: branches/new_headers/reactos/include/ndk/pstypes.h Modified: branches/new_headers/reactos/include/ndk/rtlfuncs.h Modified: branches/new_headers/reactos/include/ndk/rtltypes.h Added: branches/new_headers/reactos/include/pseh.h Added: branches/new_headers/reactos/include/reactos/debug.h Added: branches/new_headers/reactos/include/reactos/elf/ Added: branches/new_headers/reactos/include/reactos/elf/common.h Added: branches/new_headers/reactos/include/reactos/elf/elf-i386.h Added: branches/new_headers/reactos/include/reactos/elf/elf32.h Added: branches/new_headers/reactos/include/reactos/elf/elf64.h Added: branches/new_headers/reactos/include/reactos/elf/generic.h Added: branches/new_headers/reactos/include/reactos/elf/machine.h Added: branches/new_headers/reactos/include/reactos/epsapi.h Added: branches/new_headers/reactos/include/reactos/helper.h Added: branches/new_headers/reactos/include/reactos/rosrtl/ Added: branches/new_headers/reactos/include/reactos/rosrtl/CVS/ Added: branches/new_headers/reactos/include/reactos/rosrtl/CVS/Entries Added: branches/new_headers/reactos/include/reactos/rosrtl/CVS/Repository Added: branches/new_headers/reactos/include/reactos/rosrtl/CVS/Root Added: branches/new_headers/reactos/include/reactos/rosrtl/devmode.h Added: branches/new_headers/reactos/include/reactos/rosrtl/gdimacro.h Added: branches/new_headers/reactos/include/reactos/rosrtl/logfont.h Added: branches/new_headers/reactos/include/reactos/rosrtl/minmax.h Added: branches/new_headers/reactos/include/reactos/rosrtl/priv.h Added: branches/new_headers/reactos/include/reactos/rosrtl/recmutex.h Added: branches/new_headers/reactos/include/reactos/rosrtl/registry.h Added: branches/new_headers/reactos/include/reactos/rosrtl/resstr.h Added: branches/new_headers/reactos/include/reactos/rosrtl/sparse.h Added: branches/new_headers/reactos/include/reactos/rosrtl/string.h Added: branches/new_headers/reactos/include/reactos/rosrtl/thread.h Added: branches/new_headers/reactos/include/tchar.h _____ Deleted: branches/new_headers/reactos/include/ddk/ntapi.h --- branches/new_headers/reactos/include/ddk/ntapi.h 2005-05-08 17:33:17 UTC (rev 15136) +++ branches/new_headers/reactos/include/ddk/ntapi.h 2005-05-08 17:34:37 UTC (rev 15137) @@ -1,2943 +0,0 @@ -/* - * ntapi.h - * - * Windows NT Native API - * - * Most structures in this file is obtained from Windows NT/2000 Native API - * Reference by Gary Nebbett, ISBN 1578701996. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __NTAPI_H -#define __NTAPI_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#include <stdarg.h> -#include <winbase.h> -#include "ntddk.h" -#include "ntpoapi.h" - -#pragma pack(push,4) - -typedef struct _PEB *PPEB; - -/* FIXME: Unknown definitions */ -typedef PVOID POBJECT_TYPE_LIST; -typedef PVOID PEXECUTION_STATE; -typedef PVOID PLANGID; - -#ifndef NtCurrentProcess -#define NtCurrentProcess() ( (HANDLE) 0xFFFFFFFF ) -#endif /* NtCurrentProcess */ -#ifndef NtCurrentThread -#define NtCurrentThread() ( (HANDLE) 0xFFFFFFFE ) -#endif /* NtCurrentThread */ - -/* System information and control */ - -typedef enum _SYSTEM_INFORMATION_CLASS { - SystemInformationClassMin = 0, - SystemBasicInformation = 0, - SystemProcessorInformation = 1, - SystemPerformanceInformation = 2, - SystemTimeOfDayInformation = 3, - SystemPathInformation = 4, - SystemNotImplemented1 = 4, - SystemProcessInformation = 5, - SystemProcessesAndThreadsInformation = 5, - SystemCallCountInfoInformation = 6, - SystemCallCounts = 6, - SystemDeviceInformation = 7, - SystemConfigurationInformation = 7, - SystemProcessorPerformanceInformation = 8, - SystemProcessorTimes = 8, - SystemFlagsInformation = 9, - SystemGlobalFlag = 9, - SystemCallTimeInformation = 10, - SystemNotImplemented2 = 10, - SystemModuleInformation = 11, - SystemLocksInformation = 12, - SystemLockInformation = 12, - SystemStackTraceInformation = 13, - SystemNotImplemented3 = 13, - SystemPagedPoolInformation = 14, - SystemNotImplemented4 = 14, - SystemNonPagedPoolInformation = 15, - SystemNotImplemented5 = 15, - SystemHandleInformation = 16, - SystemObjectInformation = 17, - SystemPageFileInformation = 18, - SystemPagefileInformation = 18, - SystemVdmInstemulInformation = 19, - SystemInstructionEmulationCounts = 19, - SystemVdmBopInformation = 20, - SystemInvalidInfoClass1 = 20, - SystemFileCacheInformation = 21, - SystemCacheInformation = 21, - SystemPoolTagInformation = 22, - SystemInterruptInformation = 23, - SystemProcessorStatistics = 23, - SystemDpcBehaviourInformation = 24, - SystemDpcInformation = 24, - SystemFullMemoryInformation = 25, - SystemNotImplemented6 = 25, - SystemLoadImage = 26, - SystemUnloadImage = 27, - SystemTimeAdjustmentInformation = 28, - SystemTimeAdjustment = 28, - SystemSummaryMemoryInformation = 29, - SystemNotImplemented7 = 29, - SystemNextEventIdInformation = 30, - SystemNotImplemented8 = 30, - SystemEventIdsInformation = 31, - SystemNotImplemented9 = 31, - SystemCrashDumpInformation = 32, - SystemExceptionInformation = 33, - SystemCrashDumpStateInformation = 34, - SystemKernelDebuggerInformation = 35, - SystemContextSwitchInformation = 36, - SystemRegistryQuotaInformation = 37, - SystemLoadAndCallImage = 38, - SystemPrioritySeparation = 39, - SystemPlugPlayBusInformation = 40, - SystemNotImplemented10 = 40, - SystemDockInformation = 41, - SystemNotImplemented11 = 41, - /* SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL 1 */ - SystemInvalidInfoClass2 = 42, - SystemProcessorSpeedInformation = 43, - SystemInvalidInfoClass3 = 43, - SystemCurrentTimeZoneInformation = 44, - SystemTimeZoneInformation = 44, - SystemLookasideInformation = 45, - SystemSetTimeSlipEvent = 46, - SystemCreateSession = 47, - SystemDeleteSession = 48, - SystemInvalidInfoClass4 = 49, - SystemRangeStartInformation = 50, - SystemVerifierInformation = 51, - SystemAddVerifier = 52, - SystemSessionProcessesInformation = 53, - SystemInformationClassMax -} SYSTEM_INFORMATION_CLASS; - -typedef struct _SYSTEM_BASIC_INFORMATION { - ULONG Unknown; - ULONG MaximumIncrement; - ULONG PhysicalPageSize; - ULONG NumberOfPhysicalPages; - ULONG LowestPhysicalPage; - ULONG HighestPhysicalPage; - ULONG AllocationGranularity; - ULONG LowestUserAddress; - ULONG HighestUserAddress; - ULONG ActiveProcessors; - UCHAR NumberProcessors; -} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; - -typedef struct _SYSTEM_PROCESSOR_INFORMATION { - USHORT ProcessorArchitecture; - USHORT ProcessorLevel; - USHORT ProcessorRevision; - USHORT Unknown; - ULONG FeatureBits; -} SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION; - -typedef struct _SYSTEM_PERFORMANCE_INFORMATION { - LARGE_INTEGER IdleTime; - LARGE_INTEGER ReadTransferCount; - LARGE_INTEGER WriteTransferCount; - LARGE_INTEGER OtherTransferCount; - ULONG ReadOperationCount; - ULONG WriteOperationCount; - ULONG OtherOperationCount; - ULONG AvailablePages; - ULONG TotalCommittedPages; - ULONG TotalCommitLimit; - ULONG PeakCommitment; - ULONG PageFaults; - ULONG WriteCopyFaults; - ULONG TransitionFaults; - ULONG CacheTransitionFaults; - ULONG DemandZeroFaults; - ULONG PagesRead; - ULONG PageReadIos; - ULONG CacheReads; - ULONG CacheIos; - ULONG PagefilePagesWritten; - ULONG PagefilePageWriteIos; - ULONG MappedFilePagesWritten; - ULONG MappedFilePageWriteIos; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; - ULONG PagedPoolAllocs; - ULONG PagedPoolFrees; - ULONG NonPagedPoolAllocs; - ULONG NonPagedPoolFrees; - ULONG TotalFreeSystemPtes; - ULONG SystemCodePage; - ULONG TotalSystemDriverPages; - ULONG TotalSystemCodePages; - ULONG SmallNonPagedLookasideListAllocateHits; - ULONG SmallPagedLookasideListAllocateHits; - ULONG Reserved3; - ULONG MmSystemCachePage; - ULONG PagedPoolPage; - ULONG SystemDriverPage; - ULONG FastReadNoWait; - ULONG FastReadWait; - ULONG FastReadResourceMiss; - ULONG FastReadNotPossible; - ULONG FastMdlReadNoWait; - ULONG FastMdlReadWait; - ULONG FastMdlReadResourceMiss; - ULONG FastMdlReadNotPossible; - ULONG MapDataNoWait; - ULONG MapDataWait; - ULONG MapDataNoWaitMiss; - ULONG MapDataWaitMiss; - ULONG PinMappedDataCount; - ULONG PinReadNoWait; - ULONG PinReadWait; - ULONG PinReadNoWaitMiss; - ULONG PinReadWaitMiss; - ULONG CopyReadNoWait; - ULONG CopyReadWait; - ULONG CopyReadNoWaitMiss; - ULONG CopyReadWaitMiss; - ULONG MdlReadNoWait; - ULONG MdlReadWait; - ULONG MdlReadNoWaitMiss; - ULONG MdlReadWaitMiss; - ULONG ReadAheadIos; - ULONG LazyWriteIos; - ULONG LazyWritePages; - ULONG DataFlushes; - ULONG DataPages; - ULONG ContextSwitches; - ULONG FirstLevelTbFills; - ULONG SecondLevelTbFills; - ULONG SystemCalls; -} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION; - -typedef struct _SYSTEM_TIME_OF_DAY_INFORMATION { - LARGE_INTEGER BootTime; - LARGE_INTEGER CurrentTime; - LARGE_INTEGER TimeZoneBias; - ULONG CurrentTimeZoneId; -} SYSTEM_TIME_OF_DAY_INFORMATION, *PSYSTEM_TIME_OF_DAY_INFORMATION; - -typedef struct _VM_COUNTERS { - ULONG PeakVirtualSize; - ULONG VirtualSize; - ULONG PageFaultCount; - ULONG PeakWorkingSetSize; - ULONG WorkingSetSize; - ULONG QuotaPeakPagedPoolUsage; - ULONG QuotaPagedPoolUsage; - ULONG QuotaPeakNonPagedPoolUsage; - ULONG QuotaNonPagedPoolUsage; - ULONG PagefileUsage; - ULONG PeakPagefileUsage; -} VM_COUNTERS; - -typedef enum _THREAD_STATE { - Initialized, - Ready, - Running, - Standby, - Terminated, - Wait, - Transition, - DeferredReady -} THREAD_STATE; - -typedef struct _SYSTEM_CALLS_INFORMATION { - ULONG Size; - ULONG NumberOfDescriptorTables; - ULONG NumberOfRoutinesInTable[1]; - ULONG CallCounts[ANYSIZE_ARRAY]; -} SYSTEM_CALLS_INFORMATION, *PSYSTEM_CALLS_INFORMATION; - -typedef struct _SYSTEM_CONFIGURATION_INFORMATION { - ULONG DiskCount; - ULONG FloppyCount; - ULONG CdRomCount; - ULONG TapeCount; - ULONG SerialCount; - ULONG ParallelCount; -} SYSTEM_CONFIGURATION_INFORMATION, *PSYSTEM_CONFIGURATION_INFORMATION; - -typedef struct _SYSTEM_PROCESSOR_TIMES { - LARGE_INTEGER IdleTime; - LARGE_INTEGER KernelTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER DpcTime; - LARGE_INTEGER InterruptTime; - ULONG InterruptCount; -} SYSTEM_PROCESSOR_TIMES, *PSYSTEM_PROCESSOR_TIMES; - -/* SYSTEM_GLOBAL_FLAG.GlobalFlag constants */ -#define FLG_STOP_ON_EXCEPTION 0x00000001 -#define FLG_SHOW_LDR_SNAPS 0x00000002 -#define FLG_DEBUG_INITIAL_COMMAND 0x00000004 -#define FLG_STOP_ON_HUNG_GUI 0x00000008 -#define FLG_HEAP_ENABLE_TAIL_CHECK 0x00000010 -#define FLG_HEAP_ENABLE_FREE_CHECK 0x00000020 -#define FLG_HEAP_VALIDATE_PARAMETERS 0x00000040 -#define FLG_HEAP_VALIDATE_ALL 0x00000080 -#define FLG_POOL_ENABLE_TAIL_CHECK 0x00000100 -#define FLG_POOL_ENABLE_FREE_CHECK 0x00000200 -#define FLG_POOL_ENABLE_TAGGING 0x00000400 -#define FLG_HEAP_ENABLE_TAGGING 0x00000800 -#define FLG_USER_STACK_TRACE_DB 0x00001000 -#define FLG_KERNEL_STACK_TRACE_DB 0x00002000 -#define FLG_MAINTAIN_OBJECT_TYPELIST 0x00004000 -#define FLG_HEAP_ENABLE_TAG_BY_DLL 0x00008000 -#define FLG_IGNORE_DEBUG_PRIV 0x00010000 -#define FLG_ENABLE_CSRDEBUG 0x00020000 -#define FLG_ENABLE_KDEBUG_SYMBOL_LOAD 0x00040000 -#define FLG_DISABLE_PAGE_KERNEL_STACKS 0x00080000 -#define FLG_HEAP_ENABLE_CALL_TRACING 0x00100000 -#define FLG_HEAP_DISABLE_COALESCING 0x00200000 -#define FLG_ENABLE_CLOSE_EXCEPTIONS 0x00400000 -#define FLG_ENABLE_EXCEPTION_LOGGING 0x00800000 -#define FLG_ENABLE_DBGPRINT_BUFFERING 0x08000000 - -typedef struct _SYSTEM_GLOBAL_FLAG { - ULONG GlobalFlag; -} SYSTEM_GLOBAL_FLAG, *PSYSTEM_GLOBAL_FLAG; - -typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY { - ULONG Unknown1; - ULONG Unknown2; - PVOID Base; - ULONG Size; - ULONG Flags; - USHORT Index; - /* Length of module name not including the path, this - field contains valid value only for NTOSKRNL module */ - USHORT NameLength; - USHORT LoadCount; - USHORT PathLength; - CHAR ImageName[256]; -} SYSTEM_MODULE_INFORMATION_ENTRY, *PSYSTEM_MODULE_INFORMATION_ENTRY; - -typedef struct _SYSTEM_MODULE_INFORMATION { - ULONG Count; - SYSTEM_MODULE_INFORMATION_ENTRY Module[1]; -} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; - -typedef struct _SYSTEM_LOCK_INFORMATION { - PVOID Address; - USHORT Type; - USHORT Reserved1; - ULONG ExclusiveOwnerThreadId; - ULONG ActiveCount; - ULONG ContentionCount; - ULONG Reserved2[2]; - ULONG NumberOfSharedWaiters; - ULONG NumberOfExclusiveWaiters; -} SYSTEM_LOCK_INFORMATION, *PSYSTEM_LOCK_INFORMATION; - -/*SYSTEM_HANDLE_INFORMATION.Flags cosntants */ -#define PROTECT_FROM_CLOSE 0x01 -#define INHERIT 0x02 - -typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO { - USHORT UniqueProcessId; - USHORT CreatorBackTraceIndex; - UCHAR ObjectTypeIndex; - UCHAR HandleAttributes; - USHORT HandleValue; - PVOID Object; - ULONG GrantedAccess; -} SYSTEM_HANDLE_TABLE_ENTRY_INFO, *PSYSTEM_HANDLE_TABLE_ENTRY_INFO; - -typedef struct _SYSTEM_HANDLE_INFORMATION { - ULONG NumberOfHandles; - SYSTEM_HANDLE_TABLE_ENTRY_INFO Handles[1]; - -} SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION; - -typedef struct _SYSTEM_OBJECT_TYPE_INFORMATION { - ULONG NextEntryOffset; - ULONG ObjectCount; - ULONG HandleCount; - ULONG TypeNumber; - ULONG InvalidAttributes; - GENERIC_MAPPING GenericMapping; - ACCESS_MASK ValidAccessMask; - POOL_TYPE PoolType; - UCHAR Unknown; - UNICODE_STRING Name; -} SYSTEM_OBJECT_TYPE_INFORMATION, *PSYSTEM_OBJECT_TYPE_INFORMATION; - -/* SYSTEM_OBJECT_INFORMATION.Flags constants */ -#define FLG_SYSOBJINFO_SINGLE_HANDLE_ENTRY 0x40 -#define FLG_SYSOBJINFO_DEFAULT_SECURITY_QUOTA 0x20 -#define FLG_SYSOBJINFO_PERMANENT 0x10 -#define FLG_SYSOBJINFO_EXCLUSIVE 0x08 -#define FLG_SYSOBJINFO_CREATOR_INFO 0x04 -#define FLG_SYSOBJINFO_KERNEL_MODE 0x02 - -typedef struct _SYSTEM_OBJECT_INFORMATION { - ULONG NextEntryOffset; - PVOID Object; - ULONG CreatorProcessId; - USHORT Unknown; - USHORT Flags; - ULONG PointerCount; - ULONG HandleCount; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; - ULONG ExclusiveProcessId; - PSECURITY_DESCRIPTOR SecurityDescriptor; - UNICODE_STRING Name; -} SYSTEM_OBJECT_INFORMATION, *PSYSTEM_OBJECT_INFORMATION; - -typedef struct _SYSTEM_PAGEFILE_INFORMATION { - ULONG NextEntryOffset; - ULONG TotalSize; - ULONG TotalInUse; - ULONG PeakUsage; - UNICODE_STRING PageFileName; -} SYSTEM_PAGEFILE_INFORMATION, *PSYSTEM_PAGEFILE_INFORMATION; - -typedef struct _SYSTEM_INSTRUCTION_EMULATION_INFORMATION { - ULONG SegmentNotPresent; - ULONG TwoByteOpcode; - ULONG ESprefix; - ULONG CSprefix; - ULONG SSprefix; - ULONG DSprefix; - ULONG FSPrefix; - ULONG GSprefix; - ULONG OPER32prefix; - ULONG ADDR32prefix; - ULONG INSB; - ULONG INSW; - ULONG OUTSB; - ULONG OUTSW; - ULONG PUSHFD; - ULONG POPFD; - ULONG INTnn; - ULONG INTO; - ULONG IRETD; - ULONG INBimm; - ULONG INWimm; - ULONG OUTBimm; - ULONG OUTWimm; - ULONG INB; - ULONG INW; - ULONG OUTB; - ULONG OUTW; - ULONG LOCKprefix; - ULONG REPNEprefix; - ULONG REPprefix; - ULONG HLT; - ULONG CLI; - ULONG STI; - ULONG GenericInvalidOpcode; -} SYSTEM_INSTRUCTION_EMULATION_INFORMATION, *PSYSTEM_INSTRUCTION_EMULATION_INFORMATION; - -typedef struct _SYSTEM_POOL_TAG_INFORMATION { - CHAR Tag[4]; - ULONG PagedPoolAllocs; - ULONG PagedPoolFrees; - ULONG PagedPoolUsage; - ULONG NonPagedPoolAllocs; - ULONG NonPagedPoolFrees; - ULONG NonPagedPoolUsage; -} SYSTEM_POOL_TAG_INFORMATION, *PSYSTEM_POOL_TAG_INFORMATION; - -typedef struct _SYSTEM_PROCESSOR_STATISTICS { - ULONG ContextSwitches; - ULONG DpcCount; - ULONG DpcRequestRate; - ULONG TimeIncrement; - ULONG DpcBypassCount; - ULONG ApcBypassCount; -} SYSTEM_PROCESSOR_STATISTICS, *PSYSTEM_PROCESSOR_STATISTICS; - -typedef struct _SYSTEM_DPC_INFORMATION { - ULONG Reserved; - ULONG MaximumDpcQueueDepth; - ULONG MinimumDpcRate; - ULONG AdjustDpcThreshold; - ULONG IdealDpcRate; -} SYSTEM_DPC_INFORMATION, *PSYSTEM_DPC_INFORMATION; - -typedef struct _SYSTEM_LOAD_IMAGE { - UNICODE_STRING ModuleName; - PVOID ModuleBase; - PVOID SectionPointer; - PVOID EntryPoint; - PVOID ExportDirectory; -} SYSTEM_LOAD_IMAGE, *PSYSTEM_LOAD_IMAGE; - -typedef struct _SYSTEM_UNLOAD_IMAGE { - PVOID ModuleBase; -} SYSTEM_UNLOAD_IMAGE, *PSYSTEM_UNLOAD_IMAGE; - -typedef struct _SYSTEM_QUERY_TIME_ADJUSTMENT { - ULONG TimeAdjustment; - ULONG MaximumIncrement; - BOOLEAN TimeSynchronization; -} SYSTEM_QUERY_TIME_ADJUSTMENT, *PSYSTEM_QUERY_TIME_ADJUSTMENT; - -typedef struct _SYSTEM_SET_TIME_ADJUSTMENT { - ULONG TimeAdjustment; - BOOLEAN TimeSynchronization; -} SYSTEM_SET_TIME_ADJUSTMENT, *PSYSTEM_SET_TIME_ADJUSTMENT; - -typedef struct _SYSTEM_CRASH_DUMP_INFORMATION { - HANDLE CrashDumpSectionHandle; - HANDLE Unknown; -} SYSTEM_CRASH_DUMP_INFORMATION, *PSYSTEM_CRASH_DUMP_INFORMATION; - -typedef struct _SYSTEM_EXCEPTION_INFORMATION { - ULONG AlignmentFixupCount; - ULONG ExceptionDispatchCount; - ULONG FloatingEmulationCount; - ULONG Reserved; -} SYSTEM_EXCEPTION_INFORMATION, *PSYSTEM_EXCEPTION_INFORMATION; - -typedef struct _SYSTEM_CRASH_DUMP_STATE_INFORMATION { - ULONG CrashDumpSectionExists; - ULONG Unknown; -} SYSTEM_CRASH_DUMP_STATE_INFORMATION, *PSYSTEM_CRASH_DUMP_STATE_INFORMATION; - -typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { - BOOLEAN DebuggerEnabled; - BOOLEAN DebuggerNotPresent; -} SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; - -typedef struct _SYSTEM_CONTEXT_SWITCH_INFORMATION { - ULONG ContextSwitches; - ULONG ContextSwitchCounters[11]; -} SYSTEM_CONTEXT_SWITCH_INFORMATION, *PSYSTEM_CONTEXT_SWITCH_INFORMATION; - -typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION { - ULONG RegistryQuotaAllowed; - ULONG RegistryQuotaUsed; - PVOID Reserved1; -} SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION; - -typedef struct _SYSTEM_LOAD_AND_CALL_IMAGE { - UNICODE_STRING ModuleName; -} SYSTEM_LOAD_AND_CALL_IMAGE, *PSYSTEM_LOAD_AND_CALL_IMAGE; - -typedef struct _SYSTEM_PRIORITY_SEPARATION { - ULONG PrioritySeparation; -} SYSTEM_PRIORITY_SEPARATION, *PSYSTEM_PRIORITY_SEPARATION; - -typedef struct _SYSTEM_TIME_ZONE_INFORMATION { - LONG Bias; - WCHAR StandardName[32]; - LARGE_INTEGER StandardDate; - LONG StandardBias; - WCHAR DaylightName[32]; - LARGE_INTEGER DaylightDate; - LONG DaylightBias; -} SYSTEM_TIME_ZONE_INFORMATION, *PSYSTEM_TIME_ZONE_INFORMATION; - -typedef struct _SYSTEM_LOOKASIDE_INFORMATION { - USHORT Depth; - USHORT MaximumDepth; - ULONG TotalAllocates; - ULONG AllocateMisses; - ULONG TotalFrees; - ULONG FreeMisses; - POOL_TYPE Type; - ULONG Tag; - ULONG Size; -} SYSTEM_LOOKASIDE_INFORMATION, *PSYSTEM_LOOKASIDE_INFORMATION; - -typedef struct _SYSTEM_SET_TIME_SLIP_EVENT { - HANDLE TimeSlipEvent; -} SYSTEM_SET_TIME_SLIP_EVENT, *PSYSTEM_SET_TIME_SLIP_EVENT; - -typedef struct _SYSTEM_CREATE_SESSION { - ULONG SessionId; -} SYSTEM_CREATE_SESSION, *PSYSTEM_CREATE_SESSION; - -typedef struct _SYSTEM_DELETE_SESSION { - ULONG SessionId; -} SYSTEM_DELETE_SESSION, *PSYSTEM_DELETE_SESSION; - -typedef struct _SYSTEM_RANGE_START_INFORMATION { - PVOID SystemRangeStart; -} SYSTEM_RANGE_START_INFORMATION, *PSYSTEM_RANGE_START_INFORMATION; - -typedef struct _SYSTEM_SESSION_PROCESSES_INFORMATION { - ULONG SessionId; - ULONG BufferSize; - PVOID Buffer; -} SYSTEM_SESSION_PROCESSES_INFORMATION, *PSYSTEM_SESSION_PROCESSES_INFORMATION; - -typedef struct _SYSTEM_POOL_BLOCK { - BOOLEAN Allocated; - USHORT Unknown; - ULONG Size; - CHAR Tag[4]; -} SYSTEM_POOL_BLOCK, *PSYSTEM_POOL_BLOCK; - -typedef struct _SYSTEM_POOL_BLOCKS_INFORMATION { - ULONG PoolSize; - PVOID PoolBase; - USHORT Unknown; - ULONG NumberOfBlocks; - SYSTEM_POOL_BLOCK PoolBlocks[1]; -} SYSTEM_POOL_BLOCKS_INFORMATION, *PSYSTEM_POOL_BLOCKS_INFORMATION; - -typedef struct _SYSTEM_MEMORY_USAGE { - PVOID Name; - USHORT Valid; - USHORT Standby; - USHORT Modified; - USHORT PageTables; -} SYSTEM_MEMORY_USAGE, *PSYSTEM_MEMORY_USAGE; - -typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION { - ULONG Reserved; - PVOID EndOfData; - SYSTEM_MEMORY_USAGE MemoryUsage[1]; -} SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION; - -// SystemProcessThreadInfo (5) -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_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; - -NTOSAPI -NTSTATUS -NTAPI -NtQuerySystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN OUT PVOID SystemInformation, - IN ULONG SystemInformationLength, - OUT PULONG ReturnLength OPTIONAL); - -NTOSAPI -NTSTATUS -NTAPI -ZwQuerySystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN OUT PVOID SystemInformation, - IN ULONG SystemInformationLength, - OUT PULONG ReturnLength OPTIONAL); - -NTOSAPI -NTSTATUS -NTAPI -ZwSetSystemInformation( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN OUT PVOID SystemInformation, - IN ULONG SystemInformationLength); - -NTOSAPI -NTSTATUS -NTAPI -ZwQuerySystemEnvironmentValue( - IN PUNICODE_STRING VariableName, - OUT PWSTR ValueBuffer, - IN ULONG ValueBufferLength, - OUT PULONG ReturnLength OPTIONAL); - -NTOSAPI -NTSTATUS -NTAPI -ZwSetSystemEnvironmentValue( - IN PUNICODE_STRING VariableName, - IN PUNICODE_STRING Value); - -typedef enum _SHUTDOWN_ACTION { - ShutdownNoReboot, - ShutdownReboot, - ShutdownPowerOff -} SHUTDOWN_ACTION; - -NTOSAPI -NTSTATUS -NTAPI -NtShutdownSystem( - IN SHUTDOWN_ACTION Action); - -typedef enum _DEBUG_CONTROL_CODE { - DebugGetTraceInformation = 1, - DebugSetInternalBreakpoint, - DebugSetSpecialCall, - DebugClearSpecialCalls, - DebugQuerySpecialCalls, - DebugDbgBreakPoint, - DebugMaximum -} DEBUG_CONTROL_CODE; - - -NTOSAPI -NTSTATUS -NTAPI -ZwSystemDebugControl( - IN DEBUG_CONTROL_CODE ControlCode, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength, - OUT PULONG ReturnLength OPTIONAL); - - - -/* Objects, Object directories, and symbolic links */ - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllTypesInformation, - ObjectHandleInformation -} OBJECT_INFORMATION_CLASS; - -NTOSAPI -NTSTATUS -NTAPI -ZwQueryObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - OUT PVOID ObjectInformation, - IN ULONG ObjectInformationLength, - OUT PULONG ReturnLength OPTIONAL); - -NTOSAPI -NTSTATUS -NTAPI -ZwSetInformationObject( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - IN PVOID ObjectInformation, - IN ULONG ObjectInformationLength); - -/* OBJECT_BASIC_INFORMATION.Attributes constants */ -/* also in winbase.h */ -#define HANDLE_FLAG_INHERIT 0x01 -#define HANDLE_FLAG_PROTECT_FROM_CLOSE 0x02 -/* end winbase.h */ -#define PERMANENT 0x10 -#define EXCLUSIVE 0x20 - -typedef struct _OBJECT_BASIC_INFORMATION { - ULONG Attributes; - ACCESS_MASK GrantedAccess; - ULONG HandleCount; - ULONG PointerCount; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; - ULONG Reserved[3]; - ULONG NameInformationLength; - ULONG TypeInformationLength; - ULONG SecurityDescriptorLength; - LARGE_INTEGER CreateTime; -} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; -#if 0 -/* FIXME: Enable later */ -typedef struct _OBJECT_TYPE_INFORMATION { - UNICODE_STRING Name; - ULONG ObjectCount; - ULONG HandleCount; - ULONG Reserved1[4]; - ULONG PeakObjectCount; - ULONG PeakHandleCount; - ULONG Reserved2[4]; - ULONG InvalidAttributes; - GENERIC_MAPPING GenericMapping; - ULONG ValidAccess; - UCHAR Unknown; - BOOLEAN MaintainHandleDatabase; - POOL_TYPE PoolType; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; -} OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; - -typedef struct _OBJECT_ALL_TYPES_INFORMATION { - ULONG NumberOfTypes; - OBJECT_TYPE_INFORMATION TypeInformation; -} OBJECT_ALL_TYPES_INFORMATION, *POBJECT_ALL_TYPES_INFORMATION; -#endif -typedef struct _OBJECT_HANDLE_ATTRIBUTE_INFORMATION { - BOOLEAN Inherit; - BOOLEAN ProtectFromClose; -} OBJECT_HANDLE_ATTRIBUTE_INFORMATION, *POBJECT_HANDLE_ATTRIBUTE_INFORMATION; - -NTOSAPI -NTSTATUS -NTAPI -NtDuplicateObject( - IN HANDLE SourceProcessHandle, - IN HANDLE SourceHandle, - IN HANDLE TargetProcessHandle, - OUT PHANDLE TargetHandle OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG Attributes, - IN ULONG Options); - -NTOSAPI -NTSTATUS -NTAPI -ZwDuplicateObject( - IN HANDLE SourceProcessHandle, - IN HANDLE SourceHandle, - IN HANDLE TargetProcessHandle, - OUT PHANDLE TargetHandle OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG Attributes, - IN ULONG Options); - -NTOSAPI -NTSTATUS -NTAPI -NtQuerySecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG SecurityDescriptorLength, - OUT PULONG ReturnLength); - -NTOSAPI -NTSTATUS -NTAPI -ZwQuerySecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG SecurityDescriptorLength, - OUT PULONG ReturnLength); - -NTOSAPI -NTSTATUS -NTAPI -NtSetSecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor); - -NTOSAPI -NTSTATUS -NTAPI -ZwSetSecurityObject( - IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor); - -NTOSAPI -NTSTATUS -NTAPI -ZwOpenDirectoryObject( - OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes); - -NTOSAPI -NTSTATUS -NTAPI -ZwQueryDirectoryObject( - IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL); - -typedef struct _OBJECT_DIRECTORY_INFORMATION { - UNICODE_STRING ObjectName; - UNICODE_STRING ObjectTypeName; -} OBJECT_DIRECTORY_INFORMATION, *POBJECT_DIRECTORY_INFORMATION; - -NTOSAPI -NTSTATUS -NTAPI -ZwCreateSymbolicLinkObject( - OUT PHANDLE SymbolicLinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING TargetName); - - - - -/* Virtual memory */ - -typedef enum _MEMORY_INFORMATION_CLASS { -MemoryBasicInformation, -MemoryWorkingSetList, -MemorySectionName, -MemoryBasicVlmInformation -} MEMORY_INFORMATION_CLASS; - -NTOSAPI -NTSTATUS -NTAPI -NtAllocateVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN OUT PULONG AllocationSize, - IN ULONG AllocationType, - IN ULONG Protect); - -NTOSAPI -NTSTATUS -NTAPI -ZwAllocateVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN OUT PULONG AllocationSize, - IN ULONG AllocationType, - IN ULONG Protect); - -NTOSAPI -NTSTATUS -NTAPI -NtFreeVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PULONG FreeSize, - IN ULONG FreeType); - -NTOSAPI -NTSTATUS -NTAPI -ZwFreeVirtualMemory( - IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PULONG FreeSize, - IN ULONG FreeType); [truncated at 1000 lines; 4315 more skipped]

19 years, 4 months

[greatlrd] 15136: Remove last hardcode string I have check the soure 3more time after I found some more hardcode string

by greatlrd＠svn.reactos.com

Remove last hardcode string I have check the soure 3more time after I found some more hardcode string at last every hardcode string are gone in cmd and place in En.rc new strings in en.rc STRING_COPY_FILE , STRING_DELETE_WIPE, STRING_FOR_ERROR, STRING_SCREEN_COL, STRING_SCREEN_ROW, STRING_TIMER_TIME remove some unlsess value in chcp it is no longer in use thanks we are chaching the codepage hole time. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 17:33:17 UTC (rev 15136) @@ -564,5 +564,11 @@ STRING_CMD_INVALIDDRIVE, "ERROR: invalid drive" STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" -STRING_VERSION_RUNVER " running on %s" +STRING_VERSION_RUNVER, " running on %s" +STRING_COPY_FILE , " %d file(s) copied\n" +STRING_DELETE_WIPE, "wiped" +STRING_FOR_ERROR, "bad variable specification." +STRING_SCREEN_COL, "invalid value for col" +STRING_SCREEN_ROW, "invalid value for row" +STRING_TIMER_TIME "Timer %d is %s: " } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -22,8 +22,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR *arg; - INT args; - UINT uOldCodePage; + INT args; UINT uNewCodePage; /* print help */ @@ -52,10 +51,6 @@ return 1; } - - /* save old code page */ - uOldCodePage = InputCodePage; - uNewCodePage = (UINT)_ttoi(arg[0]); if (uNewCodePage == 0) _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -637,14 +637,14 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; } @@ -669,7 +669,7 @@ TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); if (hFile[1] == INVALID_HANDLE_VALUE) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); return; } @@ -722,14 +722,14 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, out); return; } if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, out); return; } @@ -783,7 +783,7 @@ NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, err); return; } @@ -791,7 +791,7 @@ if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, err); return; } @@ -1248,7 +1248,7 @@ if (IsExistingFile (_T("commandline"))) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, commandline); ParseCommandLine (commandline); } @@ -1309,7 +1309,7 @@ if (IsExistingFile (_T("commandline"))) { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, commandline); ParseCommandLine (commandline); } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-08 17:33:17 UTC (rev 15136) @@ -31,17 +31,6 @@ #include "cmdver.h" -#ifdef _MSC_VER -#define SHELLVER "Version " CMD_VER " [" __DATE__ ", msc]" -#else -#ifdef __LCC__ -#define SHELLVER "Version " CMD_VER " [" __DATE__ ", lcc-win32]" -#else -#define SHELLVER "Version " CMD_VER " [" __DATE__ "]" -#endif -#endif - - #define BREAK_BATCHFILE 1 #define BREAK_OUTOFBATCH 2 #define BREAK_INPUT 3 _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -630,6 +630,7 @@ TCHAR dir_d[_MAX_DIR]; TCHAR file_d[_MAX_FNAME]; TCHAR ext_d[_MAX_EXT]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; int argc; int append; @@ -758,7 +759,9 @@ DeleteFileList (sources); freep ((VOID*)p); - ConOutPrintf (_T(" %d file(s) copied\n"), copied); + + LoadString( CMD_ModuleHandle, STRING_COPY_FILE, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (szMsg, copied); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/del.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -71,7 +71,10 @@ HANDLE fh; WIN32_FIND_DATA f; LONGLONG FileSize; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, (LPTSTR) szMsg,sizeof(szMsg)); + fh = FindFirstFile(lpFileName, &f); FileSize = ((LONGLONG)f.nFileSizeHigh * ((LONGLONG)MAXDWORD+1)) + (LONGLONG)f.nFileSizeLow; @@ -83,10 +86,10 @@ for(i = 0; i < (FileSize - BufferSize); i += BufferSize) { WriteFile (file, buffer, BufferSize, &temp, NULL); - ConOutPrintf (_T("%I64d%% wiped\r"),(i * (LONGLONG)100)/FileSize); + ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize,szMsg); } WriteFile (file, buffer, FileSize - i, &temp, NULL); - ConOutPrintf (_T("100%% wiped\n")); + ConOutPrintf (_T("100%% %s\n"),szMsg); CloseHandle (file); } @@ -246,7 +249,7 @@ ConErrPrintf(szMsg, szFullPath); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); - res = FilePromptYN ((LPTSTR)szMsg); + res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -316,7 +319,7 @@ ConErrPrintf(szMsg, szFullPath); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); - res = FilePromptYN ((LPTSTR)szMsg); + res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -847,7 +847,7 @@ if (szVolName[0] != _T('\0')) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf((LPTSTR)szMsg, szRootName[0], szVolName); + ConOutPrintf(szMsg, szRootName[0], szVolName); } else { @@ -857,7 +857,7 @@ /* print the volume serial number if the return was successful */ LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf((LPTSTR)szMsg, + ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); @@ -1102,7 +1102,7 @@ GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf((LPTSTR)szMsg,ulDirs, szBuffer); + ConOutPrintf(szMsg,ulDirs, szBuffer); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/for.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -49,11 +49,11 @@ */ INT cmd_for (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPBATCH_CONTEXT lpNew; LPTSTR pp; TCHAR var; + TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); @@ -68,7 +68,8 @@ /* Check that first element is % then an alpha char followed by space */ if ((*param != _T('%')) || !_istalpha (*(param + 1)) || !_istspace (*(param + 2))) { - error_syntax (_T("bad variable specification.")); + LoadString( CMD_ModuleHandle, STRING_FOR_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + error_syntax (szMsg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/ren.c --- trunk/reactos/subsys/system/cmd/ren.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/ren.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -253,7 +253,7 @@ LoadString( CMD_ModuleHandle, STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE); else LoadString( CMD_ModuleHandle, STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf((LPTSTR)szMsg,dwFiles); + ConOutPrintf(szMsg,dwFiles); } freep(arg); _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 17:33:17 UTC (rev 15136) @@ -208,6 +208,13 @@ #define STRING_WINDOW_HELP1 710 #define STRING_WINDOW_HELP2 711 +#define STRING_COPY_FILE 712 +#define STRING_DELETE_WIPE 713 +#define STRING_FOR_ERROR 714 +#define STRING_SCREEN_COL 715 +#define STRING_SCREEN_ROW 716 +#define STRING_TIMER_TIME 717 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801 _____ Modified: trunk/reactos/subsys/system/cmd/screen.c --- trunk/reactos/subsys/system/cmd/screen.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/screen.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -41,7 +41,7 @@ y = _ttoi(param); if (y<0 || y>(maxy-1)) { - ConOutPrintf(_T("invalid value for row")); + ConOutResPuts(STRING_SCREEN_ROW); return 1; } @@ -64,7 +64,7 @@ x = _ttoi(param); if (x<0 || x>(maxx-1)) { - ConErrPuts(_T("invalid value for col")); + ConErrResPuts(STRING_SCREEN_COL); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/timer.c --- trunk/reactos/subsys/system/cmd/timer.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/timer.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -19,10 +19,8 @@ -//print timer status -#define PS ConOutPrintf(_T("Timer %d is %s: "),clk_n,cS?_T("ON"):_T("OFF")); \ - PrintTime() + //print timer value #define PT(format) PrintElapsedTime(GetTickCount()-cT,format) @@ -109,6 +107,7 @@ return 0; } + LoadString( CMD_ModuleHandle, STRING_TIMER_TIME, (LPTSTR) szMsg,sizeof(szMsg)); p = split (param, &argc, FALSE); @@ -161,7 +160,9 @@ { cT=GetTickCount(); cS=TRUE; - PS; + + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); freep(p); return 0; } @@ -169,8 +170,9 @@ if(bS) { if(cS) - { - PS; + { + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -178,7 +180,8 @@ cT=GetTickCount(); cS=TRUE; - PS; + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); freep(p); return 0; } @@ -188,7 +191,8 @@ if (cS) { cS=FALSE; - PS; + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -196,7 +200,8 @@ cT=GetTickCount(); cS=TRUE; - PS; + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); freep(p); return 0; } @@ -207,12 +212,14 @@ if (cS) { cS=FALSE; - PS; + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; } - PS; + ConOutPrintf (szMsg,clk_n,cS?_T("ON"):_T("OFF")); + PrintTime(); freep(p); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -46,8 +46,8 @@ (RosVersion - VersionInfo.szCSDVersion); if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7)) { - LoadString( GetModuleHandle(NULL), STRING_VERSION_RUNVER, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg, RosVersion); + LoadString( CMD_ModuleHandle, STRING_VERSION_RUNVER, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (szMsg, RosVersion); } } ConOutPuts (_T("\n")); _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -41,7 +41,7 @@ if (!*param) { LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf((LPTSTR)szMsg, bVerify ? D_ON : D_OFF); + ConOutPrintf(szMsg, bVerify ? D_ON : D_OFF); } else if (_tcsicmp (param, D_OFF) == 0) bVerify = FALSE; _____ Modified: trunk/reactos/subsys/system/cmd/window.c --- trunk/reactos/subsys/system/cmd/window.c 2005-05-08 16:53:32 UTC (rev 15135) +++ trunk/reactos/subsys/system/cmd/window.c 2005-05-08 17:33:17 UTC (rev 15136) @@ -159,7 +159,11 @@ wp.showCmd = SW_RESTORE; if (iAction & A_CLOSE) + { +#ifdef _DEBUG ConErrPrintf(_T("!!!FIXME: CLOSE Not implemented!!!\n")); +#endif + } wp.length = sizeof(WINDOWPLACEMENT); SetWindowPlacement(hWnd, &wp);

19 years, 4 months

[ion] 15135: Forgot to add RTL header

by ion＠svn.reactos.com

Forgot to add RTL header Added: branches/new_headers/reactos/lib/rtl/rtl.h _____ Added: branches/new_headers/reactos/lib/rtl/rtl.h --- branches/new_headers/reactos/lib/rtl/rtl.h 2005-05-08 16:51:11 UTC (rev 15134) +++ branches/new_headers/reactos/lib/rtl/rtl.h 2005-05-08 16:53:32 UTC (rev 15135) @@ -0,0 +1,126 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/rtl/rtl.h + * PURPOSE: Run-Time Libary Header + * PROGRAMMER: Alex Ionescu + */ + +/* INCLUDES ******************************************************************/ + +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <reactos/helper.h> +#include <reactos/rosrtl/thread.h> + +/* Required for Lib Support */ +PVOID STDCALL ExAllocatePool(IN ULONG PoolType, IN SIZE_T NumberOfBytes); +PVOID STDCALL ExAllocatePoolWithTag(IN ULONG PoolType, IN SIZE_T NumberOfBytes, IN ULONG Tag); +VOID STDCALL ExFreePool(IN PVOID P); +VOID STDCALL ExFreePoolWithTag(IN PVOID P, IN ULONG Tag); + +/* Internal Private Functions */ +NTSTATUS +FASTCALL +RtlpOemStringToCountedUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToOemString ( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpDowncaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpAnsiStringToUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PANSI_STRING SourceString, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpOemStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +BOOLEAN +FASTCALL +RtlpCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS STDCALL +RtlpDuplicateUnicodeString( + INT AddNull, + IN PUNICODE_STRING SourceString, + PUNICODE_STRING DestinationString, + POOL_TYPE PoolType); + +/* EOF */

19 years, 4 months

[ion] 15134: Add missing defintions so RTL can build. Currently a mess so I'm going to clean it up.

by ion＠svn.reactos.com

Add missing defintions so RTL can build. Currently a mess so I'm going to clean it up. Modified: branches/new_headers/reactos/include/ndk/rtlfuncs.h Modified: branches/new_headers/reactos/include/ndk/rtltypes.h Modified: branches/new_headers/reactos/include/ndk/umtypes.h Modified: branches/new_headers/reactos/include/ndk/zwfuncs.h Modified: branches/new_headers/reactos/include/winnt.h Modified: branches/new_headers/reactos/lib/rtl/i386/exception.c _____ Modified: branches/new_headers/reactos/include/ndk/rtlfuncs.h --- branches/new_headers/reactos/include/ndk/rtlfuncs.h 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/include/ndk/rtlfuncs.h 2005-05-08 16:51:11 UTC (rev 15134) @@ -122,9 +122,9 @@ NTSTATUS STDCALL RtlAbsoluteToSelfRelativeSD ( - IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, - IN PULONG BufferLength + IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, + IN PULONG BufferLength ); NTSTATUS @@ -146,6 +146,20 @@ NTSTATUS STDCALL +RtlAppendUnicodeToString ( + PUNICODE_STRING Destination, + PCWSTR Source +); + +NTSTATUS +STDCALL +RtlAppendUnicodeStringToString ( + PUNICODE_STRING Destination, + PUNICODE_STRING Source +); + +NTSTATUS +STDCALL RtlAddAtomToAtomTable ( IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName, @@ -179,6 +193,12 @@ PULONG RemainingSidAreaSize ); +SIZE_T +STDCALL +RtlCompareMemory(IN const VOID *Source1, + IN const VOID *Source2, + IN SIZE_T Length); + LONG STDCALL RtlCompareUnicodeString ( @@ -284,6 +304,15 @@ OUT PULONG FinalUncompressedSize ); +NTSTATUS +STDCALL +RtlExpandEnvironmentStrings_U ( + PWSTR Environment, + PUNICODE_STRING Source, + PUNICODE_STRING Destination, + PULONG Length +); + PRTL_USER_PROCESS_PARAMETERS STDCALL RtlDeNormalizeProcessParams ( @@ -333,9 +362,115 @@ PRTL_CRITICAL_SECTION CriticalSection ); -#ifndef _NTIFS_ NTSTATUS STDCALL +RtlMultiByteToUnicodeN ( + PWCHAR UnicodeString, + ULONG UnicodeSize, + PULONG ResultSize, + const PCHAR MbString, + ULONG MbSize +); + +NTSTATUS +STDCALL +RtlMultiByteToUnicodeSize ( + PULONG UnicodeSize, + PCHAR MbString, + ULONG MbSize +); + +CHAR STDCALL +RtlUpperChar (CHAR Source); + +WCHAR +STDCALL +RtlUpcaseUnicodeChar ( + WCHAR Source + ); + +NTSTATUS +STDCALL +RtlAnsiStringToUnicodeString ( + PUNICODE_STRING DestinationString, + PANSI_STRING SourceString, + BOOLEAN AllocateDestinationString + ); + +NTSTATUS +STDCALL +RtlUnicodeToMultiByteN ( + PCHAR MbString, + ULONG MbSize, + PULONG ResultSize, + PWCHAR UnicodeString, + ULONG UnicodeSize + ); + +ULONG +STDCALL +RtlOemStringToUnicodeSize ( + POEM_STRING AnsiString + ); + +WCHAR STDCALL +RtlDowncaseUnicodeChar(IN WCHAR Source); + +NTSTATUS +STDCALL +RtlUpcaseUnicodeToMultiByteN ( + PCHAR MbString, + ULONG MbSize, + PULONG ResultSize, + PWCHAR UnicodeString, + ULONG UnicodeSize + ); + +NTSTATUS +STDCALL +RtlUnicodeToMultiByteSize ( + PULONG MbSize, + PWCHAR UnicodeString, + ULONG UnicodeSize + ); + +NTSTATUS +STDCALL +RtlOemToUnicodeN( + PWSTR UnicodeString, + ULONG MaxBytesInUnicodeString, + PULONG BytesInUnicodeString, + IN PCHAR OemString, + ULONG BytesInOemString + ); + +NTSTATUS +STDCALL +RtlUnicodeToOemN ( + PCHAR OemString, + ULONG OemSize, + PULONG ResultSize, + PWCHAR UnicodeString, + ULONG UnicodeSize + ); + +NTSTATUS +STDCALL +RtlUpcaseUnicodeStringToOemString ( + IN OUT POEM_STRING DestinationString, + IN PUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString + ); + +ULONG +STDCALL +RtlUnicodeStringToAnsiSize ( + IN PUNICODE_STRING UnicodeString + ); + +#ifndef _NTIFS_ +BOOLEAN +STDCALL RtlEqualSid ( IN PSID Sid1, IN PSID Sid2 @@ -534,7 +669,7 @@ NTSTATUS STDCALL RtlQueryTimeZoneInformation ( - IN OUT struct _TIME_ZONE_INFORMATION *TimeZoneInformation + IN OUT PTIME_ZONE_INFORMATION TimeZoneInformation ); VOID STDCALL RtlRaiseStatus(NTSTATUS Status); @@ -644,8 +779,44 @@ RtlCreateUnicodeStringFromAsciiz (OUT PUNICODE_STRING Destination, IN PCSZ Source); + +BOOLEAN +STDCALL +RtlTimeFieldsToTime ( + PTIME_FIELDS TimeFields, + PLARGE_INTEGER Time +); + VOID STDCALL +RtlTimeToTimeFields ( + PLARGE_INTEGER Time, + PTIME_FIELDS TimeFields +); + +NTSTATUS +STDCALL +RtlQueryRegistryValues ( + IN ULONG RelativeTo, + IN PCWSTR Path, + IN PRTL_QUERY_REGISTRY_TABLE QueryTable, + IN PVOID Context, + IN PVOID Environment +); + +NTSTATUS +STDCALL +RtlWriteRegistryValue ( + ULONG RelativeTo, + PCWSTR Path, + PCWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength +); + +VOID +STDCALL RtlUnwind ( PEXCEPTION_REGISTRATION RegistrationFrame, PVOID ReturnAddress, _____ Modified: branches/new_headers/reactos/include/ndk/rtltypes.h --- branches/new_headers/reactos/include/ndk/rtltypes.h 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/include/ndk/rtltypes.h 2005-05-08 16:51:11 UTC (rev 15134) @@ -1,22 +1,3 @@ -/* $Id: rtltypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ - * - * ReactOS Headers - * Copyright (C) 1998-2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * PROJECT: ReactOS Native Headers * FILE: include/ndk/rtltypes.h @@ -106,6 +87,7 @@ LONG DaylightBias; } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; #endif +typedef LPTIME_ZONE_INFORMATION PTIME_ZONE_INFORMATION; #define EH_NONCONTINUABLE 0x01 #define EH_UNWINDING 0x02 _____ Modified: branches/new_headers/reactos/include/ndk/umtypes.h --- branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 16:51:11 UTC (rev 15134) @@ -286,6 +286,9 @@ typedef CONST char *PCSZ; typedef ULONG KPROCESSOR_MODE; typedef PVOID PTHREAD_START_ROUTINE; +typedef short CSHORT; +typedef CSHORT *PCSHORT; +#define STATIC static typedef enum _MODE { @@ -948,5 +951,131 @@ } RTL_AVL_TABLE; typedef RTL_AVL_TABLE *PRTL_AVL_TABLE; +#define RTL_REGISTRY_ABSOLUTE 0 +#define RTL_REGISTRY_SERVICES 1 +#define RTL_REGISTRY_CONTROL 2 +#define RTL_REGISTRY_WINDOWS_NT 3 +#define RTL_REGISTRY_DEVICEMAP 4 +#define RTL_REGISTRY_USER 5 +#define RTL_REGISTRY_MAXIMUM 6 +#define RTL_REGISTRY_HANDLE 0x40000000 +#define RTL_REGISTRY_OPTIONAL 0x80000000 + +typedef NTSTATUS STDCALL +(*PRTL_QUERY_REGISTRY_ROUTINE)( + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext +); + +typedef struct _RTL_QUERY_REGISTRY_TABLE +{ + PRTL_QUERY_REGISTRY_ROUTINE QueryRoutine; + ULONG Flags; + PWSTR Name; + PVOID EntryContext; + ULONG DefaultType; + PVOID DefaultData; + ULONG DefaultLength; +} RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; + +typedef struct _KEY_VALUE_BASIC_INFORMATION +{ + ULONG TitleIndex; + ULONG Type; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; + +typedef struct _KEY_VALUE_FULL_INFORMATION +{ + ULONG TitleIndex; + ULONG Type; + ULONG DataOffset; + ULONG DataLength; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION; + +typedef struct _KEY_BASIC_INFORMATION +{ + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG NameLength; + WCHAR Name[1]; +} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; + +#define RTL_QUERY_REGISTRY_SUBKEY 0x00000001 +#define RTL_QUERY_REGISTRY_TOPKEY 0x00000002 +#define RTL_QUERY_REGISTRY_REQUIRED 0x00000004 +#define RTL_QUERY_REGISTRY_NOVALUE 0x00000008 +#define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 +#define RTL_QUERY_REGISTRY_DIRECT 0x00000020 +#define RTL_QUERY_REGISTRY_DELETE 0x00000040 + +#define SID_MAX_SUB_AUTHORITIES 15 + +typedef struct _TIME_FIELDS +{ + CSHORT Year; + CSHORT Month; + CSHORT Day; + CSHORT Hour; + CSHORT Minute; + CSHORT Second; + CSHORT Milliseconds; + CSHORT Weekday; +} TIME_FIELDS; +typedef TIME_FIELDS *PTIME_FIELDS; + +typedef struct _UNICODE_PREFIX_TABLE_ENTRY +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; + struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; + RTL_SPLAY_LINKS Links; + PUNICODE_STRING Prefix; +} UNICODE_PREFIX_TABLE_ENTRY; +typedef UNICODE_PREFIX_TABLE_ENTRY *PUNICODE_PREFIX_TABLE_ENTRY; + +typedef struct _UNICODE_PREFIX_TABLE +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; + PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; +} UNICODE_PREFIX_TABLE; +typedef UNICODE_PREFIX_TABLE *PUNICODE_PREFIX_TABLE; + +#define VER_MINORVERSION 0x0000001 +#define VER_MAJORVERSION 0x0000002 +#define VER_BUILDNUMBER 0x0000004 +#define VER_PLATFORMID 0x0000008 +#define VER_SERVICEPACKMINOR 0x0000010 +#define VER_SERVICEPACKMAJOR 0x0000020 +#define VER_SUITENAME 0x0000040 +#define VER_PRODUCT_TYPE 0x0000080 +#define VER_PLATFORM_WIN32s 0 +#define VER_PLATFORM_WIN32_WINDOWS 1 +#define VER_PLATFORM_WIN32_NT 2 +#define VER_EQUAL 1 +#define VER_GREATER 2 +#define VER_GREATER_EQUAL 3 +#define VER_LESS 4 +#define VER_LESS_EQUAL 5 +#define VER_AND 6 +#define VER_OR 7 +#define VER_CONDITION_MASK 7 +#define VER_NUM_BITS_PER_CONDITION_MASK 3 + +typedef LPOSVERSIONINFOW PRTL_OSVERSIONINFOW; +typedef OSVERSIONINFOEXW RTL_OSVERSIONINFOEXW; +typedef LPOSVERSIONINFOEXW PRTL_OSVERSIONINFOEXW; + + #endif _____ Modified: branches/new_headers/reactos/include/ndk/zwfuncs.h --- branches/new_headers/reactos/include/ndk/zwfuncs.h 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/include/ndk/zwfuncs.h 2005-05-08 16:51:11 UTC (rev 15134) @@ -5653,6 +5653,18 @@ IN BOOLEAN InheritHandle, IN ULONG Options ); + +NTSTATUS +STDCALL +ZwDuplicateObject( + IN HANDLE SourceProcessHandle, + IN HANDLE SourceHandle, + IN HANDLE TargetProcessHandle, + OUT PHANDLE TargetHandle, + IN ACCESS_MASK DesiredAccess, + IN BOOLEAN InheritHandle, + IN ULONG Options + ); /* * FUNCTION: Adds an atom to the global atom table _____ Modified: branches/new_headers/reactos/include/winnt.h --- branches/new_headers/reactos/include/winnt.h 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/include/winnt.h 2005-05-08 16:51:11 UTC (rev 15134) @@ -1120,6 +1120,7 @@ #define SE_SACL_AUTO_INHERITED 2048 #define SE_DACL_PROTECTED 4096 #define SE_SACL_PROTECTED 8192 +#define SE_RM_CONTROL_VALID 0x4000 #define SE_SELF_RELATIVE 0x8000 #define SECURITY_DESCRIPTOR_MIN_LENGTH 20 #define SECURITY_DESCRIPTOR_REVISION 1 _____ Modified: branches/new_headers/reactos/lib/rtl/i386/exception.c --- branches/new_headers/reactos/lib/rtl/i386/exception.c 2005-05-08 16:50:18 UTC (rev 15133) +++ branches/new_headers/reactos/lib/rtl/i386/exception.c 2005-05-08 16:51:11 UTC (rev 15134) @@ -9,9 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> +#include "rtl.h" #define NDEBUG #include <debug.h>

19 years, 4 months

[ion] 15133: forgot this guy

by ion＠svn.reactos.com

forgot this guy Modified: trunk/reactos/lib/rtl/i386/exception.c _____ Modified: trunk/reactos/lib/rtl/i386/exception.c --- trunk/reactos/lib/rtl/i386/exception.c 2005-05-08 16:07:43 UTC (rev 15132) +++ trunk/reactos/lib/rtl/i386/exception.c 2005-05-08 16:50:18 UTC (rev 15133) @@ -9,9 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> +#include "rtl.h" #define NDEBUG #include <debug.h>

19 years, 4 months

[hbirr] 15132: Changed the trap prolog, each exception can have its own trap handler.

by hbirr＠svn.reactos.com

Changed the trap prolog, each exception can have its own trap handler. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-05-08 16:02:38 UTC (rev 15131) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-05-08 16:07:43 UTC (rev 15132) @@ -66,8 +66,10 @@ /* Restore the old previous mode */ popl %ebx + cmpl $0, %esi + je .L7 movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) - +.L7: /* Restore the old exception handler list */ popl %ebx movl %ebx, %fs:KPCR_EXCEPTION_LIST @@ -83,48 +85,16 @@ .globl _KiTrapProlog _KiTrapProlog: - + movl $_KiTrapHandler, %ebx + +.global _KiTrapProlog2 +_KiTrapProlog2: pushl %edi pushl %fs - /* - * Check that the PCR exists, very early in the boot process it may - * not - */ - cmpl $0, %ss:_KiPcrInitDone - je .L5 - - /* Load the PCR selector into fs */ - movl $PCR_SELECTOR, %ebx - movl %ebx, %fs + /* Make room for the previous mode and the exception list */ + subl $8, %esp - /* Save the old exception list */ - movl %fs:KPCR_EXCEPTION_LIST, %ebx - pushl %ebx - - /* Get a pointer to the current thread */ - movl %fs:KPCR_CURRENT_THREAD, %edi - - /* The current thread may be NULL early in the boot process */ - cmpl $0, %edi - je .L4 - - /* Save the old previous mode */ - movl $0, %ebx - movb %ss:KTHREAD_PREVIOUS_MODE(%edi), %bl - pushl %ebx - - /* Set the new previous mode based on the saved CS selector */ - movl 0x24(%esp), %ebx - andl $0x0000FFFF, %ebx - cmpl $KERNEL_CS, %ebx - jne .L1 - movb $KernelMode, %ss:KTHREAD_PREVIOUS_MODE(%edi) - jmp .L3 -.L1: - movb $UserMode, %ss:KTHREAD_PREVIOUS_MODE(%edi) -.L3: - /* Save other registers */ pushl %eax pushl %ecx @@ -147,70 +117,88 @@ pushl %eax /* Dr1 */ movl %dr0, %eax pushl %eax /* Dr0 */ - leal 0x64(%esp), %eax - pushl %eax /* XXX: TempESP */ - pushl %ss /* XXX: TempSS */ - pushl $0 /* XXX: DebugPointer */ - pushl $0 /* XXX: DebugArgMark */ - movl 0x60(%esp), %ebx - pushl %ebx /* XXX: DebugEIP */ - pushl %ebp /* XXX: DebugEBP */ - + leal 0x64(%esp), %eax + pushl %eax /* XXX: TempESP */ + pushl %ss /* XXX: TempSS */ + pushl $0 /* XXX: DebugPointer */ + pushl $0 /* XXX: DebugArgMark */ + movl 0x60(%esp), %eax + pushl %eax /* XXX: DebugEIP */ + pushl %ebp /* XXX: DebugEBP */ + /* Load the segment registers */ - movl $KERNEL_DS, %ebx - movl %ebx, %ds - movl %ebx, %es - movl %ebx, %gs + movl $KERNEL_DS, %eax + movl %eax, %ds + movl %eax, %es + movl %eax, %gs - /* Set ES to kernel segment */ - movw $KERNEL_DS,%bx - movw %bx,%es - - movl %esp, %ebx + /* save the trap frame */ movl %esp, %ebp + + /* Load the PCR selector into fs */ + movl $PCR_SELECTOR, %eax + movl %eax, %fs - /* Save the old trap frame. */ + /* Save the old exception list */ + movl %fs:KPCR_EXCEPTION_LIST, %eax + movl %eax, KTRAP_FRAME_EXCEPTION_LIST(%ebp) + + /* Get a pointer to the current thread */ + movl %fs:KPCR_CURRENT_THREAD, %edi + + /* The current thread may be NULL early in the boot process */ cmpl $0, %edi - je .L7 - movl %ss:KTHREAD_TRAP_FRAME(%edi), %edx - pushl %edx - jmp .L8 -.L7: - pushl $0 -.L8: + je .L4 + + /* Save the old previous mode */ + movl $0, %eax + movb KTHREAD_PREVIOUS_MODE(%edi), %al + movl %eax, KTRAP_FRAME_PREVIOUS_MODE(%ebp) + + /* Set the new previous mode based on the saved CS selector */ + movl KTRAP_FRAME_CS(%ebp), %eax + andl $0x0000FFFF, %eax + cmpl $KERNEL_CS, %eax + jne .L1 + movb $KernelMode, KTHREAD_PREVIOUS_MODE(%edi) + jmp .L3 +.L1: + movb $UserMode, KTHREAD_PREVIOUS_MODE(%edi) +.L3: + /* Save the old trap frame. */ + movl KTHREAD_TRAP_FRAME(%edi), %edx + pushl %edx + /* Save a pointer to the trap frame in the current KTHREAD */ - cmpl $0, %edi - je .L6 - movl %ebx, %ss:KTHREAD_TRAP_FRAME(%edi) + movl %ebp, KTHREAD_TRAP_FRAME(%edi) .L6: /* Call the C exception handler */ pushl %esi - pushl %ebx - call _KiTrapHandler - addl $4, %esp - addl $4, %esp + pushl %ebp + call *%ebx + addl $8, %esp /* Get a pointer to the current thread */ movl %fs:KPCR_CURRENT_THREAD, %esi - + /* Restore the old trap frame pointer */ popl %ebx + cmpl $0, %esi + je _KiTrapEpilog movl %ebx, KTHREAD_TRAP_FRAME(%esi) - + /* Return to the caller */ jmp _KiTrapEpilog - /* Handle the no-pcr case out of line */ -.L5: - pushl $0 - /* Handle the no-thread case out of line */ .L4: - pushl $0 - jmp .L3 - + movl $0, %eax /* previous mode */ + movl %eax, KTRAP_FRAME_PREVIOUS_MODE(%ebp) + pushl %eax /* old trap frame */ + jmp .L6 + .globl _KiTrap0 _KiTrap0: /* No error code */ @@ -337,7 +325,8 @@ pushl %ebx pushl %esi movl $14, %esi - jmp _KiTrapProlog + movl $_KiTrapHandler, %ebx + jmp _KiTrapProlog2 .globl _KiTrap15 _KiTrap15:

19 years, 4 months

[hbirr] 15131: Fixed the unlocking of pages from a mdl.

by hbirr＠svn.reactos.com

Fixed the unlocking of pages from a mdl. Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-08 16:00:59 UTC (rev 15130) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-08 16:02:38 UTC (rev 15131) @@ -61,7 +61,7 @@ { PFILE_OBJECT FileObject; PIRP Irp; - PMDL Mdl, NextMdl; + PMDL Mdl; PKEVENT UserEvent; BOOLEAN SyncIrp; @@ -101,17 +101,12 @@ Irp->Flags &= ~(IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); /* Check if there's an MDL */ - if ((Mdl = Irp->MdlAddress)) + while ((Mdl = Irp->MdlAddress)) { /* Clear all of them */ - do - { - NextMdl = Mdl->Next; - IoFreeMdl(Mdl); - Mdl = NextMdl; - } while (Mdl); + Irp->MdlAddress = Mdl->Next; + IoFreeMdl(Mdl); } - Irp->MdlAddress = NULL; /* Remove the IRP from the list of Thread Pending IRPs */ RemoveEntryList(&Irp->ThreadListEntry); @@ -1122,11 +1117,12 @@ } /* Unlock MDL Pages, page 167. */ - while ((Mdl = Irp->MdlAddress)) + Mdl = Irp->MdlAddress; + while (Mdl) { DPRINT("Unlocking MDL: %x\n", Mdl); - Irp->MdlAddress = Mdl->Next; MmUnlockPages(Mdl); + Mdl = Mdl->Next; } /* Check if we should exit because of a Deferred I/O (page 168) */

19 years, 4 months

[hbirr] 15130: Free the irp after a close operation.

by hbirr＠svn.reactos.com

Free the irp after a close operation. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-08 15:59:07 UTC (rev 15129) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-08 16:00:59 UTC (rev 15130) @@ -542,6 +542,7 @@ { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } + IoFreeIrp(Irp); } /* FUNCTIONS *****************************************************************/

19 years, 4 months

[hbirr] 15129: Fixed the stack switching.

by hbirr＠svn.reactos.com

Fixed the stack switching. It isn't possible to access memory between changing the stack and setting the cr3 register. A page fault needs a valid kmode stack which is possible not available. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-08 15:57:51 UTC (rev 15128) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-08 15:59:07 UTC (rev 15129) @@ -152,26 +152,27 @@ /* Save the stack pointer in this processors TSS */ mov ebp, [ebx+KPCR_TSS] push ss:[ebp+KTSS_ESP0] + + /* Check if address space switch is needed */ + mov eax, [esi+KTHREAD_APCSTATE_PROCESS] + cmp eax, [edi+KTHREAD_APCSTATE_PROCESS] + mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] /* Switch stacks */ mov [edi+KTHREAD_KERNEL_STACK], esp mov esp, [esi+KTHREAD_KERNEL_STACK] + + jz NoAddressSpaceSwitch + + /* Switch address space */ + mov cr3, eax - /* - * Sadly, ROS memory management is screwed up, so - * we must change the address space here. - */ - mov eax, [esi+KTHREAD_APCSTATE_PROCESS] - mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax - +NoAddressSpaceSwitch: + /* Stack is OK, safe to enable interrupts now */ sti - /* Check if address space switch is needed */ - mov eax, [edi+KTHREAD_APCSTATE_PROCESS] - cmp eax, [esi+KTHREAD_APCSTATE_PROCESS] - + /* Check if address space switch is needed (the result from above is valid) */ /* If they match, then use the fast-path and skip all this */ jz SameProcess

19 years, 4 months

← Newer
1
...
55
56
57
58
59
60
61
...
82
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 May 2005