Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[fireball] 30079: - Move Nt* APIs converted to new CM into config/cmapi.c - Start removing usage of ReactOS Hive Flags and use NT Hive Flags instead. - Add CmpLockRegsitry based on CmpLockRegistryExclusive. - Add new lazy flush implementation based on the old one, but with parallel work support. Not yet in use. - Don't delete a key that's already being deleted. - Update KcbMaxNameLen after a deletion. - Set the DELETE flag in the KCB during a deletion. - Remove the KCB Key hash during a delete.
by fireball＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: fireball Date: Sat Nov 3 02:12:22 2007 New Revision: 30079 URL: http://svn.reactos.org/svn/reactos?rev=30079&view=rev Log: - Move Nt* APIs converted to new CM into config/cmapi.c - Start removing usage of ReactOS Hive Flags and use NT Hive Flags instead. - Add CmpLockRegsitry based on CmpLockRegistryExclusive. - Add new lazy flush implementation based on the old one, but with parallel work support. Not yet in use. - Don't delete a key that's already being deleted. - Update KcbMaxNameLen after a deletion. - Set the DELETE flag in the KCB during a deletion. - Remove the KCB Key hash during a delete. - Implement CmFlushKey (not yet used). Added: trunk/reactos/ntoskrnl/config/cmlazy.c (with props) trunk/reactos/ntoskrnl/config/ntapi.c (with props) Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat Nov 3 02:12:22 2007 @@ -382,7 +382,7 @@ CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); CmiSyncHives(); - + LocalDisposition = REG_CREATED_NEW_KEY; SuccessReturn: @@ -422,13 +422,13 @@ PKEY_OBJECT KeyObject; PCMHIVE RegistryHive; KPROCESSOR_MODE PreviousMode; - + PAGED_CODE(); - + DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); - + PreviousMode = ExGetPreviousMode(); - + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, 0, @@ -440,15 +440,15 @@ { return(Status); } - + VERIFY_KEY_OBJECT(KeyObject); - + RegistryHive = (PCMHIVE)KeyObject->KeyControlBlock->KeyHive; - + /* Acquire hive lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - + if (IsNoFileHive(RegistryHive)) { Status = STATUS_SUCCESS; @@ -458,15 +458,14 @@ /* Flush non-volatile hive */ Status = CmiFlushRegistryHive(RegistryHive); } - + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); - + ObDereferenceObject(KeyObject); - + return STATUS_SUCCESS; } - NTSTATUS NTAPI @@ -674,7 +673,7 @@ if (CmiRegistryInitialized == TRUE) return STATUS_ACCESS_DENIED; - + /* Save boot log file */ IopSaveBootLogToFile(); @@ -685,635 +684,4 @@ return Status; } -NTSTATUS -NTAPI -NtDeleteKey(IN HANDLE KeyHandle) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_KEY_INFORMATION DeleteKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - DELETE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - DeleteKeyInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmDeleteKey(KeyObject->KeyControlBlock); - - /* Remove the keep-alive reference */ - ObDereferenceObject(KeyObject); - if (KeyObject->KeyControlBlock->KeyHive != - KeyObject->KeyControlBlock->ParentKcb->KeyHive) - { - /* Dereference again */ - ObDereferenceObject(KeyObject); - } - - /* Do post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); - } - - /* Dereference the object */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtEnumerateKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", - KeyHandle, Index, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_ENUMERATE_SUB_KEYS, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Index = Index; - EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; - EnumerateKeyInfo.Length = Length; - EnumerateKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateKey(KeyObject->KeyControlBlock, - Index, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtEnumerateValueKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", - KeyHandle, Index, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Index = Index; - EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; - EnumerateValueKeyInfo.Length = Length; - EnumerateValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, - &EnumerateValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, - Index, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - } - - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryKey(IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_KEY_INFORMATION QueryKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", - KeyHandle, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != - KeyNameInformation) ? - KEY_QUERY_VALUE : 0, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.KeyInformationClass = KeyInformationClass; - QueryKeyInfo.KeyInformation = KeyInformation; - QueryKeyInfo.Length = Length; - QueryKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryKey(KeyObject->KeyControlBlock, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", - KeyHandle, ValueName, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.ValueName = ValueName; - QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - QueryValueKeyInfo.Length = Length; - QueryValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryValueKey(KeyObject->KeyControlBlock, - *ValueName, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - } - - DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtSetValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN ULONG TitleIndex, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", - KeyHandle, ValueName, TitleIndex, Type, DataSize); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); - return Status; - } - - /* Setup callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.ValueName = ValueName; - SetValueKeyInfo.TitleIndex = TitleIndex; - SetValueKeyInfo.Type = Type; - SetValueKeyInfo.Data = Data; - SetValueKeyInfo.DataSize = DataSize; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmSetValueKey(KeyObject->KeyControlBlock, - ValueName, - Type, - Data, - DataSize); - } - - /* Do the post-callback and de-reference the key object */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - /* Synchronize the hives and return */ - CmiSyncHives(); - return Status; -} - -NTSTATUS -NTAPI -NtDeleteValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PAGED_CODE(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Do the callback */ - DeleteValueKeyInfo.Object = (PVOID)KeyObject; - DeleteValueKeyInfo.ValueName = ValueName; - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, - &DeleteValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); - - /* Do the post callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, - &PostOperationInfo); - } - - /* Dereference the key body and synchronize the hives */ - ObDereferenceObject(KeyObject); - CmiSyncHives(); - return Status; -} - -NTSTATUS -NTAPI -NtCompactKeys(IN ULONG Count, - IN PHANDLE KeyArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtCompressKey(IN HANDLE Key) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes) -{ - return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); -} - -NTSTATUS -NTAPI -NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN POBJECT_ATTRIBUTES SourceFile, - IN ULONG Flags, - IN HANDLE TrustClassKey, - IN HANDLE Event, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE RootHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLockProductActivationKeys(IN PULONG pPrivateVer, - IN PULONG pSafeMode) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLockRegistryKey(IN HANDLE KeyHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtNotifyChangeMultipleKeys(IN HANDLE MasterKeyHandle, - IN ULONG Count, - IN POBJECT_ATTRIBUTES SlaveObjects, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtNotifyChangeKey(IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - return NtNotifyChangeMultipleKeys(KeyHandle, - 0, - NULL, - Event, - ApcRoutine, - ApcContext, - IoStatusBlock, - CompletionFilter, - WatchTree, - Buffer, - Length, - Asynchronous); -} - -NTSTATUS -NTAPI -NtQueryMultipleValueKey(IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueList, - IN ULONG NumberOfValues, - OUT PVOID Buffer, - IN OUT PULONG Length, - OUT PULONG ReturnLength) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG HandleCount) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtQueryOpenSubKeysEx(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG BufferLength, - IN PVOID Buffer, - IN PULONG RequiredSize) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE Key, - IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtRestoreKey(IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG RestoreFlags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveKey(IN HANDLE KeyHandle, - IN HANDLE FileHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveKeyEx(IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, - IN HANDLE LowPrecedenceKeyHandle, - IN HANDLE FileHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSetInformationKey(IN HANDLE KeyHandle, - IN KEY_SET_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG KeyInformationLength) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN HANDLE Event) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat Nov 3 02:12:22 2007 @@ -36,7 +36,7 @@ if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; Status = CmpInitHiveFromFile(FileName, - (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NOLAZYFLUSH : 0, &Hive, &Allocate, 0); @@ -72,7 +72,7 @@ NTSTATUS Status; ULONG Disposition; - ASSERT(!IsNoFileHive(RegistryHive)); + ASSERT(!RegistryHive->Hive.HiveFlags & HIVE_VOLATILE); if (RtlFindSetBits(&RegistryHive->Hive.DirtyVector, 1, 0) == ~0) { Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat Nov 3 02:12:22 2007 @@ -535,6 +535,7 @@ } VOID +NTAPI CmShutdownRegistry(VOID) { PCMHIVE Hive; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat Nov 3 02:12:22 2007 @@ -502,7 +502,6 @@ #define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" #define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" #define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" -#define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) typedef struct _KEY_OBJECT { ULONG Type; @@ -515,16 +514,9 @@ } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; -extern KTIMER CmiWorkerTimer; -VOID NTAPI CmiWorkerThread(IN PVOID Param); PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); -ULONG CmiGetMaxNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxClassLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxValueNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxValueDataLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); VOID CmiSyncHives(VOID); -#define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// // @@ -785,6 +777,12 @@ VOID NTAPI +CmpLockRegistry( + VOID +); + +VOID +NTAPI CmpUnlockRegistry( VOID ); @@ -855,6 +853,12 @@ VOID NTAPI +CmpRemoveKeyControlBlock( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI CmpCleanUpKcbCacheWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively @@ -957,8 +961,26 @@ // BOOLEAN NTAPI -CmpFlushEntireRegistry( +CmpDoFlushAll( IN BOOLEAN ForceFlush +); + +VOID +NTAPI +CmpShutdownWorkers( + VOID +); + +VOID +NTAPI +CmpCmdInit( + IN BOOLEAN SetupBoot +); + +VOID +NTAPI +CmpLazyFlush( + VOID ); // @@ -1267,6 +1289,13 @@ NTAPI CmDeleteKey( IN PCM_KEY_CONTROL_BLOCK Kcb +); + +NTSTATUS +NTAPI +CmFlushKey( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN EclusiveLock ); NTSTATUS @@ -1326,6 +1355,9 @@ extern BOOLEAN InitIsWinPEMode; extern ULONG CmpHashTableSize; extern ULONG CmpDelayedCloseSize, CmpDelayedCloseIndex; +extern BOOLEAN CmpNoWrite; +extern BOOLEAN CmpForceForceFlush; +extern BOOLEAN CmpWasSetupBoot; // // Inlined functions Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sat Nov 3 02:12:22 2007 @@ -14,6 +14,59 @@ #include "debug.h" /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpDoFlushAll(IN BOOLEAN ForceFlush) +{ + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PCMHIVE Hive; + BOOLEAN Result = TRUE; + + /* Make sure that the registry isn't read-only now */ + if (CmpNoWrite) return TRUE; + + /* Otherwise, acquire the hive list lock and disable force flush */ + CmpForceForceFlush = FALSE; + ExAcquirePushLockShared(&CmpHiveListHeadLock); + + /* Loop the hive list */ + NextEntry = CmpHiveListHead.Flink; + while (NextEntry != &CmpHiveListHead) + { + /* Get the hive */ + Hive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); + if (!(Hive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) + { + /* Find out why this is needed? [Aleksey] */ + ULONG Disposition; + Status = CmpOpenHiveFiles(&Hive->FileFullPath, + L".LOG", + &Hive->FileHandles[HFILE_TYPE_PRIMARY], + &Hive->FileHandles[HFILE_TYPE_LOG], + &Disposition, + &Disposition, + FALSE, + FALSE, + TRUE, + NULL); + + /* Do the sync */ + DPRINT1("Flushing: %wZ\n", &Hive->FileFullPath); + DPRINT1("Handle: %lx\n", Hive->FileHandles[HFILE_TYPE_PRIMARY]); + Status = HvSyncHive(&Hive->Hive); + if (!NT_SUCCESS(Status)) Result = FALSE; + } + + /* Try the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Release lock and return */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Result; +} NTSTATUS NTAPI @@ -1029,6 +1082,17 @@ Status = STATUS_CANNOT_DELETE; goto Quickie; } + + /* Check if we're already being deleted */ + if (Kcb->Delete) + { + /* Don't do it twice */ + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* Sanity check */ + ASSERT(Node->Flags == Kcb->Flags); /* Check if we don't have any children */ if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile])) @@ -1042,15 +1106,23 @@ Parent = (PCM_KEY_NODE)HvGetCell(Hive, ParentCell); if (Parent) { + /* Update the maximum name length */ + Kcb->ParentKcb->KcbMaxNameLen = Parent->MaxNameLen; + /* Make sure we're dirty */ ASSERT(HvIsCellDirty(Hive, ParentCell)); /* Update the write time */ KeQuerySystemTime(&Parent->LastWriteTime); + KeQuerySystemTime(&Kcb->ParentKcb->KcbLastWriteTime); /* Release the cell */ HvReleaseCell(Hive, ParentCell); } + + /* Set the KCB in delete mode and remove it */ + Kcb->Delete = TRUE; + CmpRemoveKeyControlBlock(Kcb); /* Clear the cell */ Kcb->KeyCell = HCELL_NIL; @@ -1062,14 +1134,9 @@ Status = STATUS_CANNOT_DELETE; } - /* Make sure we're file-backed */ - if (!(IsNoFileHive((PCMHIVE)Kcb->KeyHive)) || - !(IsNoFileHive((PCMHIVE)Kcb->ParentKcb->KeyHive))) - { - /* Sync up the hives */ - CmiSyncHives(); - } - + /* Flush the registry */ + CmiSyncHives(); + Quickie: /* Release the cell */ HvReleaseCell(Hive, Cell); @@ -1079,3 +1146,36 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN EclusiveLock) +{ + PCMHIVE CmHive; + NTSTATUS Status; + PHHIVE Hive; + + /* Get the hives */ + Hive = Kcb->KeyHive; + CmHive = (PCMHIVE)Hive; + + /* Check if this is the master hive */ + if (CmHive == CmiVolatileHive) + { + /* Flush all the hives instead */ + CmpDoFlushAll(FALSE); + } + else + { + /* Flush only this hive */ + if (!HvSyncHive(Hive)) + { + /* Fail */ + Status = STATUS_REGISTRY_IO_FAILED; + } + } + + /* Return the status */ + return Status; +} Added: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c (added) +++ trunk/reactos/ntoskrnl/config/cmlazy.c Sat Nov 3 02:12:22 2007 @@ -1,0 +1,252 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmapi.c + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +KTIMER CmpLazyFlushTimer; +KDPC CmpLazyFlushDpc; +WORK_QUEUE_ITEM CmpLazyWorkItem; +KTIMER CmpEnableLazyFlushTimer; +KDPC CmpEnableLazyFlushDpc; +BOOLEAN CmpLazyFlushPending; +BOOLEAN CmpForceForceFlush; +BOOLEAN CmpHoldLazyFlush = TRUE; +ULONG CmpLazyFlushIntervalInSeconds = 5; +ULONG CmpLazyFlushHiveCount = 7; +ULONG CmpLazyFlushCount = 1; +LONG CmpFlushStarveWriters; + +/* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +CmpDoFlushNextHive(IN BOOLEAN ForceFlush, + OUT PBOOLEAN Error, + OUT PULONG DirtyCount) +{ + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PCMHIVE CmHive; + BOOLEAN Result; + ULONG HiveCount = CmpLazyFlushHiveCount; + + /* Set Defaults */ + *Error = FALSE; + *DirtyCount = 0; + + /* Don't do anything if we're not supposed to */ + if (CmpNoWrite) return TRUE; + + /* Make sure we have to flush at least one hive */ + if (!HiveCount) HiveCount = 1; + + /* Don't force flush */ + CmpForceForceFlush = FALSE; + + /* Acquire the list lock and loop */ + ExAcquirePushLockShared(&CmpHiveListHeadLock); + NextEntry = CmpHiveListHead.Flink; + while (NextEntry != &CmpHiveListHead) + { + /* Get the hive and check if we should flush it */ + CmHive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); + if (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH) && + (CmHive->FlushCount != CmpLazyFlushCount)) + { + /* Great sucess! */ + Result = TRUE; + + /* Ignore clean or volatile hves */ + if (!(CmHive->Hive.DirtyCount) || + (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) + { + /* Don't do anything but do update the count */ + CmHive->FlushCount = CmpLazyFlushCount; + } + else + { + /* Do the sync */ + DPRINT1("Flushing: %wZ\n", CmHive->FileFullPath); + DPRINT1("Handle: %lx\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); + Status = HvSyncHive(&CmHive->Hive); + if(!NT_SUCCESS(Status)) + { + /* Let them know we failed */ + *Error = TRUE; + Result = FALSE; + } + } + } + else if ((CmHive->Hive.DirtyCount) && + (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) && + (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH))) + { + /* Use another lazy flusher for this hive */ + ASSERT(CmHive->FlushCount == CmpLazyFlushCount); + *DirtyCount += CmHive->Hive.DirtyCount; + } + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } + + /* Check if we've flushed everything */ + if (NextEntry == &CmpHiveListHead) + { + /* We have, tell the caller we're done */ + Result = FALSE; + } + else + { + /* We need to be called again */ + Result = TRUE; + } + + /* Unlock the list and return the result */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Result; +} + +VOID +NTAPI +CmpEnableLazyFlushDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Don't stop lazy flushing from happening anymore */ + CmpHoldLazyFlush = FALSE; +} + +VOID +NTAPI +CmpLazyFlushDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Check if we should queue the lazy flush worker */ + if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) + { + CmpLazyFlushPending = TRUE; + ExQueueWorkItem(&CmpLazyWorkItem, DelayedWorkQueue); + } +} + +VOID +NTAPI +CmpLazyFlush(VOID) +{ + LARGE_INTEGER DueTime; + PAGED_CODE(); + + /* Check if we should set the lazy flush timer */ + if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) + { + /* Do it */ + DueTime.QuadPart = Int32x32To64(CmpLazyFlushIntervalInSeconds, + -10 * 1000 * 1000); + KeSetTimer(&CmpLazyFlushTimer, DueTime, &CmpLazyFlushDpc); + } +} + +VOID +NTAPI +CmpLazyFlushWorker(IN PVOID Parameter) +{ + BOOLEAN ForceFlush, Result, MoreWork = FALSE; + ULONG DirtyCount = 0; + PAGED_CODE(); + + /* Don't do anything if lazy flushing isn't enabled yet */ + if (CmpHoldLazyFlush) return; + + /* Check if we are forcing a flush */ + ForceFlush = CmpForceForceFlush; + if (ForceFlush) + { + /* Lock the registry exclusively */ + CmpLockRegistryExclusive(); + } + else + { + /* Do a normal lock */ + CmpLockRegistry(); + InterlockedIncrement(&CmpFlushStarveWriters); + } + + /* Flush the next hive */ + MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); + if (!MoreWork) + { + /* We're done */ + InterlockedIncrement((PLONG)&CmpLazyFlushCount); + } + + /* Check if we have starved writers */ + if (!ForceFlush) InterlockedDecrement(&CmpFlushStarveWriters); + + /* Not pending anymore, release the registry lock */ + CmpLazyFlushPending = FALSE; + CmpUnlockRegistry(); + + /* Check if we need to flush another hive */ + if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); +} + +VOID +NTAPI +CmpCmdInit(IN BOOLEAN SetupBoot) +{ + LARGE_INTEGER DueTime; + PAGED_CODE(); + + /* Setup the lazy DPC */ + KeInitializeDpc(&CmpLazyFlushDpc, CmpLazyFlushDpcRoutine, NULL); + + /* Setup the lazy timer */ + KeInitializeTimer(&CmpLazyFlushTimer); + + /* Setup the lazy worker */ + ExInitializeWorkItem(&CmpLazyWorkItem, CmpLazyFlushWorker, NULL); + + /* Setup the forced-lazy DPC and timer */ + KeInitializeDpc(&CmpEnableLazyFlushDpc, + CmpEnableLazyFlushDpcRoutine, + NULL); + KeInitializeTimer(&CmpEnableLazyFlushTimer); + + /* Enable lazy flushing after 10 minutes */ + DueTime.QuadPart = Int32x32To64(600, -10 * 1000 * 1000); + KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc); + + /* Setup flush variables */ + CmpNoWrite = CmpMiniNTBoot; + CmpWasSetupBoot = SetupBoot; + + /* Testing: Force Lazy Flushing */ + CmpHoldLazyFlush = FALSE; +} + +VOID +NTAPI +CmpShutdownWorkers(VOID) +{ + /* Stop lazy flushing */ + PAGED_CODE(); + KeCancelTimer(&CmpLazyFlushTimer); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/config/cmlazy.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Nov 3 02:12:22 2007 @@ -23,6 +23,7 @@ BOOLEAN CmpSpecialBootCondition; BOOLEAN CmpNoWrite; BOOLEAN CmpForceForceFlush; +BOOLEAN CmpWasSetupBoot; /* FUNCTIONS *****************************************************************/ @@ -810,7 +811,7 @@ /* Build the master hive */ Status = CmpInitializeHive((PCMHIVE*)&CmiVolatileHive, HINIT_CREATE, - HIVE_VOLATILE | HIVE_NO_FILE, + HIVE_VOLATILE, HFILE_TYPE_PRIMARY, NULL, NULL, @@ -900,7 +901,7 @@ ((PHBASE_BLOCK)BaseAddress)->Length = Length; Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, HINIT_MEMORY, //HINIT_CREATE, - HIVE_NO_FILE, //HIVE_VOLATILE, + HIVE_VOLATILE, HFILE_TYPE_PRIMARY, BaseAddress, // NULL, NULL, @@ -972,6 +973,26 @@ RtlGetCallersAddress(&CmpRegistryLockCaller, &CmpRegistryLockCallerCaller); } +VOID +NTAPI +CmpLockRegistry(VOID) +{ + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Check if we have to starve writers */ + if (CmpFlushStarveWriters) + { + /* Starve exlusive waiters */ + ExAcquireSharedStarveExclusive(&CmpRegistryLock, TRUE); + } + else + { + /* Just grab the lock */ + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); + } +} + BOOLEAN NTAPI CmpTestRegistryLock(VOID) @@ -1002,7 +1023,7 @@ CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); /* Flush the registry */ - CmpFlushEntireRegistry(TRUE); + CmpDoFlushAll(TRUE); CmpFlushOnLockRelease = FALSE; } @@ -1011,27 +1032,11 @@ KeLeaveCriticalRegion(); } -BOOLEAN -NTAPI -CmpFlushEntireRegistry(IN BOOLEAN ForceFlush) -{ - BOOLEAN Flushed = TRUE; - - /* Make sure that the registry isn't read-only now */ - if (CmpNoWrite) return TRUE; - - /* Otherwise, acquire the hive list lock and disable force flush */ - CmpForceForceFlush = FALSE; - ExAcquirePushLockShared(&CmpHiveListHeadLock); - - /* Check if the hive list isn't empty */ - if (!IsListEmpty(&CmpHiveListHead)) - { - /* FIXME: TODO */ - ASSERT(FALSE); - } - - /* Release the lock and return the flush state */ - ExReleasePushLock(&CmpHiveListHeadLock); - return Flushed; -} +VOID +NTAPI +CmShutdownSystem(VOID) +{ + /* Kill the workers and fush all hives */ + CmpShutdownWorkers(); + CmpDoFlushAll(TRUE); +} Added: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (added) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sat Nov 3 02:12:22 2007 @@ -1,0 +1,649 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmapi.c + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +NtDeleteKey(IN HANDLE KeyHandle) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_KEY_INFORMATION DeleteKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + DELETE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + DeleteKeyInfo.Object = (PVOID)KeyObject; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteKey(KeyObject->KeyControlBlock); + + /* Remove the keep-alive reference */ + ObDereferenceObject(KeyObject); + if (KeyObject->KeyControlBlock->KeyHive != + KeyObject->KeyControlBlock->ParentKcb->KeyHive) + { + /* Dereference again */ + ObDereferenceObject(KeyObject); + } + + /* Do post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); + } + + /* Dereference the object */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", + KeyHandle, Index, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Index = Index; + EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; + EnumerateKeyInfo.Length = Length; + EnumerateKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateKey(KeyObject->KeyControlBlock, + Index, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateValueKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", + KeyHandle, Index, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, + &EnumerateValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, + Index, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryKey(IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_KEY_INFORMATION QueryKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", + KeyHandle, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + (KeyInformationClass != + KeyNameInformation) ? + KEY_QUERY_VALUE : 0, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.KeyInformationClass = KeyInformationClass; + QueryKeyInfo.KeyInformation = KeyInformation; + QueryKeyInfo.Length = Length; + QueryKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryKey(KeyObject->KeyControlBlock, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", + KeyHandle, ValueName, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.ValueName = ValueName; + QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + QueryValueKeyInfo.Length = Length; + QueryValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryValueKey(KeyObject->KeyControlBlock, + *ValueName, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); + } + + DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtSetValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN ULONG TitleIndex, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", + KeyHandle, ValueName, TitleIndex, Type, DataSize); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); + return Status; + } + + /* Setup callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.ValueName = ValueName; + SetValueKeyInfo.TitleIndex = TitleIndex; + SetValueKeyInfo.Type = Type; + SetValueKeyInfo.Data = Data; + SetValueKeyInfo.DataSize = DataSize; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmSetValueKey(KeyObject->KeyControlBlock, + ValueName, + Type, + Data, + DataSize); + } + + /* Do the post-callback and de-reference the key object */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); + ObDereferenceObject(KeyObject); + + /* Synchronize the hives and return */ + CmiSyncHives(); + return Status; +} + +NTSTATUS +NTAPI +NtDeleteValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Do the callback */ + DeleteValueKeyInfo.Object = (PVOID)KeyObject; + DeleteValueKeyInfo.ValueName = ValueName; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, + &DeleteValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); + + /* Do the post callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, + &PostOperationInfo); + } + + /* Dereference the key body and synchronize the hives */ + ObDereferenceObject(KeyObject); + CmiSyncHives(); + return Status; +} + +NTSTATUS +NTAPI +NtCompactKeys(IN ULONG Count, + IN PHANDLE KeyArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtCompressKey(IN HANDLE Key) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes) +{ + return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); +} + +NTSTATUS +NTAPI +NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN POBJECT_ATTRIBUTES SourceFile, + IN ULONG Flags, + IN HANDLE TrustClassKey, + IN HANDLE Event, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE RootHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLockProductActivationKeys(IN PULONG pPrivateVer, + IN PULONG pSafeMode) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLockRegistryKey(IN HANDLE KeyHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtNotifyChangeMultipleKeys(IN HANDLE MasterKeyHandle, + IN ULONG Count, + IN POBJECT_ATTRIBUTES SlaveObjects, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtNotifyChangeKey(IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + return NtNotifyChangeMultipleKeys(KeyHandle, + 0, + NULL, + Event, + ApcRoutine, + ApcContext, + IoStatusBlock, + CompletionFilter, + WatchTree, + Buffer, + Length, + Asynchronous); +} + +NTSTATUS +NTAPI +NtQueryMultipleValueKey(IN HANDLE KeyHandle, + IN OUT PKEY_VALUE_ENTRY ValueList, + IN ULONG NumberOfValues, + OUT PVOID Buffer, + IN OUT PULONG Length, + OUT PULONG ReturnLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG HandleCount) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtQueryOpenSubKeysEx(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG BufferLength, + IN PVOID Buffer, + IN PULONG RequiredSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE Key, + IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtRestoreKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG RestoreFlags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKeyEx(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, + IN HANDLE LowPrecedenceKeyHandle, + IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSetInformationKey(IN HANDLE KeyHandle, + IN KEY_SET_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG KeyInformationLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN HANDLE Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/config/ntapi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sat Nov 3 02:12:22 2007 @@ -72,7 +72,7 @@ */ BOOLEAN NTAPI ObInit(VOID); BOOLEAN NTAPI CmInitSystem1(VOID); -VOID CmShutdownRegistry(VOID); +VOID NTAPI CmShutdownRegistry(VOID); //BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); //BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sat Nov 3 02:12:22 2007 @@ -123,6 +123,7 @@ <file>cmhook.c</file> <file>cmkcbncb.c</file> <file>cmkeydel.c</file> + <file>cmlazy.c</file> <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file> @@ -132,6 +133,7 @@ <file>cmvalue.c</file> <file>cmvalche.c</file> <file>cmwraprs.c</file> + <file>ntapi.c</file> </directory> <directory name="cm"> <file>ntfunc.c</file>

1 0

[mpiulachs] 30078: Place CreditsGenerator class in its own file "creditsgeneratorenerator.cpp" to make Colin happy
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Sat Nov 3 02:01:03 2007 New Revision: 30078 URL: http://svn.reactos.org/svn/reactos?rev=30078&view=rev Log: Place CreditsGenerator class in its own file "creditsgeneratorenerator.cpp" to make Colin happy Added: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (with props) Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Added: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sat Nov 3 02:01:03 2007 @@ -1,0 +1,71 @@ +/* + * Copyright (C) 2007 Marc Piulachs + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include <assert.h> +#include "rbuild.h" + +using std::string; +using std::vector; + + +CreditsGenerator::CreditsGenerator ( const Project& project ) + : project ( project ) +{ +} + +CreditsGenerator::~CreditsGenerator () +{ +} + +void +CreditsGenerator::Generate () +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); + + for ( size_t i = 0; i < project.contributors.size (); i++ ) + { + Contributor& contributor = *project.contributors[i]; + + s = s + sprintf ( s, "\t%s %s (%s)\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str() , + contributor.alias.c_str()); + + s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); + + if (strlen(contributor.city.c_str()) > 0 && + strlen(contributor.country.c_str()) > 0) + { + s = s + sprintf ( s, "\t\t%s,%s\n\n" , + contributor.city.c_str() , + contributor.country.c_str()); + } + } + + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + + free ( buf ); +} Propchange: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Sat Nov 3 02:01:03 2007 @@ -91,52 +91,3 @@ free ( buf ); } - - -CreditsGenerator::CreditsGenerator ( const Project& project ) - : project ( project ) -{ -} - -CreditsGenerator::~CreditsGenerator () -{ -} - -void -CreditsGenerator::Generate () -{ - char* buf; - char* s; - - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); - - for ( size_t i = 0; i < project.contributors.size (); i++ ) - { - Contributor& contributor = *project.contributors[i]; - - s = s + sprintf ( s, "\t%s %s (%s)\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str() , - contributor.alias.c_str()); - - s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); - - if (strlen(contributor.city.c_str()) > 0 && - strlen(contributor.country.c_str()) > 0) - { - s = s + sprintf ( s, "\t\t%s,%s\n\n" , - contributor.city.c_str() , - contributor.country.c_str()); - } - } - - - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); - - free ( buf ); -} Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.mak (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.mak Sat Nov 3 02:01:03 2007 @@ -266,6 +266,7 @@ testsupportcode.cpp \ modulesmanifestgenerator.cpp \ modulesresourcegenerator.cpp \ + creditsgeneratorenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -458,6 +459,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)creditsgeneratorenerator.o: $(RBUILD_BASE_)creditsgeneratorenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)modulesmanifestgenerator.o: $(RBUILD_BASE_)modulesmanifestgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/rbuild/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.vcproj (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Sat Nov 3 02:01:03 2007 @@ -684,6 +684,10 @@ </FileConfiguration> </File> <File + RelativePath=".\creditsgeneratorenerator.cpp" + > + </File> + <File RelativePath="define.cpp" > <FileConfiguration

1 0

[mpiulachs] 30077: Make "lastname" and "alias" attributes optional . No sure about last one but lets make it non-mandatory for now
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Sat Nov 3 01:23:33 2007 New Revision: 30077 URL: http://svn.reactos.org/svn/reactos?rev=30077&view=rev Log: Make "lastname" and "alias" attributes optional . No sure about last one but lets make it non-mandatory for now Modified: branches/rbuild/reactos/tools/rbuild/module.cpp Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sat Nov 3 01:23:33 2007 @@ -1709,9 +1709,11 @@ void Contributor::ProcessXML() { - const XMLAttribute* att = node.GetAttribute ( "alias", true ); - assert(att); - alias = att->value; + const XMLAttribute* att = node.GetAttribute ( "alias", false ); + if (att != NULL) + alias = att->value; + else + alias = ""; att = node.GetAttribute ( "firstname", true ); if (att != NULL) @@ -1719,7 +1721,7 @@ else firstName = ""; - att = node.GetAttribute ( "lastname", true ); + att = node.GetAttribute ( "lastname", false ); if (att != NULL) lastName = att->value; else

1 0

[mpiulachs] 30076: Add proper encoding to handle latin alphabet
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Sat Nov 3 01:20:56 2007 New Revision: 30076 URL: http://svn.reactos.org/svn/reactos?rev=30076&view=rev Log: Add proper encoding to handle latin alphabet Modified: branches/rbuild/reactos/contributors.rbuild Modified: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (original) +++ branches/rbuild/reactos/contributors.rbuild Sat Nov 3 01:20:56 2007 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <contributor firstname="Aleksey" lastname="Bragin" mail="aleksey(a)reactos.org" alias="fireball" />

1 0

[jimtabor] 30075: Add STOCK_LAST, update stock objects.
by jimtabor＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: jimtabor Date: Sat Nov 3 01:14:45 2007 New Revision: 30075 URL: http://svn.reactos.org/svn/reactos?rev=30075&view=rev Log: Add STOCK_LAST, update stock objects. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sat Nov 3 01:14:45 2007 @@ -28,7 +28,6 @@ #define METAFILE_MEMORY 1 #define METAFILE_DISK 2 -#define STOCK_LAST 19 #define DEFAULT_BITMAP (STOCK_LAST+1) #define NB_STOCK_OBJECTS (STOCK_LAST+2) Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Nov 3 01:14:45 2007 @@ -815,6 +815,13 @@ #if (_WIN32_WINNT >= 0x0500) #define DC_BRUSH 18 #define DC_PEN 19 +#endif +#if (_WIN32_WINNT >= 0x0500) +#define STOCK_LAST 19 +#elif (WINVER >= 0x0400) +#define STOCK_LAST 17 +#else +#define STOCK_LAST 16 #endif #define SYSPAL_NOSTATIC 2 #define SYSPAL_STATIC 1 Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Sat Nov 3 01:14:45 2007 @@ -107,7 +107,7 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -#define NB_STOCK_OBJECTS (DEFAULT_GUI_FONT + 1) +#define NB_STOCK_OBJECTS (STOCK_LAST + 1) static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; @@ -124,6 +124,7 @@ /* Create GDI Stock Objects from the logical structures we've defined */ StockObjects[WHITE_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); + StockObjects[DC_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); StockObjects[LTGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(192,192,192)); StockObjects[GRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(128,128,128)); StockObjects[DKGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(64,64,64)); @@ -132,6 +133,7 @@ StockObjects[WHITE_PEN] = IntGdiExtCreatePen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]);

1 0

[cfinck] 30074: Add all contributors from the CREDITS file along with the latest commit name they use/used. Also add some new developers, which weren't in the CREDITS file.
by cfinck＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: cfinck Date: Sat Nov 3 00:56:05 2007 New Revision: 30074 URL: http://svn.reactos.org/svn/reactos?rev=30074&view=rev Log: Add all contributors from the CREDITS file along with the latest commit name they use/used. Also add some new developers, which weren't in the CREDITS file. Modified: branches/rbuild/reactos/contributors.rbuild Modified: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (original) +++ branches/rbuild/reactos/contributors.rbuild Sat Nov 3 00:56:05 2007 @@ -1,8 +1,72 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <contributor firstname="Aleksey" lastname="Bragin" alias="fireball" /> - <contributor firstname="Colin" lastname="Finck" alias="cfinck" /> - <contributor firstname="Eric" lastname="Kohl" alias="ekohl" /> + <contributor firstname="Aleksey" lastname="Bragin" mail="aleksey(a)reactos.org" alias="fireball" /> + <contributor firstname="Alex" lastname="Ionescu" mail="alex.ionescu(a)reactos.org" alias="ion" /> + <contributor firstname="Andrew" lastname="Greenwood" mail="lists(a)silverblade.co.uk" alias="silverblade" /> + <contributor firstname="Andrew" lastname="Munger" mail="waxdragon(a)gmail.com" alias="amunger" /> + <contributor firstname="Arindam" lastname="Das" /> + <contributor firstname="Art" lastname="Yerkes" mail="ayerkes(a)speakeasy.net" alias="arty" /> + <contributor firstname="Ariadne" alias="ariadne" /> + <contributor firstname="Brandon" lastname="Turner" mail="turnerb7(a)msu.edu" alias="turner" /> + <contributor firstname="Brian" lastname="Palmer" mail="brianp(a)sginet.com" alias="bpalmer" /> + <contributor firstname="Casper S." lastname="Hornstrup" mail="chorns(a)users.sourceforge.net" alias="chorns" /> + <contributor firstname="Colin" lastname="Finck" mail="mail(a)colinfinck.de" alias="cfinck" country="Germany" city="Wiedenbrueck" /> + <contributor firstname="Christoph" lastname="von Wittich" mail="christoph_vw(a)reactos.org" alias="cwittich" /> + <contributor firstname="Daniel" lastname="Reimer" alias="dreimer" /> + <contributor firstname="David" lastname="Welch" mail="welch(a)cwcom.net" alias="dwelch" /> + <contributor firstname="Emanuele" lastname="Aliberti" mail="ea(a)iol.it" alias="ea" /> + <contributor firstname="Eric" lastname="Kohl" mail="ekohl(a)rz-online.de" alias="ekohl" /> + <contributor firstname="Eugene" lastname="Ingerman" mail="geneing(a)myrealbox.com" /> + <contributor firstname="Filip" lastname="Navara" mail="xnavara(a)volny.cz" alias="navaraf" /> + <contributor firstname="Frederik" lastname="Leemans" /> + <contributor firstname="Ge" lastname="van Geldorp" mail="ge(a)gse.nl" alias="gvg" /> + <contributor firstname="Ged" lastname="Murphy" mail="gedmurphy(a)reactos.org" alias="gedmurphy" /> + <contributor firstname="Gregor" lastname="Brunmar" alias="gbrunmar" /> + <contributor firstname="Guido" lastname="de Jong" /> + <contributor firstname="Gunnar Andre'" lastname="Dalsnes" mail="hardon(a)online.no" alias="gdalsnes" /> + <contributor firstname="Hans" lastname="Kremer" /> + <contributor firstname="Hartmut" lastname="Birr" mail="hartmut.birr(a)gmx.de" alias="hbirr" /> + <contributor firstname="Hernan" lastname="Ochoa" /> + <contributor firstname="Hervé" lastname="Poussineau" mail="hpoussin(a)reactos.com" alias="hpoussin" /> + <contributor firstname="Iwan" lastname="Fatahi" mail="i_fatahi(a)hotmail.com" /> + <contributor firstname="James B." lastname="Tabor" mail="jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net" alias="jimtabor" /> + <contributor firstname="Jason" lastname="Eager" /> + <contributor firstname="Jason" lastname="Filby" mail="jasonfilby(a)yahoo.com" alias="jfilby" /> + <contributor firstname="Jason" lastname="Weiler" /> + <contributor firstname="Jean" lastname="Michault" /> + <contributor firstname="Jim" lastname="Noeth" /> + <contributor firstname="Johannes" lastname="Anderwald" mail="johannes.anderwald(a)student.tugraz.at" alias="janderwald" /> + <contributor firstname="Jonathan" lastname="Wilson" mail="jonwil(a)tpgi.com.au" /> + <contributor firstname="Jurgen" lastname="van Gael" mail="jurgen.vangael(a)student.kuleuven.ac.be" /> + <contributor firstname="KJK::Hyperion" mail="noog(a)libero.it" alias="hyperion" /> + <contributor firstname="Klemens R." lastname="Friedl" mail="klemens_friedl(a)gmx.net" alias="frik85" /> + <contributor firstname="Maarten" lastname="Bosma" mail="maarten.paul(a)bosma.de" alias="mbosma" /> + <contributor firstname="Magnus" lastname="Olsen" mail="magnus(a)greatlord.com" alias="greatlrd" /> <contributor firstname="Marc" lastname="Piulachs" mail="marc.piulachs(a)codexchange.net" alias="mpiulachs" country="Spain" city="Barcelona" /> + <contributor firstname="Mark" lastname="Tempel" mail="mtempel(a)visi.com" alias="mtempel" /> + <contributor firstname="Mark" lastname="Weaver" mail="mark(a)npsl.co.uk" /> + <contributor firstname="Martin" lastname="Fuchs" mail="martin-fuchs(a)gmx.net" alias="martinf" /> + <contributor firstname="Marty" lastname="Dill" mail="mdill(a)uvic.ca" /> + <contributor firstname="Matt" lastname="Pyne" /> + <contributor firstname="Mike" lastname="Nordell" alias="mnordell" /> + <contributor firstname="Mindflyer" mail="mf(a)mufunyo.net" alias="mflyer" /> + <contributor firstname="Nathan" lastname="Woods" mail="npwoods(a)mess.org" alias="npwoods" /> + <contributor firstname="Pablo" lastname="Borobia" mail="pborobia(a)gmail.com" /> + <contributor firstname="Paolo" lastname="Pantaleo" mail="paolopan(a)freemail.it" /> + <contributor firstname="Peter" lastname="Ward" alias="peterw" /> + <contributor firstname="Phillip" lastname="Susi" mail="phreak(a)iag.net" /> + <contributor firstname="Rex" lastname="Jolliff" mail="rex(a)lvcablemodem.com" alias="rex" /> + <contributor firstname="Richard" lastname="Campbell" mail="betam4x(a)gmail.com" alias="rcampbell" /> + <contributor firstname="Robert" lastname="Bergkvist" mail="fragdance(a)hotmail.com" /> + <contributor firstname="Robert" lastname="Dickenson" mail="robd(a)reactos.org" alias="robd" /> + <contributor firstname="Royce" lastname="Mitchell III" mail="royce3(a)ev1.net" alias="royce" /> + <contributor firstname="Saveliy" lastname="Tretiakov" mail="saveliyt(a)mail.ru" alias="tretiakov" /> + <contributor firstname="Sebastian" lastname="Gasiorek" alias="sgasiorek" /> + <contributor firstname="Steven" lastname="Edwards" mail="steven_ed4153(a)yahoo.com" alias="sedwards" /> + <contributor firstname="Sylvain" lastname="Petreolle" alias="spetreolle" /> + <contributor firstname="Thomas" lastname="Weidenmueller" mail="w3seek(a)users.sourceforge.net" alias="weiden" /> + <contributor firstname="Timo" lastname="Kreuzer" mail="timo.kreuzer(a)reactos.org" alias="tkreuzer" /> + <contributor firstname="Victor" lastname="Kirhenshtein" mail="sauros(a)iname.com" /> + <contributor firstname="Vizzini" mail="vizzini(a)plasmic.com" alias="vizzini" /> </group>

1 0

[mpiulachs] 30073: remove '__REACTOS__' define already defined for project
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Fri Nov 2 22:59:55 2007 New Revision: 30073 URL: http://svn.reactos.org/svn/reactos?rev=30073&view=rev Log: remove '__REACTOS__' define already defined for project Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild Fri Nov 2 22:59:55 2007 @@ -2,7 +2,6 @@ <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true"> <include base="eventvwr">.</include> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library>

1 0

[mpiulachs] 30072: - Created a new concept "the cd bootstrap folder" . The cd bootstrap folder is a user customizable folder in the cd's root that defaults to the current build architecture for example i386 o ppc. - Modifed the InstallBase from the BootStrap element to be relative to the bootstrap folder, for example the usetup bootstrap: <bootstrap installbase="system32" nameoncd="smss.exe" /> will be created in : (CD)\i386\system32\smss.exe on a I386 build and (CD)\ppc\system32\smss.exe on a p
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Fri Nov 2 21:36:55 2007 New Revision: 30072 URL: http://svn.reactos.org/svn/reactos?rev=30072&view=rev Log: - Created a new concept "the cd bootstrap folder" . The cd bootstrap folder is a user customizable folder in the cd's root that defaults to the current build architecture for example i386 o ppc. - Modifed the InstallBase from the BootStrap element to be relative to the bootstrap folder, for example the usetup bootstrap: <bootstrap installbase="system32" nameoncd="smss.exe" /> will be created in : (CD)\i386\system32\smss.exe on a I386 build and (CD)\ppc\system32\smss.exe on a powerpc build - Introduced a new element "bootstrapfile" equivalent to the bootstrap for module target but applied to regular files for example : <bootstrapfile>hivecls.inf</bootstrapfile> will be placed in : (CD)\i386\hivecls.inf on a I386 build and (CD)\ppc\hivecls.inf on a powerpc build - Moved the "loader" folder from cd root to the bootstrap cd folder (this will require a modification in isoboot.asm). Every architecture will have its bootloader code in (CD)\(BootStrapFolder)\loader With this changes we will be able to place complete installation for more than one architecture in the same cd .Only one of the architectures will be able to be booted by default but we can include the cdmake utility + some .bat files in a (CD)\tools folder so the user can download the official CD with all supported architectures and create a bootable boot CD for a particular architecture. cool huh? ============================================ - Consity and explicty declare install folders , use the same ID that this folders have on Windows , we will use it later to validate InstallBase attributes and during setup Added: branches/rbuild/reactos/installfolders.rbuild (with props) Modified: branches/rbuild/reactos/ReactOS-generic.rbuild branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf branches/rbuild/reactos/base/setup/reactos/reactos.rbuild branches/rbuild/reactos/base/setup/usetup/usetup.rbuild branches/rbuild/reactos/base/setup/welcome/welcome.rbuild branches/rbuild/reactos/boot/bootdata/bootdata.rbuild branches/rbuild/reactos/boot/freeldr/freeldr/setupldr.rbuild branches/rbuild/reactos/dll/ntdll/ntdll.rbuild branches/rbuild/reactos/drivers/base/bootvid/bootvid.rbuild branches/rbuild/reactos/drivers/base/kdcom/kdcom.rbuild branches/rbuild/reactos/drivers/filesystems/cdfs/cdfs.rbuild branches/rbuild/reactos/drivers/filesystems/ntfs/ntfs.rbuild branches/rbuild/reactos/drivers/filesystems/vfat/vfatfs.rbuild branches/rbuild/reactos/drivers/input/i8042prt/i8042prt.rbuild branches/rbuild/reactos/drivers/input/kbdclass/kbdclass.rbuild branches/rbuild/reactos/drivers/setup/blue/blue.rbuild branches/rbuild/reactos/drivers/storage/class/cdrom/cdrom.rbuild branches/rbuild/reactos/drivers/storage/class/class2/class2.rbuild branches/rbuild/reactos/drivers/storage/class/disk/disk.rbuild branches/rbuild/reactos/drivers/storage/floppy/floppy.rbuild branches/rbuild/reactos/drivers/storage/ide/atapi/atapi.rbuild branches/rbuild/reactos/drivers/storage/ide/uniata/uniata.rbuild branches/rbuild/reactos/drivers/storage/port/buslogic/buslogic.rbuild branches/rbuild/reactos/drivers/storage/port/diskdump/diskdump.rbuild branches/rbuild/reactos/drivers/storage/scsiport/scsiport.rbuild branches/rbuild/reactos/hal/halppc/up/halup.rbuild branches/rbuild/reactos/hal/halx86/mp/halmp.rbuild branches/rbuild/reactos/hal/halx86/up/halup.rbuild branches/rbuild/reactos/media/drivers/etc/etc.rbuild branches/rbuild/reactos/media/nls/nls.rbuild branches/rbuild/reactos/ntoskrnl/ntoskrnl.rbuild branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/rbuild/reactos/tools/rbuild/bootstrap.cpp branches/rbuild/reactos/tools/rbuild/cdfile.cpp branches/rbuild/reactos/tools/rbuild/linkerscript.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp Modified: branches/rbuild/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-generic.… ============================================================================== --- branches/rbuild/reactos/ReactOS-generic.rbuild (original) +++ branches/rbuild/reactos/ReactOS-generic.rbuild Fri Nov 2 21:36:55 2007 @@ -3,6 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> <xi:include href="contributors.rbuild" /> + <xi:include href="installfolders.rbuild" /> <define name="__REACTOS__" overridable="true" /> <if property="MP" value="1"> Modified: branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf (original) +++ branches/rbuild/reactos/base/applications/notepad/setup/notepad.inf Fri Nov 2 21:36:55 2007 @@ -8,9 +8,9 @@ [NotepadDesktopItemAdd] Name = %NOTEPAD_NAME%, 0x0000008, 16409 -CmdLine = 24,"%SystemRoot%\system32\","notepad.exe" +CmdLine = 11,,"notepad.exe" InfoTip = %NOTEPAD_DESC% -WorkingDir = 24,"%HOMEDRIVE%%HOMEPATH%" +WorkingDir = "%HOMEDRIVE%%HOMEPATH%" ; Localizable Strings Modified: branches/rbuild/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/react… ============================================================================== --- branches/rbuild/reactos/base/setup/reactos/reactos.rbuild (original) +++ branches/rbuild/reactos/base/setup/reactos/reactos.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="reactos" type="win32gui"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="reactos">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: branches/rbuild/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/usetu… ============================================================================== --- branches/rbuild/reactos/base/setup/usetup/usetup.rbuild (original) +++ branches/rbuild/reactos/base/setup/usetup/usetup.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false"> - <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> + <bootstrap installbase="system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> <include base="inflib">.</include> Modified: branches/rbuild/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/welco… ============================================================================== --- branches/rbuild/reactos/base/setup/welcome/welcome.rbuild (original) +++ branches/rbuild/reactos/base/setup/welcome/welcome.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: branches/rbuild/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/bootdata/bo… ============================================================================== --- branches/rbuild/reactos/boot/bootdata/bootdata.rbuild (original) +++ branches/rbuild/reactos/boot/bootdata/bootdata.rbuild Fri Nov 2 21:36:55 2007 @@ -4,12 +4,23 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + + <bootstrapfile>hivecls.inf</bootstrapfile> + <bootstrapfile>hivedef.inf</bootstrapfile> + <bootstrapfile>hivesft.inf</bootstrapfile> + <bootstrapfile>hivesys.inf</bootstrapfile> + <bootstrapfile>txtsetup.sif</bootstrapfile> + <bootstrapfile>unattend.inf</bootstrapfile> + +  + <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: branches/rbuild/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/freeldr/fre… ============================================================================== --- branches/rbuild/reactos/boot/freeldr/freeldr/setupldr.rbuild (original) +++ branches/rbuild/reactos/boot/freeldr/freeldr/setupldr.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="setupldr" type="bootloader"> - <bootstrap installbase="loader" /> + <bootstrap installbase="loader"/> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> Modified: branches/rbuild/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/ntdll/ntdll.… ============================================================================== --- branches/rbuild/reactos/dll/ntdll/ntdll.rbuild (original) +++ branches/rbuild/reactos/dll/ntdll/ntdll.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> - <bootstrap installbase="$(CDOUTPUT)/system32" /> + <bootstrap installbase="system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> <include base="ReactOS">include/reactos/subsys</include> Modified: branches/rbuild/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/base/boo… ============================================================================== --- branches/rbuild/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ branches/rbuild/reactos/drivers/base/bootvid/bootvid.rbuild Fri Nov 2 21:36:55 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> <importlibrary definition="bootvid.def"></importlibrary> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <bootstrap nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/base/kdc… ============================================================================== --- branches/rbuild/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ branches/rbuild/reactos/drivers/base/kdcom/kdcom.rbuild Fri Nov 2 21:36:55 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> <importlibrary definition="kdcom.def"></importlibrary> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <bootstrap nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/filesyst… ============================================================================== --- branches/rbuild/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original) +++ branches/rbuild/reactos/drivers/filesystems/cdfs/cdfs.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="cdfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/filesyst… ============================================================================== --- branches/rbuild/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ branches/rbuild/reactos/drivers/filesystems/ntfs/ntfs.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="ntfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/filesyst… ============================================================================== --- branches/rbuild/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original) +++ branches/rbuild/reactos/drivers/filesystems/vfat/vfatfs.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> Modified: branches/rbuild/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/input/i8… ============================================================================== --- branches/rbuild/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ branches/rbuild/reactos/drivers/input/i8042prt/i8042prt.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/input/kb… ============================================================================== --- branches/rbuild/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ branches/rbuild/reactos/drivers/input/kbdclass/kbdclass.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <define name="NDEBUG" /> <library>pseh</library> Modified: branches/rbuild/reactos/drivers/setup/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/setup/bl… ============================================================================== --- branches/rbuild/reactos/drivers/setup/blue/blue.rbuild (original) +++ branches/rbuild/reactos/drivers/setup/blue/blue.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/class/cdrom/cdrom.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/class/cdrom/cdrom.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> Modified: branches/rbuild/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/class/class2/class2.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/class/disk/disk.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/class/disk/disk.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/floppy/floppy.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/floppy/floppy.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/ide/atapi/atapi.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/ide/atapi/atapi.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/ide/uniata/uniata.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/ide/uniata/uniata.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <define name="_DEBUG" /> <include base="uniata">.</include> Modified: branches/rbuild/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/port/buslogic/buslogic.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/port/buslogic/buslogic.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <include base="buslogic">.</include> <library>ntoskrnl</library> Modified: branches/rbuild/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/port/diskdump/diskdump.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/port/diskdump/diskdump.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <importlibrary definition="diskdump.def" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> Modified: branches/rbuild/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/drivers/storage/… ============================================================================== --- branches/rbuild/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ branches/rbuild/reactos/drivers/storage/scsiport/scsiport.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <define name="__USE_W32API" /> <define name="_SCSIPORT_" /> <importlibrary definition="scsiport.def" /> Modified: branches/rbuild/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/hal/halppc/up/ha… ============================================================================== --- branches/rbuild/reactos/hal/halppc/up/halup.rbuild (original) +++ branches/rbuild/reactos/hal/halppc/up/halup.rbuild Fri Nov 2 21:36:55 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halppc_up" type="kernelmodedll"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: branches/rbuild/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/hal/halx86/mp/ha… ============================================================================== --- branches/rbuild/reactos/hal/halx86/mp/halmp.rbuild (original) +++ branches/rbuild/reactos/hal/halx86/mp/halmp.rbuild Fri Nov 2 21:36:55 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halmp" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: branches/rbuild/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/hal/halx86/up/ha… ============================================================================== --- branches/rbuild/reactos/hal/halx86/up/halup.rbuild (original) +++ branches/rbuild/reactos/hal/halx86/up/halup.rbuild Fri Nov 2 21:36:55 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halup" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap nameoncd="hal.dll" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Added: branches/rbuild/reactos/installfolders.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/installfolders.r… ============================================================================== --- branches/rbuild/reactos/installfolders.rbuild (added) +++ branches/rbuild/reactos/installfolders.rbuild Fri Nov 2 21:36:55 2007 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + +  + <installfolder id="1">.</installfolder> + <installfolder id="2">system32</installfolder> + <installfolder id="3">system32\config</installfolder> + <installfolder id="4">system32\drivers</installfolder> + <installfolder id="5">system</installfolder> + <installfolder id="17">system32\drivers\etc</installfolder> + <installfolder id="20">inf</installfolder> + <installfolder id="22">fonts</installfolder> + +  + <installfolder id="201">system32\bin</installfolder> + <installfolder id="202">media\fonts</installfolder> +</group> Propchange: branches/rbuild/reactos/installfolders.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/drivers/et… ============================================================================== --- branches/rbuild/reactos/media/drivers/etc/etc.rbuild (original) +++ branches/rbuild/reactos/media/drivers/etc/etc.rbuild Fri Nov 2 21:36:55 2007 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <cdfile installbase="$(CDOUTPUT)">services</cdfile> + <bootstrapfile>services</bootstrapfile> <installfile installbase="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> - <cdfile installbase="$(CDOUTPUT)">KDBinit</cdfile> + <bootstrapfile>KDBinit</bootstrapfile> <installfile installbase="system32/drivers/etc">KDBinit</installfile> </if> </group> Modified: branches/rbuild/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/nls/nls.rb… ============================================================================== --- branches/rbuild/reactos/media/nls/nls.rbuild (original) +++ branches/rbuild/reactos/media/nls/nls.rbuild Fri Nov 2 21:36:55 2007 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile> - <cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile> - <cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile> + <bootstrapfile>c_437.nls</bootstrapfile> + <bootstrapfile>c_1252.nls</bootstrapfile> + <bootstrapfile>l_intl.nls</bootstrapfile> <installfile installbase="system32">c_037.nls</installfile> <installfile installbase="system32">c_424.nls</installfile> @@ -59,4 +59,4 @@ <installfile installbase="system32">c_28598.nls</installfile> <installfile installbase="system32">c_28599.nls</installfile> <installfile installbase="system32">l_intl.nls</installfile> -</group> +</group> Modified: branches/rbuild/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ntoskrnl/ntoskrn… ============================================================================== --- branches/rbuild/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/rbuild/reactos/ntoskrnl/ntoskrnl.rbuild Fri Nov 2 21:36:55 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <bootstrap installbase="$(CDOUTPUT)" /> + <bootstrap /> <importlibrary definition="ntoskrnl.def" /> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Nov 2 21:36:55 2007 @@ -3329,7 +3329,8 @@ } void -MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( +MingwIsoModuleHandler::OutputBootstrapModuleTargetCopyCommands ( + const string& bootcdstrapDirectory , const string& bootcdDirectory ) { for ( size_t i = 0; i < module.project.modules.size (); i++ ) @@ -3339,12 +3340,26 @@ continue; if ( m.bootstrap != NULL ) { - FileLocation targetFile ( OutputDirectory, - m.bootstrap->base.length () > 0 - ? bootcdDirectory + sSep + m.bootstrap->base - : bootcdDirectory, - m.bootstrap->nameoncd ); - OutputCopyCommand ( *m.output, targetFile ); + if (m.bootstrap->archDependent == true) + { + FileLocation targetFile ( OutputDirectory, + m.bootstrap->base.length () > 0 + ? bootcdstrapDirectory + sSep + m.bootstrap->base + : bootcdstrapDirectory, + m.bootstrap->nameoncd ); + + OutputCopyCommand ( *m.output, targetFile ); + } + else + { + FileLocation targetFile ( OutputDirectory, + m.bootstrap->base.length () > 0 + ? bootcdDirectory + sSep + m.bootstrap->base + : bootcdDirectory, + m.bootstrap->nameoncd ); + + OutputCopyCommand ( *m.output, targetFile ); + } } } } @@ -3362,6 +3377,22 @@ : bootcdDirectory, cdfile.target->name ); OutputCopyCommand ( *cdfile.source, targetFile ); + } +} + +void +MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( + const string& bootcdDirectory ) +{ + for ( size_t i = 0; i < module.project.bootstrapfiles.size (); i++ ) + { + const BootstrapFile& bootfile = *module.project.bootstrapfiles[i]; + FileLocation targetFile ( OutputDirectory, + bootfile.target->relative_path.length () > 0 + ? bootcdDirectory + sSep + bootfile.target->relative_path + : bootcdDirectory, + bootfile.target->name ); + OutputCopyCommand ( *bootfile.source, targetFile ); } } @@ -3449,11 +3480,13 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; + string bootcdStrapDirectory = bootcdDirectory + sSep + Environment::GetBootstrapCdOutputPath(); + FileLocation bootcd ( OutputDirectory, bootcdDirectory, "" ); FileLocation bootcdReactos ( OutputDirectory, - bootcdDirectory + sSep + Environment::GetCdOutputPath (), + bootcdStrapDirectory, "" ); vector<FileLocation> vSourceFiles, vCdFiles; vector<FileLocation> vCdDirectories; @@ -3523,7 +3556,9 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", backend->GetFullName ( reactosInf ).c_str () ); - OutputBootstrapfileCopyCommands ( bootcdDirectory ); + + OutputBootstrapfileCopyCommands ( bootcdStrapDirectory ); + OutputBootstrapModuleTargetCopyCommands ( bootcdStrapDirectory , bootcdDirectory); OutputCdfileCopyCommands ( bootcdDirectory ); if (module.type == IsoRegTest) @@ -3670,7 +3705,7 @@ FileLocation isoboot ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "bootsect", bootloader ); - string reactosDirectory = "reactos"; + string reactosDirectory = Environment::GetArch();// "reactos"; string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory; FileLocation livecdReactos ( OutputDirectory, livecdReactosNoFixup, Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Nov 2 21:36:55 2007 @@ -434,8 +434,9 @@ void GetBootstrapCdFiles ( std::vector<FileLocation>& out ) const; void GetNonModuleCdFiles ( std::vector<FileLocation>& out ) const; void GetCdFiles ( std::vector<FileLocation>& out ) const; - void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory ); + void OutputBootstrapModuleTargetCopyCommands ( const std::string& bootcdstrapDirectory , const std::string& bootcdDirectory ); void OutputCdfileCopyCommands ( const std::string& bootcdDirectory ); + void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory ); }; Modified: branches/rbuild/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/boo… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/bootstrap.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/bootstrap.cpp Fri Nov 2 21:36:55 2007 @@ -103,6 +103,24 @@ else base = ""; + archDependent = true; + + att = node.GetAttribute ( "archDependent", false ); + if ( att != NULL ) + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) + archDependent = true; + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) + archDependent = false; + else + { + throw XMLInvalidBuildFileException ( + node.location, + "attribute 'archDependent' of <bootstrap> element can only be 'true' or 'false'" ); + } + } + att = node.GetAttribute ( "nameoncd", false ); if ( att != NULL ) nameoncd = att->value; Modified: branches/rbuild/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cdf… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/cdfile.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/cdfile.cpp Fri Nov 2 21:36:55 2007 @@ -34,6 +34,18 @@ return path; } +string +BootstrapFile::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + CDFile::CDFile ( const Project& project, const XMLElement& cdfileNode, const string& path ) @@ -57,3 +69,27 @@ nameoncd ? att->value : cdfileNode.value, &cdfileNode ); } + +BootstrapFile::BootstrapFile ( const Project& project, + const XMLElement& cdfileNode, + const string& path ) + : XmlNode ( project, cdfileNode ) +{ + const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false ); + string target_relative_directory; + if ( att != NULL ) + target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); + else + target_relative_directory = ""; + + const XMLAttribute* nameoncd = cdfileNode.GetAttribute ( "nameoncd", false ); + + source = new FileLocation ( SourceDirectory, + path, + cdfileNode.value, + &cdfileNode ); + target = new FileLocation ( OutputDirectory, + target_relative_directory, + nameoncd ? att->value : cdfileNode.value, + &cdfileNode ); +} Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/lin… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Fri Nov 2 21:36:55 2007 @@ -76,3 +76,18 @@ else section = "DefaultInstall"; } + +InstallFolder::InstallFolder ( const XMLElement& node_) + : node(node_) +{ + ProcessXML (); +} + +void +InstallFolder::ProcessXML() +{ + const XMLAttribute* att = node.GetAttribute ( "id", true ); + assert(att); + id = att->value; + name = node.value; +} Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Fri Nov 2 21:36:55 2007 @@ -73,16 +73,23 @@ /* static */ string Environment::GetInstallPath () { - string defaultInstall = GetCdOutputPath (); + //string defaultInstall = GetCdOutputPath (); return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", - defaultInstall ); + /*defaultInstall*/ "reactos" ); } /* static */ string Environment::GetCdOutputPath () { return GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", - "reactos" ); + ""); +} + +/* static */ string +Environment::GetBootstrapCdOutputPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_CDBOOTSTRAPOUTPUT", + GetArch()); } /* static */ string @@ -193,6 +200,8 @@ delete linkerFlags[i]; for ( i = 0; i < cdfiles.size (); i++ ) delete cdfiles[i]; + for ( i = 0; i < bootstrapfiles.size (); i++ ) + delete bootstrapfiles[i]; for ( i = 0; i < installfiles.size (); i++ ) delete installfiles[i]; delete head; @@ -401,6 +410,8 @@ linkerFlags[i]->ProcessXML (); for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); + for ( i = 0; i < bootstrapfiles.size (); i++ ) + bootstrapfiles[i]->ProcessXML (); for ( i = 0; i < cdfiles.size (); i++ ) cdfiles[i]->ProcessXML (); for ( i = 0; i < installfiles.size (); i++ ) @@ -477,6 +488,12 @@ cdfiles.push_back ( cdfile ); subs_invalid = true; } + else if ( e.name == "bootstrapfile" ) + { + BootstrapFile* bootstrapfile = new BootstrapFile ( *this, e, path ); + bootstrapfiles.push_back ( bootstrapfile ); + subs_invalid = true; + } else if ( e.name == "installfile" ) { InstallFile* installfile = new InstallFile ( *this, e, path ); @@ -493,7 +510,13 @@ { Contributor* contributor = new Contributor ( e ); contributors.push_back ( contributor ); - subs_invalid = true; + subs_invalid = false; + } + else if ( e.name == "installfolder" ) + { + InstallFolder* installFolder = new InstallFolder ( e ); + installFolders.push_back ( installFolder ); + subs_invalid = false; } else if ( e.name == "directory" ) { @@ -596,6 +619,18 @@ return NULL; } +const Contributor* +Project::LocateContributor ( const string& alias ) const +{ + for ( size_t i = 0; i < contributors.size (); i++ ) + { + if ( contributors[i]->alias == alias ) + return contributors[i]; + } + + return NULL; +} + const std::string& Project::GetProjectFilename () const { Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Fri Nov 2 21:36:55 2007 @@ -99,6 +99,7 @@ class Bootstrap; class CDFile; class InstallFile; +class BootstrapFile; class PchFile; class StubbedComponent; class StubbedSymbol; @@ -117,6 +118,7 @@ class AutoManifest; class AutoResource; class InstallComponent; +class InstallFolder; typedef std::map<std::string,Directory*> directory_map; @@ -199,6 +201,7 @@ static std::string GetIntermediatePath (); static std::string GetOutputPath (); static std::string GetCdOutputPath (); + static std::string GetBootstrapCdOutputPath (); static std::string GetInstallPath (); static std::string GetAutomakeFile ( const std::string& defaultFile ); static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, @@ -262,10 +265,12 @@ XMLIncludes xmlbuildfiles; std::vector<LinkerFlag*> linkerFlags; std::vector<CDFile*> cdfiles; + std::vector<BootstrapFile*> bootstrapfiles; std::vector<InstallFile*> installfiles; std::vector<Module*> modules; std::vector<Language*> languages; std::vector<Contributor*> contributors; + std::vector<InstallFolder*> installFolders; IfableData non_if_data; ArchitectureType GetArchitectureType ( const std::string& location, const XMLAttribute& attribute ); @@ -280,6 +285,7 @@ ArchitectureType architectureType; void ProcessXML ( const std::string& path ); Module* LocateModule ( const std::string& name ); + const Contributor* LocateContributor ( const std::string& alias ) const; const Module* LocateModule ( const std::string& name ) const; const std::string& GetProjectFilename () const; std::string ResolveProperties ( const std::string& s ) const; @@ -339,6 +345,19 @@ HostDefault, HostTrue }; + +// reference : http://www.msfn.org/board/lofiversion/index.php/t29964.html + +#define SETUPAPI_SOURCEDRIVE "1" //(the directory from which the INF file was installed) +#define SETUPAPI_OS "10" //(%SystemRoot%) +#define SETUPAPI_SYSTEM "11" //(%SystemRoot%\system32) +#define SETUPAPI_DRIVERS "12" //(%SystemRoot%\system32\drivers) +#define SETUPAPI_INF "17" //(%SystemRoot%\inf) +#define SETUPAPI_HELP "18" //(%SystemRoot%\Help) +#define SETUPAPI_FONTS "20" //(%SystemRoot%\Fonts) +#define SETUPAPI_ROOT "24" //(%SystemDrive%) +#define SETUPAPI_SHARED "25" //(%ALLUSERSPROFILE%\Shared Documents) +#define SETUPAPI_USERPROFILE "53" //(%USERPROFILE%) class FileLocation { @@ -773,6 +792,17 @@ void ProcessXML(); }; +class InstallFolder +{ +public: + const XMLElement& node; + std::string id; + std::string name; + + InstallFolder ( const XMLElement& node); + ~InstallFolder (); + void ProcessXML(); +}; class Property { @@ -938,6 +968,7 @@ const XMLElement& node; std::string base; std::string nameoncd; + bool archDependent; Bootstrap ( const Project& project, const Module* module, @@ -968,6 +999,20 @@ std::string path ); }; +class BootstrapFile : public XmlNode +{ +public: + FileLocation *source; + FileLocation *target; + + BootstrapFile ( const Project& project, + const XMLElement& bootstrapNode, + const std::string& path ); +private: + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); +}; class InstallFile : public XmlNode { Modified: branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/sys… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/syssetupgenerator.cpp Fri Nov 2 21:36:55 2007 @@ -67,13 +67,11 @@ InfHostCloseFile ( inf ); } -#define DIRECTORYID_SYSTEM32 "11" - string SysSetupGenerator::GetDirectoryId ( const Module& module ) { if ( module.install && ToLower ( module.install->relative_path ) == "system32" ) - return DIRECTORYID_SYSTEM32; + return SETUPAPI_SYSTEM; throw InvalidOperationException ( __FILE__, __LINE__ ); }

1 0

[fireball] 30071: - It may happen so, that the driver was loaded by the bootloader, but failed initialization (thus DriverObject == NULL), and later PNP manager tries to install it again, and BSOD due to NULL DriverObject (because really only its image is loaded, but it's not initialized). Prevent this situation by initializing DriverObject in that case.
by fireball＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: fireball Date: Fri Nov 2 19:00:58 2007 New Revision: 30071 URL: http://svn.reactos.org/svn/reactos?rev=30071&view=rev Log: - It may happen so, that the driver was loaded by the bootloader, but failed initialization (thus DriverObject == NULL), and later PNP manager tries to install it again, and BSOD due to NULL DriverObject (because really only its image is loaded, but it's not initialized). Prevent this situation by initializing DriverObject in that case. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Nov 2 19:00:58 2007 @@ -2516,7 +2516,8 @@ { /* STATUS_IMAGE_ALREADY_LOADED means this driver was loaded by the bootloader */ - if (Status != STATUS_IMAGE_ALREADY_LOADED) + if ((Status != STATUS_IMAGE_ALREADY_LOADED) || + (Status == STATUS_IMAGE_ALREADY_LOADED && !DriverObject)) { /* Initialize the driver */ Status = IopInitializeDriverModule(DeviceNode, ModuleObject,

1 0

[gedmurphy] 30070: add missing break
by gedmurphy＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: gedmurphy Date: Fri Nov 2 16:39:56 2007 New Revision: 30070 URL: http://svn.reactos.org/svn/reactos?rev=30070&view=rev Log: add missing break Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Nov 2 16:39:56 2007 @@ -599,6 +599,7 @@ DeleteDC(hdcMem); } } + break; } case WM_COMMAND: {

1 0

← Newer
1
...
82
83
84
85
86
87
88
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007