Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26762: - Fix crash at end of text-mode setup (by hacking cmlib not to write a log file anymore -- logs aren't critical and I'll see why exactly it couldn't write the log anymore later, and apply a proper fix).
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Sun May 13 23:11:13 2007 New Revision: 26762 URL: http://svn.reactos.org/svn/reactos?rev=26762&view=rev Log: - Fix crash at end of text-mode setup (by hacking cmlib not to write a log file anymore -- logs aren't critical and I'll see why exactly it couldn't write the log anymore later, and apply a proper fix). Modified: trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=26… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c (original) +++ trunk/reactos/lib/cmlib/hivewrt.c Sun May 13 23:11:13 2007 @@ -22,6 +22,7 @@ ULONG LastIndex; PVOID BlockPtr; BOOLEAN Success; + return TRUE; ASSERT(RegistryHive->ReadOnly == FALSE);

1 0

[ion] 26761: - Remove more old/dead code.
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Sun May 13 23:10:23 2007 New Revision: 26761 URL: http://svn.reactos.org/svn/reactos?rev=26761&view=rev Log: - Remove more old/dead code. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c 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 Sun May 13 23:10:23 2007 @@ -1949,15 +1949,8 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes, IN ULONG Flags) { - POBJECT_NAME_INFORMATION NameInfo; - PUNICODE_STRING NamePointer; - PUCHAR Buffer; - ULONG BufferSize; - ULONG Length; NTSTATUS Status; - PAGED_CODE(); - DPRINT ("NtLoadKey2() called\n"); #if 0 @@ -1965,85 +1958,12 @@ return STATUS_PRIVILEGE_NOT_HELD; #endif - if (FileObjectAttributes->RootDirectory != NULL) - { - BufferSize = - sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); - Buffer = ExAllocatePool (NonPagedPool, - BufferSize); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Status = ZwQueryObject (FileObjectAttributes->RootDirectory, - ObjectNameInformation, - Buffer, - BufferSize, - &Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("NtQueryObject() failed (Status %lx)\n", Status); - ExFreePool (Buffer); - return Status; - } - - NameInfo = (POBJECT_NAME_INFORMATION)Buffer; - DPRINT ("ObjectPath: '%wZ' Length %hu\n", - &NameInfo->Name, NameInfo->Name.Length); - - NameInfo->Name.MaximumLength = MAX_PATH * sizeof(WCHAR); - if (FileObjectAttributes->ObjectName->Buffer[0] != L'\\') - { - RtlAppendUnicodeToString (&NameInfo->Name, - L"\\"); - DPRINT ("ObjectPath: '%wZ' Length %hu\n", - &NameInfo->Name, NameInfo->Name.Length); - } - RtlAppendUnicodeStringToString (&NameInfo->Name, - FileObjectAttributes->ObjectName); - - DPRINT ("ObjectPath: '%wZ' Length %hu\n", - &NameInfo->Name, NameInfo->Name.Length); - NamePointer = &NameInfo->Name; - } - else - { - if (FileObjectAttributes->ObjectName->Buffer[0] == L'\\') - { - Buffer = NULL; - NamePointer = FileObjectAttributes->ObjectName; - } - else - { - BufferSize = - sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); - Buffer = ExAllocatePool (NonPagedPool, - BufferSize); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - NameInfo = (POBJECT_NAME_INFORMATION)Buffer; - NameInfo->Name.MaximumLength = MAX_PATH * sizeof(WCHAR); - NameInfo->Name.Length = 0; - NameInfo->Name.Buffer = (PWSTR)((ULONG_PTR)Buffer + sizeof(OBJECT_NAME_INFORMATION)); - NameInfo->Name.Buffer[0] = 0; - - RtlAppendUnicodeToString (&NameInfo->Name, - L"\\"); - RtlAppendUnicodeStringToString (&NameInfo->Name, - FileObjectAttributes->ObjectName); - - NamePointer = &NameInfo->Name; - } - } - - DPRINT ("Full name: '%wZ'\n", NamePointer); - /* Acquire hive lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); Status = CmiLoadHive (KeyObjectAttributes, - NamePointer, + FileObjectAttributes->ObjectName, Flags); if (!NT_SUCCESS (Status)) { @@ -2053,148 +1973,6 @@ /* Release hive lock */ ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); - - if (Buffer != NULL) - ExFreePool (Buffer); - - return Status; -} - -NTSTATUS STDCALL -NtQueryMultipleValueKey (IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueList, - IN ULONG NumberOfValues, - OUT PVOID Buffer, - IN OUT PULONG Length, - OUT PULONG ReturnLength) -{ - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_VALUE ValueCell; - PKEY_OBJECT KeyObject; - PVOID DataCell; - ULONG BufferLength = 0; - PCM_KEY_NODE KeyCell; - NTSTATUS Status; - PUCHAR DataPtr; - ULONG i; - REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION QueryMultipleValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *) &KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with status %x\n", Status); - return(Status); - } - - PostOperationInfo.Object = (PVOID)KeyObject; - QueryMultipleValueKeyInfo.Object = (PVOID)KeyObject; - QueryMultipleValueKeyInfo.ValueEntries = ValueList; - QueryMultipleValueKeyInfo.EntryCount = NumberOfValues; - QueryMultipleValueKeyInfo.ValueBuffer = Buffer; - QueryMultipleValueKeyInfo.BufferLength = Length; - QueryMultipleValueKeyInfo.RequiredBufferLength = ReturnLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreQueryMultipleValueKey, &QueryMultipleValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryMultipleValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - DataPtr = (PUCHAR) Buffer; - - for (i = 0; i < NumberOfValues; i++) - { - DPRINT("ValueName: '%wZ'\n", ValueList[i].ValueName); - - /* Get Value block of interest */ - Status = CmiScanKeyForValue(RegistryHive, - KeyCell, - ValueList[i].ValueName, - &ValueCell, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiScanKeyForValue() failed with status %x\n", Status); - break; - } - else if (ValueCell == NULL) - { - Status = STATUS_OBJECT_NAME_NOT_FOUND; - break; - } - - BufferLength = ROUND_UP(BufferLength, sizeof(PVOID)); - - if (BufferLength + (ValueCell->DataSize & REG_DATA_SIZE_MASK) <= *Length) - { - DataPtr = (PUCHAR)ROUND_UP((ULONG_PTR)DataPtr, sizeof(PVOID)); - - ValueList[i].Type = ValueCell->DataType; - ValueList[i].DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - ValueList[i].DataOffset = (ULONG_PTR)DataPtr - (ULONG_PTR)Buffer; - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, - ValueCell->DataOffset); - RtlCopyMemory(DataPtr, DataCell, - ValueCell->DataSize & REG_DATA_SIZE_MASK); - } - else - { - RtlCopyMemory(DataPtr, - &ValueCell->DataOffset, - ValueCell->DataSize & REG_DATA_SIZE_MASK); - } - - DataPtr += ValueCell->DataSize & REG_DATA_SIZE_MASK; - } - else - { - Status = STATUS_BUFFER_TOO_SMALL; - } - - BufferLength += ValueCell->DataSize & REG_DATA_SIZE_MASK; - } - - if (NT_SUCCESS(Status)) - *Length = BufferLength; - - *ReturnLength = BufferLength; - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryMultipleValueKey, &PostOperationInfo); - - ObDereferenceObject(KeyObject); - - DPRINT("Return Status 0x%X\n", Status); return Status; } @@ -2323,6 +2101,19 @@ NTSTATUS NTAPI +NtQueryMultipleValueKey(IN HANDLE KeyHandle, + IN OUT PKEY_VALUE_ENTRY ValueList, + IN ULONG NumberOfValues, + OUT PVOID Buffer, + IN OUT PULONG Length, + OUT PULONG ReturnLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, IN ULONG HandleCount) {

1 0

[ion] 26760: - HvGetCellSize should return the correct positive length instead of the raw negative length. Update code and callers to match. - Add cmapi.c file containing internal Cm* APIs for the Nt counterparts and to make it easier to seperate the handle->object code, SEH and callback parts. - Remove CmiAddValueToKey, CmiAllocateValueCell since we have new routines for this. - Make NtSetValueKey a simple wrapper around CmSetValueKey. - Implement CmSetValueKey based on previous code, but use n
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Sun May 13 22:39:35 2007 New Revision: 26760 URL: http://svn.reactos.org/svn/reactos?rev=26760&view=rev Log: - HvGetCellSize should return the correct positive length instead of the raw negative length. Update code and callers to match. - Add cmapi.c file containing internal Cm* APIs for the Nt counterparts and to make it easier to seperate the handle->object code, SEH and callback parts. - Remove CmiAddValueToKey, CmiAllocateValueCell since we have new routines for this. - Make NtSetValueKey a simple wrapper around CmSetValueKey. - Implement CmSetValueKey based on previous code, but use newer Cm APIs instead (this also fixes some cell allocation bugs regarding Stable/Volatile storage). - New code is more conservative with HvMakeCellDirty calls when they're not needed, and is more scalable to support big cells in the future. Added: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmvalue.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Sun May 13 22:39:35 2007 @@ -82,17 +82,16 @@ } LONG CMAPI -HvGetCellSize( - PHHIVE RegistryHive, - PVOID Cell) -{ - PHCELL CellHeader; - - CellHeader = (PHCELL)Cell - 1; - if (CellHeader->Size < 0) - return CellHeader->Size + sizeof(HCELL); - else - return CellHeader->Size - sizeof(HCELL); +HvGetCellSize(IN PHHIVE Hive, + IN PVOID Address) +{ + PHCELL CellHeader; + LONG Size; + + CellHeader = (PHCELL)Address - 1; + Size = CellHeader->Size * -1; + Size -= sizeof(HCELL); + return Size; } VOID CMAPI @@ -375,8 +374,8 @@ OldCell = HvGetCell(RegistryHive, CellIndex); OldCellSize = HvGetCellSize(RegistryHive, OldCell); - ASSERT(OldCellSize < 0); - + ASSERT(OldCellSize > 0); + /* * If new data size is larger than the current, destroy current * data block and allocate a new one. @@ -384,14 +383,14 @@ * FIXME: Merge with adjacent free cell if possible. * FIXME: Implement shrinking. */ - if (Size > (ULONG)-OldCellSize) + if (Size > OldCellSize) { NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage); if (NewCellIndex == HCELL_NULL) return HCELL_NULL; NewCell = HvGetCell(RegistryHive, NewCellIndex); - RtlCopyMemory(NewCell, OldCell, (SIZE_T)-OldCellSize); + RtlCopyMemory(NewCell, OldCell, (SIZE_T)OldCellSize); HvFreeCell(RegistryHive, CellIndex); Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26760… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sun May 13 22:39:35 2007 @@ -261,14 +261,6 @@ OUT PCM_KEY_VALUE *ValueCell); NTSTATUS -CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName, - OUT PCM_KEY_VALUE *pValueCell, - OUT HCELL_INDEX *pValueCellOffset); - -NTSTATUS CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, @@ -295,16 +287,17 @@ HCELL_INDEX NKBOffset); NTSTATUS +NTAPI +CmSetValueKey(IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize); + +NTSTATUS CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, PHASH_TABLE_CELL HashBlock, HCELL_INDEX NKBOffset); - -NTSTATUS -CmiAllocateValueCell(IN PEREGISTRY_HIVE RegistryHive, - OUT PCM_KEY_VALUE *ValueCell, - OUT HCELL_INDEX *VBOffset, - IN PUNICODE_STRING ValueName, - IN HV_STORAGE_TYPE Storage); NTSTATUS CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, 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 Sun May 13 22:39:35 2007 @@ -1799,193 +1799,60 @@ return Status; } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtSetValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN ULONG TitleIndex, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_NODE KeyCell; - PCM_KEY_VALUE ValueCell; - HCELL_INDEX ValueCellOffset; - PVOID DataCell; - ULONG DesiredAccess; - REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - ULONG DataCellSize; - - PAGED_CODE(); - - DPRINT("NtSetValueKey(KeyHandle 0x%p ValueName '%wZ' Type %d)\n", - KeyHandle, ValueName, Type); - - DesiredAccess = KEY_SET_VALUE; - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - DesiredAccess, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - return(Status); - - PostOperationInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.ValueName = ValueName; - SetValueKeyInfo.TitleIndex = TitleIndex; - SetValueKeyInfo.Type = Type; - SetValueKeyInfo.Data = Data; - SetValueKeyInfo.DataSize = DataSize; - Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock exclucively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to key cell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - Status = CmiScanKeyForValue(RegistryHive, - KeyCell, - ValueName, - &ValueCell, - &ValueCellOffset); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - DPRINT("Allocate new value cell\n"); - Status = CmiAddValueToKey(RegistryHive, - KeyCell, - KeyObject->KeyCellOffset, - ValueName, - &ValueCell, - &ValueCellOffset); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("Cannot add value. Status 0x%X\n", Status); - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - DPRINT("DataSize %lu\n", DataSize); - DPRINT("ValueCell %p\n", ValueCell); - DPRINT("ValueCell->DataSize %lu\n", ValueCell->DataSize); - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET) && - (ValueCell->DataSize & REG_DATA_SIZE_MASK) != 0) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - DataCellSize = -HvGetCellSize (&RegistryHive->Hive, DataCell); - } - else - { - DataCell = NULL; - DataCellSize = 0; - } - - - if (DataSize <= sizeof(HCELL_INDEX)) - { - /* If data size <= sizeof(HCELL_INDEX) then store data in the data offset */ - DPRINT("ValueCell->DataSize %lu\n", ValueCell->DataSize); - if (DataCell) - { - HvFreeCell(&RegistryHive->Hive, ValueCell->DataOffset); - } - - RtlCopyMemory(&ValueCell->DataOffset, Data, DataSize); - ValueCell->DataSize = DataSize | REG_DATA_IN_OFFSET; - ValueCell->DataType = Type; - HvMarkCellDirty(&RegistryHive->Hive, ValueCellOffset); - } - else - { - if (DataSize > DataCellSize) - { - /* - * New data size is larger than the current, destroy current - * data block and allocate a new one. - */ - HCELL_INDEX NewOffset; - - DPRINT("ValueCell->DataSize %lu\n", ValueCell->DataSize); - - NewOffset = HvAllocateCell (&RegistryHive->Hive, DataSize, HvStable); - if (NewOffset == HCELL_NULL) - { - DPRINT("CmiAllocateBlock() failed (Status %lx)\n", Status); - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - return Status; - } - - if (DataCell) - { - HvFreeCell(&RegistryHive->Hive, ValueCell->DataOffset); - } - - ValueCell->DataOffset = NewOffset; - DataCell = HvGetCell(&RegistryHive->Hive, NewOffset); - } - - RtlCopyMemory(DataCell, Data, DataSize); - ValueCell->DataSize = DataSize & REG_DATA_SIZE_MASK; - ValueCell->DataType = Type; - HvMarkCellDirty(&RegistryHive->Hive, ValueCell->DataOffset); - HvMarkCellDirty(&RegistryHive->Hive, ValueCellOffset); - } - - /* Mark link key */ - if ((Type == REG_LINK) && - (_wcsicmp(ValueName->Buffer, L"SymbolicLinkValue") == 0)) - { - KeyCell->Flags |= REG_KEY_LINK_CELL; - } - - KeQuerySystemTime (&KeyCell->LastWriteTime); - HvMarkCellDirty (&RegistryHive->Hive, KeyObject->KeyCellOffset); - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - CmiSyncHives(); - - DPRINT("Return Status 0x%X\n", Status); - - return Status; -} - + IN PUNICODE_STRING ValueName, + IN ULONG TitleIndex, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + /* Setup callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.ValueName = ValueName; + SetValueKeyInfo.TitleIndex = TitleIndex; + SetValueKeyInfo.Type = Type; + SetValueKeyInfo.Data = Data; + SetValueKeyInfo.DataSize = DataSize; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmSetValueKey(KeyObject, + ValueName, + Type, + Data, + DataSize); + } + + /* Do the post-callback and de-reference the key object */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); + ObDereferenceObject(KeyObject); + + /* Synchronize the hives and return */ + CmiSyncHives(); + return Status; +} NTSTATUS STDCALL NtDeleteValueKey (IN HANDLE KeyHandle, 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 Sun May 13 22:39:35 2007 @@ -57,22 +57,6 @@ DPRINT ("CmiLoadHive() done\n"); return Status; -} - - -NTSTATUS -CmiRemoveRegistaryHive(PEREGISTRY_HIVE RegistryHive) -{ - /* Remove hive from hive list */ - RemoveEntryList (&RegistryHive->HiveList); - - /* Release file names */ - RtlFreeUnicodeString (&RegistryHive->HiveFileName); - - /* Release hive */ - HvFree (&RegistryHive->Hive); - - return STATUS_SUCCESS; } VOID @@ -680,93 +664,6 @@ return STATUS_SUCCESS; } - -NTSTATUS -CmiAddValueToKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName, - OUT PCM_KEY_VALUE *pValueCell, - OUT HCELL_INDEX *pValueCellOffset) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE NewValueCell; - HCELL_INDEX ValueListCellOffset; - HCELL_INDEX NewValueCellOffset; - ULONG CellSize; - HV_STORAGE_TYPE Storage; - NTSTATUS Status; - - DPRINT("KeyCell->ValuesOffset %lu\n", (ULONG)KeyCell->ValueList.List); - - Storage = (KeyCell->Flags & REG_KEY_VOLATILE_CELL) ? HvVolatile : HvStable; - if (KeyCell->ValueList.List == HCELL_NULL) - { - CellSize = sizeof(VALUE_LIST_CELL) + - (3 * sizeof(HCELL_INDEX)); - ValueListCellOffset = HvAllocateCell (&RegistryHive->Hive, CellSize, Storage); - if (ValueListCellOffset == HCELL_NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - ValueListCell = HvGetCell (&RegistryHive->Hive, ValueListCellOffset); - KeyCell->ValueList.List = ValueListCellOffset; - HvMarkCellDirty(&RegistryHive->Hive, KeyCellOffset); - } - else - { - ValueListCell = (PVALUE_LIST_CELL) HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); - CellSize = ABS_VALUE(HvGetCellSize(&RegistryHive->Hive, ValueListCell)); - - if (KeyCell->ValueList.Count >= - (CellSize / sizeof(HCELL_INDEX))) - { - CellSize *= 2; - ValueListCellOffset = HvReallocateCell (&RegistryHive->Hive, KeyCell->ValueList.List, CellSize); - if (ValueListCellOffset == HCELL_NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - ValueListCell = HvGetCell (&RegistryHive->Hive, ValueListCellOffset); - KeyCell->ValueList.List = ValueListCellOffset; - HvMarkCellDirty (&RegistryHive->Hive, KeyCellOffset); - } - } - -#if 0 - DPRINT("KeyCell->ValueList.Count %lu, ValueListCell->Size %lu (%lu %lx)\n", - KeyCell->ValueList.Count, - (ULONG)ABS_VALUE(ValueListCell->Size), - ((ULONG)ABS_VALUE(ValueListCell->Size) - sizeof(HCELL)) / sizeof(HCELL_INDEX), - ((ULONG)ABS_VALUE(ValueListCell->Size) - sizeof(HCELL)) / sizeof(HCELL_INDEX)); -#endif - - Status = CmiAllocateValueCell(RegistryHive, - &NewValueCell, - &NewValueCellOffset, - ValueName, - Storage); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - ValueListCell->ValueOffset[KeyCell->ValueList.Count] = NewValueCellOffset; - KeyCell->ValueList.Count++; - - HvMarkCellDirty(&RegistryHive->Hive, KeyCellOffset); - HvMarkCellDirty(&RegistryHive->Hive, KeyCell->ValueList.List); - HvMarkCellDirty(&RegistryHive->Hive, NewValueCellOffset); - - *pValueCell = NewValueCell; - *pValueCellOffset = NewValueCellOffset; - - return STATUS_SUCCESS; -} - - NTSTATUS CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, @@ -934,63 +831,6 @@ return STATUS_UNSUCCESSFUL; } - -NTSTATUS -CmiAllocateValueCell(PEREGISTRY_HIVE RegistryHive, - PCM_KEY_VALUE *ValueCell, - HCELL_INDEX *VBOffset, - IN PUNICODE_STRING ValueName, - IN HV_STORAGE_TYPE Storage) -{ - PCM_KEY_VALUE NewValueCell; - NTSTATUS Status; - BOOLEAN Packable; - ULONG NameSize; - ULONG i; - - Status = STATUS_SUCCESS; - - NameSize = CmiGetPackedNameLength(ValueName, - &Packable); - - DPRINT("ValueName->Length %lu NameSize %lu\n", ValueName->Length, NameSize); - - *VBOffset = HvAllocateCell (&RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameSize, Storage); - if (*VBOffset == HCELL_NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - ASSERT(NameSize <= 0xffff); /* should really be USHORT_MAX or similar */ - NewValueCell = HvGetCell (&RegistryHive->Hive, *VBOffset); - NewValueCell->Id = REG_VALUE_CELL_ID; - NewValueCell->NameSize = (USHORT)NameSize; - if (Packable) - { - /* Pack the value name */ - for (i = 0; i < NameSize; i++) - NewValueCell->Name[i] = (CHAR)ValueName->Buffer[i]; - NewValueCell->Flags |= REG_VALUE_NAME_PACKED; - } - else - { - /* Copy the value name */ - RtlCopyMemory(NewValueCell->Name, - ValueName->Buffer, - NameSize); - NewValueCell->Flags = 0; - } - NewValueCell->DataType = 0; - NewValueCell->DataSize = 0; - NewValueCell->DataOffset = (HCELL_INDEX)-1; - *ValueCell = NewValueCell; - } - - return Status; -} - - NTSTATUS CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, PCM_KEY_VALUE ValueCell, 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 Sun May 13 22:39:35 2007 @@ -1049,6 +1049,21 @@ IN HCELL_INDEX Cell ); +BOOLEAN +NTAPI +CmpMarkValueDataDirty( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value +); + +BOOLEAN +NTAPI +CmpFreeValueData( + IN PHHIVE Hive, + IN HCELL_INDEX DataCell, + IN ULONG DataLength +); + // // Boot Routines // Added: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (added) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sun May 13 22:39:35 2007 @@ -1,0 +1,342 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmapi.c + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpSetValueKeyNew(IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PUNICODE_STRING ValueName, + IN ULONG Index, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN ULONG SmallData) +{ + PCELL_DATA CellData; + HCELL_INDEX ValueCell; + NTSTATUS Status; + + /* Check if we already have a value list */ + if (Parent->ValueList.Count) + { + /* Then make sure it's valid and dirty it */ + ASSERT(Parent->ValueList.List != HCELL_NIL); + HvMarkCellDirty(Hive, Parent->ValueList.List); + } + + /* Allocate avalue cell */ + ValueCell = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_VALUE, Name) + + CmpNameSize(Hive, ValueName), + StorageType); + if (ValueCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual data for it */ + CellData = HvGetCell(Hive, ValueCell); + if (!CellData) ASSERT(FALSE); + + /* Now we can release it, make sure it's also dirty */ + HvReleaseCell(Hive, ValueCell); + ASSERT(HvIsCellDirty(Hive, ValueCell)); + + /* Set it up and copy the name */ + CellData->u.KeyValue.Signature = CM_KEY_VALUE_SIGNATURE; + CellData->u.KeyValue.Flags = 0; + CellData->u.KeyValue.Type = Type; + CellData->u.KeyValue.NameLength = CmpCopyName(Hive, + CellData->u.KeyValue.Name, + ValueName); + if (CellData->u.KeyValue.NameLength < ValueName->Length) + { + /* This is a compressed name */ + CellData->u.KeyValue.Flags = VALUE_COMP_NAME; + } + + /* Check if this is a normal key */ + if (DataSize > CM_KEY_VALUE_SMALL) + { + /* Build a data cell for it */ + Status = CmpSetValueDataNew(Hive, + Data, + DataSize, + StorageType, + ValueCell, + &CellData->u.KeyValue.Data); + if (!NT_SUCCESS(Status)) + { + /* We failed, free the cell */ + HvFreeCell(Hive, ValueCell); + return Status; + } + + /* Otherwise, set the data length, and make sure the data is dirty */ + CellData->u.KeyValue.DataLength = DataSize; + ASSERT(HvIsCellDirty(Hive,CellData->u.KeyValue.Data)); + } + else + { + /* This is a small key, set the data directly inside */ + CellData->u.KeyValue.DataLength = DataSize + CM_KEY_VALUE_SPECIAL_SIZE; + CellData->u.KeyValue.Data = SmallData; + } + + /* Add this value cell to the child list */ + Status = CmpAddValueToList(Hive, + ValueCell, + Index, + StorageType, + &Parent->ValueList); + + /* If we failed, free the entire cell, including the data */ + if (!NT_SUCCESS(Status)) CmpFreeValue(Hive, ValueCell); + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +CmpSetValueKeyExisting(IN PHHIVE Hive, + IN HCELL_INDEX OldChild, + IN PCM_KEY_VALUE Value, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN ULONG TempData) +{ + HCELL_INDEX DataCell, NewCell; + PCELL_DATA CellData; + ULONG Length; + BOOLEAN WasSmall, IsSmall; + + /* Mark the old child cell dirty */ + HvMarkCellDirty(Hive, OldChild); + + /* See if this is a small or normal key */ + WasSmall = CmpIsKeyValueSmall(&Length, Value->DataLength); + + /* See if our new data can fit in a small key */ + IsSmall = (DataSize <= CM_KEY_VALUE_SMALL) ? TRUE: FALSE; + + /* Big keys are unsupported */ + ASSERT_VALUE_BIG(Hive, Length); + ASSERT_VALUE_BIG(Hive, DataSize); + + /* Mark the old value dirty */ + CmpMarkValueDataDirty(Hive, Value); + + /* Check if we have a small key */ + if (IsSmall) + { + /* Check if we had a normal key with some data in it */ + if (!(WasSmall) && (Length > 0)) + { + /* Free the previous data */ + CmpFreeValueData(Hive, Value->Data, Length); + } + + /* Write our data directly */ + Value->DataLength = DataSize + CM_KEY_VALUE_SPECIAL_SIZE; + Value->Data = TempData; + Value->Type = Type; + return STATUS_SUCCESS; + } + else + { + /* We have a normal key. Was the old cell also normal and had data? */ + if (!(WasSmall) && (Length > 0)) + { + /* Get the current data cell and actual data inside it */ + DataCell = Value->Data; + ASSERT(DataCell != HCELL_NIL); + CellData = HvGetCell(Hive, DataCell); + if (!CellData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Immediately release the cell */ + HvReleaseCell(Hive, DataCell); + + /* Make sure that the data cell actually has a size */ + ASSERT(HvGetCellSize(Hive, CellData) > 0); + + /* Check if the previous data cell could fit our new data */ + if (DataSize <= (ULONG)(HvGetCellSize(Hive, CellData))) + { + /* Re-use it then */ + NewCell = DataCell; + } + else + { + /* Otherwise, re-allocate the current data cell */ + NewCell = HvReallocateCell(Hive, DataCell, DataSize); + if (NewCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + /* This was a small key, or a key with no data, allocate a cell */ + NewCell = HvAllocateCell(Hive, DataSize, StorageType); + if (NewCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Now get the actual data for our data cell */ + CellData = HvGetCell(Hive, NewCell); + if (!CellData) ASSERT(FALSE); + + /* Release it immediately */ + HvReleaseCell(Hive, NewCell); + + /* Copy our data into the data cell's buffer, and set up the value */ + RtlCopyMemory(CellData, Data, DataSize); + Value->Data = NewCell; + Value->DataLength = DataSize; + Value->Type = Type; + + /* Return success */ + ASSERT(HvIsCellDirty(Hive, NewCell)); + return STATUS_SUCCESS; + } +} + +NTSTATUS +NTAPI +CmSetValueKey(IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataLength) +{ + PHHIVE Hive; + PCM_KEY_NODE Parent; + PCM_KEY_VALUE Value = NULL; + HCELL_INDEX CurrentChild, Cell; + NTSTATUS Status; + BOOLEAN Found, Result; + ULONG Count, ChildIndex, SmallData, Storage; + + /* Acquire hive lock exclusively */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get pointer to key cell */ + Parent = KeyObject->KeyCell; + Hive = &KeyObject->RegistryHive->Hive; + Cell = KeyObject->KeyCellOffset; + + /* Prepare to scan the key node */ + Count = Parent->ValueList.Count; + Found = FALSE; + if (Count > 0) + { + /* Try to find the existing name */ + Result = CmpFindNameInList(Hive, + &Parent->ValueList, + ValueName, + &ChildIndex, + &CurrentChild); + if (!Result) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Check if we found something */ + if (CurrentChild != HCELL_NIL) + { + /* Get its value */ + Value = (PCM_KEY_VALUE)HvGetCell(Hive, CurrentChild); + if (!Value) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Remember that we found it */ + Found = TRUE; + } + } + else + { + /* No child list, we'll need to add it */ + ChildIndex = 0; + } + + /* Mark the cell dirty */ + HvMarkCellDirty(Hive, Cell); + + /* Get the storage type */ + Storage = HvGetCellType(Cell); + + /* Check if this is small data */ + SmallData = 0; + if ((DataLength <= CM_KEY_VALUE_SMALL) && (DataLength > 0)) + { + /* Copy it */ + RtlCopyMemory(&SmallData, Data, DataLength); + } + + /* Check if we didn't find a matching key */ + if (!Found) + { + /* Call the internal routine */ + Status = CmpSetValueKeyNew(Hive, + Parent, + ValueName, + ChildIndex, + Type, + Data, + DataLength, + Storage, + SmallData); + } + else + { + /* Call the internal routine */ + Status = CmpSetValueKeyExisting(Hive, + CurrentChild, + Value, + Type, + Data, + DataLength, + Storage, + SmallData); + } + + /* Mark link key */ + if ((Type == REG_LINK) && + (_wcsicmp(ValueName->Buffer, L"SymbolicLinkValue") == 0)) + { + Parent->Flags |= KEY_SYM_LINK; + } + + /* Check for success */ +Quickie: + if (NT_SUCCESS(Status)) + { + /* Save the write time */ + KeQuerySystemTime(&Parent->LastWriteTime); + } + + /* Release the lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} + Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Sun May 13 22:39:35 2007 @@ -56,7 +56,7 @@ if (DataCell == HCELL_NIL) return TRUE; /* Make sure the data cell is allocated */ - ASSERT(HvIsCellAllocated(Hive, DataCell)); + //ASSERT(HvIsCellAllocated(Hive, DataCell)); /* Unsupported value type */ ASSERT_VALUE_BIG(Hive, KeySize); 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 Sun May 13 22:39:35 2007 @@ -89,6 +89,7 @@ <file>cmhardwr.c</file> </directory> </if> + <file>cmapi.c</file> <file>cmboot.c</file> <file>cmcheck.c</file> <file>cmcontrl.c</file>

1 0

[mbosma] 26759: Some more CreateSurface Tests (for invaild flags)
by mbosma＠svn.reactos.org 13 May '07

13 May '07

Author: mbosma Date: Sun May 13 21:58:05 2007 New Revision: 26759 URL: http://svn.reactos.org/svn/reactos?rev=26759&view=rev Log: Some more CreateSurface Tests (for invaild flags) Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun May 13 21:58:05 2007 @@ -13,10 +13,9 @@ TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); - TEST (DirectDraw && DirectDraw->Release()); + //TEST (DirectDraw && DirectDraw->Release()); TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); - TEST (DirectDraw2 && DirectDraw2->Release()); - + //TEST (DirectDraw2 && DirectDraw2->Release()); return TRUE; } Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 21:58:05 2007 @@ -46,9 +46,56 @@ TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_FLIP; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); DirectDraw->Release();

1 0

[mbosma] 26758: - Release Ddraw Object Test_CreateDDraw - First Surface Test of many to follow - GetMonitorFrequency and whitespace changes by EmuandCo
by mbosma＠svn.reactos.org 13 May '07

13 May '07

Author: mbosma Date: Sun May 13 21:31:35 2007 New Revision: 26758 URL: http://svn.reactos.org/svn/reactos?rev=26758&view=rev Log: - Release Ddraw Object Test_CreateDDraw - First Surface Test of many to follow - GetMonitorFrequency and whitespace changes by EmuandCo Modified: trunk/rostests/dxtest/ddraw/debug.cpp trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Modified: trunk/rostests/dxtest/ddraw/debug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/debug.cpp?re… ============================================================================== --- trunk/rostests/dxtest/ddraw/debug.cpp (original) +++ trunk/rostests/dxtest/ddraw/debug.cpp Sun May 13 21:31:35 2007 @@ -5,7 +5,7 @@ { switch (hResult) { - case DD_OK: return "DD_OK"; + case DD_OK: return "DD_OK"; case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; case DDERR_CANNOTATTACHSURFACE: return "DDERR_CANNOTATTACHSURFACE"; case DDERR_CANNOTDETACHSURFACE: return "DDERR_CANNOTDETACHSURFACE"; Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun May 13 21:31:35 2007 @@ -15,7 +15,8 @@ { "DirectDrawCreate(Ex)", Test_CreateDDraw }, { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes }, // uncomment this test if you have enough time and patience - { "IDirectDraw::CreateSurface", Test_CreateSurface } + { "IDirectDraw::CreateSurface", Test_CreateSurface }, + { "IDirectDraw::GetMonitorFrequency", Test_GetMonitorFrequency }, }; /* The function that gives us the number of tests */ Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun May 13 21:31:35 2007 @@ -4,8 +4,8 @@ BOOL Test_CreateDDraw (INT* passed, INT* failed) { - LPDIRECTDRAW7 DirectDraw; - IDirectDraw* DirectDraw2; + LPDIRECTDRAW7 DirectDraw = NULL; + IDirectDraw* DirectDraw2 = NULL; /*** FIXME: Test first parameter using EnumDisplayDrivers ***/ @@ -13,16 +13,19 @@ TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); + TEST (DirectDraw && DirectDraw->Release()); TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); + TEST (DirectDraw2 && DirectDraw2->Release()); + return TRUE; } BOOL Test_SetCooperativeLevel (INT* passed, INT* failed) { - HWND hwnd; + HWND hwnd; LPDIRECTDRAW7 DirectDraw; - + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { @@ -36,9 +39,10 @@ DirectDraw->Release(); return FALSE; } - + /* The Test */ TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) == DDERR_INVALIDPARAMS ); @@ -54,27 +58,27 @@ return TRUE; } -LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) -{ +LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) +{ switch (message) { case WM_DESTROY: { - PostQuitMessage (0); + PostQuitMessage (0); return 0; } break; } return DefWindowProc (hwnd, message, wParam, lParam); -} +} HWND CreateBasicWindow (VOID) { WNDCLASS wndclass = {0}; wndclass.lpfnWndProc = BasicWindowProc; wndclass.hInstance = GetModuleHandle(NULL); - wndclass.lpszClassName = "DDrawTest"; - RegisterClass(&wndclass); + wndclass.lpszClassName = "DDrawTest"; + RegisterClass(&wndclass); return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); } Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 21:31:35 2007 @@ -4,7 +4,7 @@ BOOL Test_CreateSurface (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; - LPDIRECTDRAWSURFACE7 DirectDrawSurface; + LPDIRECTDRAWSURFACE7 DirectDrawSurface = NULL; HWND hwnd; /* Preparations */ @@ -40,7 +40,17 @@ Desc.dwSize = sizeof (DDSURFACEDESC2); TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDraw->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 21:31:35 2007 @@ -22,7 +22,7 @@ { /*** FIXME: Also test with surface as parameter; try busy/locked surface as well ***/ LPDIRECTDRAW7 DirectDraw; - + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { @@ -34,12 +34,12 @@ /* The Test */ - // First try with some generic display modes + // First try with some generic display modes TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED ); TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0) == DD_OK ); - TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); + TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); // does this change the display mode to DDSCL_EXCLUSIVE ? @@ -55,3 +55,31 @@ return TRUE; } + +BOOL Test_GetMonitorFrequency (INT* passed, INT* failed) +{ + HWND hwnd; + DWORD lpdwFrequency; + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + if(!( hwnd = CreateBasicWindow() )) + { + printf("ERROR: Failed to create window\n"); + DirectDraw->Release(); + return FALSE; + } + + /* The Test */ + TEST ( DirectDraw->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK ); + TEST ( lpdwFrequency != 0 ); + + return TRUE; +}

1 0

[ion] 26757: - Fix critical bug in CmpCopyName, it wasn't compressing names at all. - Implement new cmlib routines: HvIsCellAllocated, Doesn't really work fully since we don't support mapped-file hives, but works for the kinds of hives we currently use. HvIsCellDirty, should work as expected. - Implement new cm routines: CmpMarkValueDataDirty, CmpFreeValueData, CmpFreeValue. There are generic so they can deal with Big, Small or Normal keys. - Implement CmpAddValueToList, CmpSetValueDataNew. - Ad
by ion＠svn.reactos.org 13 May '07

13 May '07

Author: ion Date: Sun May 13 20:58:54 2007 New Revision: 26757 URL: http://svn.reactos.org/svn/reactos?rev=26757&view=rev Log: - Fix critical bug in CmpCopyName, it wasn't compressing names at all. - Implement new cmlib routines: HvIsCellAllocated, Doesn't really work fully since we don't support mapped-file hives, but works for the kinds of hives we currently use. HvIsCellDirty, should work as expected. - Implement new cm routines: CmpMarkValueDataDirty, CmpFreeValueData, CmpFreeValue. There are generic so they can deal with Big, Small or Normal keys. - Implement CmpAddValueToList, CmpSetValueDataNew. - Add RtlCheckBit to winddk.h, it's inlined instead of being an actual function call. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun May 13 20:58:54 2007 @@ -4277,6 +4277,8 @@ PULONG Buffer; } RTL_BITMAP, *PRTL_BITMAP; +#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) + typedef struct _RTL_BITMAP_RUN { ULONG StartingIndex; ULONG NumberOfBits; @@ -5806,12 +5808,14 @@ IN ULONG Base OPTIONAL, IN OUT PULONG Value); +#if 0 NTSYSAPI ULONG NTAPI RtlCheckBit( IN PRTL_BITMAP BitMapHeader, IN ULONG BitPosition); +#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2675… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sun May 13 20:58:54 2007 @@ -183,6 +183,12 @@ SIZE_T Size, HV_STORAGE_TYPE Storage); +BOOLEAN CMAPI +HvIsCellAllocated( + IN PHHIVE RegistryHive, + IN HCELL_INDEX CellIndex +); + HCELL_INDEX CMAPI HvReallocateCell( PHHIVE RegistryHive, @@ -198,6 +204,12 @@ HvMarkCellDirty( PHHIVE RegistryHive, HCELL_INDEX CellOffset); + +BOOLEAN CMAPI +HvIsCellDirty( + IN PHHIVE Hive, + IN HCELL_INDEX Cell +); BOOLEAN CMAPI HvSyncHive( Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Sun May 13 20:58:54 2007 @@ -39,6 +39,32 @@ } } +BOOLEAN CMAPI +HvIsCellAllocated(IN PHHIVE RegistryHive, + IN HCELL_INDEX CellIndex) +{ + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + if (((CellIndex % ~HCELL_TYPE_MASK) > RegistryHive->Storage[Type].Length) || + (CellIndex % (RegistryHive->Version >= 2 ? 8 : 16))) + { + /* Invalid cell index */ + return FALSE; + } + + /* Try to get the cell block */ + Block = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + if (RegistryHive->Storage[Type].BlockList[Block].Block) return TRUE; + + /* No valid block, fail */ + return FALSE; +} + PVOID CMAPI HvGetCell( PHHIVE RegistryHive, @@ -92,6 +118,20 @@ RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); +} + +BOOLEAN CMAPI +HvIsCellDirty(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == HvVolatile) return TRUE; + + /* Check if the dirty bit is set */ + return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); } static ULONG __inline CMAPI Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Sun May 13 20:58:54 2007 @@ -39,6 +39,9 @@ #define HCELL_TYPE_SHIFT 31 #define HCELL_BLOCK_SHIFT 12 #define HCELL_OFFSET_SHIFT 0 + +#define HvGetCellType(Cell) \ + ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) #include <pshpack1.h> 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 Sun May 13 20:58:54 2007 @@ -35,6 +35,13 @@ #else #define CMTRACE(x, ...) DPRINT(__VA_ARGS__) #endif + + +// +// Hack since bigkeys are not yet supported +// +#define ASSERT_VALUE_BIG(h, s) \ + ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); // // Tag for all registry allocations @@ -678,6 +685,8 @@ extern KTIMER CmiWorkerTimer; VOID NTAPI CmiWorkerThread(IN PVOID Param); PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); +NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); +VOID CmiSyncHives(VOID); #define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// @@ -1010,6 +1019,34 @@ IN PHHIVE Hive, IN PCM_KEY_VALUE Value, OUT PULONG Length +); + +NTSTATUS +NTAPI +CmpSetValueDataNew( + IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell +); + +NTSTATUS +NTAPI +CmpAddValueToList( + IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpFreeValue( + IN PHHIVE Hive, + IN HCELL_INDEX Cell ); // Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Sun May 13 20:58:54 2007 @@ -45,7 +45,7 @@ } /* Copy this character */ - Destination[i] = Source->Buffer[i]; + ((PCHAR)Destination)[i] = (CHAR)(Source->Buffer[i]); } /* Compressed name, return length */ Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Sun May 13 20:58:54 2007 @@ -13,9 +13,87 @@ #define NDEBUG #include "debug.h" -/* GLOBALS *******************************************************************/ - /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpMarkValueDataDirty(IN PHHIVE Hive, + IN PCM_KEY_VALUE Value) +{ + ULONG KeySize; + PAGED_CODE(); + + /* Make sure there's actually any data */ + if (Value->Data != HCELL_NIL) + { + /* If this is a small key, there's no need to have it dirty */ + if (CmpIsKeyValueSmall(&KeySize, Value->DataLength)) return TRUE; + + /* Check if this is a big key */ + ASSERT_VALUE_BIG(Hive, KeySize); + + /* Normal value, just mark it dirty */ + HvMarkCellDirty(Hive, Value->Data); + } + + /* Operation complete */ + return TRUE; +} + +BOOLEAN +NTAPI +CmpFreeValueData(IN PHHIVE Hive, + IN HCELL_INDEX DataCell, + IN ULONG DataLength) +{ + ULONG KeySize; + PAGED_CODE(); + + /* If this is a small key, the data is built-in */ + if (!CmpIsKeyValueSmall(&KeySize, DataLength)) + { + /* If there's no data cell, there's nothing to do */ + if (DataCell == HCELL_NIL) return TRUE; + + /* Make sure the data cell is allocated */ + ASSERT(HvIsCellAllocated(Hive, DataCell)); + + /* Unsupported value type */ + ASSERT_VALUE_BIG(Hive, KeySize); + + /* Normal value, just free the data cell */ + HvFreeCell(Hive, DataCell); + } + + /* Operation complete */ + return TRUE; +} + +BOOLEAN +NTAPI +CmpFreeValue(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCM_KEY_VALUE Value; + PAGED_CODE(); + + /* Get the cell data */ + Value = (PCM_KEY_VALUE)HvGetCell(Hive, Cell); + if (!Value) ASSERT(FALSE); + + /* Free it */ + if (!CmpFreeValueData(Hive, Value->Data, Value->DataLength)) + { + /* We failed to free the data, return failure */ + HvReleaseCell(Hive, Cell); + return FALSE; + } + + /* Release the cell and free it */ + HvReleaseCell(Hive, Cell); + HvFreeCell(Hive, Cell); + return TRUE; +} HCELL_INDEX NTAPI @@ -67,13 +145,8 @@ return TRUE; } - /* Check if this is a big cell */ - if (CmpIsKeyValueBig(Hive, *Length)) - { - /* FIXME: We don't support big cells */ - DPRINT1("Unsupported cell type!\n"); - while (TRUE); - } + /* Unsupported */ + ASSERT_VALUE_BIG(Hive, *Length); /* Get the data from the cell */ *Buffer = HvGetCell(Hive, Value->Data); @@ -123,3 +196,114 @@ /* Otherwise, return the cell data */ return Buffer; } + +NTSTATUS +NTAPI +CmpAddValueToList(IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList) +{ + HCELL_INDEX ListCell; + ULONG ChildCount, Length, i; + PCELL_DATA CellData; + PAGED_CODE(); + + /* Sanity check */ + ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); + + /* Get the number of entries in the child list */ + ChildCount = ChildList->Count; + ChildCount++; + if (ChildCount > 1) + { + /* The cell should be dirty at this point */ + ASSERT(HvIsCellDirty(Hive, ChildList->List)); + + /* Check if we have less then 100 children */ + if (ChildCount < 100) + { + /* Allocate just enough as requested */ + Length = ChildCount * sizeof(HCELL_INDEX); + } + else + { + /* Otherwise, we have quite a few, so allocate a batch */ + Length = ROUND_UP(ChildCount, 100) * sizeof(HCELL_INDEX); + if (Length > HBLOCK_SIZE) + { + /* But make sure we don't allocate beyond our block size */ + Length = ROUND_UP(Length, HBLOCK_SIZE); + } + } + + /* Perform the allocation */ + ListCell = HvReallocateCell(Hive, ChildList->List, Length); + } + else + { + /* This is our first child, so allocate a single cell */ + ListCell = HvAllocateCell(Hive, sizeof(HCELL_INDEX), Type); + } + + /* Fail if we couldn't get a cell */ + if (!ListCell) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set this cell as the child list's list cell */ + ChildList->List = ListCell; + + /* Get the actual key list memory */ + CellData = HvGetCell(Hive, ListCell); + if (!CellData) ASSERT(FALSE); + + /* Loop all the children */ + for (i = ChildCount - 1; i > Index; i--) + { + /* Move them all down */ + CellData->u.KeyList[i] = CellData->u.KeyList[i - 1]; + } + + /* Insert us on top now */ + CellData->u.KeyList[Index] = ValueCell; + ChildList->Count = ChildCount; + + /* Release the list cell and make sure the value cell is dirty */ + HvReleaseCell(Hive, ListCell); + ASSERT(HvIsCellDirty(Hive, ValueCell)); + + /* We're done here */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpSetValueDataNew(IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell) +{ + PCELL_DATA CellData; + PAGED_CODE(); + ASSERT(DataSize > CM_KEY_VALUE_SMALL); + + /* Check if this is a big key */ + ASSERT_VALUE_BIG(Hive, DataSize); + + /* Allocate a data cell */ + *DataCell = HvAllocateCell(Hive, DataSize, StorageType); + if (*DataCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual data */ + CellData = HvGetCell(Hive, *DataCell); + if (!CellData) ASSERT(FALSE); + + /* Copy our buffer into it */ + RtlCopyMemory(CellData, Data, DataSize); + + /* All done */ + return STATUS_SUCCESS; +} +

1 0

[greatlrd] 26756: adding more check for createsurface
by greatlrd＠svn.reactos.org 13 May '07

13 May '07

Author: greatlrd Date: Sun May 13 20:51:15 2007 New Revision: 26756 URL: http://svn.reactos.org/svn/reactos?rev=26756&view=rev Log: adding more check for createsurface Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 20:51:15 2007 @@ -12,7 +12,7 @@ /* * all param have been checked if they are vaild before they are call to * Internal_CreateSurface, if not please fix the code in the functions - * call to Internal_CreateSurface, ppSurf are being vaildate in + * call to Internal_CreateSurface, ppSurf,pDDSD,pDDraw are being vaildate in * Internal_CreateSurface */ @@ -20,47 +20,69 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { + DDSURFACEDESC2 desc; + + /* Test se if the pointers are vaild */ + if ((IsBadReadPtr(pDDraw,sizeof(LPDDRAWI_DIRECTDRAW_INT))) || + (IsBadReadPtr(pDDSD,sizeof(LPDDSURFACEDESC2))) || + (IsBadWritePtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7))) || + (IsBadReadPtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7)))) + { + return DDERR_INVALIDPARAMS; + } + + /* make local backup of DDSURFACEDESC2 */ + RtlCopyMemory(&desc, pDDSD, sizeof(DDSURFACEDESC2)); /* * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY * if both are define ddraw.dll will return error code 0x88760064 */ - if ( (pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && - (pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if ( (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && + (desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { return DDERR_INVALIDCAPS; } /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ - if (pDDSD->dwFlags & DDSD_LPSURFACE) - { - - if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + if (desc.dwFlags & DDSD_LPSURFACE) + { + /* + * DDSD_LPSURFACE flag is set now we start vaildate see if + * pDDSD->lpSurface are a pointer or not + */ + if (IsBadReadPtr(desc.lpSurface,sizeof(LPVOID)) || + (desc.dwFlags - (desc.dwFlags & DDSD_ALL))) + { + return DDERR_INVALIDPARAMS; + } + + /* only support dx7 interface for DDSD_LPSURFACE older interface do not support it */ + if (pDDraw->lpVtbl != &DirectDraw7_Vtable) + { + return DDERR_INVALIDPARAMS; + } + + /* vaildate the caps */ + if (desc.ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) { return DDERR_INVALIDCAPS; } - /* - * DDSD_LPSURFACE flag is set now we start vaildate see if - * pDDSD->lpSurface are a pointer or not - */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || - (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) - { - return DDERR_INVALIDPARAMS; - } - /* more code will follow */ } else { - /* - * DDSD_LPSURFACE flag is not set we do not handler this case yet - */ - - /* more code will follow */ - } + /* + * DDSD_LPSURFACE flag are not set + * remove all wrong flags are being set + */ + + desc.dwFlags = desc.dwFlags & DDSD_ALL; + } + + return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun May 13 20:51:15 2007 @@ -18,6 +18,7 @@ extern WCHAR classname[128]; extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; +extern IDirectDraw7Vtbl DirectDraw7_Vtable; HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable);

1 0

[mbosma] 26755: Beginning of CreateSurface test.
by mbosma＠svn.reactos.org 13 May '07

13 May '07

Author: mbosma Date: Sun May 13 20:37:58 2007 New Revision: 26755 URL: http://svn.reactos.org/svn/reactos?rev=26755&view=rev Log: Beginning of CreateSurface test. Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun May 13 20:37:58 2007 @@ -7,13 +7,15 @@ /* include the tests */ #include "tests/CreateDDraw.cpp" #include "tests/DisplayModes.cpp" +#include "tests/CreateSurface.cpp" /* The List of tests */ TEST TestList[] = { { "DirectDrawCreate(Ex)", Test_CreateDDraw }, { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, - // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes } // uncomment this test if you have enough time and patience + // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes }, // uncomment this test if you have enough time and patience + { "IDirectDraw::CreateSurface", Test_CreateSurface } }; /* The function that gives us the number of tests */ Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (added) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 20:37:58 2007 @@ -1,0 +1,46 @@ + +HWND CreateBasicWindow (VOID); + +BOOL Test_CreateSurface (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + LPDIRECTDRAWSURFACE7 DirectDrawSurface; + HWND hwnd; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + if(!( hwnd = CreateBasicWindow() )) + { + printf("ERROR: Failed to create window\n"); + DirectDraw->Release(); + return FALSE; + } + + if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) + { + printf("ERROR: you not set cooperative level\n"); + DirectDraw->Release(); + return 0; + } + + /* The Test */ + + DDSURFACEDESC2 Desc = { 0 }; + + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION ); + TEST ( DirectDraw->CreateSurface(NULL, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->CreateSurface(&Desc, NULL, NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + + Desc.dwSize = sizeof (DDSURFACEDESC2); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 20:37:58 2007 @@ -42,6 +42,8 @@ TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); + // does this change the display mode to DDSCL_EXCLUSIVE ? + // Now try getting vaild modes from driver TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );

1 0

[hpoussin] 26754: Move itss.idl to the place it belongs
by hpoussin＠svn.reactos.org 13 May '07

13 May '07

Author: hpoussin Date: Sun May 13 18:38:27 2007 New Revision: 26754 URL: http://svn.reactos.org/svn/reactos?rev=26754&view=rev Log: Move itss.idl to the place it belongs Added: trunk/reactos/include/reactos/wine/itss.idl - copied unchanged from r26686, trunk/reactos/dll/win32/hhctrl.ocx/itss.idl trunk/reactos/include/reactos/wine/wineheaders.rbuild (with props) Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/include/reactos/reactos.rbuild trunk/reactos/include/reactos/wine/ (props changed) Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Sun May 13 18:38:27 2007 @@ -8,6 +8,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <dependency>wineheaders</dependency> <library>wine</library> <library>uuid</library> <library>kernel32</library> @@ -27,7 +28,6 @@ <file>hhctrl.c</file> <file>regsvr.c</file> <file>webbrowser.c</file> - <file>itss.idl</file> <file>hhctrl.rc</file> <file>hhctrl.ocx.spec</file> </module> Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/itss.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (removed) @@ -1,95 +1,0 @@ -/* - * Copyright (C) 2004 Mike McCormack - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "oaidl.idl"; - -typedef struct _ITS_Control_Data -{ - UINT cdwControlData; - UINT adwControlData[1]; - -} ITS_Control_Data, *PITS_Control_Data; - -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH -} ECompactionLev; - -[ - object, - uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), - pointer_default(unique) -] -interface IITStorage : IUnknown -{ - HRESULT StgCreateDocfile( - [in] const WCHAR * pwcsName, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgCreateDocfileOnILockBytes( - [in] ILockBytes * plkbyt, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - - HRESULT StgIsStorageFile( - [in] const WCHAR * pwcsName); - - HRESULT StgIsStorageILockBytes( - [in] ILockBytes * plkbyt); - - HRESULT StgOpenStorage( - [in] const WCHAR * pwcsName, - [in] IStorage * pstgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgOpenStorageOnILockBytes( - [in] ILockBytes * plkbyt, - [in] IStorage * pStgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgSetTimes( - [in] WCHAR const * lpszName, - [in] FILETIME const * pctime, - [in] FILETIME const * patime, - [in] FILETIME const * pmtime); - - HRESULT SetControlData( - [in] PITS_Control_Data pControlData); - - HRESULT DefaultControlData( - [out] PITS_Control_Data * ppControlData); - - HRESULT Compact( - [in] const WCHAR * pwcsName, - [in] ECompactionLev iLev); -} - -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") Modified: trunk/reactos/include/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactos.rb… ============================================================================== --- trunk/reactos/include/reactos/reactos.rbuild (original) +++ trunk/reactos/include/reactos/reactos.rbuild Sun May 13 18:38:27 2007 @@ -1,3 +1,8 @@ +<group> <directory name="idl"> <xi:include href="idl/idl.rbuild" /> </directory> +<directory name="wine"> + <xi:include href="wine/wineheaders.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/include/reactos/wine/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun May 13 18:38:27 2007 @@ -1,0 +1,1 @@ +itss.h Added: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh… ============================================================================== --- trunk/reactos/include/reactos/wine/wineheaders.rbuild (added) +++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Sun May 13 18:38:27 2007 @@ -1,0 +1,3 @@ +<module name="wineheaders" type="idlheader"> + <file>itss.idl</file> +</module> Propchange: trunk/reactos/include/reactos/wine/wineheaders.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26753: adding more check
by greatlrd＠svn.reactos.org 13 May '07

13 May '07

Author: greatlrd Date: Sun May 13 17:14:54 2007 New Revision: 26753 URL: http://svn.reactos.org/svn/reactos?rev=26753&view=rev Log: adding more check Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 17:14:54 2007 @@ -34,11 +34,19 @@ /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ if (pDDSD->dwFlags & DDSD_LPSURFACE) { + + if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) + { + return DDERR_INVALIDCAPS; + } + /* * DDSD_LPSURFACE flag is set now we start vaildate see if * pDDSD->lpSurface are a pointer or not */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID))) + if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || + (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) { return DDERR_INVALIDPARAMS; }

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