Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 46084: [HPP] - Fix allocation size - add some more traces - add to build
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Thu Mar 11 00:37:47 2010 New Revision: 46084 URL: http://svn.reactos.org/svn/reactos?rev=46084&view=rev Log: [HPP] - Fix allocation size - add some more traces - add to build Modified: branches/header-work/tools/hpp/hpp.c branches/header-work/tools/tools.rbuild Modified: branches/header-work/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/hpp/hpp.c?rev… ============================================================================== --- branches/header-work/tools/hpp/hpp.c [iso-8859-1] (original) +++ branches/header-work/tools/hpp/hpp.c [iso-8859-1] Thu Mar 11 00:37:47 2010 @@ -11,6 +11,8 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> + +//#define DBG 1 #if DBG #define trace printf @@ -70,24 +72,40 @@ { FILE* file; void* pFileData = NULL; + int iFileSize; + + trace("Loading file..."); file = fopen(pszFileName, "rb"); - if (file != NULL) + if (!file) { - fseek(file, 0L, SEEK_END); - *pFileSize = ftell(file); - fseek(file, 0L, SEEK_SET); - pFileData = malloc(*pFileSize); - if (pFileData != NULL) - { - if (*pFileSize != fread(pFileData, 1, *pFileSize, file)) - { - free(pFileData); - pFileData = NULL; - } - } - fclose(file); + trace("Could not open file\n"); + return NULL; } + + fseek(file, 0L, SEEK_END); + iFileSize = ftell(file); + fseek(file, 0L, SEEK_SET); + *pFileSize = iFileSize; + trace("ok. Size is %d\n", iFileSize); + + pFileData = malloc(iFileSize + 1); + + if (pFileData != NULL) + { + if (iFileSize != fread(pFileData, 1, iFileSize, file)) + { + free(pFileData); + pFileData = NULL; + } + } + else + { + trace("Could not allocate memory for file\n"); + } + + fclose(file); + return pFileData; } @@ -452,6 +470,9 @@ /* Restore the global file name */ gpszCurFile = pszInFile; + + /* Restore the zeroed character */ + *p2 = ')'; if (ret == -1) { @@ -481,6 +502,8 @@ /* Free the file data */ free(pInputData); + trace("Done with file.\n\n"); + return 0; } @@ -494,7 +517,7 @@ if (argc != 3) { - error("Usage: hc <inputfile> <outputfile>\n"); + error("Usage: hpp <inputfile> <outputfile>\n"); exit(1); } Modified: branches/header-work/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/tools.rbuild?… ============================================================================== --- branches/header-work/tools/tools.rbuild [iso-8859-1] (original) +++ branches/header-work/tools/tools.rbuild [iso-8859-1] Thu Mar 11 00:37:47 2010 @@ -6,6 +6,9 @@ </directory> <directory name="cdmake"> <xi:include href="cdmake/cdmake.rbuild" /> +</directory> +<directory name="hpp"> + <xi:include href="hpp/hpp.rbuild" /> </directory> <directory name="kbdtool"> <xi:include href="kbdtool/kbdtool.rbuild" />

1 0

[akhaldi] 46083: [NTDDK] - Move several ntddk.h related definition from winddk.h - Group related definitions - ZwSetTimer : BOOLEAN WakeTimer -> BOOLEAN ResumeTimer - IoWritePartitionTableEx : *PartitionBuffer -> *DriveLayout - HalPutDmaAdapter : AdapterObject -> DmaAdapter - MmAllocateNonCachedMemory : ULONG NumberOfBytes -> SIZE_T NumberOfBytes
by akhaldi＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: akhaldi Date: Thu Mar 11 00:09:27 2010 New Revision: 46083 URL: http://svn.reactos.org/svn/reactos?rev=46083&view=rev Log: [NTDDK] - Move several ntddk.h related definition from winddk.h - Group related definitions - ZwSetTimer : BOOLEAN WakeTimer -> BOOLEAN ResumeTimer - IoWritePartitionTableEx : *PartitionBuffer -> *DriveLayout - HalPutDmaAdapter : AdapterObject -> DmaAdapter - MmAllocateNonCachedMemory : ULONG NumberOfBytes -> SIZE_T NumberOfBytes Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/winddk.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Thu Mar 11 00:09:27 2010 @@ -343,7 +343,29 @@ IN const PSTRING String2, IN BOOLEAN CaseInSensitive); -#endif +NTSYSAPI +NTSTATUS +NTAPI +RtlCharToInteger( + IN PCSZ String, + IN ULONG Base OPTIONAL, + OUT PULONG Value); + +NTSYSAPI +CHAR +NTAPI +RtlUpperChar( + IN CHAR Character); + +NTSYSAPI +ULONG +NTAPI +RtlWalkFrameChain( + OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ /* Executive Types */ @@ -362,6 +384,43 @@ } ZONE_HEADER, *PZONE_HEADER; /* Executive Functions */ + +static __inline PVOID +ExAllocateFromZone( + IN PZONE_HEADER Zone) +{ + if (Zone->FreeList.Next) + Zone->FreeList.Next = Zone->FreeList.Next->Next; + return (PVOID) Zone->FreeList.Next; +} + +static __inline PVOID +ExFreeToZone( + IN PZONE_HEADER Zone, + IN PVOID Block) +{ + ((PSINGLE_LIST_ENTRY) Block)->Next = Zone->FreeList.Next; + Zone->FreeList.Next = ((PSINGLE_LIST_ENTRY) Block); + return ((PSINGLE_LIST_ENTRY) Block)->Next; +} + +/* + * PVOID + * ExInterlockedAllocateFromZone( + * IN PZONE_HEADER Zone, + * IN PKSPIN_LOCK Lock) + */ +#define ExInterlockedAllocateFromZone(Zone, Lock) \ + ((PVOID) ExInterlockedPopEntryList(&Zone->FreeList, Lock)) + +/* PVOID + * ExInterlockedFreeToZone( + * IN PZONE_HEADER Zone, + * IN PVOID Block, + * IN PKSPIN_LOCK Lock); + */ +#define ExInterlockedFreeToZone(Zone, Block, Lock) \ + ExInterlockedPushEntryList(&(Zone)->FreeList, (PSINGLE_LIST_ENTRY)(Block), Lock) /* * BOOLEAN @@ -423,7 +482,21 @@ NTSTATUS NTAPI ExUuidCreate( - OUT UUID *Uuid); + OUT UUID *Uuid); + +NTKERNELAPI +DECLSPEC_NORETURN +VOID +NTAPI +ExRaiseAccessViolation( + VOID); + +NTKERNELAPI +DECLSPEC_NORETURN +VOID +NTAPI +ExRaiseDatatypeMisalignment( + VOID); #endif @@ -522,7 +595,31 @@ typedef DRIVER_REINITIALIZE *PDRIVER_REINITIALIZE; +/** Filesystem runtime library routines **/ +#if (NTDDI_VERSION >= NTDDI_WIN2K) +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlIsTotalDeviceFailure( + IN NTSTATUS Status); +#endif + /* I/O Manager Functions */ + +/* + * VOID IoAssignArcName( + * IN PUNICODE_STRING ArcName, + * IN PUNICODE_STRING DeviceName); + */ +#define IoAssignArcName(_ArcName, _DeviceName) ( \ + IoCreateSymbolicLink((_ArcName), (_DeviceName))) + +/* + * VOID + * IoDeassignArcName( + * IN PUNICODE_STRING ArcName) + */ +#define IoDeassignArcName IoDeleteSymbolicLink #if (NTDDI_VERSION >= NTDDI_WIN2K) @@ -661,8 +758,176 @@ IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice); +NTKERNELAPI +NTSTATUS +NTAPI +IoReportDetectedDevice( + IN PDRIVER_OBJECT DriverObject, + IN INTERFACE_TYPE LegacyBusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN PCM_RESOURCE_LIST ResourceList OPTIONAL, + IN PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements OPTIONAL, + IN BOOLEAN ResourceAssigned, + IN OUT PDEVICE_OBJECT *DeviceObject); + +NTKERNELAPI +NTSTATUS +NTAPI +IoReportResourceForDetection( + IN PDRIVER_OBJECT DriverObject, + IN PCM_RESOURCE_LIST DriverList OPTIONAL, + IN ULONG DriverListSize OPTIONAL, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PCM_RESOURCE_LIST DeviceList OPTIONAL, + IN ULONG DeviceListSize OPTIONAL, + OUT PBOOLEAN ConflictDetected); + +NTKERNELAPI +NTSTATUS +NTAPI +IoReportResourceUsage( + IN PUNICODE_STRING DriverClassName OPTIONAL, + IN PDRIVER_OBJECT DriverObject, + IN PCM_RESOURCE_LIST DriverList OPTIONAL, + IN ULONG DriverListSize OPTIONAL, + IN PDEVICE_OBJECT DeviceObject, + IN PCM_RESOURCE_LIST DeviceList OPTIONAL, + IN ULONG DeviceListSize OPTIONAL, + IN BOOLEAN OverrideConflict, + OUT PBOOLEAN ConflictDetected); + +NTKERNELAPI +VOID +NTAPI +IoSetHardErrorOrVerifyDevice( + IN PIRP Irp, + IN PDEVICE_OBJECT DeviceObject); + #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ +#if (NTDDI_VERSION >= NTDDI_WINXP) + +NTKERNELAPI +NTSTATUS +NTAPI +IoCreateDisk( + IN PDEVICE_OBJECT DeviceObject, + IN PCREATE_DISK Disk OPTIONAL); + +NTKERNELAPI +NTSTATUS +NTAPI +IoReadDiskSignature( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG BytesPerSector, + OUT PDISK_SIGNATURE Signature); + +NTKERNELAPI +NTSTATUS +FASTCALL +IoReadPartitionTable( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); + +NTKERNELAPI +NTSTATUS +NTAPI +IoReadPartitionTableEx( + IN PDEVICE_OBJECT DeviceObject, + IN struct _DRIVE_LAYOUT_INFORMATION_EX **PartitionBuffer); + +NTKERNELAPI +NTSTATUS +FASTCALL +IoSetPartitionInformation( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +NTKERNELAPI +NTSTATUS +NTAPI +IoSetPartitionInformationEx( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG PartitionNumber, + IN struct _SET_PARTITION_INFORMATION_EX *PartitionInfo); + +NTKERNELAPI +NTSTATUS +NTAPI +IoSetSystemPartition( + IN PUNICODE_STRING VolumeNameString); + +NTKERNELAPI +BOOLEAN +NTAPI +IoSetThreadHardErrorMode( + IN BOOLEAN EnableHardErrors); + +NTKERNELAPI +NTSTATUS +NTAPI +IoVerifyPartitionTable( + IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN FixErrors); + +NTKERNELAPI +NTSTATUS +NTAPI +IoVolumeDeviceToDosName( + IN PVOID VolumeDeviceObject, + OUT PUNICODE_STRING DosName); + +NTKERNELAPI +NTSTATUS +FASTCALL +IoWritePartitionTable( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +NTKERNELAPI +NTSTATUS +NTAPI +IoWritePartitionTableEx( + IN PDEVICE_OBJECT DeviceObject, + IN struct _DRIVE_LAYOUT_INFORMATION_EX *DriveLayout); + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +/* Kernel Functions */ + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +DECLSPEC_NORETURN +VOID +NTAPI +KeBugCheck( + IN ULONG BugCheckCode); + +NTKERNELAPI +LONG +NTAPI +KePulseEvent( + IN OUT PRKEVENT Event, + IN KPRIORITY Increment, + IN BOOLEAN Wait); + +NTKERNELAPI +LONG +NTAPI +KeSetBasePriorityThread( + IN OUT PRKTHREAD Thread, + IN LONG Increment); + +#endif /* Memory Manager Types */ @@ -689,6 +954,279 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ +/* Security reference monitor routines */ + +#if (NTDDI_VERSION >= NTDDI_WIN2K) +NTKERNELAPI +BOOLEAN +NTAPI +SeSinglePrivilegeCheck( + IN LUID PrivilegeValue, + IN KPROCESSOR_MODE PreviousMode); +#endif + +/* Hardware abstraction layer routines */ + +#if !defined(NO_LEGACY_DRIVERS) +#if (NTDDI_VERSION >= NTDDI_WIN2K) +NTHALAPI +NTSTATUS +NTAPI +HalAssignSlotResources( + IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING DriverClassName, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN INTERFACE_TYPE BusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN OUT PCM_RESOURCE_LIST *AllocatedResources); +#endif +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTHALAPI +PADAPTER_OBJECT +NTAPI +HalGetAdapter( + IN PDEVICE_DESCRIPTION DeviceDescription, + IN OUT PULONG NumberOfMapRegisters); + +NTHALAPI +BOOLEAN +NTAPI +HalMakeBeep( + IN ULONG Frequency); + +VOID +NTAPI +HalPutDmaAdapter( + IN PADAPTER_OBJECT DmaAdapter); + +#endif + +#if (NTDDI_VERSION >= NTDDI_WINXP) +NTKERNELAPI +VOID +FASTCALL +HalExamineMBR( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); +#endif + +/** Process manager routines **/ + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +NTSTATUS +NTAPI +PsSetLoadImageNotifyRoutine( + IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine); + +NTKERNELAPI +NTSTATUS +NTAPI +PsSetCreateThreadNotifyRoutine( + IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine); + +NTKERNELAPI +NTSTATUS +NTAPI +PsSetCreateProcessNotifyRoutine( + IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, + IN BOOLEAN Remove); + +NTKERNELAPI +HANDLE +NTAPI +PsGetCurrentProcessId( + VOID); + +NTKERNELAPI +HANDLE +NTAPI +PsGetCurrentThreadId( + VOID); + +NTKERNELAPI +BOOLEAN +NTAPI +PsGetVersion( + OUT PULONG MajorVersion OPTIONAL, + OUT PULONG MinorVersion OPTIONAL, + OUT PULONG BuildNumber OPTIONAL, + OUT PUNICODE_STRING CSDVersion OPTIONAL); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +NTKERNELAPI +HANDLE +NTAPI +PsGetProcessId( + IN PEPROCESS Process); + +NTKERNELAPI +NTSTATUS +NTAPI +PsRemoveCreateThreadNotifyRoutine( + IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine); + +NTKERNELAPI +NTSTATUS +NTAPI +PsRemoveLoadImageNotifyRoutine( + IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine); + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +extern NTKERNELAPI PEPROCESS PsInitialSystemProcess; + +#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) +// nothing here +#else + +#if (NTDDI_VERSION >= NTDDI_WIN2K) +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +VOID +NTAPI +IoFreeAdapterChannel( + IN PADAPTER_OBJECT AdapterObject); + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +BOOLEAN +NTAPI +IoFlushAdapterBuffers( + IN PADAPTER_OBJECT AdapterObject, + IN PMDL Mdl, + IN PVOID MapRegisterBase, + IN PVOID CurrentVa, + IN ULONG Length, + IN BOOLEAN WriteToDevice); + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +VOID +NTAPI +IoFreeMapRegisters( + IN PADAPTER_OBJECT AdapterObject, + IN PVOID MapRegisterBase, + IN ULONG NumberOfMapRegisters); + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +PVOID +NTAPI +HalAllocateCommonBuffer( + IN PADAPTER_OBJECT AdapterObject, + IN ULONG Length, + OUT PPHYSICAL_ADDRESS LogicalAddress, + IN BOOLEAN CacheEnabled); + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +VOID +NTAPI +HalFreeCommonBuffer( + IN PADAPTER_OBJECT AdapterObject, + IN ULONG Length, + IN PHYSICAL_ADDRESS LogicalAddress, + IN PVOID VirtualAddress, + IN BOOLEAN CacheEnabled); + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +ULONG +NTAPI +HalReadDmaCounter( + IN PADAPTER_OBJECT AdapterObject); + +NTHALAPI +NTSTATUS +NTAPI +HalAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PWAIT_CONTEXT_BLOCK Wcb, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +#endif /* defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) */ + +/** NtXxx and ZwXxx routines **/ + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtOpenProcess( + OUT PHANDLE ProcessHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN PCLIENT_ID ClientId OPTIONAL); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryInformationProcess( + IN HANDLE ProcessHandle, + IN PROCESSINFOCLASS ProcessInformationClass, + OUT PVOID ProcessInformation OPTIONAL, + IN ULONG ProcessInformationLength, + OUT PULONG ReturnLength OPTIONAL); + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTSTATUS +NTAPI +ZwCancelTimer( + IN HANDLE TimerHandle, + OUT PBOOLEAN CurrentState OPTIONAL); + +NTSTATUS +NTAPI +ZwCreateTimer( + OUT PHANDLE TimerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN TIMER_TYPE TimerType); + +NTSTATUS +NTAPI +ZwOpenTimer( + OUT PHANDLE TimerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetInformationThread( + IN HANDLE ThreadHandle, + IN THREADINFOCLASS ThreadInformationClass, + IN PVOID ThreadInformation, + IN ULONG ThreadInformationLength); + +NTSTATUS +NTAPI +ZwSetTimer( + IN HANDLE TimerHandle, + IN PLARGE_INTEGER DueTime, + IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, + IN PVOID TimerContext OPTIONAL, + IN BOOLEAN ResumeTimer, + IN LONG Period OPTIONAL, + OUT PBOOLEAN PreviousState OPTIONAL); + +#endif + /* Windows Device Driver Kit */ #include "winddk.h" Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Thu Mar 11 00:09:27 2010 @@ -1995,14 +1995,6 @@ ((CHAR*)((ULONG_PTR)(ArgumentPointer)) != (CHAR*)NULL) NTSYSAPI -NTSTATUS -NTAPI -RtlCharToInteger( - IN PCSZ String, - IN ULONG Base OPTIONAL, - IN OUT PULONG Value); - -NTSYSAPI VOID NTAPI RtlCopyMemory32( @@ -2010,337 +2002,7 @@ IN CONST VOID UNALIGNED *Source, IN ULONG Length); -NTSYSAPI -CHAR -NTAPI -RtlUpperChar( - IN CHAR Character); - -NTSYSAPI -ULONG -NTAPI -RtlWalkFrameChain( - OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags); - -static __inline PVOID -ExAllocateFromZone( - IN PZONE_HEADER Zone) -{ - if (Zone->FreeList.Next) - Zone->FreeList.Next = Zone->FreeList.Next->Next; - return (PVOID) Zone->FreeList.Next; -} - -static __inline PVOID -ExFreeToZone( - IN PZONE_HEADER Zone, - IN PVOID Block) -{ - ((PSINGLE_LIST_ENTRY) Block)->Next = Zone->FreeList.Next; - Zone->FreeList.Next = ((PSINGLE_LIST_ENTRY) Block); - return ((PSINGLE_LIST_ENTRY) Block)->Next; -} - -/* - * PVOID - * ExInterlockedAllocateFromZone( - * IN PZONE_HEADER Zone, - * IN PKSPIN_LOCK Lock) - */ -#define ExInterlockedAllocateFromZone(Zone, Lock) \ - ((PVOID) ExInterlockedPopEntryList(&Zone->FreeList, Lock)) - -/* PVOID - * ExInterlockedFreeToZone( - * IN PZONE_HEADER Zone, - * IN PVOID Block, - * IN PKSPIN_LOCK Lock); - */ -#define ExInterlockedFreeToZone(Zone, Block, Lock) \ - ExInterlockedPushEntryList(&(Zone)->FreeList, (PSINGLE_LIST_ENTRY)(Block), Lock) - -NTKERNELAPI -DECLSPEC_NORETURN -VOID -NTAPI -ExRaiseAccessViolation( - VOID); - -NTKERNELAPI -DECLSPEC_NORETURN -VOID -NTAPI -ExRaiseDatatypeMisalignment( - VOID); - -/** Filesystem runtime library routines **/ - -NTKERNELAPI -BOOLEAN -NTAPI -FsRtlIsTotalDeviceFailure( - IN NTSTATUS Status); - -/** Hardware abstraction layer routines **/ - -NTHALAPI -BOOLEAN -NTAPI -HalMakeBeep( - IN ULONG Frequency); - -NTKERNELAPI -VOID -FASTCALL -HalExamineMBR( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MBRTypeIdentifier, - OUT PVOID *Buffer); - -VOID -NTAPI -HalPutDmaAdapter( - PADAPTER_OBJECT AdapterObject -); - -/** I/O manager routines **/ - -/* - * VOID IoAssignArcName( - * IN PUNICODE_STRING ArcName, - * IN PUNICODE_STRING DeviceName); - */ -#define IoAssignArcName(_ArcName, _DeviceName) ( \ - IoCreateSymbolicLink((_ArcName), (_DeviceName))) - -NTKERNELAPI -NTSTATUS -NTAPI -IoCreateDisk( - IN PDEVICE_OBJECT DeviceObject, - IN PCREATE_DISK Disk); - -/* - * VOID - * IoDeassignArcName( - * IN PUNICODE_STRING ArcName) - */ -#define IoDeassignArcName IoDeleteSymbolicLink - -NTKERNELAPI -NTSTATUS -NTAPI -IoReadDiskSignature( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG BytesPerSector, - OUT PDISK_SIGNATURE Signature); - -NTKERNELAPI -NTSTATUS -FASTCALL -IoReadPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); - -NTKERNELAPI -NTSTATUS -NTAPI -IoReadPartitionTableEx( - IN PDEVICE_OBJECT DeviceObject, - IN struct _DRIVE_LAYOUT_INFORMATION_EX **PartitionBuffer); - -NTKERNELAPI -NTSTATUS -NTAPI -IoReportDetectedDevice( - IN PDRIVER_OBJECT DriverObject, - IN INTERFACE_TYPE LegacyBusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PCM_RESOURCE_LIST ResourceList, - IN PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements OPTIONAL, - IN BOOLEAN ResourceAssigned, - IN OUT PDEVICE_OBJECT *DeviceObject); - -NTKERNELAPI -NTSTATUS -NTAPI -IoReportResourceForDetection( - IN PDRIVER_OBJECT DriverObject, - IN PCM_RESOURCE_LIST DriverList OPTIONAL, - IN ULONG DriverListSize OPTIONAL, - IN PDEVICE_OBJECT DeviceObject OPTIONAL, - IN PCM_RESOURCE_LIST DeviceList OPTIONAL, - IN ULONG DeviceListSize OPTIONAL, - OUT PBOOLEAN ConflictDetected); - -NTKERNELAPI -NTSTATUS -NTAPI -IoReportResourceUsage( - IN PUNICODE_STRING DriverClassName OPTIONAL, - IN PDRIVER_OBJECT DriverObject, - IN PCM_RESOURCE_LIST DriverList OPTIONAL, - IN ULONG DriverListSize OPTIONAL, - IN PDEVICE_OBJECT DeviceObject, - IN PCM_RESOURCE_LIST DeviceList OPTIONAL, - IN ULONG DeviceListSize OPTIONAL, - IN BOOLEAN OverrideConflict, - OUT PBOOLEAN ConflictDetected); - -NTKERNELAPI -VOID -NTAPI -IoSetHardErrorOrVerifyDevice( - IN PIRP Irp, - IN PDEVICE_OBJECT DeviceObject); - -NTKERNELAPI -NTSTATUS -FASTCALL -IoSetPartitionInformation( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType); - -NTKERNELAPI -NTSTATUS -NTAPI -IoSetPartitionInformationEx( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG PartitionNumber, - IN struct _SET_PARTITION_INFORMATION_EX *PartitionInfo); - -NTKERNELAPI -NTSTATUS -NTAPI -IoSetSystemPartition( - IN PUNICODE_STRING VolumeNameString); - -NTKERNELAPI -BOOLEAN -NTAPI -IoSetThreadHardErrorMode( - IN BOOLEAN EnableHardErrors); - -NTKERNELAPI -NTSTATUS -NTAPI -IoVerifyPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN FixErrors); - -NTKERNELAPI -NTSTATUS -NTAPI -IoVolumeDeviceToDosName( - IN PVOID VolumeDeviceObject, - OUT PUNICODE_STRING DosName); - -NTKERNELAPI -NTSTATUS -FASTCALL -IoWritePartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); - -NTKERNELAPI -NTSTATUS -NTAPI -IoWritePartitionTableEx( - IN PDEVICE_OBJECT DeviceObject, - IN struct _DRIVE_LAYOUT_INFORMATION_EX *PartitionBuffer); - -#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) -// nothing here -#else - -#if (NTDDI_VERSION >= NTDDI_WIN2K) -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -VOID -NTAPI -IoFreeAdapterChannel( - IN PADAPTER_OBJECT AdapterObject); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -BOOLEAN -NTAPI -IoFlushAdapterBuffers( - IN PADAPTER_OBJECT AdapterObject, - IN PMDL Mdl, - IN PVOID MapRegisterBase, - IN PVOID CurrentVa, - IN ULONG Length, - IN BOOLEAN WriteToDevice); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -VOID -NTAPI -IoFreeMapRegisters( - IN PADAPTER_OBJECT AdapterObject, - IN PVOID MapRegisterBase, - IN ULONG NumberOfMapRegisters); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -PVOID -NTAPI -HalAllocateCommonBuffer( - IN PADAPTER_OBJECT AdapterObject, - IN ULONG Length, - IN PPHYSICAL_ADDRESS LogicalAddress, - IN BOOLEAN CacheEnabled); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -VOID -NTAPI -HalFreeCommonBuffer( - IN PADAPTER_OBJECT AdapterObject, - IN ULONG Length, - IN PHYSICAL_ADDRESS LogicalAddress, - IN PVOID VirtualAddress, - IN BOOLEAN CacheEnabled); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI -ULONG -NTAPI -HalReadDmaCounter( - IN PADAPTER_OBJECT AdapterObject); - -NTHALAPI -NTSTATUS -NTAPI -HalAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PWAIT_CONTEXT_BLOCK Wcb, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine); - -#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ -#endif /* defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) */ - /** Kernel routines **/ - -NTKERNELAPI -DECLSPEC_NORETURN -VOID -NTAPI -KeBugCheck( - IN ULONG BugCheckCode); #ifdef _X86_ @@ -2359,14 +2021,6 @@ #endif -NTKERNELAPI -LONG -NTAPI -KePulseEvent( - IN PRKEVENT Event, - IN KPRIORITY Increment, - IN BOOLEAN Wait); - #if !defined(_M_AMD64) NTKERNELAPI @@ -2375,13 +2029,6 @@ KeQueryTickCount( OUT PLARGE_INTEGER TickCount); #endif - -NTKERNELAPI -LONG -NTAPI -KeSetBasePriorityThread( - IN PRKTHREAD Thread, - IN LONG Increment); NTKERNELAPI VOID @@ -2784,101 +2431,7 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes); -NTKERNELAPI -HANDLE -NTAPI -PsGetCurrentProcessId( - VOID); - -NTKERNELAPI -HANDLE -NTAPI -PsGetCurrentThreadId( - VOID); - -NTKERNELAPI -HANDLE -NTAPI -PsGetProcessId(PEPROCESS Process); - -NTKERNELAPI -BOOLEAN -NTAPI -PsGetVersion( - PULONG MajorVersion OPTIONAL, - PULONG MinorVersion OPTIONAL, - PULONG BuildNumber OPTIONAL, - PUNICODE_STRING CSDVersion OPTIONAL); - -NTKERNELAPI -NTSTATUS -NTAPI -PsRemoveCreateThreadNotifyRoutine( - IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine); - -NTKERNELAPI -NTSTATUS -NTAPI -PsRemoveLoadImageNotifyRoutine( - IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine); - -NTKERNELAPI -NTSTATUS -NTAPI -PsSetCreateProcessNotifyRoutine( - IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, - IN BOOLEAN Remove); - -NTKERNELAPI -NTSTATUS -NTAPI -PsSetCreateThreadNotifyRoutine( - IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine); - -NTKERNELAPI -NTSTATUS -NTAPI -PsSetLoadImageNotifyRoutine( - IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine); - -extern NTSYSAPI PEPROCESS PsInitialSystemProcess; - -/** Security reference monitor routines **/ - -NTKERNELAPI -BOOLEAN -NTAPI -SeSinglePrivilegeCheck( - LUID PrivilegeValue, - KPROCESSOR_MODE PreviousMode); - /** NtXxx and ZwXxx routines **/ - -NTSYSCALLAPI -NTSTATUS -NTAPI -NtOpenProcess( - OUT PHANDLE ProcessHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PCLIENT_ID ClientId OPTIONAL); - -NTSYSCALLAPI -NTSTATUS -NTAPI -NtQueryInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCancelTimer( - IN HANDLE TimerHandle, - OUT PBOOLEAN CurrentState OPTIONAL); NTSYSCALLAPI NTSTATUS @@ -2905,15 +2458,6 @@ IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN EVENT_TYPE EventType, IN BOOLEAN InitialState); - -NTSYSAPI -NTSTATUS -NTAPI -ZwCreateTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN TIMER_TYPE TimerType); NTSYSCALLAPI NTSTATUS @@ -2969,14 +2513,6 @@ IN ULONG ShareAccess, IN ULONG OpenOptions); -NTSYSAPI -NTSTATUS -NTAPI -ZwOpenTimer( - OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes); - NTSYSCALLAPI NTSTATUS NTAPI @@ -3005,27 +2541,6 @@ IN HANDLE EventHandle, OUT PLONG PreviousState OPTIONAL); -NTSYSAPI -NTSTATUS -NTAPI -ZwSetInformationThread( - IN HANDLE ThreadHandle, - IN THREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength); - -NTSYSAPI -NTSTATUS -NTAPI -ZwSetTimer( - IN HANDLE TimerHandle, - IN PLARGE_INTEGER DueTime, - IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, - IN PVOID TimerContext OPTIONAL, - IN BOOLEAN WakeTimer, - IN LONG Period OPTIONAL, - OUT PBOOLEAN PreviousState OPTIONAL); - /* [Nt|Zw]MapViewOfSection.InheritDisposition constants */ #define AT_EXTENDABLE_FILE 0x00002000 #define AT_RESERVED 0x20000000 @@ -3182,26 +2697,6 @@ IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); NTHALAPI -NTSTATUS -NTAPI -HalAssignSlotResources( - IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources); - -NTHALAPI -PADAPTER_OBJECT -NTAPI -HalGetAdapter( - IN PDEVICE_DESCRIPTION DeviceDescription, - IN OUT PULONG NumberOfMapRegisters); - -NTHALAPI ULONG NTAPI HalGetBusData(

1 0

[cfinck] 46082: Use a different wallpaper for CLT2010 (2/2)
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 23:42:35 2010 New Revision: 46082 URL: http://svn.reactos.org/svn/reactos?rev=46082&view=rev Log: Use a different wallpaper for CLT2010 (2/2) Modified: branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Mar 10 23:42:35 2010 @@ -96,7 +96,7 @@ HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\clouds-clt.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 Modified: branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Mar 10 23:42:35 2010 @@ -796,4 +796,4 @@ modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional +modules\wallpaper\clouds-clt.bmp 4 optional

1 0

[cfinck] 46081: Use a different wallpaper for CLT2010 (1/2)
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 23:39:41 2010 New Revision: 46081 URL: http://svn.reactos.org/svn/reactos?rev=46081&view=rev Log: Use a different wallpaper for CLT2010 (1/2) Added: branches/ros-branch-0_3_11-clt2010/wallpaper/clouds-clt.bmp (with props) Removed: branches/ros-branch-0_3_11-clt2010/wallpaper/Angelus_02_ROSWP.bmp branches/ros-branch-0_3_11-clt2010/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg branches/ros-branch-0_3_11-clt2010/wallpaper/lake.bmp branches/ros-branch-0_3_11-clt2010/wallpaper/lake.jpg Modified: branches/ros-branch-0_3_11-clt2010/wallpaper/directory.rbuild Removed: branches/ros-branch-0_3_11-clt2010/wallpaper/Angelus_02_ROSWP.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== Binary file - no diff available. Added: branches/ros-branch-0_3_11-clt2010/wallpaper/clouds-clt.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_11-clt2010/wallpaper/clouds-clt.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/ros-branch-0_3_11-clt2010/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/wallpaper/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/wallpaper/directory.rbuild [iso-8859-1] Wed Mar 10 23:39:41 2010 @@ -1,3 +1,3 @@ <group> - <installfile>Angelus_02_ROSWP.bmp</installfile> + <installfile>clouds-clt.bmp</installfile> </group> Removed: branches/ros-branch-0_3_11-clt2010/wallpaper/lake.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/wallpaper/lake.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/wallp… ============================================================================== Binary file - no diff available.

1 0

[cgutman] 46080: - We forget that AE_BUFFER_OVERFLOW is normal and expected since our buffer length is 0 so don't fail if that status is returned - For any device that actually had resources we would return STATUS_SUCCESS without building a resource list and if the device didn't have resources we would end up freeing a NULL pointer, storing stack trash in Irp->IoStatus.Information, and then returning STATUS_SUCCESS - Fixes reporting device resources (and possibly the VBox additions crash with AC
by cgutman＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cgutman Date: Wed Mar 10 23:25:40 2010 New Revision: 46080 URL: http://svn.reactos.org/svn/reactos?rev=46080&view=rev Log: - We forget that AE_BUFFER_OVERFLOW is normal and expected since our buffer length is 0 so don't fail if that status is returned - For any device that actually had resources we would return STATUS_SUCCESS without building a resource list and if the device didn't have resources we would end up freeing a NULL pointer, storing stack trash in Irp->IoStatus.Information, and then returning STATUS_SUCCESS - Fixes reporting device resources (and possibly the VBox additions crash with ACPI enabled) Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Wed Mar 10 23:25:40 2010 @@ -599,23 +599,23 @@ /* Get current resources */ Buffer.Length = 0; AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); + if ((!ACPI_SUCCESS(AcpiStatus) && AcpiStatus != AE_BUFFER_OVERFLOW) || + Buffer.Length == 0) + { + return Irp->IoStatus.Status; + } + + Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length); + if (!Buffer.Pointer) + return STATUS_INSUFFICIENT_RESOURCES; + + AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); if (!ACPI_SUCCESS(AcpiStatus)) { - return STATUS_SUCCESS; - } - if (Buffer.Length > 0) - { - Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length); - if (!Buffer.Pointer) - { - ASSERT(FALSE); - } - AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); - if (!ACPI_SUCCESS(AcpiStatus)) - { - ASSERT(FALSE); - } - } + DPRINT1("AcpiGetCurrentResources #2 failed (0x%x)\n", AcpiStatus); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } resource= Buffer.Pointer; /* Count number of resources */ @@ -776,23 +776,23 @@ /* Get current resources */ Buffer.Length = 0; AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); + if ((!ACPI_SUCCESS(AcpiStatus) && AcpiStatus != AE_BUFFER_OVERFLOW) || + Buffer.Length == 0) + { + return Irp->IoStatus.Status; + } + + Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length); + if (!Buffer.Pointer) + return STATUS_INSUFFICIENT_RESOURCES; + + AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); if (!ACPI_SUCCESS(AcpiStatus)) { - return STATUS_SUCCESS; - } - if (Buffer.Length > 0) - { - Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length); - if (!Buffer.Pointer) - { - ASSERT(FALSE); - } - AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); - if (!ACPI_SUCCESS(AcpiStatus)) - { - ASSERT(FALSE); - } - } + DPRINT1("AcpiGetCurrentResources #2 failed (0x%x)\n", AcpiStatus); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } resource= Buffer.Pointer; /* Count number of resources */

1 0

[tkreuzer] 46079: [NTIFS] Add back some members of OBJECT_INFORMATION_CLASS, with a comment that they are missing in WDK
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Wed Mar 10 23:23:12 2010 New Revision: 46079 URL: http://svn.reactos.org/svn/reactos?rev=46079&view=rev Log: [NTIFS] Add back some members of OBJECT_INFORMATION_CLASS, with a comment that they are missing in WDK Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Wed Mar 10 23:23:12 2010 @@ -743,7 +743,12 @@ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation = 0, - ObjectTypeInformation = 2 + ObjectNameInformation = 1, /* FIXME, not in WDK */ + ObjectTypeInformation = 2, + ObjectTypesInformation = 3, /* FIXME, not in WDK */ + ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */ + ObjectSessionInformation = 5, /* FIXME, not in WDK */ + MaxObjectInfoClass /* FIXME, not in WDK */ } OBJECT_INFORMATION_CLASS; #if (NTDDI_VERSION >= NTDDI_NT4)

1 0

[tkreuzer] 46078: Add extern "C"
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Wed Mar 10 23:05:56 2010 New Revision: 46078 URL: http://svn.reactos.org/svn/reactos?rev=46078&view=rev Log: Add extern "C" Modified: branches/header-work/include/ddk/ntddk.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed Mar 10 23:05:56 2010 @@ -51,6 +51,9 @@ #include <basetyps.h> // FIXME +#ifdef __cplusplus +extern "C" { +#endif // // GUID and UUID @@ -689,5 +692,9 @@ /* Windows Device Driver Kit */ #include "winddk.h" +#ifdef __cplusplus +} +#endif + #endif /* _NTDDK_ */

1 0

[cwittich] 46077: [OLE32_WINETEST] sync OLE32_WINETEST with wine 1.1.40
by cwittich＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cwittich Date: Wed Mar 10 22:52:40 2010 New Revision: 46077 URL: http://svn.reactos.org/svn/reactos?rev=46077&view=rev Log: [OLE32_WINETEST] sync OLE32_WINETEST with wine 1.1.40 Modified: trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/hglobalstream.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/stg_prop.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… Modified: trunk/rostests/winetests/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/hglobalst… Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha…

1 0

[cwittich] 46076: [PSDK] add extern GUID_NULL
by cwittich＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cwittich Date: Wed Mar 10 22:52:00 2010 New Revision: 46076 URL: http://svn.reactos.org/svn/reactos?rev=46076&view=rev Log: [PSDK] add extern GUID_NULL Modified: trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Wed Mar 10 22:52:00 2010 @@ -140,4 +140,6 @@ #endif #endif +extern const IID GUID_NULL; + #endif /* _GUIDDEF_H_ */

1 0

[spetreolle] 46075: [ACPI] Fix implicit declaration warnings
by spetreolle＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: spetreolle Date: Wed Mar 10 22:49:42 2010 New Revision: 46075 URL: http://svn.reactos.org/svn/reactos?rev=46075&view=rev Log: [ACPI] Fix implicit declaration warnings Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h trunk/reactos/drivers/bus/acpi/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] Wed Mar 10 22:49:42 2010 @@ -318,6 +318,7 @@ BOOLEAN acpi_bus_power_manageable(ACPI_HANDLE handle); BOOLEAN acpi_bus_can_wakeup(ACPI_HANDLE handle); int acpi_bus_generate_proc_event(struct acpi_device *device, UINT8 type, int data); +int acpi_bus_generate_event(struct acpi_device *device, UINT8 type, int data); int acpi_bus_receive_event(struct acpi_bus_event *event); int acpi_bus_register_driver(struct acpi_driver *driver); void acpi_bus_unregister_driver(struct acpi_driver *driver); @@ -328,6 +329,9 @@ ACPI_STATUS acpi_bus_get_ejd(ACPI_HANDLE handle, ACPI_HANDLE * ejd); int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids); +int acpi_bus_get_device(ACPI_HANDLE handle, struct acpi_device **device); +int acpi_init(void); +ACPI_STATUS acpi_suspend (UINT32 state); /* * Bind physical devices with ACPI devices Modified: trunk/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] Wed Mar 10 22:49:42 2010 @@ -86,9 +86,9 @@ /* acpienum.c */ -//NTSTATUS -//ACPIEnumerateDevices( -// PFDO_DEVICE_EXTENSION DeviceExtension); +NTSTATUS +ACPIEnumerateDevices( + PFDO_DEVICE_DATA DeviceExtension); NTSTATUS NTAPI

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs