Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26702: - Move CmpInitializeSystemHive and CmpCreateObjectTypes to cmsysini.c since they're almost identical to the Cm rewrite and compatible, so they're considered "new" code (although they still use EREGISTRY_HIVE). - Add code missing in CmpInitializeSystemHive from Cm Rewrite (mainly detecting boot type and self-healing settings). - Free a memory leak. - Enable security for key objects. - Rename CmiKeyType to CmpKeyObjectType.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Fri May 11 22:58:34 2007 New Revision: 26702 URL: http://svn.reactos.org/svn/reactos?rev=26702&view=rev Log: - Move CmpInitializeSystemHive and CmpCreateObjectTypes to cmsysini.c since they're almost identical to the Cm rewrite and compatible, so they're considered "new" code (although they still use EREGISTRY_HIVE). - Add code missing in CmpInitializeSystemHive from Cm Rewrite (mainly detecting boot type and self-healing settings). - Free a memory leak. - Enable security for key objects. - Rename CmiKeyType to CmpKeyObjectType. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26702… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Fri May 11 22:58:34 2007 @@ -107,7 +107,7 @@ extern PEREGISTRY_HIVE CmiVolatileHive; -extern POBJECT_TYPE CmiKeyType; +extern POBJECT_TYPE CmpKeyObjectType; extern KSPIN_LOCK CmiKeyListLock; extern LIST_ENTRY CmiHiveListHead; @@ -148,7 +148,7 @@ CmUnRegisterCallback(IN LARGE_INTEGER Cookie); NTSTATUS STDCALL -CmiObjectParse(IN PVOID ParsedObject, +CmpParseKey(IN PVOID ParsedObject, IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, @@ -160,10 +160,10 @@ OUT PVOID *NextObject); VOID STDCALL -CmiObjectDelete(PVOID DeletedObject); +CmpDeleteKeyObject(PVOID DeletedObject); NTSTATUS STDCALL -CmiObjectSecurity(PVOID ObjectBody, +CmpSecurityMethod(PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, PSECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -173,7 +173,7 @@ PGENERIC_MAPPING GenericMapping); NTSTATUS STDCALL -CmiObjectQueryName (PVOID ObjectBody, +CmpQueryKeyName (PVOID ObjectBody, IN BOOLEAN HasObjectName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, @@ -478,6 +478,14 @@ NTAPI CmpHiveRootSecurityDescriptor(VOID); +BOOLEAN +NTAPI +CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpCreateObjectTypes(VOID); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Fri May 11 22:58:34 2007 @@ -24,7 +24,7 @@ /* GLOBALS ******************************************************************/ -extern POBJECT_TYPE CmiKeyType; +extern POBJECT_TYPE CmpKeyObjectType; extern LIST_ENTRY CmiKeyObjectListHead; static BOOLEAN CmiRegistryInitialized = FALSE; @@ -218,7 +218,7 @@ &ObjectName, (PVOID*)&Object, &RemainingPath, - CmiKeyType, + CmpKeyObjectType, NULL, NULL); if (!NT_SUCCESS(Status)) @@ -300,7 +300,7 @@ DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object); Status = ObCreateObject(PreviousMode, - CmiKeyType, + CmpKeyObjectType, NULL, PreviousMode, NULL, @@ -452,7 +452,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, DELETE, - CmiKeyType, + CmpKeyObjectType, PreviousMode, (PVOID *)&KeyObject, NULL); @@ -516,7 +516,7 @@ /* * Note: * Hive-Synchronization will not be triggered here. This is done in - * CmiObjectDelete() (in regobj.c) after all key-related structures + * CmpDeleteKeyObject() (in regobj.c) after all key-related structures * have been released. */ @@ -563,7 +563,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_ENUMERATE_SUB_KEYS, - CmiKeyType, + CmpKeyObjectType, PreviousMode, (PVOID *) &KeyObject, NULL); @@ -863,7 +863,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, - CmiKeyType, + CmpKeyObjectType, ExGetPreviousMode(), (PVOID *) &KeyObject, NULL); @@ -1116,7 +1116,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, 0, - CmiKeyType, + CmpKeyObjectType, PreviousMode, (PVOID *)&KeyObject, NULL); @@ -1244,7 +1244,7 @@ &ObjectName, (PVOID*)&Object, &RemainingPath, - CmiKeyType, + CmpKeyObjectType, NULL, NULL); if (!NT_SUCCESS(Status)) @@ -1340,7 +1340,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, (KeyInformationClass != KeyNameInformation ? KEY_QUERY_VALUE : 0), - CmiKeyType, + CmpKeyObjectType, ExGetPreviousMode(), (PVOID *) &KeyObject, NULL); @@ -1566,7 +1566,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, - CmiKeyType, + CmpKeyObjectType, ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); @@ -1830,7 +1830,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, DesiredAccess, - CmiKeyType, + CmpKeyObjectType, ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); @@ -2005,7 +2005,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_SET_VALUE, - CmiKeyType, + CmpKeyObjectType, PreviousMode, (PVOID *)&KeyObject, NULL); @@ -2218,7 +2218,7 @@ /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, - CmiKeyType, + CmpKeyObjectType, ExGetPreviousMode(), (PVOID *) &KeyObject, NULL); 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 Fri May 11 22:58:34 2007 @@ -29,7 +29,7 @@ extern BOOLEAN ExpInTextModeSetup; -POBJECT_TYPE CmiKeyType = NULL; +POBJECT_TYPE CmpKeyObjectType = NULL; PEREGISTRY_HIVE CmiVolatileHive = NULL; LIST_ENTRY CmiHiveListHead; @@ -45,9 +45,6 @@ volatile BOOLEAN CmiHiveSyncPending = FALSE; KDPC CmiHiveSyncDpc; KTIMER CmiHiveSyncTimer; - -static GENERIC_MAPPING CmiKeyMapping = - {KEY_READ, KEY_WRITE, KEY_EXECUTE, KEY_ALL_ACCESS}; static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -188,118 +185,6 @@ BOOLEAN NTAPI -CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PVOID HiveBase; - ANSI_STRING LoadString; - PVOID Buffer; - ULONG Length; - NTSTATUS Status; - BOOLEAN Allocate; - UNICODE_STRING KeyName; - PEREGISTRY_HIVE SystemHive; - UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); - PSECURITY_DESCRIPTOR SecurityDescriptor; - PAGED_CODE(); - - /* Setup the ansi string */ - RtlInitAnsiString(&LoadString, LoaderBlock->LoadOptions); - - /* Allocate the unicode buffer */ - Length = LoadString.Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); - Buffer = ExAllocatePoolWithTag(PagedPool, Length, 0); - if (!Buffer) - { - /* Fail */ - KEBUGCHECKEX(BAD_SYSTEM_CONFIG_INFO, 3, 1, (ULONG_PTR)LoaderBlock, 0); - } - - /* Setup the unicode string */ - RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, Length); - - /* Add the load options and null-terminate */ - RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); - CmpLoadOptions.Buffer[LoadString.Length] = UNICODE_NULL; - CmpLoadOptions.Length += sizeof(WCHAR); - - /* Get the System Hive base address */ - HiveBase = LoaderBlock->RegistryBase; - if (HiveBase) - { - /* Import it */ - ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; - Status = CmpInitializeHive(&SystemHive, - HINIT_MEMORY, - 0, //HIVE_NOLAZYFLUSH, - HFILE_TYPE_LOG, - HiveBase, - NULL, - NULL, - NULL, - &HiveName, - 2); - if (!NT_SUCCESS(Status)) return FALSE; - CmPrepareHive(&SystemHive->Hive); - - /* Set the hive filename */ - RtlCreateUnicodeString(&SystemHive->HiveFileName, SYSTEM_REG_FILE); - - /* Set the log filename */ - RtlCreateUnicodeString(&SystemHive->LogFileName, SYSTEM_LOG_FILE); - - /* We imported, no need to create a new hive */ - Allocate = FALSE; - } - else - { - /* FIXME: Create an empty hive */ - Allocate = TRUE; - } - - /* Create the default security descriptor */ - SecurityDescriptor = CmpHiveRootSecurityDescriptor(); - - /* Attach it to the system key */ - RtlInitUnicodeString(&KeyName, REG_SYSTEM_KEY_NAME); - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - SystemHive, - Allocate, - SecurityDescriptor); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Success! */ - return TRUE; -} - -NTSTATUS -NTAPI -CmpCreateObjectTypes(VOID) -{ - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - UNICODE_STRING Name; - PAGED_CODE(); - - /* Initialize the Key object type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"Key"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(KEY_OBJECT); - ObjectTypeInitializer.GenericMapping = CmiKeyMapping; - ObjectTypeInitializer.PoolType = PagedPool; - ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; - ObjectTypeInitializer.ParseProcedure = CmiObjectParse; - ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; - ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; - - /* Create it */ - return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmiKeyType); -} - -BOOLEAN -NTAPI CmpCreateRootNode(IN PHHIVE Hive, IN PCWSTR Name, OUT PHCELL_INDEX Index) @@ -381,7 +266,7 @@ NULL, NULL); Status = ObCreateObject(KernelMode, - CmiKeyType, + CmpKeyObjectType, &ObjectAttributes, KernelMode, NULL, @@ -675,7 +560,7 @@ &ObjectName, (PVOID*)&ParentKey, &RemainingPath, - CmiKeyType, + CmpKeyObjectType, NULL, NULL); /* Yields a new reference */ @@ -714,7 +599,7 @@ &RemainingPath, ParentKey); Status = ObCreateObject(KernelMode, - CmiKeyType, + CmpKeyObjectType, NULL, KernelMode, NULL, Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri May 11 22:58:34 2007 @@ -174,7 +174,7 @@ { ObReferenceObjectByPointer(ObpRootDirectoryObject, DIRECTORY_TRAVERSE, - CmiKeyType, + CmpKeyObjectType, ObjectCreateInfo->ProbeMode); CurrentObject = ObpRootDirectoryObject; } @@ -267,7 +267,7 @@ ObReferenceObjectByPointer(FoundObject, STANDARD_RIGHTS_REQUIRED, - CmiKeyType, + CmpKeyObjectType, KernelMode); if (End != NULL) { @@ -317,7 +317,7 @@ ObReferenceObjectByPointer(NextObject, DIRECTORY_TRAVERSE, - CmiKeyType, + CmpKeyObjectType, ObjectCreateInfo->ProbeMode); } @@ -342,7 +342,7 @@ } NTSTATUS STDCALL -CmiObjectParse(IN PVOID ParsedObject, +CmpParseKey(IN PVOID ParsedObject, IN PVOID ObjectType, IN OUT PACCESS_STATE AccessState, IN KPROCESSOR_MODE AccessMode, @@ -481,9 +481,9 @@ } /* Create new key object and put into linked list */ - DPRINT("CmiObjectParse: %S\n", *Path); + DPRINT("CmpParseKey: %S\n", *Path); Status = ObCreateObject(KernelMode, - CmiKeyType, + CmpKeyObjectType, NULL, KernelMode, NULL, @@ -586,7 +586,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT("CmiObjectParse: %wZ\n", &FoundObject->Name); + DPRINT("CmpParseKey: %wZ\n", &FoundObject->Name); *Path = EndPtr; @@ -600,7 +600,7 @@ } VOID STDCALL -CmiObjectDelete(PVOID DeletedObject) +CmpDeleteKeyObject(PVOID DeletedObject) { PKEY_OBJECT ParentKeyObject; PKEY_OBJECT KeyObject; @@ -789,7 +789,7 @@ NTSTATUS STDCALL -CmiObjectSecurity(PVOID ObjectBody, +CmpSecurityMethod(PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, PSECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -798,7 +798,7 @@ POOL_TYPE PoolType, PGENERIC_MAPPING GenericMapping) { - DPRINT("CmiObjectSecurity() called\n"); + DPRINT("CmpSecurityMethod() called\n"); switch (OperationCode) { @@ -828,7 +828,7 @@ NTSTATUS STDCALL -CmiObjectQueryName (PVOID ObjectBody, +CmpQueryKeyName (PVOID ObjectBody, IN BOOLEAN HasName, POBJECT_NAME_INFORMATION ObjectNameInfo, ULONG Length, @@ -838,7 +838,7 @@ PKEY_OBJECT KeyObject; NTSTATUS Status; - DPRINT ("CmiObjectQueryName() called\n"); + DPRINT ("CmpQueryKeyName() called\n"); KeyObject = (PKEY_OBJECT)ObjectBody; @@ -931,7 +931,7 @@ ObReferenceObjectByPointer(ParentKey, STANDARD_RIGHTS_REQUIRED, - CmiKeyType, + CmpKeyObjectType, KernelMode); NewKey->ParentKey = ParentKey; } Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri May 11 22:58:34 2007 @@ -767,10 +767,10 @@ IN ULONG FileType, IN PVOID HiveData, IN HANDLE Primary, - IN HANDLE Alternate, IN HANDLE Log, IN HANDLE External, - IN PUNICODE_STRING FileName + IN PUNICODE_STRING FileName, + IN ULONG CheckFlags ); PSECURITY_DESCRIPTOR @@ -983,6 +983,24 @@ extern BOOLEAN ExpInTextModeSetup; // +// BUGBUG Old Hive Stuff for Temporary Support +// +#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" +#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" +#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" +typedef struct _EREGISTRY_HIVE +{ + HHIVE Hive; + LIST_ENTRY HiveList; + UNICODE_STRING HiveFileName; + UNICODE_STRING LogFileName; + PCM_KEY_SECURITY RootSecurityCell; + ULONG Flags; + HANDLE HiveHandle; + HANDLE LogHandle; +} EREGISTRY_HIVE, *PEREGISTRY_HIVE; + +// // Inlined functions // #include "cm_x.h" Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c (original) +++ trunk/reactos/ntoskrnl/config/cmse.c Fri May 11 22:58:34 2007 @@ -44,7 +44,7 @@ if (!(Sid[0]) || !(Sid[1]) || !(Sid[2]) || !(Sid[3])) { /* Bugcheck */ - KEBUGCHECKEX(REGISTRY_ERROR, 2, 1, 0, 0); + KEBUGCHECKEX(REGISTRY_ERROR, 11, 1, 0, 0); } /* Phase 2: Initialize all SIDs */ @@ -52,7 +52,7 @@ Status |= RtlInitializeSid(Sid[1], &NtAuthority, 1); Status |= RtlInitializeSid(Sid[2], &NtAuthority, 1); Status |= RtlInitializeSid(Sid[3], &NtAuthority, 2); - if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 2, 0, 0); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 11, 2, 0, 0); /* Phase 2: Setup SID Sub Authorities */ *RtlSubAuthoritySid(Sid[0], 0) = SECURITY_WORLD_RID; @@ -79,18 +79,18 @@ /* Phase 3: Allocate the ACL */ Acl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_CM); - if (!Acl) KEBUGCHECKEX(REGISTRY_ERROR, 2, 3, 0, 0); + if (!Acl) KEBUGCHECKEX(REGISTRY_ERROR, 11, 3, 0, 0); /* Phase 4: Create the ACL */ Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION); - if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 4, Status, 0); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 11, 4, Status, 0); /* Phase 5: Build the ACL */ Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_ALL_ACCESS, Sid[0]); Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_ALL_ACCESS, Sid[1]); Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, Sid[2]); Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, Sid[3]); - if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 5, Status, 0); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 11, 5, Status, 0); /* Phase 5: Make the ACEs inheritable */ Status = RtlGetAce(Acl, 0,( PVOID*)&AceHeader); @@ -111,7 +111,7 @@ sizeof(SECURITY_DESCRIPTOR) + AclLength, TAG_CM); - if (!SecurityDescriptor) KEBUGCHECKEX(REGISTRY_ERROR, 2, 6, 0, 0); + if (!SecurityDescriptor) KEBUGCHECKEX(REGISTRY_ERROR, 11, 6, 0, 0); /* Phase 6: Make a copy of the ACL */ AclCopy = (PACL)((PISECURITY_DESCRIPTOR)SecurityDescriptor + 1); @@ -120,14 +120,14 @@ /* Phase 7: Create the security descriptor */ Status = RtlCreateSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 7, Status, 0); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 11, 7, Status, 0); /* Phase 8: Set the ACL as a DACL */ Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, TRUE, AclCopy, FALSE); - if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 8, Status, 0); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 11, 8, Status, 0); /* Free the SIDs and original ACL */ for (i = 0; i < 4; i++) ExFreePool(Sid[i]); 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 Fri May 11 22:58:34 2007 @@ -15,11 +15,19 @@ /* GLOBALS *******************************************************************/ +HIVE_LIST_ENTRY CmpMachineHiveList[5]; + UNICODE_STRING CmSymbolicLinkValueName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); UNICODE_STRING CmpSystemStartOptions; UNICODE_STRING CmpLoadOptions; + +BOOLEAN CmpShareSystemHives; +BOOLEAN CmSelfHeal = TRUE; +BOOLEAN CmpSelfHeal = TRUE; +ULONG CmpBootType; + extern BOOLEAN ExpInTextModeSetup; /* FUNCTIONS *****************************************************************/ @@ -310,3 +318,165 @@ /* Return success */ return STATUS_SUCCESS; } + +BOOLEAN +NTAPI +CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PVOID HiveBase; + ANSI_STRING LoadString; + PVOID Buffer; + ULONG Length; + NTSTATUS Status; + BOOLEAN Allocate; + UNICODE_STRING KeyName; + PEREGISTRY_HIVE SystemHive = NULL; + UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); + PSECURITY_DESCRIPTOR SecurityDescriptor; + PAGED_CODE(); + + /* Setup the ansi string */ + RtlInitAnsiString(&LoadString, LoaderBlock->LoadOptions); + + /* Allocate the unicode buffer */ + Length = LoadString.Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); + Buffer = ExAllocatePoolWithTag(PagedPool, Length, 0); + if (!Buffer) + { + /* Fail */ + KEBUGCHECKEX(BAD_SYSTEM_CONFIG_INFO, 3, 1, (ULONG_PTR)LoaderBlock, 0); + } + + /* Setup the unicode string */ + RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, Length); + + /* Add the load options and null-terminate */ + RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); + CmpLoadOptions.Buffer[LoadString.Length] = UNICODE_NULL; + CmpLoadOptions.Length += sizeof(WCHAR); + + /* Get the System Hive base address */ + HiveBase = LoaderBlock->RegistryBase; + if (HiveBase) + { + /* Import it */ + ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; + Status = CmpInitializeHive((PCMHIVE*)&SystemHive, + HINIT_MEMORY, + 0, //HIVE_NOLAZYFLUSH, + HFILE_TYPE_LOG, + HiveBase, + NULL, + NULL, + NULL, + &HiveName, + 2); + if (!NT_SUCCESS(Status)) return FALSE; + CmPrepareHive(&SystemHive->Hive); + + /* Set the hive filename */ + RtlCreateUnicodeString(&SystemHive->HiveFileName, SYSTEM_REG_FILE); + + /* Set the log filename */ + RtlCreateUnicodeString(&SystemHive->LogFileName, SYSTEM_LOG_FILE); + + /* We imported, no need to create a new hive */ + Allocate = FALSE; + + /* Manually set the hive as volatile, if in Live CD mode */ + if (CmpShareSystemHives) SystemHive->Hive.HiveFlags = HIVE_VOLATILE; + } + else + { +#if 0 + /* Create it */ + Status = CmpInitializeHive((PCMHIVE*)&SystemHive, + HINIT_CREATE, + HIVE_NOLAZYFLUSH, + HFILE_TYPE_LOG, + NULL, + NULL, + NULL, + NULL, + &HiveName, + 0); + if (!NT_SUCCESS(Status)) return FALSE; +#endif + + /* Tell CmpLinkHiveToMaster to allocate a hive */ + Allocate = TRUE; + } + + /* Save the boot type */ + if (SystemHive) CmpBootType = SystemHive->Hive.HiveHeader->BootType; + + /* Are we in self-healing mode? */ + if (!CmSelfHeal) + { + /* Disable self-healing internally and check if boot type wanted it */ + CmpSelfHeal = FALSE; + if (CmpBootType & 4) + { + /* We're disabled, so bugcheck */ + KEBUGCHECKEX(BAD_SYSTEM_CONFIG_INFO, + 3, + 3, + (ULONG_PTR)SystemHive, + 0); + } + } + + /* Create the default security descriptor */ + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + + /* Attach it to the system key */ + RtlInitUnicodeString(&KeyName, REG_SYSTEM_KEY_NAME); + Status = CmpLinkHiveToMaster(&KeyName, + NULL, + (PCMHIVE)SystemHive, + Allocate, + SecurityDescriptor); + + /* Free the security descriptor */ + ExFreePool(SecurityDescriptor); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Add the hive to the hive list */ + CmpMachineHiveList[3].CmHive = (PCMHIVE)SystemHive; + + /* Success! */ + return TRUE; +} + +NTSTATUS +NTAPI +CmpCreateObjectTypes(VOID) +{ + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + GENERIC_MAPPING CmpKeyMapping = {KEY_READ, + KEY_WRITE, + KEY_EXECUTE, + KEY_ALL_ACCESS}; + PAGED_CODE(); + + /* Initialize the Key object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Key"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(CM_KEY_BODY); + ObjectTypeInitializer.GenericMapping = CmpKeyMapping; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = CmpDeleteKeyObject; + ObjectTypeInitializer.ParseProcedure = CmpParseKey; + ObjectTypeInitializer.SecurityProcedure = CmpSecurityMethod; + ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; + //ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; + ObjectTypeInitializer.SecurityRequired = TRUE; + + /* Create it */ + return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType); +} +

1 0

[ion] 26701: - Add missing ACE structures to ntifs.h. - Add missing SeLengthSid to ntifs.h. - Implement CmpHiveRootSecurityDescriptor and use it in CmpInitializeSystemHive and CmInitSystem1 to properly secure system-created hives. - Implement CmpInitializeHardwareConfiguration and call it. Its job is to populate the hardware hive, but FreeLDR already does this, so it doesn't do much at the moment.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Fri May 11 22:15:13 2007 New Revision: 26701 URL: http://svn.reactos.org/svn/reactos?rev=26701&view=rev Log: - Add missing ACE structures to ntifs.h. - Add missing SeLengthSid to ntifs.h. - Implement CmpHiveRootSecurityDescriptor and use it in CmpInitializeSystemHive and CmInitSystem1 to properly secure system-created hives. - Implement CmpInitializeHardwareConfiguration and call it. Its job is to populate the hardware hive, but FreeLDR already does this, so it doesn't do much at the moment. Added: trunk/reactos/ntoskrnl/config/cmse.c Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=26… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Fri May 11 22:15:13 2007 @@ -1724,6 +1724,41 @@ USHORT AceSize; } ACE_HEADER, *PACE_HEADER; +typedef struct _ACCESS_ALLOWED_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; + +typedef struct _ACCESS_DENIED_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; + +typedef struct _SYSTEM_AUDIT_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; + +typedef struct _SYSTEM_ALARM_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_ALARM_ACE, *PSYSTEM_ALARM_ACE; + +typedef struct _SYSTEM_MANDATORY_LABEL_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; + typedef struct _TUNNEL { FAST_MUTEX Mutex; PRTL_SPLAY_LINKS Cache; @@ -4305,6 +4340,10 @@ ); #endif /* (VER_PRODUCTBUILD >= 2195) */ + + +#define SeLengthSid( Sid ) \ + (8 + (4 * ((SID *)Sid)->SubAuthorityCount)) #define SeDeleteClientSecurity(C) { \ if (SeTokenType((C)->ClientToken) == TokenPrimary) { \ Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26701… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Fri May 11 22:15:13 2007 @@ -418,6 +418,66 @@ PHHIVE RegistryHive, ULONG FileType); +VOID +CmiCheckKey(BOOLEAN Verbose, + HANDLE Key); + +BOOLEAN +INIT_FUNCTION +CmImportSystemHive(PCHAR ChunkBase, + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive); + +BOOLEAN +INIT_FUNCTION +CmImportHardwareHive(PCHAR ChunkBase, + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive); + +NTSTATUS +NTAPI +CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpInitializeHive(PEREGISTRY_HIVE *RegistryHive, + ULONG OperationType, + ULONG HiveFlags, + ULONG FileType, + PVOID HiveData OPTIONAL, + HANDLE Primary, + HANDLE Log, + HANDLE External, + PUNICODE_STRING FileName OPTIONAL, + ULONG CheckFlags); + +USHORT +NTAPI +CmpCopyName(IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source); + +USHORT +NTAPI +CmpNameSize(IN PHHIVE Hive, + IN PUNICODE_STRING Name); + +NTSTATUS +NTAPI +CmpInitializeHardwareConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +PSECURITY_DESCRIPTOR +NTAPI +CmpHiveRootSecurityDescriptor(VOID); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { 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 Fri May 11 22:15:13 2007 @@ -48,60 +48,6 @@ static GENERIC_MAPPING CmiKeyMapping = {KEY_READ, KEY_WRITE, KEY_EXECUTE, KEY_ALL_ACCESS}; - - - -VOID -CmiCheckKey(BOOLEAN Verbose, - HANDLE Key); - -BOOLEAN -INIT_FUNCTION -CmImportSystemHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive); - -BOOLEAN -INIT_FUNCTION -CmImportHardwareHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive); - -NTSTATUS -NTAPI -CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -NTSTATUS -NTAPI -CmpInitializeHive(PEREGISTRY_HIVE *RegistryHive, - ULONG OperationType, - ULONG HiveFlags, - ULONG FileType, - PVOID HiveData OPTIONAL, - HANDLE Primary, - HANDLE Log, - HANDLE External, - PUNICODE_STRING FileName OPTIONAL, - ULONG CheckFlags); - -USHORT -NTAPI -CmpCopyName(IN PHHIVE Hive, - IN PWCHAR Destination, - IN PUNICODE_STRING Source); - -USHORT -NTAPI -CmpNameSize(IN PHHIVE Hive, - IN PUNICODE_STRING Name); static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -253,6 +199,7 @@ UNICODE_STRING KeyName; PEREGISTRY_HIVE SystemHive; UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); + PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); /* Setup the ansi string */ @@ -309,9 +256,16 @@ Allocate = TRUE; } + /* Create the default security descriptor */ + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + /* Attach it to the system key */ RtlInitUnicodeString(&KeyName, REG_SYSTEM_KEY_NAME); - Status = CmpLinkHiveToMaster(&KeyName, NULL, SystemHive, Allocate, NULL); + Status = CmpLinkHiveToMaster(&KeyName, + NULL, + SystemHive, + Allocate, + SecurityDescriptor); if (!NT_SUCCESS(Status)) return FALSE; /* Success! */ @@ -495,6 +449,7 @@ PEREGISTRY_HIVE HardwareHive; PVOID BaseAddress; ULONG Length; + PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); /* Initialize the hive list */ @@ -559,13 +514,16 @@ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 3, 0, 0); } + /* Create the default security descriptor */ + SecurityDescriptor = CmpHiveRootSecurityDescriptor(); + /* Create '\Registry\Machine' key. */ RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, - NULL); + SecurityDescriptor); Status = NtCreateKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes, @@ -588,7 +546,7 @@ &KeyName, OBJ_CASE_INSENSITIVE, NULL, - NULL); + SecurityDescriptor); Status = NtCreateKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes, @@ -642,11 +600,23 @@ /* Attach it to the machine key */ RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); - Status = CmpLinkHiveToMaster(&KeyName, NULL, HardwareHive, FALSE, NULL); + Status = CmpLinkHiveToMaster(&KeyName, + NULL, + HardwareHive, + FALSE, + SecurityDescriptor); if (!NT_SUCCESS(Status)) { /* Bugcheck */ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); + } + + /* Fill out the Hardware key with the ARC Data from the Loader */ + Status = CmpInitializeHardwareConfiguration(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 13, Status, 0); } /* Initialize machine-dependent information into the registry */ Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Fri May 11 22:15:13 2007 @@ -194,3 +194,81 @@ return Status; } +NTSTATUS +NTAPI +CmpInitializeHardwareConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + ULONG Disposition; + UNICODE_STRING KeyName; + + /* Setup the key name */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\Hardware\\DeviceMap"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Create the device map key */ + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + NtClose(KeyHandle); + + /* Nobody should've created this key yet! */ + //ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Setup the key name */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\Hardware\\Description"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Create the description key */ + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Nobody should've created this key yet! */ + //ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Allocate the configuration data buffer */ + CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, + CmpConfigurationAreaSize, + TAG_CM); + if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Check if we got anything from NTLDR */ + if (LoaderBlock->ConfigurationRoot) + { + ASSERTMSG("NTLDR ARC Hardware Tree Not Supported!\n", FALSE); + } + else + { + /* Nothing else to do */ + Status = STATUS_SUCCESS; + } + + /* Close our handle, free the buffer and return status */ + ExFreePool(CmpConfigurationData); + NtClose(KeyHandle); + return Status; +} + Added: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c (added) +++ trunk/reactos/ntoskrnl/config/cmse.c Fri May 11 22:15:13 2007 @@ -1,0 +1,138 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmse.c + * PURPOSE: Configuration Manager - Security Subsystem Interface + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +PSECURITY_DESCRIPTOR +NTAPI +CmpHiveRootSecurityDescriptor(VOID) +{ + NTSTATUS Status; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PACL Acl, AclCopy; + PSID Sid[3]; + SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + ULONG AceLength, AclLength, SidLength; + PACE_HEADER AceHeader; + ULONG i; + PAGED_CODE(); + + /* Phase 1: Allocate SIDs */ + SidLength = RtlLengthRequiredSid(1); + Sid[0] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CM); + Sid[1] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CM); + Sid[2] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CM); + SidLength = RtlLengthRequiredSid(2); + Sid[3] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CM); + + /* Make sure all SIDs were allocated */ + if (!(Sid[0]) || !(Sid[1]) || !(Sid[2]) || !(Sid[3])) + { + /* Bugcheck */ + KEBUGCHECKEX(REGISTRY_ERROR, 2, 1, 0, 0); + } + + /* Phase 2: Initialize all SIDs */ + Status = RtlInitializeSid(Sid[0], &WorldAuthority, 1); + Status |= RtlInitializeSid(Sid[1], &NtAuthority, 1); + Status |= RtlInitializeSid(Sid[2], &NtAuthority, 1); + Status |= RtlInitializeSid(Sid[3], &NtAuthority, 2); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 2, 0, 0); + + /* Phase 2: Setup SID Sub Authorities */ + *RtlSubAuthoritySid(Sid[0], 0) = SECURITY_WORLD_RID; + *RtlSubAuthoritySid(Sid[1], 0) = SECURITY_RESTRICTED_CODE_RID; + *RtlSubAuthoritySid(Sid[2], 0) = SECURITY_LOCAL_SYSTEM_RID; + *RtlSubAuthoritySid(Sid[3], 0) = SECURITY_BUILTIN_DOMAIN_RID; + *RtlSubAuthoritySid(Sid[3], 1) = DOMAIN_ALIAS_RID_ADMINS; + + /* Make sure all SIDs are valid */ + ASSERT(RtlValidSid(Sid[0])); + ASSERT(RtlValidSid(Sid[1])); + ASSERT(RtlValidSid(Sid[2])); + ASSERT(RtlValidSid(Sid[3])); + + /* Phase 3: Calculate ACL Length */ + AclLength = sizeof(ACL); + for (i = 0; i < 4; i++) + { + /* This is what MSDN says to do */ + AceLength = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart); + AceLength += SeLengthSid(Sid[i]); + AclLength += AceLength; + } + + /* Phase 3: Allocate the ACL */ + Acl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_CM); + if (!Acl) KEBUGCHECKEX(REGISTRY_ERROR, 2, 3, 0, 0); + + /* Phase 4: Create the ACL */ + Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 4, Status, 0); + + /* Phase 5: Build the ACL */ + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_ALL_ACCESS, Sid[0]); + Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_ALL_ACCESS, Sid[1]); + Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, Sid[2]); + Status |= RtlAddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, Sid[3]); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 5, Status, 0); + + /* Phase 5: Make the ACEs inheritable */ + Status = RtlGetAce(Acl, 0,( PVOID*)&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl, 1, (PVOID*)&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl, 2, (PVOID*)&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + Status = RtlGetAce(Acl, 3, (PVOID*)&AceHeader); + ASSERT(NT_SUCCESS(Status)); + AceHeader->AceFlags |= CONTAINER_INHERIT_ACE; + + /* Phase 6: Allocate the security descriptor and make space for the ACL */ + SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR) + + AclLength, + TAG_CM); + if (!SecurityDescriptor) KEBUGCHECKEX(REGISTRY_ERROR, 2, 6, 0, 0); + + /* Phase 6: Make a copy of the ACL */ + AclCopy = (PACL)((PISECURITY_DESCRIPTOR)SecurityDescriptor + 1); + RtlCopyMemory(AclCopy, Acl, AclLength); + + /* Phase 7: Create the security descriptor */ + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 7, Status, 0); + + /* Phase 8: Set the ACL as a DACL */ + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, + TRUE, + AclCopy, + FALSE); + if (!NT_SUCCESS(Status)) KEBUGCHECKEX(REGISTRY_ERROR, 2, 8, Status, 0); + + /* Free the SIDs and original ACL */ + for (i = 0; i < 4; i++) ExFreePool(Sid[i]); + ExFreePool(Acl); + + /* Return the security descriptor */ + return SecurityDescriptor; +} 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 Fri May 11 22:15:13 2007 @@ -98,6 +98,7 @@ <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file> + <file>cmse.c</file> <file>cmsecach.c</file> <file>cmsysini.c</file> <file>cmvalue.c</file>

