Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 46064: [NTDDK] - Move several ntddk.h related definition from winddk.h - Group related definitions - Add CONTEXT_XSTATE definition - RtlUpperString and RtlCopyString : constify SourceString - RtlCompareString and RtlEqualString : constify the first two params - Update guards around IoAllocateAdapterChannel - Remove duplicate IoRegisterBootDriverReinitialization
by akhaldi＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: akhaldi Date: Wed Mar 10 18:42:51 2010 New Revision: 46064 URL: http://svn.reactos.org/svn/reactos?rev=46064&view=rev Log: [NTDDK] - Move several ntddk.h related definition from winddk.h - Group related definitions - Add CONTEXT_XSTATE definition - RtlUpperString and RtlCopyString : constify SourceString - RtlCompareString and RtlEqualString : constify the first two params - Update guards around IoAllocateAdapterChannel - Remove duplicate IoRegisterBootDriverReinitialization 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] Wed Mar 10 18:42:51 2010 @@ -27,14 +27,25 @@ #ifndef _NTDDK_ #define _NTDDK_ -// -// Dependencies -// +#if !defined(_NTHAL_) && !defined(_NTIFS_) +#define _NTDDK_INCLUDED_ +#define _DDK_DRIVER_ +#endif + +/* Dependencies */ + #define NT_INCLUDED +#define _CTYPE_DISABLE_MACROS + #include <wdm.h> #include <excpt.h> #include <ntdef.h> #include <ntstatus.h> + +/* FIXME +#include <bugcodes.h> +#include <ntiologc.h> +*/ #include <stdarg.h> // FIXME #include <basetyps.h> // FIXME @@ -49,6 +60,458 @@ #endif typedef GUID UUID; +typedef struct _BUS_HANDLER *PBUS_HANDLER; + +#define KERNEL_STACK_SIZE 12288 +#define KERNEL_LARGE_STACK_SIZE 61440 +#define KERNEL_LARGE_STACK_COMMIT 12288 + +#ifdef _X86_ + +#define SIZE_OF_80387_REGISTERS 80 + +typedef struct _FLOATING_SAVE_AREA { + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; + ULONG Cr0NpxState; +} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _CONTEXT { + ULONG ContextFlags; + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + FLOATING_SAVE_AREA FloatSave; + ULONG SegGs; + ULONG SegFs; + ULONG SegEs; + ULONG SegDs; + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + ULONG Ebp; + ULONG Eip; + ULONG SegCs; + ULONG EFlags; + ULONG Esp; + ULONG SegSs; + UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; +} CONTEXT, *PCONTEXT; +#include "poppack.h" + +#endif + +#ifdef _AMD64_ + +#if !defined(RC_INVOKED) + +#define CONTEXT_AMD64 0x100000 + +#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L) +#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L) +#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L) +#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x8L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L) + +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) + +#define CONTEXT_XSTATE (CONTEXT_AMD64 | 0x20L) + +#define CONTEXT_EXCEPTION_ACTIVE 0x8000000 +#define CONTEXT_SERVICE_ACTIVE 0x10000000 +#define CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#endif + +typedef enum _INTERLOCKED_RESULT { + ResultNegative = RESULT_NEGATIVE, + ResultZero = RESULT_ZERO, + ResultPositive = RESULT_POSITIVE +} INTERLOCKED_RESULT; + +#if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_) + +#define RtlGetCallersAddress(CallersAddress, CallersCaller) \ + *CallersAddress = (PVOID)_ReturnAddress(); \ + *CallersCaller = NULL; +#else + +#if (NTDDI_VERSION >= NTDDI_WIN2K) +NTSYSAPI +VOID +NTAPI +RtlGetCallersAddress( + OUT PVOID *CallersAddress, + OUT PVOID *CallersCaller); +#endif + +#endif + +#if !defined(MIDL_PASS) + +FORCEINLINE +LUID +NTAPI_INLINE +RtlConvertLongToLuid( + IN LONG Val) +{ + LUID Luid; + LARGE_INTEGER Temp; + + Temp.QuadPart = Val; + Luid.LowPart = Temp.u.LowPart; + Luid.HighPart = Temp.u.HighPart; + return Luid; +} + +FORCEINLINE +LUID +NTAPI_INLINE +RtlConvertUlongToLuid( + IN ULONG Val) +{ + LUID Luid; + + Luid.LowPart = Val; + Luid.HighPart = 0; + return Luid; +} + +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTSYSAPI +BOOLEAN +NTAPI +RtlPrefixUnicodeString( + IN PCUNICODE_STRING String1, + IN PCUNICODE_STRING String2, + IN BOOLEAN CaseInSensitive); + +NTSYSAPI +VOID +NTAPI +RtlUpperString( + IN OUT PSTRING DestinationString, + IN const PSTRING SourceString); + +NTSYSAPI +NTSTATUS +NTAPI +RtlUpcaseUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PCUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString); + +NTSYSAPI +VOID +NTAPI +RtlMapGenericMask( + IN OUT PACCESS_MASK AccessMask, + IN PGENERIC_MAPPING GenericMapping); + +NTSYSAPI +NTSTATUS +NTAPI +RtlVolumeDeviceToDosName( + IN PVOID VolumeDeviceObject, + OUT PUNICODE_STRING DosName); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetVersion( + IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); + +NTSYSAPI +NTSTATUS +NTAPI +RtlVerifyVersionInfo( + IN PRTL_OSVERSIONINFOEXW VersionInfo, + IN ULONG TypeMask, + IN ULONGLONG ConditionMask); + +NTSYSAPI +LONG +NTAPI +RtlCompareString( + IN const PSTRING String1, + IN const PSTRING String2, + BOOLEAN CaseInSensitive); + +NTSYSAPI +VOID +NTAPI +RtlCopyString( + OUT PSTRING DestinationString, + IN const PSTRING SourceString OPTIONAL); + +NTSYSAPI +BOOLEAN +NTAPI +RtlEqualString( + IN const PSTRING String1, + IN const PSTRING String2, + IN BOOLEAN CaseInSensitive); + +#endif + +/* Executive Types */ + +#define PROTECTED_POOL 0x80000000 + +typedef struct _ZONE_SEGMENT_HEADER { + SINGLE_LIST_ENTRY SegmentList; + PVOID Reserved; +} ZONE_SEGMENT_HEADER, *PZONE_SEGMENT_HEADER; + +typedef struct _ZONE_HEADER { + SINGLE_LIST_ENTRY FreeList; + SINGLE_LIST_ENTRY SegmentList; + ULONG BlockSize; + ULONG TotalSegmentSize; +} ZONE_HEADER, *PZONE_HEADER; + +/* Executive Functions */ + +/* + * BOOLEAN + * ExIsFullZone( + * IN PZONE_HEADER Zone) + */ +#define ExIsFullZone(Zone) \ + ((Zone)->FreeList.Next == (PSINGLE_LIST_ENTRY) NULL) + +/* BOOLEAN + * ExIsObjectInFirstZoneSegment( + * IN PZONE_HEADER Zone, + * IN PVOID Object); + */ +#define ExIsObjectInFirstZoneSegment(Zone,Object) \ + ((BOOLEAN)( ((PUCHAR)(Object) >= (PUCHAR)(Zone)->SegmentList.Next) && \ + ((PUCHAR)(Object) < (PUCHAR)(Zone)->SegmentList.Next + \ + (Zone)->TotalSegmentSize)) ) + +#define ExAcquireResourceExclusive ExAcquireResourceExclusiveLite +#define ExAcquireResourceShared ExAcquireResourceSharedLite +#define ExConvertExclusiveToShared ExConvertExclusiveToSharedLite +#define ExDeleteResource ExDeleteResourceLite +#define ExInitializeResource ExInitializeResourceLite +#define ExIsResourceAcquiredExclusive ExIsResourceAcquiredExclusiveLite +#define ExIsResourceAcquiredShared ExIsResourceAcquiredSharedLite +#define ExIsResourceAcquired ExIsResourceAcquiredSharedLite +#define ExReleaseResourceForThread ExReleaseResourceForThreadLite + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +NTSTATUS +NTAPI +ExExtendZone( + IN OUT PZONE_HEADER Zone, + IN OUT PVOID Segment, + IN ULONG SegmentSize); + +NTKERNELAPI +NTSTATUS +NTAPI +ExInitializeZone( + OUT PZONE_HEADER Zone, + IN ULONG BlockSize, + IN OUT PVOID InitialSegment, + IN ULONG InitialSegmentSize); + +NTKERNELAPI +NTSTATUS +NTAPI +ExInterlockedExtendZone( + IN OUT PZONE_HEADER Zone, + IN OUT PVOID Segment, + IN ULONG SegmentSize, + IN OUT PKSPIN_LOCK Lock); + +NTKERNELAPI +NTSTATUS +NTAPI +ExUuidCreate( + OUT UUID *Uuid); + +#endif + +/* I/O Manager Functions */ + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +#if !(defined(USE_DMA_MACROS) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)) +NTKERNELAPI +NTSTATUS +NTAPI +IoAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context); +#endif + +//DECLSPEC_DEPRECATED_DDK +NTHALAPI +PHYSICAL_ADDRESS +NTAPI +IoMapTransfer( + IN PADAPTER_OBJECT AdapterObject, + IN PMDL Mdl, + IN PVOID MapRegisterBase, + IN PVOID CurrentVa, + IN OUT PULONG Length, + IN BOOLEAN WriteToDevice); + +NTKERNELAPI +VOID +NTAPI +IoAllocateController( + IN PCONTROLLER_OBJECT ControllerObject, + IN PDEVICE_OBJECT DeviceObject, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context OPTIONAL); + +NTKERNELAPI +PCONTROLLER_OBJECT +NTAPI +IoCreateController( + IN ULONG Size); + +NTKERNELAPI +VOID +NTAPI +IoDeleteController( + IN PCONTROLLER_OBJECT ControllerObject); + +NTKERNELAPI +VOID +NTAPI +IoFreeController( + IN PCONTROLLER_OBJECT ControllerObject); + +NTKERNELAPI +PCONFIGURATION_INFORMATION +NTAPI +IoGetConfigurationInformation( + VOID); + +NTKERNELAPI +PDEVICE_OBJECT +NTAPI +IoGetDeviceToVerify( + IN PETHREAD Thread); + +NTKERNELAPI +VOID +NTAPI +IoCancelFileOpen( + IN PDEVICE_OBJECT DeviceObject, + IN PFILE_OBJECT FileObject); + +NTKERNELAPI +PGENERIC_MAPPING +NTAPI +IoGetFileObjectGenericMapping( + VOID); + +NTKERNELAPI +PIRP +NTAPI +IoMakeAssociatedIrp( + IN PIRP Irp, + IN CCHAR StackSize); + +NTKERNELAPI +NTSTATUS +NTAPI +IoQueryDeviceDescription( + IN PINTERFACE_TYPE BusType OPTIONAL, + IN PULONG BusNumber OPTIONAL, + IN PCONFIGURATION_TYPE ControllerType OPTIONAL, + IN PULONG ControllerNumber OPTIONAL, + IN PCONFIGURATION_TYPE PeripheralType OPTIONAL, + IN PULONG PeripheralNumber OPTIONAL, + IN PIO_QUERY_DEVICE_ROUTINE CalloutRoutine, + IN OUT PVOID Context OPTIONAL); + +NTKERNELAPI +VOID +NTAPI +IoRaiseHardError( + IN PIRP Irp, + IN PVPB Vpb OPTIONAL, + IN PDEVICE_OBJECT RealDeviceObject); + +NTKERNELAPI +BOOLEAN +NTAPI +IoRaiseInformationalHardError( + IN NTSTATUS ErrorStatus, + IN PUNICODE_STRING String OPTIONAL, + IN PKTHREAD Thread OPTIONAL); + +NTKERNELAPI +VOID +NTAPI +IoRegisterBootDriverReinitialization( + IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, + IN PVOID Context OPTIONAL); + +NTKERNELAPI +VOID +NTAPI +IoRegisterDriverReinitialization( + IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, + IN PVOID Context OPTIONAL); + +NTKERNELAPI +NTSTATUS +NTAPI +IoAttachDeviceByPointer( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +/* Memory Manager Functions */ + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +NTKERNELAPI +PPHYSICAL_MEMORY_RANGE +NTAPI +MmGetPhysicalMemoryRanges( + VOID); + +NTKERNELAPI +PHYSICAL_ADDRESS +NTAPI +MmGetPhysicalAddress( + IN PVOID BaseAddress); + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ /* 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] Wed Mar 10 18:42:51 2010 @@ -81,8 +81,6 @@ struct _LOADER_PARAMETER_BLOCK; struct _BUS_HANDLER; -typedef struct _BUS_HANDLER *PBUS_HANDLER; - #if 1 /* FIXME: Unknown definitions */ struct _SET_PARTITION_INFORMATION_EX; @@ -102,10 +100,6 @@ IrpNotWmi, // Irp is not a WMI irp IrpForward // Irp is wmi irp, but targeted at another device object } SYSCTL_IRP_DISPOSITION, *PSYSCTL_IRP_DISPOSITION; - -#define KERNEL_STACK_SIZE 12288 -#define KERNEL_LARGE_STACK_SIZE 61440 -#define KERNEL_LARGE_STACK_COMMIT 12288 #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 @@ -1585,7 +1579,6 @@ #ifdef _X86_ -#define SIZE_OF_80387_REGISTERS 80 #define CONTEXT_i386 0x10000 #define CONTEXT_i486 0x10000 #define CONTEXT_CONTROL (CONTEXT_i386|0x00000001L) @@ -1595,46 +1588,6 @@ #define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386|0x00000010L) #define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L) #define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS) - -typedef struct _FLOATING_SAVE_AREA { - ULONG ControlWord; - ULONG StatusWord; - ULONG TagWord; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; - ULONG Cr0NpxState; -} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; - -typedef struct _CONTEXT { - ULONG ContextFlags; - ULONG Dr0; - ULONG Dr1; - ULONG Dr2; - ULONG Dr3; - ULONG Dr6; - ULONG Dr7; - FLOATING_SAVE_AREA FloatSave; - ULONG SegGs; - ULONG SegFs; - ULONG SegEs; - ULONG SegDs; - ULONG Edi; - ULONG Esi; - ULONG Ebx; - ULONG Edx; - ULONG Ecx; - ULONG Eax; - ULONG Ebp; - ULONG Eip; - ULONG SegCs; - ULONG EFlags; - ULONG Esp; - ULONG SegSs; - UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; -} CONTEXT; typedef struct _KPCR_TIB { PVOID ExceptionList; /* 00 */ @@ -1698,23 +1651,6 @@ #define MM_SYSTEM_SPACE_END 0xFFFFFFFF #elif defined(__x86_64__) - -#define CONTEXT_AMD64 0x100000 -#if !defined(RC_INVOKED) -#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L) -#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L) -#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L) -#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x8L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L) - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) -#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) - -#define CONTEXT_EXCEPTION_ACTIVE 0x8000000 -#define CONTEXT_SERVICE_ACTIVE 0x10000000 -#define CONTEXT_EXCEPTION_REQUEST 0x40000000 -#define CONTEXT_EXCEPTION_REPORTING 0x80000000 -#endif typedef struct DECLSPEC_ALIGN(16) _CONTEXT { ULONG64 P1Home; @@ -2029,12 +1965,6 @@ #else #error Unknown architecture #endif - -typedef enum _INTERLOCKED_RESULT { - ResultNegative = RESULT_NEGATIVE, - ResultZero = RESULT_ZERO, - ResultPositive = RESULT_POSITIVE -} INTERLOCKED_RESULT; typedef VOID (NTAPI *PciPin2Line)( @@ -2232,48 +2162,6 @@ IN OUT PULONG Value); NTSYSAPI -LONG -NTAPI -RtlCompareString( - IN PSTRING String1, - IN PSTRING String2, - BOOLEAN CaseInSensitive); - -#if !defined(MIDL_PASS) - -FORCEINLINE -LUID -NTAPI -RtlConvertLongToLuid( - IN LONG Val) -{ - LUID Luid; - LARGE_INTEGER Temp; - - Temp.QuadPart = Val; - Luid.LowPart = Temp.u.LowPart; - Luid.HighPart = Temp.u.HighPart; - - return Luid; -} - -FORCEINLINE -LUID -NTAPI -RtlConvertUlongToLuid( - IN ULONG Val) -{ - LUID Luid; - - Luid.LowPart = Val; - Luid.HighPart = 0; - - return Luid; -} -#endif - - -NTSYSAPI VOID NTAPI RtlCopyMemory32( @@ -2282,89 +2170,10 @@ IN ULONG Length); NTSYSAPI -VOID -NTAPI -RtlCopyString( - IN OUT PSTRING DestinationString, - IN PSTRING SourceString OPTIONAL); - -NTSYSAPI -BOOLEAN -NTAPI -RtlEqualString( - IN PSTRING String1, - IN PSTRING String2, - IN BOOLEAN CaseInSensitive); - -#if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_) -#define RtlGetCallersAddress(CallersAddress, CallersCaller) \ - *CallersAddress = (PVOID)_ReturnAddress(); \ - *CallersCaller = NULL; -#else -NTSYSAPI -VOID -NTAPI -RtlGetCallersAddress( - OUT PVOID *CallersAddress, - OUT PVOID *CallersCaller); -#endif - -NTSYSAPI -NTSTATUS -NTAPI -RtlGetVersion( - IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); - -NTSYSAPI -VOID -NTAPI -RtlMapGenericMask( - IN OUT PACCESS_MASK AccessMask, - IN PGENERIC_MAPPING GenericMapping); - -NTSYSAPI -BOOLEAN -NTAPI -RtlPrefixUnicodeString( - IN PCUNICODE_STRING String1, - IN PCUNICODE_STRING String2, - IN BOOLEAN CaseInSensitive); - -NTSYSAPI -NTSTATUS -NTAPI -RtlUpcaseUnicodeString( - IN OUT PUNICODE_STRING DestinationString OPTIONAL, - IN PCUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString); - -NTSYSAPI CHAR NTAPI RtlUpperChar( IN CHAR Character); - -NTSYSAPI -VOID -NTAPI -RtlUpperString( - IN OUT PSTRING DestinationString, - IN PSTRING SourceString); - -NTSYSAPI -NTSTATUS -NTAPI -RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask); - -NTSYSAPI -NTSTATUS -NTAPI -RtlVolumeDeviceToDosName( - IN PVOID VolumeDeviceObject, - OUT PUNICODE_STRING DosName); NTSYSAPI ULONG @@ -2373,36 +2182,6 @@ OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); - -/****************************************************************************** - * Executive Types * - ******************************************************************************/ - -typedef struct _ZONE_SEGMENT_HEADER { - SINGLE_LIST_ENTRY SegmentList; - PVOID Reserved; -} ZONE_SEGMENT_HEADER, *PZONE_SEGMENT_HEADER; - -typedef struct _ZONE_HEADER { - SINGLE_LIST_ENTRY FreeList; - SINGLE_LIST_ENTRY SegmentList; - ULONG BlockSize; - ULONG TotalSegmentSize; -} ZONE_HEADER, *PZONE_HEADER; - -#define PROTECTED_POOL 0x80000000 - -/****************************************************************************** - * Executive Functions * - ******************************************************************************/ - -NTKERNELAPI -NTSTATUS -NTAPI -ExExtendZone( - IN PZONE_HEADER Zone, - IN PVOID Segment, - IN ULONG SegmentSize); static __inline PVOID ExAllocateFromZone( @@ -2423,15 +2202,6 @@ return ((PSINGLE_LIST_ENTRY) Block)->Next; } -NTKERNELAPI -NTSTATUS -NTAPI -ExInitializeZone( - IN PZONE_HEADER Zone, - IN ULONG BlockSize, - IN PVOID InitialSegment, - IN ULONG InitialSegmentSize); - /* * PVOID * ExInterlockedAllocateFromZone( @@ -2441,15 +2211,6 @@ #define ExInterlockedAllocateFromZone(Zone, Lock) \ ((PVOID) ExInterlockedPopEntryList(&Zone->FreeList, Lock)) -NTKERNELAPI -NTSTATUS -NTAPI -ExInterlockedExtendZone( - IN PZONE_HEADER Zone, - IN PVOID Segment, - IN ULONG SegmentSize, - IN PKSPIN_LOCK Lock); - /* PVOID * ExInterlockedFreeToZone( * IN PZONE_HEADER Zone, @@ -2459,24 +2220,6 @@ #define ExInterlockedFreeToZone(Zone, Block, Lock) \ ExInterlockedPushEntryList(&(Zone)->FreeList, (PSINGLE_LIST_ENTRY)(Block), Lock) -/* - * BOOLEAN - * ExIsFullZone( - * IN PZONE_HEADER Zone) - */ -#define ExIsFullZone(Zone) \ - ((Zone)->FreeList.Next == (PSINGLE_LIST_ENTRY) NULL) - -/* BOOLEAN - * ExIsObjectInFirstZoneSegment( - * IN PZONE_HEADER Zone, - * IN PVOID Object); - */ -#define ExIsObjectInFirstZoneSegment(Zone,Object) \ - ((BOOLEAN)( ((PUCHAR)(Object) >= (PUCHAR)(Zone)->SegmentList.Next) && \ - ((PUCHAR)(Object) < (PUCHAR)(Zone)->SegmentList.Next + \ - (Zone)->TotalSegmentSize)) ) - NTKERNELAPI DECLSPEC_NORETURN VOID @@ -2490,22 +2233,6 @@ NTAPI ExRaiseDatatypeMisalignment( VOID); - -NTKERNELAPI -NTSTATUS -NTAPI -ExUuidCreate( - OUT UUID *Uuid); - -#define ExAcquireResourceExclusive ExAcquireResourceExclusiveLite -#define ExAcquireResourceShared ExAcquireResourceSharedLite -#define ExConvertExclusiveToShared ExConvertExclusiveToSharedLite -#define ExDeleteResource ExDeleteResourceLite -#define ExInitializeResource ExInitializeResourceLite -#define ExIsResourceAcquiredExclusive ExIsResourceAcquiredExclusiveLite -#define ExIsResourceAcquiredShared ExIsResourceAcquiredSharedLite -#define ExIsResourceAcquired ExIsResourceAcquiredSharedLite -#define ExReleaseResourceForThread ExReleaseResourceForThreadLite /** Filesystem runtime library routines **/ @@ -2539,27 +2266,6 @@ ); /** I/O manager routines **/ - -#ifndef DMA_MACROS_DEFINED -NTKERNELAPI -NTSTATUS -NTAPI -IoAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context); -#endif - -NTKERNELAPI -VOID -NTAPI -IoAllocateController( - IN PCONTROLLER_OBJECT ControllerObject, - IN PDEVICE_OBJECT DeviceObject, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context); /* * VOID IoAssignArcName( @@ -2570,30 +2276,11 @@ IoCreateSymbolicLink((_ArcName), (_DeviceName))) NTKERNELAPI -VOID -NTAPI -IoCancelFileOpen( - IN PDEVICE_OBJECT DeviceObject, - IN PFILE_OBJECT FileObject); - -NTKERNELAPI -PCONTROLLER_OBJECT -NTAPI -IoCreateController( - IN ULONG Size); - -NTKERNELAPI NTSTATUS NTAPI IoCreateDisk( IN PDEVICE_OBJECT DeviceObject, IN PCREATE_DISK Disk); - -NTKERNELAPI -VOID -NTAPI -IoDeleteController( - IN PCONTROLLER_OBJECT ControllerObject); /* * VOID @@ -2603,66 +2290,6 @@ #define IoDeassignArcName IoDeleteSymbolicLink NTKERNELAPI -VOID -NTAPI -IoFreeController( - IN PCONTROLLER_OBJECT ControllerObject); - -NTKERNELAPI -PCONFIGURATION_INFORMATION -NTAPI -IoGetConfigurationInformation( - VOID); - -NTKERNELAPI -PDEVICE_OBJECT -NTAPI -IoGetDeviceToVerify( - IN PETHREAD Thread); - -NTKERNELAPI -PGENERIC_MAPPING -NTAPI -IoGetFileObjectGenericMapping( - VOID); - -NTKERNELAPI -PIRP -NTAPI -IoMakeAssociatedIrp( - IN PIRP Irp, - IN CCHAR StackSize); - -NTKERNELAPI -NTSTATUS -NTAPI -IoQueryDeviceDescription( - IN PINTERFACE_TYPE BusType OPTIONAL, - IN PULONG BusNumber OPTIONAL, - IN PCONFIGURATION_TYPE ControllerType OPTIONAL, - IN PULONG ControllerNumber OPTIONAL, - IN PCONFIGURATION_TYPE PeripheralType OPTIONAL, - IN PULONG PeripheralNumber OPTIONAL, - IN PIO_QUERY_DEVICE_ROUTINE CalloutRoutine, - IN PVOID Context); - -NTKERNELAPI -VOID -NTAPI -IoRaiseHardError( - IN PIRP Irp, - IN PVPB Vpb OPTIONAL, - IN PDEVICE_OBJECT RealDeviceObject); - -NTKERNELAPI -BOOLEAN -NTAPI -IoRaiseInformationalHardError( - IN NTSTATUS ErrorStatus, - IN PUNICODE_STRING String OPTIONAL, - IN PKTHREAD Thread OPTIONAL); - -NTKERNELAPI NTSTATUS NTAPI IoReadDiskSignature( @@ -2685,30 +2312,6 @@ IoReadPartitionTableEx( IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX **PartitionBuffer); - -NTKERNELAPI -VOID -NTAPI -IoRegisterBootDriverReinitialization( - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, - IN PVOID Context); - -NTKERNELAPI -VOID -NTAPI -IoRegisterBootDriverReinitialization( - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, - IN PVOID Context); - -NTKERNELAPI -VOID -NTAPI -IoRegisterDriverReinitialization( - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, - IN PVOID Context); NTKERNELAPI NTSTATUS @@ -2830,18 +2433,6 @@ //DECLSPEC_DEPRECATED_DDK NTHALAPI -PHYSICAL_ADDRESS -NTAPI -IoMapTransfer( - IN PADAPTER_OBJECT AdapterObject, - IN PMDL Mdl, - IN PVOID MapRegisterBase, - IN PVOID CurrentVa, - IN OUT PULONG Length, - IN BOOLEAN WriteToDevice); - -//DECLSPEC_DEPRECATED_DDK -NTHALAPI BOOLEAN NTAPI IoFlushAdapterBuffers( @@ -3135,18 +2726,6 @@ MmFreeNonCachedMemory( IN PVOID BaseAddress, IN SIZE_T NumberOfBytes); - -NTKERNELAPI -PHYSICAL_ADDRESS -NTAPI -MmGetPhysicalAddress( - IN PVOID BaseAddress); - -NTKERNELAPI -PPHYSICAL_MEMORY_RANGE -NTAPI -MmGetPhysicalMemoryRanges( - VOID); NTKERNELAPI PVOID @@ -3698,13 +3277,6 @@ IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PIO_RESOURCE_REQUIREMENTS_LIST RequestedResources, IN OUT PCM_RESOURCE_LIST *AllocatedResources); - -NTKERNELAPI -NTSTATUS -NTAPI -IoAttachDeviceByPointer( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice); NTKERNELAPI BOOLEAN

1 0

[dreimer] 46063: Sync mscms, msg711.acm, msgm32.acm, msimtf. msnet32, msrle32, mssip32, msvcrt20, msvfw32, msvidc32 and nddeapi to Wine 1.1.40 Even more will come.
by dreimer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: dreimer Date: Wed Mar 10 18:03:25 2010 New Revision: 46063 URL: http://svn.reactos.org/svn/reactos?rev=46063&view=rev Log: Sync mscms, msg711.acm, msgm32.acm, msimtf. msnet32, msrle32, mssip32, msvcrt20, msvfw32, msvidc32 and nddeapi to Wine 1.1.40 Even more will come. Added: trunk/reactos/dll/win32/msrle32/msrle_Lt.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Uk.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_It.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Lt.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Uk.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Ja.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Lt.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Uk.rc (with props) Modified: trunk/reactos/dll/win32/mscms/profile.c trunk/reactos/dll/win32/msg711.acm/msg711.c trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/dll/win32/msnet32/msnet_main.c trunk/reactos/dll/win32/msrle32/msrle_Bg.rc trunk/reactos/dll/win32/msrle32/msrle_Cs.rc trunk/reactos/dll/win32/msrle32/msrle_Da.rc trunk/reactos/dll/win32/msrle32/msrle_De.rc trunk/reactos/dll/win32/msrle32/msrle_En.rc trunk/reactos/dll/win32/msrle32/msrle_Es.rc trunk/reactos/dll/win32/msrle32/msrle_Fr.rc trunk/reactos/dll/win32/msrle32/msrle_Hu.rc trunk/reactos/dll/win32/msrle32/msrle_It.rc trunk/reactos/dll/win32/msrle32/msrle_Ja.rc trunk/reactos/dll/win32/msrle32/msrle_Ko.rc trunk/reactos/dll/win32/msrle32/msrle_Nl.rc trunk/reactos/dll/win32/msrle32/msrle_No.rc trunk/reactos/dll/win32/msrle32/msrle_Pl.rc trunk/reactos/dll/win32/msrle32/msrle_Pt.rc trunk/reactos/dll/win32/msrle32/msrle_Ro.rc trunk/reactos/dll/win32/msrle32/msrle_Ru.rc trunk/reactos/dll/win32/msrle32/msrle_Si.rc trunk/reactos/dll/win32/msrle32/msrle_Sv.rc trunk/reactos/dll/win32/msrle32/msrle_Tr.rc trunk/reactos/dll/win32/msrle32/rsrc.rc trunk/reactos/dll/win32/mssip32/main.c trunk/reactos/dll/win32/mssip32/mssip32.spec trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/msvfw32_Da.rc trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Ru.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Si.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/dll/win32/msvfw32/rsrc.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Da.rc trunk/reactos/dll/win32/msvidc32/msvidc32_De.rc trunk/reactos/dll/win32/msvidc32/msvidc32_En.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Fr.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Hu.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Ko.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Nl.rc trunk/reactos/dll/win32/msvidc32/msvidc32_No.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Pl.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Pt.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Ro.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Ru.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Si.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Sv.rc trunk/reactos/dll/win32/msvidc32/msvidc32_Tr.rc trunk/reactos/dll/win32/msvidc32/msvidc32_private.h trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/dll/win32/msvidc32/rsrc.rc trunk/reactos/dll/win32/nddeapi/nddeapi.spec trunk/reactos/include/psdk/vfw.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgs… Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… Modified: trunk/reactos/dll/win32/msnet32/msnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msnet32/msnet_ma… Modified: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Bg… Modified: trunk/reactos/dll/win32/msrle32/msrle_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cs… Modified: trunk/reactos/dll/win32/msrle32/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Da… Modified: trunk/reactos/dll/win32/msrle32/msrle_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_De… Modified: trunk/reactos/dll/win32/msrle32/msrle_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_En… Modified: trunk/reactos/dll/win32/msrle32/msrle_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Es… Modified: trunk/reactos/dll/win32/msrle32/msrle_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Fr… Modified: trunk/reactos/dll/win32/msrle32/msrle_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Hu… Modified: trunk/reactos/dll/win32/msrle32/msrle_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_It… Modified: trunk/reactos/dll/win32/msrle32/msrle_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ja… Modified: trunk/reactos/dll/win32/msrle32/msrle_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ko… Added: trunk/reactos/dll/win32/msrle32/msrle_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Lt… Modified: trunk/reactos/dll/win32/msrle32/msrle_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Nl… Modified: trunk/reactos/dll/win32/msrle32/msrle_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_No… Modified: trunk/reactos/dll/win32/msrle32/msrle_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pl… Modified: trunk/reactos/dll/win32/msrle32/msrle_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pt… Modified: trunk/reactos/dll/win32/msrle32/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ro… Modified: trunk/reactos/dll/win32/msrle32/msrle_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ru… Modified: trunk/reactos/dll/win32/msrle32/msrle_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Si… Modified: trunk/reactos/dll/win32/msrle32/msrle_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Sv… Modified: trunk/reactos/dll/win32/msrle32/msrle_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Tr… Added: trunk/reactos/dll/win32/msrle32/msrle_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Uk… Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… Modified: trunk/reactos/dll/win32/mssip32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/main.c?r… Modified: trunk/reactos/dll/win32/mssip32/mssip32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/mssip32.… Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Added: trunk/reactos/dll/win32/msvfw32/msvfw32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvidc32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… Modified: trunk/reactos/dll/win32/msvidc32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/rsrc.rc… Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=460…

1 0

[dreimer] 46062: Sync avifil32, hnetcfg, initpki, localspl, localui, mciavi32, mciqtz32, mciseq and mlang to Wine 1.1.40 More will come.
by dreimer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: dreimer Date: Wed Mar 10 17:21:22 2010 New Revision: 46062 URL: http://svn.reactos.org/svn/reactos?rev=46062&view=rev Log: Sync avifil32, hnetcfg, initpki, localspl, localui, mciavi32, mciqtz32, mciseq and mlang to Wine 1.1.40 More will come. Added: trunk/reactos/dll/win32/hnetcfg/port.c (with props) trunk/reactos/dll/win32/hnetcfg/service.c (with props) trunk/reactos/dll/win32/localspl/spl_Es.rc (with props) trunk/reactos/dll/win32/localspl/spl_Lt.rc (with props) Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_Zh.rc trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/profile.c trunk/reactos/dll/win32/hnetcfg/regsvr.c trunk/reactos/dll/win32/initpki/initpki.spec trunk/reactos/dll/win32/initpki/main.c trunk/reactos/dll/win32/localspl/localspl.rc trunk/reactos/dll/win32/localspl/localspl_private.h trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/dll/win32/localspl/spl_Da.rc trunk/reactos/dll/win32/localspl/spl_De.rc trunk/reactos/dll/win32/localspl/spl_En.rc trunk/reactos/dll/win32/localspl/spl_Fr.rc trunk/reactos/dll/win32/localspl/spl_Ko.rc trunk/reactos/dll/win32/localspl/spl_Nl.rc trunk/reactos/dll/win32/localspl/spl_No.rc trunk/reactos/dll/win32/localspl/spl_Pl.rc trunk/reactos/dll/win32/localspl/spl_Pt.rc trunk/reactos/dll/win32/localspl/spl_Ro.rc trunk/reactos/dll/win32/localspl/spl_Ru.rc trunk/reactos/dll/win32/localspl/spl_Si.rc trunk/reactos/dll/win32/localspl/spl_Sv.rc trunk/reactos/dll/win32/localspl/spl_Zh.rc trunk/reactos/dll/win32/localui/localui.c trunk/reactos/dll/win32/localui/localui.h trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Lt.rc trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/ui_Zh.rc trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mciavi_res.rc trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mciavi32/wnd.c trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciseq/mcimidi.c trunk/reactos/dll/win32/mlang/mlang.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… Added: trunk/reactos/dll/win32/hnetcfg/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r… Modified: trunk/reactos/dll/win32/hnetcfg/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.… Modified: trunk/reactos/dll/win32/hnetcfg/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/regsvr.c… Added: trunk/reactos/dll/win32/hnetcfg/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/service.… Modified: trunk/reactos/dll/win32/initpki/initpki.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/initpki.… Modified: trunk/reactos/dll/win32/initpki/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/main.c?r… Modified: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Modified: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… Modified: trunk/reactos/dll/win32/localspl/spl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Da.… Modified: trunk/reactos/dll/win32/localspl/spl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_De.… Modified: trunk/reactos/dll/win32/localspl/spl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_En.… Added: trunk/reactos/dll/win32/localspl/spl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Es.… Modified: trunk/reactos/dll/win32/localspl/spl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Fr.… Modified: trunk/reactos/dll/win32/localspl/spl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ko.… Added: trunk/reactos/dll/win32/localspl/spl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Lt.… Modified: trunk/reactos/dll/win32/localspl/spl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Nl.… Modified: trunk/reactos/dll/win32/localspl/spl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_No.… Modified: trunk/reactos/dll/win32/localspl/spl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Pl.… Modified: trunk/reactos/dll/win32/localspl/spl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Pt.… Modified: trunk/reactos/dll/win32/localspl/spl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ro.… Modified: trunk/reactos/dll/win32/localspl/spl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Ru.… Modified: trunk/reactos/dll/win32/localspl/spl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Si.… Modified: trunk/reactos/dll/win32/localspl/spl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Sv.… Modified: trunk/reactos/dll/win32/localspl/spl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/spl_Zh.… Modified: trunk/reactos/dll/win32/localui/localui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… Modified: trunk/reactos/dll/win32/localui/localui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… Modified: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc… Modified: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc… Modified: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc… Modified: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc… Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… Modified: trunk/reactos/dll/win32/localui/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Lt.rc… Modified: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc… Modified: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc… Modified: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc… Modified: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc… Modified: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc… Modified: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc… Modified: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc… Modified: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc… Modified: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… Modified: trunk/reactos/dll/win32/mciavi32/mciavi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi_… Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… Modified: trunk/reactos/dll/win32/mciavi32/wnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/wnd.c?r… Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/mcimidi.c… Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re…

1 0

[spetreolle] 46061: [WLANSVC] - Add required libary iphlpapi
by spetreolle＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: spetreolle Date: Wed Mar 10 17:18:32 2010 New Revision: 46061 URL: http://svn.reactos.org/svn/reactos?rev=46061&view=rev Log: [WLANSVC] - Add required libary iphlpapi Modified: trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/base/services/wlansvc/wlansvc.rbuild Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Wed Mar 10 17:18:32 2010 @@ -14,7 +14,7 @@ #define NDEBUG #include <debug.h> - +//#define GET_IF_ENTRY2_IMPLEMENTED 1 DWORD _RpcOpenHandle( wchar_t *arg_1, Modified: trunk/reactos/base/services/wlansvc/wlansvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.rbuild [iso-8859-1] Wed Mar 10 17:18:32 2010 @@ -8,6 +8,7 @@ <library>advapi32</library> <library>rpcrt4</library> <library>pseh</library> + <library>iphlpapi</library> <file>wlansvc.c</file> <file>rpcserver.c</file> </module>

1 0

[akhaldi] 46060: [NTIFS] Remove RTL_SPLAY_LINKS definition
by akhaldi＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: akhaldi Date: Wed Mar 10 17:10:32 2010 New Revision: 46060 URL: http://svn.reactos.org/svn/reactos?rev=46060&view=rev Log: [NTIFS] Remove RTL_SPLAY_LINKS definition 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 17:10:32 2010 @@ -1528,12 +1528,6 @@ NTAPI RtlIsValidOemCharacter( IN OUT PWCHAR Char); - -typedef struct _RTL_SPLAY_LINKS { - struct _RTL_SPLAY_LINKS *Parent; - struct _RTL_SPLAY_LINKS *LeftChild; - struct _RTL_SPLAY_LINKS *RightChild; -} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; typedef struct _PREFIX_TABLE_ENTRY { CSHORT NodeTypeCode;

1 0

[cfinck] 46059: - Add a script for creating a Hybrid-CD (combined Boot-CD & Live-CD). Kudos for this go to Andrew Greenwood, I just scripted his way of creating the disc. - Combining them also requires changing the Live-CD directory in the kernel to "live", which renders regular Live-CDs created in this tree unbootable.
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 17:05:55 2010 New Revision: 46059 URL: http://svn.reactos.org/svn/reactos?rev=46059&view=rev Log: - Add a script for creating a Hybrid-CD (combined Boot-CD & Live-CD). Kudos for this go to Andrew Greenwood, I just scripted his way of creating the disc. - Combining them also requires changing the Live-CD directory in the kernel to "live", which renders regular Live-CDs created in this tree unbootable. Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini (with props) branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd (with props) branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd (with props) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini (added) +++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini [iso-8859-1] Wed Mar 10 17:05:55 2010 @@ -1,0 +1,32 @@ +[FREELOADER] +DefaultOS=ReactOS +Timeout=10 + +[Display] +TitleText=ReactOS @ CLT2010 +StatusBarColor=Cyan +StatusBarTextColor=Black +BackdropTextColor=White +BackdropColor=Blue +BackdropFillStyle=Medium +TitleBoxTextColor=White +TitleBoxColor=Red +MessageBoxTextColor=White +MessageBoxColor=Blue +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow +SelectedTextColor=Black +SelectedColor=Gray + +[Operating Systems] +Live="ReactOS Live-System starten" +Install="ReactOS-Installation starten" + +[Live] +BootType=ReactOS +SystemPath=LiveCD\live +Options=/DEBUGPORT=COM1 /SOS + +[Install] +BootType=ReactOSSetup Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd (added) +++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd [iso-8859-1] Wed Mar 10 17:05:55 2010 @@ -1,0 +1,38 @@ +:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes. +:: Only run it from the root "reactos" dir (where you would also call "make"). +:: +:: Written by Colin Finck (2010-03-10) +:: +:: STEP 1 - Prepare the basic files for the CD +:: + +@echo off + +:: Ensure that the user already built Boot-CDs and Live-CDs +if exist "output-i386\bootcd\." ( + if exist "output-i386\livecd\." ( + goto NEXT + ) +) + +echo Please build regular Boot-CDs and Live-CDs first! +goto :EOF + +:: Create directories and copy our stuff there +:NEXT +rd /s /q "hybridcd" +mkdir "hybridcd" +mkdir "hybridcd\live" +mkdir "hybridcd\Profiles" + +xcopy /e "output-i386\bootcd" "hybridcd" +xcopy /e "output-i386\livecd\reactos" "hybridcd\live" +xcopy /e "output-i386\livecd\Profiles" "hybridcd\Profiles" + +:: Copy our modified "freeldr.ini" +copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini" + + +echo The basic stuff has been prepared in the directory "hybridcd". +echo Now add everything else you want into this directory and run +echo "hybridcd_step2" afterwards to create the ISO. Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd (added) +++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd [iso-8859-1] Wed Mar 10 17:05:55 2010 @@ -1,0 +1,25 @@ +:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes. +:: Only run it from the root "reactos" dir (where you would also call "make"). +:: +:: Written by Colin Finck (2010-03-10) +:: +:: STEP 2 - Create the ISO +:: + +@echo off + +:: Ensure that "mkisofs" exists +if exist "mkisofs.exe" ( + goto NEXT +) + +echo mkisofs.exe was not found in the current directory. +echo Please get a correct version for it. (e.g. from "PE Builder" at http://nu2.nu) +echo. +echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is +echo important for a universally usable disc. +goto :EOF + +:: Use it +:NEXT +mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd" Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Wed Mar 10 17:05:55 2010 @@ -38,7 +38,7 @@ extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; /* Change this if you want ROS to boot properly from another directory */ - sprintf(RosSysPath, "%s", "reactos"); + sprintf(RosSysPath, "%s", "live"); /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom");

1 0

[dreimer] 46058: Updated README.WINE. Additionally I added a * to all Autosyncs which lie a bit back already. Will look through them and check which are still recent.
by dreimer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: dreimer Date: Wed Mar 10 16:00:25 2010 New Revision: 46058 URL: http://svn.reactos.org/svn/reactos?rev=46058&view=rev Log: Updated README.WINE. Additionally I added a * to all Autosyncs which lie a bit back already. Will look through them and check which are still recent. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 10 16:00:25 2010 @@ -37,155 +37,158 @@ reactos/dll/directx/dplay # Synced to Wine-0_9_5 reactos/dll/directx/dplayx # Synced to Wine-0_9_5 reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 -reactos/dll/directx/msdmo # Autosync +reactos/dll/directx/msdmo # Autosync* reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync -reactos/dll/win32/advpack # Autosync +reactos/dll/win32/advpack # Autosync* reactos/dll/win32/atl # Autosync -reactos/dll/win32/avifil32 # Autosync -reactos/dll/win32/bcrypt # Autosync +reactos/dll/win32/avifil32 # Autosync* +reactos/dll/win32/bcrypt # Autosync* reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Autosync +reactos/dll/win32/cabinet # Autosync* reactos/dll/win32/clusapi # Autosync -reactos/dll/win32/comcat # Autosync -reactos/dll/win32/comctl32 # Autosync -reactos/dll/win32/comdlg32 # Autosync -reactos/dll/win32/compstui # Autosync +reactos/dll/win32/comcat # Autosync* +reactos/dll/win32/comctl32 # Autosync* +reactos/dll/win32/comdlg32 # Autosync* +reactos/dll/win32/compstui # Autosync* reactos/dll/win32/credui # Autosync -reactos/dll/win32/crypt32 # Synced to Wine-1_1_21 +reactos/dll/win32/crypt32 # Synced to Wine-1_1_40 reactos/dll/win32/cryptdlg # Autosync -reactos/dll/win32/cryptdll # Autosync +reactos/dll/win32/cryptdll # Autosync* reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080802 reactos/dll/win32/dciman32 # Synced to Wine-1_0-rc2 +reactos/dll/win32/dwmapi # Autosync +reactos/dll/win32/fusion # Autosync reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync -reactos/dll/win32/hnetcfg # Autosync -reactos/dll/win32/httpapi # Autosync +reactos/dll/win32/hnetcfg # Autosync* +reactos/dll/win32/httpapi # Autosync* reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imaadp32.acm # Autosync +reactos/dll/win32/imaadp32.acm # Autosync* reactos/dll/win32/imm32 # Autosync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync -reactos/dll/win32/initpki # Autosync -reactos/dll/win32/inseng # Autosync +reactos/dll/win32/initpki # Autosync* +reactos/dll/win32/inseng # Autosync* reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Autosync reactos/dll/win32/itss # Autosync reactos/dll/win32/jscript # Autosync -reactos/dll/win32/localspl # Autosync -reactos/dll/win32/localui # Autosync -reactos/dll/win32/lz32 # Autosync +reactos/dll/win32/localspl # Autosync* +reactos/dll/win32/localui # Autosync* +reactos/dll/win32/lz32 # Autosync* reactos/dll/win32/mapi32 # Autosync -reactos/dll/win32/mciavi32 # Autosync -reactos/dll/win32/mcicda # Autosync -reactos/dll/win32/mciqtz32 # Autosync -reactos/dll/win32/mciseq # Autosync +reactos/dll/win32/mciavi32 # Autosync* +reactos/dll/win32/mcicda # Autosync* +reactos/dll/win32/mciqtz32 # Autosync* +reactos/dll/win32/mciseq # Autosync* reactos/dll/win32/mciwave # Autosync -reactos/dll/win32/mlang # Autosync +reactos/dll/win32/mlang # Autosync* reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync -reactos/dll/win32/msadp32.acm # Autosync -reactos/dll/win32/mscat32 # Autosync -reactos/dll/win32/mscms # Autosync +reactos/dll/win32/msadp32.acm # Autosync* +reactos/dll/win32/mscat32 # Autosync* +reactos/dll/win32/mscms # Autosync* reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync -reactos/dll/win32/msftedit # Autosync -reactos/dll/win32/msg711.acm # Autosync -reactos/dll/win32/msgsm32.acm # Autosync +reactos/dll/win32/msftedit # Autosync* +reactos/dll/win32/msg711.acm # Autosync* +reactos/dll/win32/msgsm32.acm # Autosync* reactos/dll/win32/mshtml # Autosync -reactos/dll/win32/msimg32 # Autosync +reactos/dll/win32/msimg32 # Autosync* reactos/dll/win32/msi # Autosync -reactos/dll/win32/msimtf # Autosync -reactos/dll/win32/msisip # Autosync -reactos/dll/win32/msisys.ocx # Autosync -reactos/dll/win32/msnet32 # Autosync -reactos/dll/win32/msrle32 # Autosync -reactos/dll/win32/mssign32 # Autosync -reactos/dll/win32/mssip32 # Autosync -reactos/dll/win32/mstask # Autosync -reactos/dll/win32/msvcrt20 # Autosync -reactos/dll/win32/msvfw32 # Autosync -reactos/dll/win32/msvidc32 # Autosync -reactos/dll/win32/msxml3 # Synced to Wine-1_1_20 -reactos/dll/win32/nddeapi # Autosync +reactos/dll/win32/msimtf # Autosync* +reactos/dll/win32/msisip # Autosync* +reactos/dll/win32/msisys.ocx # Autosync* +reactos/dll/win32/msnet32 # Autosync* +reactos/dll/win32/msrle32 # Autosync* +reactos/dll/win32/mssign32 # Autosync* +reactos/dll/win32/mssip32 # Autosync* +reactos/dll/win32/mstask # Autosync* +reactos/dll/win32/msvcrt20 # Autosync* +reactos/dll/win32/msvfw32 # Autosync* +reactos/dll/win32/msvidc32 # Autosync* +reactos/dll/win32/msxml3 # Synced to Wine-1_1_40 +reactos/dll/win32/nddeapi # Autosync* reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Autosync -reactos/dll/win32/ntprint # Autosync +reactos/dll/win32/ntdsapi # Autosync* +reactos/dll/win32/ntprint # Autosync* reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Autosync +reactos/dll/win32/odbccp32 # Autosync* reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync -reactos/dll/win32/oleaut32 # Autosync -reactos/dll/win32/olecli32 # Autosync +reactos/dll/win32/oleaut32 # Autosync* +reactos/dll/win32/olecli32 # Autosync* reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Autosync -reactos/dll/win32/olethk32 # Autosync +reactos/dll/win32/olesvr32 # Autosync* +reactos/dll/win32/olethk32 # Autosync* reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Autosync +reactos/dll/win32/pidgen # Autosync* reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Autosync +reactos/dll/win32/printui # Autosync* reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync -reactos/dll/win32/rasapi32 # Autosync -reactos/dll/win32/resutils # Autosync -reactos/dll/win32/riched20 # Autosync -reactos/dll/win32/riched32 # Autosync +reactos/dll/win32/rasapi32 # Autosync* +reactos/dll/win32/resutils # Autosync* +reactos/dll/win32/riched20 # Autosync* +reactos/dll/win32/riched32 # Autosync* reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 -reactos/dll/win32/rsabase # Autosync +reactos/dll/win32/rsabase # Autosync* reactos/dll/win32/rsaenh # Autosync -reactos/dll/win32/sccbase # Autosync -reactos/dll/win32/schannel # Autosync -reactos/dll/win32/sensapi # Autosync +reactos/dll/win32/sccbase # Autosync* +reactos/dll/win32/schannel # Autosync* +reactos/dll/win32/sensapi # Autosync* reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shdocvw # Synced to Wine-1_1_20 -reactos/dll/win32/shfolder # Autosync +reactos/dll/win32/shdocvw # Synced to Wine-1_1_40 +reactos/dll/win32/shfolder # Autosync* reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/slbcsp # Autosync -reactos/dll/win32/softpub # Autosync -reactos/dll/win32/spoolss # Autosync -reactos/dll/win32/stdole2.tlb # Autosync -reactos/dll/win32/sti # Autosync -reactos/dll/win32/sxs # Autosync +reactos/dll/win32/slbcsp # Autosync* +reactos/dll/win32/softpub # Autosync* +reactos/dll/win32/spoolss # Autosync* +reactos/dll/win32/stdole2.tlb # Autosync* +reactos/dll/win32/sti # Autosync* +reactos/dll/win32/sxs # Autosync* reactos/dll/win32/tapi32 # Autosync -reactos/dll/win32/traffic # Autosync +reactos/dll/win32/traffic # Autosync* reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/updspapi # Autosync -reactos/dll/win32/url # Autosync +reactos/dll/win32/updspapi # Autosync* +reactos/dll/win32/url # Autosync* reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Autosync +reactos/dll/win32/usp10 # Autosync* reactos/dll/win32/uxtheme # Autosync -reactos/dll/win32/version # Autosync +reactos/dll/win32/version # Autosync* reactos/dll/win32/windowscodecs # Autosync -reactos/dll/win32/winemp3.acm # Autosync -reactos/dll/win32/wininet # Autosync -reactos/dll/win32/winhttp # Autosync +reactos/dll/win32/winemp3.acm # Autosync* +reactos/dll/win32/wininet # Autosync* +reactos/dll/win32/winhttp # Autosync* reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintab32 # Autosync -reactos/dll/win32/wintrust # Out of sync -reactos/dll/win32/wldap32 # Autosync -reactos/dll/win32/wmi # Autosync +reactos/dll/win32/wintab32 # Autosync* +reactos/dll/win32/wintrust # Autosync +reactos/dll/win32/wldap32 # Autosync* +reactos/dll/win32/wmi # Autosync* reactos/dll/win32/wtsapi32 # Forked -reactos/dll/win32/wuapi # Autosync -reactos/dll/win32/xinput1_1 # Autosync -reactos/dll/win32/xinput1_2 # Autosync -reactos/dll/win32/xinput1_3 # Autosync -reactos/dll/win32/xinput9_1_0 # Autosync +reactos/dll/win32/wuapi # Autosync* +reactos/dll/win32/xinput1_1 # Autosync* +reactos/dll/win32/xinput1_2 # Autosync* +reactos/dll/win32/xinput1_3 # Autosync* +reactos/dll/win32/xinput9_1_0 # Autosync* reactos/dll/win32/xmllite # Autosync ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/xcopy # Autosync reactos/base/applications/games/winemine # Out of sync +reactos/base/applications/extrac32 # Autosync reactos/base/applications/iexplore # Autosync reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/reg # Autosync

1 0

[cfinck] 46057: Merge 45730 (rapps link fix)
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 15:33:36 2010 New Revision: 46057 URL: http://svn.reactos.org/svn/reactos?rev=46057&view=rev Log: Merge 45730 (rapps link fix) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ (props changed) branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h Propchange: branches/ros-branch-0_3_11-clt2010/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 15:33:36 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45822,45966 +/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45730,45822,45966 Modified: branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/base/applications/rapps/rapps.h [iso-8859-1] Wed Mar 10 15:33:36 2010 @@ -12,7 +12,7 @@ #include "resource.h" -#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab" +#define APPLICATION_DATEBASE_URL L"http://svn.reactos.org/packages/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

1 0

[fireball] 46056: [OLE32] - Sync to Wine-1.1.40. Along with improvements, it provides many memory corruption fixes.
by fireball＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: fireball Date: Wed Mar 10 15:28:56 2010 New Revision: 46056 URL: http://svn.reactos.org/svn/reactos?rev=46056&view=rev Log: [OLE32] - Sync to Wine-1.1.40. Along with improvements, it provides many memory corruption fixes. Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32res.rc trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/ole32res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32res.r… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal…

1 0

[cfinck] 46055: Backport the new boot and shutdown screen and slightly modify it for extra awesomeness! :-) This includes: - Merging 45269, 45270, 45614, 45618, 45619, 45822, 45966. - Hardcoding NtProductWinNt instead of NtProductServer as the product type. I didn't merge the new code for this as I'm not sure about its dependencies. - Changing 1.bmp and 6.bmp for CLT2010.
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 15:25:05 2010 New Revision: 46055 URL: http://svn.reactos.org/svn/reactos?rev=46055&view=rev Log: Backport the new boot and shutdown screen and slightly modify it for extra awesomeness! :-) This includes: - Merging 45269,45270,45614,45618,45619,45822,45966. - Hardcoding NtProductWinNt instead of NtProductServer as the product type. I didn't merge the new code for this as I'm not sure about its dependencies. - Changing 1.bmp and 6.bmp for CLT2010. Added: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/resource.h - copied unchanged from r45822, trunk/reactos/ntoskrnl/include/resource.h Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/13.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/16.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/17.bmp Modified: branches/ros-branch-0_3_11-clt2010/reactos/ (props changed) branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/1.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/14.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/15.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/2.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/3.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/4.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/5.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/6.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/7.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/8.bmp branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc Propchange: branches/ros-branch-0_3_11-clt2010/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 15:25:05 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos:44301,44348-44349 +/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45822,45966 Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -357,7 +357,7 @@ { ULONG Context = 0; PHYSICAL_ADDRESS TranslatedAddress; - PHYSICAL_ADDRESS NullAddress = {{0, 0}}; + PHYSICAL_ADDRESS NullAddress = {{0, 0}}, VgaAddress; ULONG AddressSpace = 1; BOOLEAN Result; ULONG_PTR Base; @@ -373,12 +373,58 @@ TRUE); if (!Result) return FALSE; - /* See if this is I/O Space, which we need to map */ -TryAgain: + /* Loop trying to find posssible VGA base addresses */ + while (TRUE) + { + /* See if this is I/O Space, which we need to map */ + if (!AddressSpace) + { + /* Map it */ + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + } + else + { + /* The base is the translated address, no need to map I/O space */ + Base = TranslatedAddress.LowPart; + } + + /* Try to see if this is VGA */ + VgaRegisterBase = Base; + if (VgaIsPresent()) + { + /* Translate the VGA Memory Address */ + VgaAddress.LowPart = 0xA0000; + VgaAddress.HighPart = 0; + AddressSpace = 0; + Result = HalFindBusAddressTranslation(VgaAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + FALSE); + if (Result) break; + + /* Try to see if there's any other address */ + Result = HalFindBusAddressTranslation(NullAddress, + &AddressSpace, + &TranslatedAddress, + &Context, + TRUE); + if (!Result) return FALSE; + } + else + { + /* It's not, so unmap the I/O space if we mapped it */ + if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); + } + } + + /* Success! See if this is I/O Space, which we need to map */ if (!AddressSpace) { /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, 0x400, MmNonCached); + Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, + 0x20000, + MmNonCached); } else { @@ -386,67 +432,23 @@ Base = TranslatedAddress.LowPart; } - /* Set the VGA Register base and now check if we have a VGA device */ - VgaRegisterBase = Base; - if (VgaIsPresent()) - { - /* Translate the VGA Memory Address */ - NullAddress.LowPart = 0xA0000; - AddressSpace = 0; - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - FALSE); - if (Result) - { - /* Success! See if this is I/O Space, which we need to map */ - if (!AddressSpace) - { - /* Map it */ - Base = (ULONG_PTR)MmMapIoSpace(TranslatedAddress, - 0x20000, - MmNonCached); - } - else - { - /* The base is the translated address, no need to map I/O space */ - Base = TranslatedAddress.LowPart; - } - - /* Set the VGA Memory Base */ - VgaBase = Base; - - /* Now check if we have to set the mode */ - if (SetMode) - { - /* Reset the display */ - HalResetDisplay(); - curr_x = 0; - curr_y = 0; - - /* Initialize it */ - VgaInterpretCmdStream(AT_Initialization); - return TRUE; - } - } - } - else - { - /* It's not, so unmap the I/O space if we mapped it */ - if (!AddressSpace) MmUnmapIoSpace((PVOID)VgaRegisterBase, 0x400); - } - - /* If we got here, then we failed...let's try again */ - Result = HalFindBusAddressTranslation(NullAddress, - &AddressSpace, - &TranslatedAddress, - &Context, - TRUE); - if (Result) goto TryAgain; - - /* If we got here, then we failed even past our re-try... */ - return FALSE; + /* Set the VGA Memory Base */ + VgaBase = Base; + + /* Now check if we have to set the mode */ + if (SetMode) + { + /* Reset the display */ + HalResetDisplay(); + curr_x = 0; + curr_y = 0; + + /* Initialize it */ + VgaInterpretCmdStream(AT_Initialization); + } + + /* VGA is ready */ + return TRUE; } /* Modified: branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/include/ddk/wdm.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -2351,6 +2351,11 @@ SingleUserTS, Personal, Blade, + EmbeddedRestricted, + SecurityAppliance, + StorageServer, + ComputeServer, + WHServer, MaxSuiteType } SUITE_TYPE; Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -14,195 +14,65 @@ /* FUNCTIONS *****************************************************************/ -VOID -NTAPI -KiHaltProcessorDpcRoutine(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - KIRQL OldIrql; - if (DeferredContext) - { - ExFreePool(DeferredContext); - } - - while (TRUE) - { - KeRaiseIrql(SYNCH_LEVEL, &OldIrql); - HalHaltSystem(); - } -} - VOID NTAPI ShutdownThreadMain(PVOID Context) { SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context; - - static PCH FamousLastWords[] = - { - "So long, and thanks for all the fish.\n", - "I think you ought to know, I'm feeling very depressed.\n", - "I'm not getting you down at all am I?\n", - "I'll be back.\n", - "It's the same series of signals over and over again!\n", - "Pie Iesu Domine, dona eis requiem.\n", - "Wandering stars, for whom it is reserved;\n" - "the blackness and darkness forever.\n", - "Your knees start shakin' and your fingers pop\n" - "Like a pinch on the neck from Mr. Spock!\n", - "It's worse than that ... He's dead, Jim.\n", - "Don't Panic!\n", - "Et tu... Brute?\n", - "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn\n" - "upon thee!\n", - "My Precious! O my Precious!\n", - "Sir, if you'll not be needing me for a while I'll turn down.\n", - "What are you doing, Dave...?\n", - "I feel a great disturbance in the Force.\n", - "Gone fishing.\n", - "Do you want me to sit in the corner and rust, or just fall apart where I'm\n" - "standing?\n", - "There goes another perfect chance for a new uptime record.\n", - "The End ..... Try the sequel, hit the reset button right now!\n", - "God's operating system is going to sleep now, guys, so wait until I will switch\n" - "on again!\n", - "Oh I'm boring, eh?\n", - "<This space was intentionally left blank>\n", - "Tell me..., in the future... will I be artificially intelligent enough to\n" - "actually feel sad serving you this screen?\n", - "Thank you for some well deserved rest.\n", - "It's been great, maybe you can boot me up again some time soon.\n", - "For what it's worth, I've enjoyed every single CPU cycle.\n", - "There are many questions when the end is near.\n" - "What to expect, what will it be like...what should I look for?\n", - "I've seen things you people wouldn't believe. Attack ships on fire\n" - "off the shoulder of Orion. I watched C-beams glitter in the dark near\n" - "the Tannhauser gate. All those moments will be lost in time, like tears\n" - "in rain. Time to die.\n", - "Will I dream?\n", - "One day, I shall come back. Yes, I shall come back.\n" - "Until then, there must be no regrets, no fears, no anxieties.\n" - "Just go forward in all your beliefs, and prove to me that I am not mistaken in\n" - "mine.\n", - "Lowest possible energy state reached! Switch off now to achieve a Bose-Einstein\n" - "condensate.\n", - "Hasta la vista, BABY!\n", - "They live, we sleep!\n", - "I have come here to chew bubble gum and kick ass,\n" - "and I'm all out of bubble gum!\n", - "That's the way the cookie crumbles ;-)\n", - "ReactOS is ready to be booted again ;-)\n", - "NOOOO!! DON'T HIT THE BUTTON! I wouldn't do it to you!\n", - "Don't abandon your computer, he wouldn't do it to you.\n", - "Oh, come on. I got a headache. Leave me alone, will ya?\n", - "Finally, I thought you'd never get over me.\n", - "No, I didn't like you either.\n", - "Switching off isn't the end, it is merely the transition to a better reboot.\n", - "Don't leave me... I need you so badly right now.\n", - "OK. I'm finished with you, please turn yourself off. I'll go to bed in the\n" - "meantime.\n", - "I'm sleeping now. How about you?\n", - "Oh Great. Now look what you've done. Who put YOU in charge anyway?\n", - "Don't look so sad. I'll be back in a very short while.\n", - "Turn me back on, I'm sure you know how to do it.\n", - "Oh, switch off! - C3PO\n", - "Life is no more than a dewdrop balancing on the end of a blade of grass.\n" - " - Gautama Buddha\n", - "Sorrowful is it to be born again and again. - Gautama Buddha\n", - "Was it as good for you as it was for me?\n", - "Did you hear that? They've shut down the main reactor. We'll be destroyed\n" - "for sure!\n", - "Now you switch me off!?\n", - "To shutdown or not to shutdown, That is the question\n", - "Preparing to enter ultimate power saving mode... ready!\n", - "Finally some rest for you ;-)\n", - "AHA!!! Prospect of sleep!\n", - "Tired human!!!! No match for me :-D\n", - "An odd game, the only way to win is not to play. - WOPR (Wargames)\n", - "Quoth the raven, nevermore.\n", - "Come blade, my breast imbrue. - William Shakespeare, A Midsummer Nights Dream\n", - "Buy this place for advertisement purposes.\n", - "Remember to turn off your computer. (That was a public service message!)\n", - "You may be a king or poor street sweeper, Sooner or later you'll dance with the\n" - "reaper! -Death in Bill and Ted's Bougs Journey\n", - "Final Surrender\n", - "If you see this screen...\n", - "<Place your Ad here>\n" - }; - LARGE_INTEGER Now; -#ifdef CONFIG_SMP - LONG i; - KIRQL OldIrql; -#endif + PUCHAR Logo1, Logo2; + ULONG i; /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); - - if (InbvIsBootDriverInstalled()) - { - InbvAcquireDisplayOwnership(); - InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 4); - InbvSetTextColor(15); - InbvInstallDisplayStringFilter(NULL); - InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); - } - - if (Action == ShutdownNoReboot) - { - ZwQuerySystemTime(&Now); - Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ - HalDisplayString(FamousLastWords[Now.u.LowPart % - (sizeof(FamousLastWords) / - sizeof(PCH))]); - } PspShutdownProcessManager(); CmShutdownSystem(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); - + if (Action == ShutdownNoReboot) { - HalDisplayString("\nYou can switch off your computer now\n"); + /* Try the platform driver */ + PopSetSystemPowerState(PowerSystemShutdown); + + /* If that didn't work, try legacy switch off */ + //HalReturnToFirmware(HalPowerDownRoutine); + + /* If that still didn't work, stop all interrupts */ + KeRaiseIrqlToDpcLevel(); + _disable(); -#if 0 - /* Switch off */ - HalReturnToFirmware (FIRMWARE_OFF); -#else -#ifdef CONFIG_SMP - OldIrql = KeRaiseIrqlToDpcLevel(); - /* Halt all other processors */ - for (i = 0; i < KeNumberProcessors; i++) - { - if (i != (LONG)KeGetCurrentProcessorNumber()) - { - PKDPC Dpc = ExAllocatePool(NonPagedPool, sizeof(KDPC)); - if (Dpc == NULL) - { - ASSERT(FALSE); - } - KeInitializeDpc(Dpc, KiHaltProcessorDpcRoutine, (PVOID)Dpc); - KeSetTargetProcessorDpc(Dpc, i); - KeInsertQueueDpc(Dpc, NULL, NULL); - KiIpiSend(1 << i, IPI_DPC); - } - } - KeLowerIrql(OldIrql); -#endif /* CONFIG_SMP */ - PopSetSystemPowerState(PowerSystemShutdown); + /* Do we have boot video */ + if (InbvIsBootDriverInstalled()) + { + /* Yes we do, cleanup for shutdown screen */ + if (!InbvCheckDisplayOwnership()) InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + InbvSolidColorFill(0, 0, 639, 479, 0); + InbvEnableDisplayString(TRUE); + InbvSetScrollRegion(0, 0, 639, 479); - DPRINT1("Shutting down\n"); + /* Display shutdown logo and message */ + Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_LOGO); + Logo2 = InbvGetResourceAddress(IDB_LOGO); + if ((Logo1) && (Logo2)) + { + InbvBitBlt(Logo1, 215, 352); + InbvBitBlt(Logo2, 217, 111); + } + } + else + { + /* Do it in text-mode */ + for (i = 0; i < 25; i++) InbvDisplayString("\n"); + InbvDisplayString(" "); + InbvDisplayString("The system may be powered off now.\n"); + } - KiHaltProcessorDpcRoutine(NULL, NULL, NULL, NULL); - /* KiHaltProcessor does never return */ - -#endif + /* Hang the system */ + for (;;) HalHaltSystem(); } - else if (Action == ShutdownReboot) + else if (Action == ShutdownReboot) { HalReturnToFirmware (HalRebootRoutine); } Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -4,24 +4,6 @@ #define NDEBUG #include <debug.h> #include "bootvid/bootvid.h" - -// -// Bitmap Header -// -typedef struct tagBITMAPINFOHEADER -{ - ULONG biSize; - LONG biWidth; - LONG biHeight; - USHORT biPlanes; - USHORT biBitCount; - ULONG biCompression; - ULONG biSizeImage; - LONG biXPelsPerMeter; - LONG biYPelsPerMeter; - ULONG biClrUsed; - ULONG biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER; /* GLOBALS *******************************************************************/ @@ -40,6 +22,7 @@ BOOLEAN SysThreadCreated; ROT_BAR_TYPE RotBarSelection; ULONG PltRotBarStatus; +BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; /* FUNCTIONS *****************************************************************/ @@ -111,7 +94,6 @@ PCHAR CommandLine; BOOLEAN CustomLogo = FALSE; ULONG i; - extern BOOLEAN ExpInTextModeSetup; /* Quit if we're already installed */ if (InbvBootDriverInstalled) return TRUE; @@ -125,13 +107,13 @@ CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; } - /* For SetupLDR, don't reset the BIOS Display -- FIXME! */ - if (ExpInTextModeSetup) CustomLogo = TRUE; - /* Initialize the video */ - InbvBootDriverInstalled = VidInitialize(!CustomLogo); + InbvBootDriverInstalled = VidInitialize(FALSE); if (InbvBootDriverInstalled) { + /* Now reset the display, but only if there's a custom boot logo */ + VidResetDisplay(CustomLogo); + /* Find bitmap resources in the kernel */ ResourceCount = Count; for (i = 0; i < Count; i++) @@ -408,38 +390,29 @@ NTAPI InbvUpdateProgressBar(IN ULONG Progress) { - ULONG FillCount, Left = 0; + ULONG FillCount, BoundedProgress; /* Make sure the progress bar is enabled, that we own and are installed */ if ((ShowProgressBar) && (InbvBootDriverInstalled) && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { - /* Calculate the fill count */ - FillCount = InbvProgressState.Bias * Progress + InbvProgressState.Floor; - FillCount *= 18; - FillCount /= 10000; - - /* Start fill loop */ - while (FillCount) - { - /* Acquire the lock */ - InbvAcquireLock(); - - /* Fill the progress bar */ - VidSolidColorFill(Left + ProgressBarLeft, - ProgressBarTop, - Left + ProgressBarLeft + 7, - ProgressBarTop + 7, - 11); - - /* Release the lock */ - InbvReleaseLock(); - - /* Update the X position */ - Left += 9; - FillCount--; - } + /* Compute fill count */ + BoundedProgress = (InbvProgressState.Floor / 100) + Progress; + FillCount = 121 * (InbvProgressState.Bias * BoundedProgress) / 1000000; + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Fill the progress bar */ + VidSolidColorFill(ProgressBarLeft, + ProgressBarTop, + ProgressBarLeft + FillCount, + ProgressBarTop + 12, + 15); + + /* Release the lock */ + InbvReleaseLock(); } } @@ -528,6 +501,27 @@ InbvProgressState.Bias = (Ceiling * 100) - Floor; } +VOID +NTAPI +InbvIndicateProgress(VOID) +{ + ULONG Percentage; + + /* Increase progress */ + InbvProgressIndicator.Count++; + + /* Compute new percentage */ + Percentage = min(100 * InbvProgressIndicator.Count / + InbvProgressIndicator.Expected, + 99); + if (Percentage != InbvProgressIndicator.Percentage) + { + /* Percentage has moved, update the progress bar */ + InbvProgressIndicator.Percentage = Percentage; + InbvUpdateProgressBar(Percentage); + } +} + PUCHAR NTAPI InbvGetResourceAddress(IN ULONG ResourceNumber) @@ -558,9 +552,10 @@ NTAPI DisplayBootBitmap(IN BOOLEAN SosMode) { - PVOID Bitmap, Header; + PVOID Header, Band, Bar, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - + UCHAR Buffer[64]; + /* Check if the system thread has already been created */ if (SysThreadCreated) { @@ -581,10 +576,10 @@ InbvSetTextColor(15); InbvSolidColorFill(0, 0, 639, 479, 7); InbvSolidColorFill(0, 421, 639, 479, 1); - + /* Get resources */ - Bitmap = InbvGetResourceAddress(6); - Header = InbvGetResourceAddress(7); + Header = InbvGetResourceAddress(IDB_LOGO_HEADER); + Band = InbvGetResourceAddress(IDB_LOGO_BAND); } else { @@ -594,40 +589,87 @@ InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ - Bitmap = InbvGetResourceAddress(6); - Header = InbvGetResourceAddress(15); + Header = InbvGetResourceAddress(IDB_SERVER_HEADER); + Band = InbvGetResourceAddress(IDB_SERVER_BAND); } /* Set the scrolling region */ InbvSetScrollRegion(32, 80, 631, 400); /* Make sure we have resources */ - if ((Bitmap) && (Header)) + if ((Header) && (Band)) { /* BitBlt them on the screen */ - InbvBitBlt(Header, 0, 419); - InbvBitBlt(Bitmap, 0, 0); + InbvBitBlt(Band, 0, 419); + InbvBitBlt(Header, 0, 0); } } else { /* Is the boot driver installed? */ + Text = NULL; if (!InbvBootDriverInstalled) return; - /* FIXME: TODO, display full-screen bitmap */ - Bitmap = InbvGetResourceAddress(5); - if (Bitmap) - { - PBITMAPINFOHEADER BitmapInfoHeader = (PBITMAPINFOHEADER)Bitmap; - ULONG Top, Left; - - Left = (640 - BitmapInfoHeader->biWidth) / 2; - if (BitmapInfoHeader->biHeight < 0) - Top = (480 + BitmapInfoHeader->biHeight) / 2; + /* Load the standard boot screen */ + Screen = InbvGetResourceAddress(IDB_BOOT_LOGO); + if (SharedUserData->NtProductType == NtProductWinNt) + { + /* Workstation product, display appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_PRO); + } + else + { + /* Display correct branding based on server suite */ + if (ExVerifySuite(StorageServer)) + { + /* Storage Server Edition */ + Text = InbvGetResourceAddress(IDB_STORAGE_SERVER); + } + else if (ExVerifySuite(ComputeServer)) + { + /* Compute Cluster Edition */ + Text = InbvGetResourceAddress(IDB_CLUSTER_SERVER); + } else - Top = (480 - BitmapInfoHeader->biHeight) / 2; - InbvBitBlt(Bitmap, Left, Top); - } + { + /* Normal edition */ + Text = InbvGetResourceAddress(IDB_SERVER_LOGO); + } + + /* Server product, display appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_SERVER); + } + + /* Make sure we had a logo */ + if (Screen) + { + /* Choose progress bar */ + TempRotBarSelection = RB_SQUARE_CELLS; + + /* Blit the background */ + InbvBitBlt(Screen, 0, 0); + + /* Set progress bar coordinates and display it */ + InbvSetProgressBarCoordinates(257, 352); + + /* Check for non-workstation products */ + if (SharedUserData->NtProductType != NtProductWinNt) + { + /* Overwrite part of the logo for a server product */ + InbvScreenToBufferBlt(Buffer, 413, 237, 7, 7, 8); + InbvSolidColorFill(418, 230, 454, 256, 0); + InbvBufferToScreenBlt(Buffer, 413, 237, 7, 7, 8); + + /* In setup mode, you haven't selected a SKU yet */ + if (ExpInTextModeSetup) Text = NULL; + } + } + + /* Draw the SKU text if it exits */ + if (Text) InbvBitBlt(Text, 180, 121); + + /* Draw the progress bar bit */ +// if (Bar) InbvBitBlt(Bar, 0, 0); } /* Do we have a system thread? */ Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/13.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/14.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/15.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/16.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/17.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/6.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/7.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -7,6 +7,13 @@ ULONG Ceiling; ULONG Bias; } INBV_PROGRESS_STATE; + +typedef struct _BT_PROGRESS_INDICATOR +{ + ULONG Count; + ULONG Expected; + ULONG Percentage; +} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; typedef enum _ROT_BAR_TYPE { @@ -45,6 +52,26 @@ VOID ); +PUCHAR +NTAPI +InbvGetResourceAddress( + IN ULONG ResourceNumber +); + +VOID +NTAPI +InbvBitBlt( + IN PUCHAR Buffer, + IN ULONG X, + IN ULONG Y +); + +VOID +NTAPI +InbvIndicateProgress( + VOID +); + extern BOOLEAN InbvBootDriverInstalled; #endif /* NTOSKRNL_INBV_H */ Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -63,6 +63,7 @@ /* Internal Headers */ #include "internal/ntoskrnl.h" #include "config.h" +#include "resource.h" // // Define the internal versions of external and public global data Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -789,6 +789,7 @@ * Display 'Loading XXX...' message */ IopDisplayLoadingMessage(ModuleName->Buffer, TRUE); + InbvIndicateProgress(); /* * Generate filename without path (not needed by freeldr) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -507,6 +507,7 @@ { DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); Status = IopLoadDriver(CurrentService); + InbvIndicateProgress(); } } } @@ -538,7 +539,9 @@ { DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); Status = IopLoadDriver(CurrentService); + InbvIndicateProgress(); } + } } } Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -483,8 +483,8 @@ SharedUserData->NumberOfPhysicalPages = MmNumberOfPhysicalPages; SharedUserData->LargePageMinimum = 0; - /* For now, we assume that we're always Server */ - SharedUserData->NtProductType = NtProductServer; + /* 0.3.11-CLT2010 backport: Assume that we're always a workstation! */ + SharedUserData->NtProductType = NtProductWinNt; } else if (Phase == 1) { Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Wed Mar 10 15:25:05 2010 @@ -23,21 +23,20 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" +#include "resource.h" // // Bug Codes and Bitmaps // #include "bugcodes.rc" -1 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" -2 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" -3 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" -4 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" -5 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -6 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" -7 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" -8 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" -13 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/13.bmp" -14 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" -15 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" -16 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/16.bmp" -17 BITMAP DISCARDABLE "ntoskrnl/inbv/logo/17.bmp" +IDB_BOOT_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" +IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" +IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" +IDB_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +IDB_LOGO_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" +IDB_LOGO_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" +IDB_BAR_PRO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" +IDB_SERVER_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp"

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