1 0

[dgorbachev] 26700: - Terminate the string. NtUserMenuItemInfo() sometimes returns no string. - Check if NtUserBuildMenuItemList() returns negative result.
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Fri May 11 18:12:57 2007 New Revision: 26700 URL: http://svn.reactos.org/svn/reactos?rev=26700&view=rev Log: - Terminate the string. NtUserMenuItemInfo() sometimes returns no string. - Check if NtUserBuildMenuItemList() returns negative result. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Fri May 11 18:12:57 2007 @@ -200,6 +200,7 @@ ItemInfo->fType = 0; return FALSE; } + ItemInfo->dwTypeData[ItemInfo->cch - 1] = UNICODE_NULL; } ItemInfo->fMask = Save_Mask; return TRUE; @@ -251,7 +252,7 @@ DWORD BufSize; BufSize = NtUserBuildMenuItemList(Menu, (VOID *) 1, 0, 0); - if (BufSize <= 0) + if (BufSize == (DWORD) -1 || BufSize == 0) { return -1; }

1 0

[dgorbachev] 26699: Check result of DRIVER_FindFromHDrvr().
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Fri May 11 18:12:40 2007 New Revision: 26699 URL: http://svn.reactos.org/svn/reactos?rev=26699&view=rev Log: Check result of DRIVER_FindFromHDrvr(). Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c Fri May 11 18:12:40 2007 @@ -645,7 +645,11 @@ return FALSE; } - d = DRIVER_FindFromHDrvr(lpDrv->hDriver); + if (!(d = DRIVER_FindFromHDrvr(lpDrv->hDriver))) { + CloseDriver(lpDrv->hDriver, 0, 0); + WARN("Couldn't get the WINE internal structure for driver '%s'\n", drvFileName); + return FALSE; + } lpDrv->bIs32 = (d->dwFlags & WINE_GDF_16BIT) ? FALSE : TRUE; /* Then look for xxxMessage functions */

1 0

[dgorbachev] 26698: Fix (partially) bug #2243.
by dgorbachev＠svn.reactos.org 11 May '07

11 May '07

Author: dgorbachev Date: Fri May 11 18:12:21 2007 New Revision: 26698 URL: http://svn.reactos.org/svn/reactos?rev=26698&view=rev Log: Fix (partially) bug #2243. Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Fri May 11 18:12:21 2007 @@ -285,11 +285,26 @@ else { /* No callback, just copy the message */ - LpcpMoveMessage(&Message->Request, - LpcRequest, - LpcRequest + 1, - MessageType, - &Thread->Cid); + _SEH_TRY + { + LpcpMoveMessage(&Message->Request, + LpcRequest, + LpcRequest + 1, + MessageType, + &Thread->Cid); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + LpcpFreeToPortZone(Message, 0); + ObDereferenceObject(Port); + return Status; + } /* Acquire the LPC lock */ KeAcquireGuardedMutex(&LpcpLock);

1 0

[gedmurphy] 26697: don't try to boot with bad paths
by gedmurphy＠svn.reactos.org 11 May '07

11 May '07

Author: gedmurphy Date: Fri May 11 17:41:40 2007 New Revision: 26697 URL: http://svn.reactos.org/svn/reactos?rev=26697&view=rev Log: don't try to boot with bad paths Modified: trunk/tools/Qemu GUI/AboutForm.Designer.cs trunk/tools/Qemu GUI/AboutForm.resx trunk/tools/Qemu GUI/MainForm.Designer.cs trunk/tools/Qemu GUI/MainForm.cs trunk/tools/Qemu GUI/Runner.cs Modified: trunk/tools/Qemu GUI/AboutForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/AboutForm.Designe… ============================================================================== --- trunk/tools/Qemu GUI/AboutForm.Designer.cs (original) +++ trunk/tools/Qemu GUI/AboutForm.Designer.cs Fri May 11 17:41:40 2007 @@ -32,8 +32,8 @@ this.button1 = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.textBox1 = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -71,6 +71,16 @@ this.tabPage1.Text = "License"; this.tabPage1.UseVisualStyleBackColor = true; // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(6, 6); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(267, 207); + this.textBox1.TabIndex = 0; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // // tabPage2 // this.tabPage2.Controls.Add(this.textBox2); @@ -81,16 +91,6 @@ this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Credits"; this.tabPage2.UseVisualStyleBackColor = true; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(6, 6); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(267, 207); - this.textBox1.TabIndex = 0; - this.textBox1.Text = resources.GetString("textBox1.Text"); // // textBox2 // Modified: trunk/tools/Qemu GUI/AboutForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/AboutForm.resx?re… ============================================================================== --- trunk/tools/Qemu GUI/AboutForm.resx (original) +++ trunk/tools/Qemu GUI/AboutForm.resx Fri May 11 17:41:40 2007 @@ -117,14 +117,6 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="textBox2.Text" xml:space="preserve"> - <value>ReactOS QEmu Manager was brought to you by: - -Magnus Olsen [greatlord(a)reactos.org] -Christoph Von Widitch [Christoph_vW(a)ReactOS.org] -Samuel SerapiÃ³n [samcharly(a)hotmail.com] -Ged Murphy [gedmurphy(a)reactos.org]</value> - </data> <data name="textBox1.Text" xml:space="preserve"> <value>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. @@ -132,4 +124,12 @@ 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.</value> </data> + <data name="textBox2.Text" xml:space="preserve"> + <value>ReactOS QEmu Manager was brought to you by: + +Magnus Olsen [greatlord(a)reactos.org] +Christoph von Wittich [Christoph_vW(a)ReactOS.org] +Samuel SerapiÃ³n [samcharly(a)hotmail.com] +Ged Murphy [gedmurphy(a)reactos.org]</value> + </data> </root> Modified: trunk/tools/Qemu GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/MainForm.Designer… ============================================================================== --- trunk/tools/Qemu GUI/MainForm.Designer.cs (original) +++ trunk/tools/Qemu GUI/MainForm.Designer.cs Fri May 11 17:41:40 2007 @@ -358,9 +358,9 @@ this.groupBox3.Controls.Add(this.btnBrowseBios); this.groupBox3.Controls.Add(this.txtABios); this.groupBox3.Enabled = false; - this.groupBox3.Location = new System.Drawing.Point(6, 65); + this.groupBox3.Location = new System.Drawing.Point(3, 65); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(351, 57); + this.groupBox3.Size = new System.Drawing.Size(354, 57); this.groupBox3.TabIndex = 11; this.groupBox3.TabStop = false; this.groupBox3.Text = "BIOS"; @@ -475,9 +475,9 @@ this.groupBox1.Controls.Add(this.btnBrowseLinuxK); this.groupBox1.Controls.Add(this.txtLinuxK); this.groupBox1.Enabled = false; - this.groupBox1.Location = new System.Drawing.Point(6, 6); + this.groupBox1.Location = new System.Drawing.Point(3, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(351, 53); + this.groupBox1.Size = new System.Drawing.Size(354, 53); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Linux"; @@ -532,9 +532,9 @@ this.grpVDK.Controls.Add(this.btnMount); this.grpVDK.Controls.Add(this.lblImage); this.grpVDK.Enabled = false; - this.grpVDK.Location = new System.Drawing.Point(4, 83); + this.grpVDK.Location = new System.Drawing.Point(3, 83); this.grpVDK.Name = "grpVDK"; - this.grpVDK.Size = new System.Drawing.Size(501, 118); + this.grpVDK.Size = new System.Drawing.Size(502, 118); this.grpVDK.TabIndex = 7; this.grpVDK.TabStop = false; this.grpVDK.Text = "VDK"; @@ -619,9 +619,9 @@ this.groupBox9.Controls.Add(this.lblImageSize); this.groupBox9.Controls.Add(this.btnCreateImage); this.groupBox9.Controls.Add(this.cboImageFormat); - this.groupBox9.Location = new System.Drawing.Point(4, 3); + this.groupBox9.Location = new System.Drawing.Point(3, 3); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(501, 74); + this.groupBox9.Size = new System.Drawing.Size(502, 74); this.groupBox9.TabIndex = 6; this.groupBox9.TabStop = false; this.groupBox9.Text = "Harddisk Tools"; @@ -1315,9 +1315,9 @@ this.grpHarddisk.Controls.Add(this.btnBrowseHDA); this.grpHarddisk.Controls.Add(this.chkUseHDB); this.grpHarddisk.Controls.Add(this.chkUseHDA); - this.grpHarddisk.Location = new System.Drawing.Point(5, 3); + this.grpHarddisk.Location = new System.Drawing.Point(3, 3); this.grpHarddisk.Name = "grpHarddisk"; - this.grpHarddisk.Size = new System.Drawing.Size(500, 195); + this.grpHarddisk.Size = new System.Drawing.Size(502, 195); this.grpHarddisk.TabIndex = 5; this.grpHarddisk.TabStop = false; this.grpHarddisk.Text = " Harddisks"; Modified: trunk/tools/Qemu GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/MainForm.cs?rev=2… ============================================================================== --- trunk/tools/Qemu GUI/MainForm.cs (original) +++ trunk/tools/Qemu GUI/MainForm.cs Fri May 11 17:41:40 2007 @@ -697,18 +697,56 @@ bool HasHDisk = false; bool HasFDisk = false; + /* check the QEmu path */ + if (!Directory.Exists(data.Paths.Qemu)) + { + MessageBox.Show("\"" + data.Paths.Qemu + "\"" + " does not exist", "Error - QEmu path"); + return; + } + /* There must be atleast one source of OS */ for (int i = 0; i < data.Harddisks.HDD.Length; i++) { if (data.Harddisks.HDD[i].Enabled == true) - HasHDisk = true; + { + if (File.Exists(data.Harddisks.HDD[i].Path)) + { + HasHDisk = true; + } + else + { + MessageBox.Show("\"" + data.Harddisks.HDD[i].Path + "\"" + " does not exist", "Error - Harddisk file"); + return; + } + } } for (int i = 0; i < data.Floppies.FDD.Length; i++) { if (data.Floppies.FDD[i].Enabled == true) - HasFDisk = true; - } + { + if (File.Exists(data.Floppies.FDD[i].Path)) + { + HasFDisk = true; + } + else + { + MessageBox.Show("\"" + data.Floppies.FDD[i].Path + "\"" + " does not exist", "Error - Floppy File"); + return; + } + } + } + + /* ensure we have a correct CD image if we need to boot from it */ + if (optCDImage.Enabled && txtCDROM.Text.Length > 0) + { + if (!File.Exists(txtCDROM.Text)) + { + MessageBox.Show("\"" + txtCDROM.Text + "\"" + " does not exist", "Error - CD-ROM image"); + return; + } + } + if (HasHDisk == false && data.CDROM.Enabled == false && HasFDisk == false) MessageBox.Show("Must enable atleast 1 Hard disk, CD-Rom or Floppy disk!", "Error");//or specify linux kernel image??? else Modified: trunk/tools/Qemu GUI/Runner.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Runner.cs?rev=266… ============================================================================== --- trunk/tools/Qemu GUI/Runner.cs (original) +++ trunk/tools/Qemu GUI/Runner.cs Fri May 11 17:41:40 2007 @@ -79,7 +79,6 @@ } catch { } } - } p.StartInfo.Arguments = data.GetArgv(); }

1 0

[fireball] 26696: Fix for linux build (#include "..\ -> #include "../).
by fireball＠svn.reactos.org 11 May '07

11 May '07

Author: fireball Date: Fri May 11 17:07:54 2007 New Revision: 26696 URL: http://svn.reactos.org/svn/reactos?rev=26696&view=rev Log: Fix for linux build (#include "..\ -> #include "../). Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c 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 Fri May 11 17:07:54 2007 @@ -15,7 +15,7 @@ #include <internal/debug.h> #include "cm.h" -#include "..\config\cm.h" +#include "../config/cm.h" /* LOCAL MACROS *************************************************************/ 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 Fri May 11 17:07:54 2007 @@ -19,7 +19,7 @@ #include <internal/debug.h> #include "cm.h" -#include "..\config\cm.h" +#include "../config/cm.h" #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, CmInitSystem1)

1 0

[gedmurphy] 26695: fix aesthetics
by gedmurphy＠svn.reactos.org 11 May '07

11 May '07

Author: gedmurphy Date: Fri May 11 15:34:34 2007 New Revision: 26695 URL: http://svn.reactos.org/svn/reactos?rev=26695&view=rev Log: fix aesthetics Modified: trunk/tools/Qemu GUI/MainForm.Designer.cs trunk/tools/Qemu GUI/Runner.cs Modified: trunk/tools/Qemu GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/MainForm.Designer… ============================================================================== --- trunk/tools/Qemu GUI/MainForm.Designer.cs (original) +++ trunk/tools/Qemu GUI/MainForm.Designer.cs Fri May 11 15:34:34 2007 @@ -40,6 +40,7 @@ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpContentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.aboutReactOSQEmuManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabOther = new System.Windows.Forms.TabPage(); this.groupBox3 = new System.Windows.Forms.GroupBox(); @@ -177,7 +178,6 @@ this.chkVGAoutput = new System.Windows.Forms.CheckBox(); this.chkFullscreen = new System.Windows.Forms.CheckBox(); this.Tabs = new System.Windows.Forms.TabControl(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.menuStrip1.SuspendLayout(); this.tabOther.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -223,7 +223,7 @@ // this.btnLaunch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.btnLaunch.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.btnLaunch.Location = new System.Drawing.Point(423, 266); + this.btnLaunch.Location = new System.Drawing.Point(435, 266); this.btnLaunch.Name = "btnLaunch"; this.btnLaunch.Size = new System.Drawing.Size(93, 23); this.btnLaunch.TabIndex = 4; @@ -323,6 +323,11 @@ this.helpContentsToolStripMenuItem.Text = "Help Contents"; this.helpContentsToolStripMenuItem.Click += new System.EventHandler(this.helpContentsToolStripMenuItem_Click); // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(232, 6); + // // aboutReactOSQEmuManagerToolStripMenuItem // this.aboutReactOSQEmuManagerToolStripMenuItem.Name = "aboutReactOSQEmuManagerToolStripMenuItem"; @@ -342,7 +347,7 @@ this.tabOther.Location = new System.Drawing.Point(4, 22); this.tabOther.Name = "tabOther"; this.tabOther.Padding = new System.Windows.Forms.Padding(3); - this.tabOther.Size = new System.Drawing.Size(527, 204); + this.tabOther.Size = new System.Drawing.Size(508, 204); this.tabOther.TabIndex = 11; this.tabOther.Text = "Other"; this.tabOther.UseVisualStyleBackColor = true; @@ -395,7 +400,7 @@ this.grpVNC.Controls.Add(this.chkVNC); this.grpVNC.Location = new System.Drawing.Point(363, 6); this.grpVNC.Name = "grpVNC"; - this.grpVNC.Size = new System.Drawing.Size(146, 116); + this.grpVNC.Size = new System.Drawing.Size(139, 116); this.grpVNC.TabIndex = 10; this.grpVNC.TabStop = false; this.grpVNC.Text = "VNC Server"; @@ -511,7 +516,7 @@ this.tabTools.Controls.Add(this.groupBox9); this.tabTools.Location = new System.Drawing.Point(4, 22); this.tabTools.Name = "tabTools"; - this.tabTools.Size = new System.Drawing.Size(527, 204); + this.tabTools.Size = new System.Drawing.Size(508, 204); this.tabTools.TabIndex = 6; this.tabTools.Text = "Tools"; this.tabTools.UseVisualStyleBackColor = true; @@ -529,7 +534,7 @@ this.grpVDK.Enabled = false; this.grpVDK.Location = new System.Drawing.Point(4, 83); this.grpVDK.Name = "grpVDK"; - this.grpVDK.Size = new System.Drawing.Size(517, 115); + this.grpVDK.Size = new System.Drawing.Size(501, 118); this.grpVDK.TabIndex = 7; this.grpVDK.TabStop = false; this.grpVDK.Text = "VDK"; @@ -537,7 +542,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(16, 96); + this.label9.Location = new System.Drawing.Point(116, 102); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(222, 13); this.label9.TabIndex = 11; @@ -547,14 +552,14 @@ // this.txtVDKImage.Location = new System.Drawing.Point(19, 32); this.txtVDKImage.Name = "txtVDKImage"; - this.txtVDKImage.Size = new System.Drawing.Size(398, 20); + this.txtVDKImage.Size = new System.Drawing.Size(443, 20); this.txtVDKImage.TabIndex = 6; // // cboVDKDrive // this.cboVDKDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboVDKDrive.FormattingEnabled = true; - this.cboVDKDrive.Location = new System.Drawing.Point(89, 65); + this.cboVDKDrive.Location = new System.Drawing.Point(57, 70); this.cboVDKDrive.Name = "cboVDKDrive"; this.cboVDKDrive.Size = new System.Drawing.Size(69, 21); this.cboVDKDrive.TabIndex = 10; @@ -563,7 +568,7 @@ // lblDrive // this.lblDrive.AutoSize = true; - this.lblDrive.Location = new System.Drawing.Point(39, 68); + this.lblDrive.Location = new System.Drawing.Point(16, 73); this.lblDrive.Name = "lblDrive"; this.lblDrive.Size = new System.Drawing.Size(35, 13); this.lblDrive.TabIndex = 9; @@ -571,7 +576,7 @@ // // btnVDKImage // - this.btnVDKImage.Location = new System.Drawing.Point(422, 30); + this.btnVDKImage.Location = new System.Drawing.Point(468, 30); this.btnVDKImage.Name = "btnVDKImage"; this.btnVDKImage.Size = new System.Drawing.Size(27, 22); this.btnVDKImage.TabIndex = 8; @@ -581,7 +586,7 @@ // // btnUnmount // - this.btnUnmount.Location = new System.Drawing.Point(378, 68); + this.btnUnmount.Location = new System.Drawing.Point(402, 68); this.btnUnmount.Name = "btnUnmount"; this.btnUnmount.Size = new System.Drawing.Size(93, 23); this.btnUnmount.TabIndex = 5; @@ -590,7 +595,7 @@ // // btnMount // - this.btnMount.Location = new System.Drawing.Point(280, 68); + this.btnMount.Location = new System.Drawing.Point(303, 68); this.btnMount.Name = "btnMount"; this.btnMount.Size = new System.Drawing.Size(93, 23); this.btnMount.TabIndex = 3; @@ -616,7 +621,7 @@ this.groupBox9.Controls.Add(this.cboImageFormat); this.groupBox9.Location = new System.Drawing.Point(4, 3); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(517, 74); + this.groupBox9.Size = new System.Drawing.Size(501, 74); this.groupBox9.TabIndex = 6; this.groupBox9.TabStop = false; this.groupBox9.Text = "Harddisk Tools"; @@ -684,7 +689,7 @@ this.tabDebug.Controls.Add(this.grpSerial); this.tabDebug.Location = new System.Drawing.Point(4, 22); this.tabDebug.Name = "tabDebug"; - this.tabDebug.Size = new System.Drawing.Size(527, 204); + this.tabDebug.Size = new System.Drawing.Size(508, 204); this.tabDebug.TabIndex = 8; this.tabDebug.Text = "Debug"; this.tabDebug.UseVisualStyleBackColor = true; @@ -696,14 +701,14 @@ this.grpGDB.Controls.Add(this.checkBox14); this.grpGDB.Location = new System.Drawing.Point(350, 102); this.grpGDB.Name = "grpGDB"; - this.grpGDB.Size = new System.Drawing.Size(171, 96); + this.grpGDB.Size = new System.Drawing.Size(155, 96); this.grpGDB.TabIndex = 2; this.grpGDB.TabStop = false; this.grpGDB.Text = "GDB"; // // lblGDBPort // - this.lblGDBPort.Location = new System.Drawing.Point(12, 46); + this.lblGDBPort.Location = new System.Drawing.Point(2, 49); this.lblGDBPort.Name = "lblGDBPort"; this.lblGDBPort.Size = new System.Drawing.Size(55, 23); this.lblGDBPort.TabIndex = 2; @@ -711,16 +716,16 @@ // // txtGDBPort // - this.txtGDBPort.Location = new System.Drawing.Point(73, 46); + this.txtGDBPort.Location = new System.Drawing.Point(63, 49); this.txtGDBPort.Name = "txtGDBPort"; - this.txtGDBPort.Size = new System.Drawing.Size(60, 20); + this.txtGDBPort.Size = new System.Drawing.Size(47, 20); this.txtGDBPort.TabIndex = 1; this.txtGDBPort.Text = "1234"; this.txtGDBPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // checkBox14 // - this.checkBox14.Location = new System.Drawing.Point(15, 19); + this.checkBox14.Location = new System.Drawing.Point(5, 19); this.checkBox14.Name = "checkBox14"; this.checkBox14.Size = new System.Drawing.Size(144, 24); this.checkBox14.TabIndex = 0; @@ -732,7 +737,7 @@ this.groupBox16.Controls.Add(this.button20); this.groupBox16.Location = new System.Drawing.Point(350, 3); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Size = new System.Drawing.Size(171, 96); + this.groupBox16.Size = new System.Drawing.Size(155, 96); this.groupBox16.TabIndex = 1; this.groupBox16.TabStop = false; this.groupBox16.Text = "LoadVM state"; @@ -740,7 +745,7 @@ // checkBox3 // this.checkBox3.AutoSize = true; - this.checkBox3.Location = new System.Drawing.Point(50, 30); + this.checkBox3.Location = new System.Drawing.Point(45, 30); this.checkBox3.Name = "checkBox3"; this.checkBox3.Size = new System.Drawing.Size(65, 17); this.checkBox3.TabIndex = 4; @@ -749,7 +754,7 @@ // // button20 // - this.button20.Location = new System.Drawing.Point(36, 53); + this.button20.Location = new System.Drawing.Point(29, 53); this.button20.Name = "button20"; this.button20.Size = new System.Drawing.Size(96, 23); this.button20.TabIndex = 3; @@ -764,9 +769,9 @@ this.grpSerial.Controls.Add(this.txtSerialFile); this.grpSerial.Controls.Add(this.btnBrowseSerial); this.grpSerial.Controls.Add(this.chkSerialToFile); - this.grpSerial.Location = new System.Drawing.Point(5, 3); + this.grpSerial.Location = new System.Drawing.Point(3, 3); this.grpSerial.Name = "grpSerial"; - this.grpSerial.Size = new System.Drawing.Size(339, 195); + this.grpSerial.Size = new System.Drawing.Size(341, 195); this.grpSerial.TabIndex = 1; this.grpSerial.TabStop = false; this.grpSerial.Text = "Serial Port"; @@ -803,9 +808,9 @@ // // txtSerialFile // - this.txtSerialFile.Location = new System.Drawing.Point(97, 69); + this.txtSerialFile.Location = new System.Drawing.Point(105, 69); this.txtSerialFile.Name = "txtSerialFile"; - this.txtSerialFile.Size = new System.Drawing.Size(201, 20); + this.txtSerialFile.Size = new System.Drawing.Size(193, 20); this.txtSerialFile.TabIndex = 4; // // btnBrowseSerial @@ -832,7 +837,7 @@ this.tabAudio.Controls.Add(this.grpAudio); this.tabAudio.Location = new System.Drawing.Point(4, 22); this.tabAudio.Name = "tabAudio"; - this.tabAudio.Size = new System.Drawing.Size(527, 204); + this.tabAudio.Size = new System.Drawing.Size(508, 204); this.tabAudio.TabIndex = 5; this.tabAudio.Text = "Audio"; this.tabAudio.UseVisualStyleBackColor = true; @@ -849,7 +854,7 @@ this.grpAudio.Controls.Add(this.chkOPL2); this.grpAudio.Location = new System.Drawing.Point(3, 3); this.grpAudio.Name = "grpAudio"; - this.grpAudio.Size = new System.Drawing.Size(494, 195); + this.grpAudio.Size = new System.Drawing.Size(502, 198); this.grpAudio.TabIndex = 4; this.grpAudio.TabStop = false; this.grpAudio.Text = "Audio Card Emulation"; @@ -939,7 +944,7 @@ this.tabNetwork.Controls.Add(this.grpNetwork); this.tabNetwork.Location = new System.Drawing.Point(4, 22); this.tabNetwork.Name = "tabNetwork"; - this.tabNetwork.Size = new System.Drawing.Size(527, 204); + this.tabNetwork.Size = new System.Drawing.Size(508, 204); this.tabNetwork.TabIndex = 7; this.tabNetwork.Text = "Network"; this.tabNetwork.UseVisualStyleBackColor = true; @@ -958,7 +963,7 @@ this.grpNetwork.Controls.Add(this.listVLANs); this.grpNetwork.Location = new System.Drawing.Point(3, 3); this.grpNetwork.Name = "grpNetwork"; - this.grpNetwork.Size = new System.Drawing.Size(518, 195); + this.grpNetwork.Size = new System.Drawing.Size(502, 198); this.grpNetwork.TabIndex = 1; this.grpNetwork.TabStop = false; this.grpNetwork.Text = "Network"; @@ -1093,7 +1098,7 @@ // // btnNetRemove // - this.btnNetRemove.Location = new System.Drawing.Point(123, 159); + this.btnNetRemove.Location = new System.Drawing.Point(112, 167); this.btnNetRemove.Name = "btnNetRemove"; this.btnNetRemove.Size = new System.Drawing.Size(60, 25); this.btnNetRemove.TabIndex = 49; @@ -1103,7 +1108,7 @@ // // btnNetAdd // - this.btnNetAdd.Location = new System.Drawing.Point(9, 159); + this.btnNetAdd.Location = new System.Drawing.Point(26, 167); this.btnNetAdd.Name = "btnNetAdd"; this.btnNetAdd.Size = new System.Drawing.Size(60, 25); this.btnNetAdd.TabIndex = 48; @@ -1118,7 +1123,7 @@ this.listVLANs.Location = new System.Drawing.Point(6, 36); this.listVLANs.Name = "listVLANs"; this.listVLANs.ShowGroups = false; - this.listVLANs.Size = new System.Drawing.Size(191, 117); + this.listVLANs.Size = new System.Drawing.Size(191, 125); this.listVLANs.TabIndex = 47; this.listVLANs.UseCompatibleStateImageBehavior = false; this.listVLANs.View = System.Windows.Forms.View.List; @@ -1128,7 +1133,7 @@ this.tabFloppy.Controls.Add(this.grpFloppy); this.tabFloppy.Location = new System.Drawing.Point(4, 22); this.tabFloppy.Name = "tabFloppy"; - this.tabFloppy.Size = new System.Drawing.Size(527, 204); + this.tabFloppy.Size = new System.Drawing.Size(508, 204); this.tabFloppy.TabIndex = 2; this.tabFloppy.Text = "Floppy"; this.tabFloppy.UseVisualStyleBackColor = true; @@ -1141,9 +1146,9 @@ this.grpFloppy.Controls.Add(this.btnBrowseFloppyA); this.grpFloppy.Controls.Add(this.chkFloppyB); this.grpFloppy.Controls.Add(this.chkFloppyA); - this.grpFloppy.Location = new System.Drawing.Point(5, 3); + this.grpFloppy.Location = new System.Drawing.Point(3, 3); this.grpFloppy.Name = "grpFloppy"; - this.grpFloppy.Size = new System.Drawing.Size(516, 195); + this.grpFloppy.Size = new System.Drawing.Size(502, 195); this.grpFloppy.TabIndex = 4; this.grpFloppy.TabStop = false; this.grpFloppy.Text = "Floppy"; @@ -1153,7 +1158,7 @@ this.txtFloppyB.Enabled = false; this.txtFloppyB.Location = new System.Drawing.Point(32, 135); this.txtFloppyB.Name = "txtFloppyB"; - this.txtFloppyB.Size = new System.Drawing.Size(445, 20); + this.txtFloppyB.Size = new System.Drawing.Size(431, 20); this.txtFloppyB.TabIndex = 5; // // txtFloppyA @@ -1161,13 +1166,13 @@ this.txtFloppyA.Enabled = false; this.txtFloppyA.Location = new System.Drawing.Point(32, 49); this.txtFloppyA.Name = "txtFloppyA"; - this.txtFloppyA.Size = new System.Drawing.Size(445, 20); + this.txtFloppyA.Size = new System.Drawing.Size(431, 20); this.txtFloppyA.TabIndex = 4; // // btnBrowseFloppyB // this.btnBrowseFloppyB.Enabled = false; - this.btnBrowseFloppyB.Location = new System.Drawing.Point(483, 135); + this.btnBrowseFloppyB.Location = new System.Drawing.Point(469, 135); this.btnBrowseFloppyB.Name = "btnBrowseFloppyB"; this.btnBrowseFloppyB.Size = new System.Drawing.Size(27, 22); this.btnBrowseFloppyB.TabIndex = 3; @@ -1177,7 +1182,7 @@ // btnBrowseFloppyA // this.btnBrowseFloppyA.Enabled = false; - this.btnBrowseFloppyA.Location = new System.Drawing.Point(483, 49); + this.btnBrowseFloppyA.Location = new System.Drawing.Point(469, 49); this.btnBrowseFloppyA.Name = "btnBrowseFloppyA"; this.btnBrowseFloppyA.Size = new System.Drawing.Size(27, 22); this.btnBrowseFloppyA.TabIndex = 2; @@ -1207,7 +1212,7 @@ this.tabCDROM.Controls.Add(this.grpCDROM); this.tabCDROM.Location = new System.Drawing.Point(4, 22); this.tabCDROM.Name = "tabCDROM"; - this.tabCDROM.Size = new System.Drawing.Size(527, 204); + this.tabCDROM.Size = new System.Drawing.Size(508, 204); this.tabCDROM.TabIndex = 4; this.tabCDROM.Text = "CD-ROM"; this.tabCDROM.UseVisualStyleBackColor = true; @@ -1222,7 +1227,7 @@ this.grpCDROM.Controls.Add(this.optCDImage); this.grpCDROM.Location = new System.Drawing.Point(3, 3); this.grpCDROM.Name = "grpCDROM"; - this.grpCDROM.Size = new System.Drawing.Size(518, 195); + this.grpCDROM.Size = new System.Drawing.Size(502, 198); this.grpCDROM.TabIndex = 5; this.grpCDROM.TabStop = false; this.grpCDROM.Text = "CD-ROM"; @@ -1291,7 +1296,7 @@ this.tabHardDisk.Controls.Add(this.grpHarddisk); this.tabHardDisk.Location = new System.Drawing.Point(4, 22); this.tabHardDisk.Name = "tabHardDisk"; - this.tabHardDisk.Size = new System.Drawing.Size(527, 204); + this.tabHardDisk.Size = new System.Drawing.Size(508, 204); this.tabHardDisk.TabIndex = 3; this.tabHardDisk.Text = " Harddisk"; this.tabHardDisk.UseVisualStyleBackColor = true; @@ -1312,7 +1317,7 @@ this.grpHarddisk.Controls.Add(this.chkUseHDA); this.grpHarddisk.Location = new System.Drawing.Point(5, 3); this.grpHarddisk.Name = "grpHarddisk"; - this.grpHarddisk.Size = new System.Drawing.Size(516, 195); + this.grpHarddisk.Size = new System.Drawing.Size(500, 195); this.grpHarddisk.TabIndex = 5; this.grpHarddisk.TabStop = false; this.grpHarddisk.Text = " Harddisks"; @@ -1322,7 +1327,7 @@ this.txtHDD.Enabled = false; this.txtHDD.Location = new System.Drawing.Point(77, 155); this.txtHDD.Name = "txtHDD"; - this.txtHDD.Size = new System.Drawing.Size(394, 20); + this.txtHDD.Size = new System.Drawing.Size(384, 20); this.txtHDD.TabIndex = 15; // // txtHDC @@ -1330,7 +1335,7 @@ this.txtHDC.Enabled = false; this.txtHDC.Location = new System.Drawing.Point(77, 110); this.txtHDC.Name = "txtHDC"; - this.txtHDC.Size = new System.Drawing.Size(394, 20); + this.txtHDC.Size = new System.Drawing.Size(384, 20); this.txtHDC.TabIndex = 14; // // txtHDB @@ -1338,21 +1343,21 @@ this.txtHDB.Enabled = false; this.txtHDB.Location = new System.Drawing.Point(77, 65); this.txtHDB.Name = "txtHDB"; - this.txtHDB.Size = new System.Drawing.Size(394, 20); + this.txtHDB.Size = new System.Drawing.Size(384, 20); this.txtHDB.TabIndex = 13; // // txtHDA // this.txtHDA.Enabled = false; - this.txtHDA.Location = new System.Drawing.Point(77, 20); + this.txtHDA.Location = new System.Drawing.Point(77, 22); this.txtHDA.Name = "txtHDA"; - this.txtHDA.Size = new System.Drawing.Size(394, 20); + this.txtHDA.Size = new System.Drawing.Size(384, 20); this.txtHDA.TabIndex = 12; // // btnBrowseHDD // this.btnBrowseHDD.Enabled = false; - this.btnBrowseHDD.Location = new System.Drawing.Point(477, 155); + this.btnBrowseHDD.Location = new System.Drawing.Point(467, 155); this.btnBrowseHDD.Name = "btnBrowseHDD"; this.btnBrowseHDD.Size = new System.Drawing.Size(27, 23); this.btnBrowseHDD.TabIndex = 11; @@ -1362,7 +1367,7 @@ // btnBrowseHDC // this.btnBrowseHDC.Enabled = false; - this.btnBrowseHDC.Location = new System.Drawing.Point(477, 110); + this.btnBrowseHDC.Location = new System.Drawing.Point(467, 110); this.btnBrowseHDC.Name = "btnBrowseHDC"; this.btnBrowseHDC.Size = new System.Drawing.Size(27, 23); this.btnBrowseHDC.TabIndex = 10; @@ -1371,7 +1376,7 @@ // // chkUseHDD // - this.chkUseHDD.Location = new System.Drawing.Point(18, 155); + this.chkUseHDD.Location = new System.Drawing.Point(6, 151); this.chkUseHDD.Name = "chkUseHDD"; this.chkUseHDD.Size = new System.Drawing.Size(72, 24); this.chkUseHDD.TabIndex = 9; @@ -1380,7 +1385,7 @@ // // chkUseHDC // - this.chkUseHDC.Location = new System.Drawing.Point(18, 110); + this.chkUseHDC.Location = new System.Drawing.Point(6, 106); this.chkUseHDC.Name = "chkUseHDC"; this.chkUseHDC.Size = new System.Drawing.Size(72, 24); this.chkUseHDC.TabIndex = 8; @@ -1390,7 +1395,7 @@ // btnBrowseHDB // this.btnBrowseHDB.Enabled = false; - this.btnBrowseHDB.Location = new System.Drawing.Point(477, 65); + this.btnBrowseHDB.Location = new System.Drawing.Point(467, 65); this.btnBrowseHDB.Name = "btnBrowseHDB"; this.btnBrowseHDB.Size = new System.Drawing.Size(27, 23); this.btnBrowseHDB.TabIndex = 7; @@ -1400,7 +1405,7 @@ // btnBrowseHDA // this.btnBrowseHDA.Enabled = false; - this.btnBrowseHDA.Location = new System.Drawing.Point(477, 20); + this.btnBrowseHDA.Location = new System.Drawing.Point(467, 20); this.btnBrowseHDA.Name = "btnBrowseHDA"; this.btnBrowseHDA.Size = new System.Drawing.Size(27, 23); this.btnBrowseHDA.TabIndex = 6; @@ -1409,7 +1414,7 @@ // // chkUseHDB // - this.chkUseHDB.Location = new System.Drawing.Point(18, 65); + this.chkUseHDB.Location = new System.Drawing.Point(6, 61); this.chkUseHDB.Name = "chkUseHDB"; this.chkUseHDB.Size = new System.Drawing.Size(72, 24); this.chkUseHDB.TabIndex = 5; @@ -1418,7 +1423,7 @@ // // chkUseHDA // - this.chkUseHDA.Location = new System.Drawing.Point(18, 20); + this.chkUseHDA.Location = new System.Drawing.Point(6, 16); this.chkUseHDA.Name = "chkUseHDA"; this.chkUseHDA.Size = new System.Drawing.Size(72, 24); this.chkUseHDA.TabIndex = 4; @@ -1430,7 +1435,7 @@ this.tabPaths.Controls.Add(this.groupBox2); this.tabPaths.Location = new System.Drawing.Point(4, 22); this.tabPaths.Name = "tabPaths"; - this.tabPaths.Size = new System.Drawing.Size(527, 204); + this.tabPaths.Size = new System.Drawing.Size(508, 204); this.tabPaths.TabIndex = 10; this.tabPaths.Text = "Paths"; this.tabPaths.UseVisualStyleBackColor = true; @@ -1443,9 +1448,9 @@ this.groupBox2.Controls.Add(this.lblVDKPath); this.groupBox2.Controls.Add(this.btnQEmuPath); this.groupBox2.Controls.Add(this.lblQEmuPath); - this.groupBox2.Location = new System.Drawing.Point(18, 13); + this.groupBox2.Location = new System.Drawing.Point(3, 3); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(491, 172); + this.groupBox2.Size = new System.Drawing.Size(502, 198); this.groupBox2.TabIndex = 21; this.groupBox2.TabStop = false; this.groupBox2.Text = "Paths"; @@ -1511,7 +1516,7 @@ this.tabGen.Controls.Add(this.grpDisplay); this.tabGen.Location = new System.Drawing.Point(4, 22); this.tabGen.Name = "tabGen"; - this.tabGen.Size = new System.Drawing.Size(527, 204); + this.tabGen.Size = new System.Drawing.Size(508, 204); this.tabGen.TabIndex = 1; this.tabGen.Text = "General"; this.tabGen.UseVisualStyleBackColor = true; @@ -1519,9 +1524,9 @@ // grpACPI // this.grpACPI.Controls.Add(this.chkACPI); - this.grpACPI.Location = new System.Drawing.Point(335, 57); + this.grpACPI.Location = new System.Drawing.Point(315, 57); this.grpACPI.Name = "grpACPI"; - this.grpACPI.Size = new System.Drawing.Size(174, 51); + this.grpACPI.Size = new System.Drawing.Size(190, 51); this.grpACPI.TabIndex = 20; this.grpACPI.TabStop = false; this.grpACPI.Text = "ACPI"; @@ -1549,9 +1554,9 @@ this.groupBox6.Controls.Add(this.lblBootFrom); this.groupBox6.Controls.Add(this.lblSMP); this.groupBox6.Controls.Add(this.cboBootFrom); - this.groupBox6.Location = new System.Drawing.Point(14, 57); + this.groupBox6.Location = new System.Drawing.Point(3, 57); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(301, 131); + this.groupBox6.Size = new System.Drawing.Size(306, 144); this.groupBox6.TabIndex = 4; this.groupBox6.TabStop = false; // @@ -1669,9 +1674,9 @@ // grpMachine // this.grpMachine.Controls.Add(this.cboMachine); - this.grpMachine.Location = new System.Drawing.Point(14, 3); + this.grpMachine.Location = new System.Drawing.Point(3, 3); this.grpMachine.Name = "grpMachine"; - this.grpMachine.Size = new System.Drawing.Size(301, 48); + this.grpMachine.Size = new System.Drawing.Size(306, 48); this.grpMachine.TabIndex = 2; this.grpMachine.TabStop = false; this.grpMachine.Text = "Machine"; @@ -1702,9 +1707,9 @@ // grpClock // this.grpClock.Controls.Add(this.chkSetClock); - this.grpClock.Location = new System.Drawing.Point(335, 3); + this.grpClock.Location = new System.Drawing.Point(315, 3); this.grpClock.Name = "grpClock"; - this.grpClock.Size = new System.Drawing.Size(174, 48); + this.grpClock.Size = new System.Drawing.Size(190, 48); this.grpClock.TabIndex = 18; this.grpClock.TabStop = false; this.grpClock.Text = "Clock"; @@ -1725,9 +1730,9 @@ // this.grpDisplay.Controls.Add(this.chkVGAoutput); this.grpDisplay.Controls.Add(this.chkFullscreen); - this.grpDisplay.Location = new System.Drawing.Point(335, 114); + this.grpDisplay.Location = new System.Drawing.Point(315, 114); this.grpDisplay.Name = "grpDisplay"; - this.grpDisplay.Size = new System.Drawing.Size(174, 74); + this.grpDisplay.Size = new System.Drawing.Size(190, 87); this.grpDisplay.TabIndex = 19; this.grpDisplay.TabStop = false; this.grpDisplay.Text = "Display"; @@ -1764,21 +1769,16 @@ this.Tabs.Controls.Add(this.tabDebug); this.Tabs.Controls.Add(this.tabTools); this.Tabs.Controls.Add(this.tabOther); - this.Tabs.Location = new System.Drawing.Point(0, 30); + this.Tabs.Location = new System.Drawing.Point(12, 30); this.Tabs.Name = "Tabs"; this.Tabs.SelectedIndex = 0; - this.Tabs.Size = new System.Drawing.Size(535, 230); + this.Tabs.Size = new System.Drawing.Size(516, 230); this.Tabs.TabIndex = 3; // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(232, 6); - // // MainForm // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(540, 301); + this.ClientSize = new System.Drawing.Size(540, 297); this.Controls.Add(this.btnLoad); this.Controls.Add(this.btnLaunch); this.Controls.Add(this.Tabs); Modified: trunk/tools/Qemu GUI/Runner.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Runner.cs?rev=266… ============================================================================== --- trunk/tools/Qemu GUI/Runner.cs (original) +++ trunk/tools/Qemu GUI/Runner.cs Fri May 11 15:34:34 2007 @@ -116,10 +116,10 @@ long d = Size * 1024; string argv = " create -f " + Format + " \"" + FileName + "\" " + d.ToString(); - p.StartInfo.FileName = data.Paths.Qemu + "\\qemu-img.exe"; if (Directory.Exists(data.Paths.Qemu)) { p.StartInfo.WorkingDirectory = data.Paths.Qemu; + p.StartInfo.FileName = data.Paths.Qemu + "\\qemu-img.exe"; p.StartInfo.Arguments = argv; try { @@ -149,11 +149,10 @@ public bool MountImage() { - p.StartInfo.FileName = data.Paths.VDK + "\\vdk.exe"; - if (Directory.Exists(data.Paths.VDK)) { p.StartInfo.WorkingDirectory = data.Paths.VDK; + p.StartInfo.FileName = data.Paths.VDK + "\\vdk.exe"; p.StartInfo.Arguments = "open 0 " + "\"" + data.Tools.vdk.Image + "\" /RW /L:" + data.Tools.vdk.DriveLetter; try

1 0

[gedmurphy] 26694: - fix possible exceptions for incorrect paths - set Main as STA to allow debuging
by gedmurphy＠svn.reactos.org 11 May '07

11 May '07

Author: gedmurphy Date: Fri May 11 15:18:21 2007 New Revision: 26694 URL: http://svn.reactos.org/svn/reactos?rev=26694&view=rev Log: - fix possible exceptions for incorrect paths - set Main as STA to allow debuging Modified: trunk/tools/Qemu GUI/Runner.cs trunk/tools/Qemu GUI/program.cs Modified: trunk/tools/Qemu GUI/Runner.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Runner.cs?rev=266… ============================================================================== --- trunk/tools/Qemu GUI/Runner.cs (original) +++ trunk/tools/Qemu GUI/Runner.cs Fri May 11 15:18:21 2007 @@ -117,22 +117,29 @@ string argv = " create -f " + Format + " \"" + FileName + "\" " + d.ToString(); p.StartInfo.FileName = data.Paths.Qemu + "\\qemu-img.exe"; - p.StartInfo.WorkingDirectory = data.Paths.Qemu; - p.StartInfo.Arguments = argv; - try - { - p.Start(); - } - catch(Exception e) - { - ErrBuffer += Environment.NewLine + "Error: " + e.Message; - ErrorForm error = new ErrorForm(); - error.txtError.Text = ErrBuffer; - error.txtError.Text += p.StandardError.ReadToEnd(); - error.ShowDialog(); - return false; - } - return true; + if (Directory.Exists(data.Paths.Qemu)) + { + p.StartInfo.WorkingDirectory = data.Paths.Qemu; + p.StartInfo.Arguments = argv; + try + { + p.Start(); + } + catch (Exception e) + { + ErrBuffer += Environment.NewLine + "Error: " + e.Message; + ErrorForm error = new ErrorForm(); + error.txtError.Text = ErrBuffer; + //error.txtError.Text += p.StandardError.ReadToEnd(); + error.ShowDialog(); + return false; + } + return true; + } + else + MessageBox.Show("\"" + data.Paths.Qemu + "\"" + " does not exist"); + + return false; } public string GetErrorBuffer() @@ -143,28 +150,36 @@ public bool MountImage() { p.StartInfo.FileName = data.Paths.VDK + "\\vdk.exe"; - p.StartInfo.WorkingDirectory = data.Paths.VDK; - p.StartInfo.Arguments = "open 0 " + "\"" + data.Tools.vdk.Image + "\" /RW /L:" + data.Tools.vdk.DriveLetter; - - try - { - p.Start(); - //frmError error = new frmError(); - //error.txtError.Text = ErrBuffer; - //error.txtError.Text += p.StandardError.ReadToEnd(); - //error.txtError.Text += p.StandardOutput.ReadToEnd(); - //error.ShowDialog(); - } - catch(Exception e) - { - ErrBuffer += Environment.NewLine + "Error: " + e.Message; - ErrorForm error = new ErrorForm(); - error.txtError.Text = ErrBuffer; - error.txtError.Text += p.StandardError.ReadToEnd(); - error.ShowDialog(); - return false; - } - return true; + + if (Directory.Exists(data.Paths.VDK)) + { + p.StartInfo.WorkingDirectory = data.Paths.VDK; + p.StartInfo.Arguments = "open 0 " + "\"" + data.Tools.vdk.Image + "\" /RW /L:" + data.Tools.vdk.DriveLetter; + + try + { + p.Start(); + //frmError error = new frmError(); + //error.txtError.Text = ErrBuffer; + //error.txtError.Text += p.StandardError.ReadToEnd(); + //error.txtError.Text += p.StandardOutput.ReadToEnd(); + //error.ShowDialog(); + } + catch (Exception e) + { + ErrBuffer += Environment.NewLine + "Error: " + e.Message; + ErrorForm error = new ErrorForm(); + error.txtError.Text = ErrBuffer; + error.txtError.Text += p.StandardError.ReadToEnd(); + error.ShowDialog(); + return false; + } + return true; + } + else + MessageBox.Show("\"" + data.Paths.VDK + "\"" + " does not exist"); + + return false; } public bool UnmountImage() Modified: trunk/tools/Qemu GUI/program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/program.cs?rev=26… ============================================================================== --- trunk/tools/Qemu GUI/program.cs (original) +++ trunk/tools/Qemu GUI/program.cs Fri May 11 15:18:21 2007 @@ -9,7 +9,7 @@ /// <summary> /// The main entry point for the application. /// </summary> - [MTAThread] + [STAThread] static void Main() { Application.Run(new MainForm());

1 0

[ion] 26693: - More simplification: Get rid of CmImportBinaryHive, CmpImportSystemHive, CmpImportHardwareHive and all of import.c! - Fix CmpInitializeHive to set any flags that are passed, not assume HIVE_NO_FILE by default. - "Import" the system and hardware hives using CmpInitializeHive instead of the cmimport.c routines which are gone. - Get rid of old/unused cmdata.c in /cm.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Fri May 11 10:24:00 2007 New Revision: 26693 URL: http://svn.reactos.org/svn/reactos?rev=26693&view=rev Log: - More simplification: Get rid of CmImportBinaryHive, CmpImportSystemHive, CmpImportHardwareHive and all of import.c! - Fix CmpInitializeHive to set any flags that are passed, not assume HIVE_NO_FILE by default. - "Import" the system and hardware hives using CmpInitializeHive instead of the cmimport.c routines which are gone. - Get rid of old/unused cmdata.c in /cm. Removed: trunk/reactos/ntoskrnl/cm/cmdata.c trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Removed: trunk/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cmdata.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cmdata.c (original) +++ trunk/reactos/ntoskrnl/cm/cmdata.c (removed) @@ -1,710 +1,0 @@ -#include "ntoskrnl.h" -#include "cm.h" - -/* SYSTEM CONFIGURATION VECTOR ***********************************************/ - -ULONG DummyData; -ULONG CmNtGlobalFlag; -ULONG CmNtCSDVersion; - -WCHAR CmDefaultLanguageId[12]; -ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); -ULONG CmDefaultLanguageIdType; - -WCHAR CmInstallUILanguageId[12]; -ULONG CmInstallUILanguageIdLength = sizeof(CmInstallUILanguageId); -ULONG CmInstallUILanguageIdType; - -WCHAR CmSuiteBuffer[128]; -ULONG CmSuiteBufferLength = sizeof(CmSuiteBuffer); -ULONG CmSuiteBufferType; - -extern LANGID PsInstallUILanguageId; -extern LANGID PsDefaultUILanguageId; - -//CMHIVE CmControlHive; - -CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = -{ - { - L"Session Manager", - L"ProtectionMode", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"ObjectSecurityMode", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"LUIDDeviceMapsDisabled", - &DummyData, - NULL, - NULL - }, - - { - L"LSA", - L"AuditBaseDirectories", - &DummyData, - NULL, - NULL - }, - - { - L"LSA", - L"AuditBaseObjects", - &DummyData, - NULL, - NULL - }, - - { - L"LSA\\audit", - L"ProcessAccessesToAudit", - &DummyData, - NULL, - NULL - }, - - { - L"TimeZoneInformation", - L"ActiveTimeBias", - &DummyData, - NULL, - NULL - }, - - { - L"TimeZoneInformation", - L"Bias", - &DummyData, - NULL, - NULL - }, - - { - L"TimeZoneInformation", - L"RealTimeIsUniversal", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"GlobalFlag", - &CmNtGlobalFlag, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PagedPoolQuota", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"NonPagedPoolQuota", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PagingFileQuota", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"AllocationPreference", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"DynamicMemory", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"Mirroring", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"Mirroring", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SystemViewSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SessionViewSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SessionImageSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SessionPoolSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PoolUsageMaximum", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"MapAllocationFragment", - &DummyData, - NULL, - NULL - }, - -{ - L"Session Manager\\Memory Management", - L"PagedPoolSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"NonPagedPoolSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"NonPagedPoolMaximumPercent", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"LargeSystemCache", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"LargeStackSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SystemPages", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"LowMemoryThreshold", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"HighMemoryThreshold", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"DisablePagingExecutive", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"ModifiedPageLife", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SecondLevelDataCache", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"ClearPageFileAtShutdown", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PoolTagSmallTableSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PoolTagBigTableSize", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PoolTag", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"PoolTagOverruns", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"SnapUnloads", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"ProtectNonPagedPool", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"TrackLockedPages", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"TrackPtes", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"VerifyDrivers", - &DummyData, - &DummyData, - &DummyData - }, - - { - L"Session Manager\\Memory Management", - L"VerifyDriverLevel", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"VerifyMode", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"LargePageMinimum", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"EnforceWriteProtection", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"MakeLowMemory", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", - L"WriteWatch", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Executive", - L"AdditionalCriticalWorkerThreads", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Executive", - L"AdditionalDelayedWorkerThreads", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Executive", - L"PriorityQuantumMatrix", - &DummyData, - &DummyData, - NULL - }, - - { - L"Session Manager\\Kernel", - L"DpcQueueDepth", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Kernel", - L"MinimumDpcRate", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Kernel", - L"AdjustDpcThreshold", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Kernel", - L"IdealDpcRate", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\I/O System", - L"CountOperations", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\I/O System", - L"LargeIrpStackLocations", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\I/O System", - L"IoVerifierLevel", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"ResourceTimeoutCount", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"CriticalSectionTimeout", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"HeapSegmentReserve", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"HeapSegmentCommit", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"HeapDeCommitTotalFreeThreshold", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"HeapDeCommitFreeBlockThreshold", - &DummyData, - NULL, - NULL - }, - - { - L"ProductOptions", - L"ProductType", - &DummyData, - NULL, - NULL - }, - - { - L"Terminal Server", - L"TSEnabled", - &DummyData, - NULL, - NULL - }, - - { - L"Terminal Server", - L"TSAppCompat", - &DummyData, - NULL, - NULL - }, - - - { - L"ProductOptions", - L"ProductSuite", - CmSuiteBuffer, - &CmSuiteBufferLength, - &CmSuiteBufferType - }, - - { - L"Windows", - L"CSDVersion", - &CmNtCSDVersion, - NULL, - NULL - }, - - { - L"Nls\\Language", - L"Default", - CmDefaultLanguageId, - &CmDefaultLanguageIdLength, - &CmDefaultLanguageIdType - }, - - { - L"Nls\\Language", - L"InstallLanguage", - CmInstallUILanguageId, - &CmInstallUILanguageIdLength, - &CmInstallUILanguageIdType - }, - - { - L"\0\0", - L"RegistrySizeLimit", - &DummyData, - &DummyData, - &DummyData - }, - - { - L"Session Manager", - L"ForceNpxEmulation", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"PowerPolicySimulate", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Executive", - L"MaxTimeSeparationBeforeCorrect", - &DummyData, - NULL, - NULL - }, - - { - L"Windows", - L"ShutdownTime", - &DummyData, - &DummyData, - NULL - }, - - { - L"PriorityControl", - L"Win32PrioritySeparation", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"EnableTimerWatchdog", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager", - L"Debugger Retries", - &DummyData, - NULL, - NULL - }, - - { - L"WMI", - L"MaxEventSize", - &DummyData, - NULL, - NULL - }, - - { - L"WMI\\Trace", - L"UsePerformanceClock", - &DummyData, - NULL, - NULL - }, - - { - L"WMI\\Trace", - L"TraceAlignment", - &DummyData, - NULL, - NULL - }, - - { - NULL, - NULL, - NULL, - NULL, - NULL -} -}; - Removed: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c (removed) @@ -1,136 +1,0 @@ -/* $Id$ - * - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/cm/import.c - * PURPOSE: Registry-Hive import functions - * - * PROGRAMMERS: Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#include "cm.h" - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, CmImportHardwareHive) -#endif - -/* GLOBALS ******************************************************************/ - -/* FUNCTIONS ****************************************************************/ - -static BOOLEAN -CmImportBinaryHive (PCHAR ChunkBase, - ULONG ChunkSize, - ULONG Flags, - PEREGISTRY_HIVE *RegistryHive) -{ - PEREGISTRY_HIVE Hive; - NTSTATUS Status; - - *RegistryHive = NULL; - - /* Create a new hive */ - Hive = ExAllocatePool (NonPagedPool, - sizeof(EREGISTRY_HIVE)); - if (Hive == NULL) - { - return FALSE; - } - RtlZeroMemory (Hive, - sizeof(EREGISTRY_HIVE)); - - /* Set hive flags */ - Hive->Flags = Flags; - - /* Allocate hive header */ - ((PHBASE_BLOCK)ChunkBase)->Length = ChunkSize; - Status = HvInitialize(&Hive->Hive, HV_OPERATION_MEMORY, 0, 0, - (ULONG_PTR)ChunkBase, 0, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("Opening hive failed (%x)\n", Status); - ExFreePool (Hive); - return FALSE; - } - - CmPrepareHive(&Hive->Hive); - - /* Acquire hive list lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - DPRINT("Adding new hive\n"); - - /* Add the new hive to the hive list */ - InsertTailList(&CmiHiveListHead, &Hive->HiveList); - - /* Release hive list lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - - *RegistryHive = Hive; - - return TRUE; -} - - -BOOLEAN -INIT_FUNCTION -CmImportSystemHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive) -{ - *RegistryHive = NULL; - - /* Import the binary system hive (non-volatile, offset-based, permanent) */ - if (!CmImportBinaryHive (ChunkBase, ChunkSize, 0, RegistryHive)) - { - return FALSE; - } - - /* Set the hive filename */ - RtlCreateUnicodeString (&(*RegistryHive)->HiveFileName, - SYSTEM_REG_FILE); - - /* Set the log filename */ - RtlCreateUnicodeString (&(*RegistryHive)->LogFileName, - SYSTEM_LOG_FILE); - - return TRUE; -} - -BOOLEAN -INIT_FUNCTION -CmImportHardwareHive(PCHAR ChunkBase, - ULONG ChunkSize, - OUT PEREGISTRY_HIVE *RegistryHive) -{ - *RegistryHive = NULL; - - /* Import the binary system hive (volatile, offset-based, permanent) */ - if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_NO_FILE, RegistryHive)) - { - return FALSE; - } - - /* Set the hive filename */ - RtlInitUnicodeString (&(*RegistryHive)->HiveFileName, - NULL); - - /* Set the log filename */ - RtlInitUnicodeString (&(*RegistryHive)->LogFileName, - NULL); - - return TRUE; -} - -/* 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 Fri May 11 10:24:00 2007 @@ -422,8 +422,8 @@ return Status; } - /* Set flag */ - Hive->Flags = HIVE_NO_FILE; + /* Set flags */ + Hive->Flags = HiveFlags; /* Check if we should verify the registry */ if ((OperationType == HINIT_FILE) || 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 Fri May 11 10:24:00 2007 @@ -252,6 +252,7 @@ BOOLEAN Allocate; UNICODE_STRING KeyName; PEREGISTRY_HIVE SystemHive; + UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); PAGED_CODE(); /* Setup the ansi string */ @@ -279,10 +280,25 @@ if (HiveBase) { /* Import it */ - Status = CmImportSystemHive(HiveBase, - LoaderBlock->RegistryLength, - &SystemHive); + ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; + Status = CmpInitializeHive(&SystemHive, + HINIT_MEMORY, + 0, //HIVE_NOLAZYFLUSH, + HFILE_TYPE_LOG, + HiveBase, + NULL, + NULL, + NULL, + &HiveName, + 2); if (!NT_SUCCESS(Status)) return FALSE; + CmPrepareHive(&SystemHive->Hive); + + /* Set the hive filename */ + RtlCreateUnicodeString(&SystemHive->HiveFileName, SYSTEM_REG_FILE); + + /* Set the log filename */ + RtlCreateUnicodeString(&SystemHive->LogFileName, SYSTEM_LOG_FILE); /* We imported, no need to create a new hive */ Allocate = FALSE; @@ -393,6 +409,7 @@ HANDLE RootKeyHandle; HCELL_INDEX RootIndex; NTSTATUS Status; + PCM_KEY_NODE KeyCell; PAGED_CODE(); /* Setup the root node */ @@ -420,17 +437,26 @@ (PVOID*)&RootKey); if (!NT_SUCCESS(Status)) return FALSE; + /* Sanity check, and get the key cell */ + ASSERT((&CmiVolatileHive->Hive)->ReleaseCellRoutine == NULL); + KeyCell = (PCM_KEY_NODE)HvGetCell(&CmiVolatileHive->Hive, RootIndex); + if (!KeyCell) return FALSE; + /* Setup the root key */ RootKey->RegistryHive = CmiVolatileHive; RootKey->KeyCellOffset = RootIndex; - RootKey->KeyCell = HvGetCell(&CmiVolatileHive->Hive, RootIndex); + RootKey->KeyCell = KeyCell; RootKey->ParentKey = RootKey; RootKey->Flags = 0; RootKey->SubKeyCounts = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; + + /* Insert it into the object list head */ InsertTailList(&CmiKeyObjectListHead, &RootKey->ListEntry); - Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); + + /* Setup the name */ + RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -467,7 +493,6 @@ HANDLE ThreadHandle; CLIENT_ID ThreadId; PEREGISTRY_HIVE HardwareHive; - BOOLEAN Allocate = FALSE; PVOID BaseAddress; ULONG Length; PAGED_CODE(); @@ -513,7 +538,7 @@ /* Build the master hive */ Status = CmpInitializeHive(&CmiVolatileHive, HINIT_CREATE, - HIVE_VOLATILE, + HIVE_VOLATILE | HIVE_NO_FILE, HFILE_TYPE_PRIMARY, NULL, NULL, @@ -595,12 +620,24 @@ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 8, Status, 0); } - /* Initialize the hardware hive */ + /* Import the hardware hive (FIXME: We should create it from scratch) */ BaseAddress = CmpRosGetHardwareHive(&Length); - if (!CmImportHardwareHive(BaseAddress, Length, &HardwareHive)) - { - /* Don't actually link anything below */ - Allocate = TRUE; + ((PHBASE_BLOCK)BaseAddress)->Length = Length; + Status = CmpInitializeHive(&HardwareHive, + HINIT_MEMORY, //HINIT_CREATE, + HIVE_NO_FILE, //HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + BaseAddress, // NULL, + NULL, + NULL, + NULL, + NULL, + 0); + CmPrepareHive(&HardwareHive->Hive); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); } /* Attach it to the machine key */ 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 Fri May 11 10:24:00 2007 @@ -103,7 +103,6 @@ <file>cmvalue.c</file> </directory> <directory name="cm"> - <file>import.c</file> <file>ntfunc.c</file> <file>regfile.c</file> <file>registry.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs