Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 29987: Try to unbreak build by adding the -Iinclude/psdk line again. Build has been broken by hpoussin's commit in r29976. As stated before, Wine components like the "winnt.h" file in include/reactos/wine still refer to include/psdk components (in this case by an #include_next "winnt.h" line). This has to be fixed first. Build probably worked successfully with older RosBE-Windows versions, since they put the include directory to the bundled w32api header files in the global C_INCLUDE_PA
by cfinck＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: cfinck Date: Wed Oct 31 00:23:11 2007 New Revision: 29987 URL: http://svn.reactos.org/svn/reactos?rev=29987&view=rev Log: Try to unbreak build by adding the -Iinclude/psdk line again. Build has been broken by hpoussin's commit in r29976. As stated before, Wine components like the "winnt.h" file in include/reactos/wine still refer to include/psdk components (in this case by an #include_next "winnt.h" line). This has to be fixed first. Build probably worked successfully with older RosBE-Windows versions, since they put the include directory to the bundled w32api header files in the global C_INCLUDE_PATH environment variable. Modified: trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=29… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Oct 31 00:23:11 2007 @@ -59,7 +59,7 @@ WIDL_HOST_CFLAGS = \ -DINT16=SHORT -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude/psdk \ -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[fireball] 29986: - Start using members inside the KCB instead of the PKEY_OBJECT. - Remove DummyKcb hacks since we now have a real, valid KCB. - Get rid of the cm worker thread and related code, this should fix a couple of random registry bugchecks and corruption. - This is a slow transition to using CM_KEY_BODY and KCB.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 23:50:18 2007 New Revision: 29986 URL: http://svn.reactos.org/svn/reactos?rev=29986&view=rev Log: - Start using members inside the KCB instead of the PKEY_OBJECT. - Remove DummyKcb hacks since we now have a real, valid KCB. - Get rid of the cm worker thread and related code, this should fix a couple of random registry bugchecks and corruption. - This is a slow transition to using CM_KEY_BODY and KCB. Modified: 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/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.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 Tue Oct 30 23:50:18 2007 @@ -149,6 +149,7 @@ KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedClass = {0}; HANDLE hKey; + PCM_KEY_NODE Node, ParentNode; PAGED_CODE(); @@ -237,7 +238,7 @@ if (RemainingPath.Length == 0) { /* Fail if the key has been deleted */ - if (((PKEY_OBJECT) Object)->Flags & KO_MARKED_FOR_DELETE) + if (((PKEY_OBJECT) Object)->KeyControlBlock->Delete) { PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; @@ -305,8 +306,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Create the key */ - Status = CmpDoCreate(&((PKEY_OBJECT)Object)->RegistryHive->Hive, - ((PKEY_OBJECT)Object)->KeyCellOffset, + Status = CmpDoCreate(((PKEY_OBJECT)Object)->KeyControlBlock->KeyHive, + ((PKEY_OBJECT)Object)->KeyControlBlock->KeyCell, NULL, &RemainingPath, KernelMode, @@ -332,10 +333,17 @@ RtlCreateUnicodeString(&KeyObject->Name, Start); - KeyObject->KeyCell->Parent = KeyObject->ParentKey->KeyCellOffset; - KeyObject->KeyCell->Security = KeyObject->ParentKey->KeyCell->Security; - KeyObject->ValueCache.ValueList = KeyObject->KeyCell->ValueList.List; - KeyObject->ValueCache.Count = KeyObject->KeyCell->ValueList.Count; + ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->ParentKey->KeyControlBlock->KeyHive, + KeyObject->ParentKey->KeyControlBlock->KeyCell); + + Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, + KeyObject->KeyControlBlock->KeyCell); + + Node->Parent = KeyObject->ParentKey->KeyControlBlock->KeyCell; + Node->Security = ParentNode->Security; + + KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; + KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; DPRINT("RemainingPath: %wZ\n", &RemainingPath); @@ -435,7 +443,7 @@ VERIFY_KEY_OBJECT(KeyObject); - RegistryHive = KeyObject->RegistryHive; + RegistryHive = (PCMHIVE)KeyObject->KeyControlBlock->KeyHive; /* Acquire hive lock */ KeEnterCriticalRegion(); @@ -576,7 +584,7 @@ RtlFreeUnicodeString(&RemainingPath); /* Fail if the key has been deleted */ - if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) + if (((PKEY_OBJECT)Object)->KeyControlBlock->Delete) { Status = STATUS_UNSUCCESSFUL; goto openkey_cleanup; @@ -708,17 +716,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmDeleteKey(&DummyKcb); + Status = CmDeleteKey(KeyObject->KeyControlBlock); /* Remove the keep-alive reference */ ObDereferenceObject(KeyObject); - if (KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive) + if (KeyObject->KeyControlBlock->KeyHive != + KeyObject->ParentKey->KeyControlBlock->KeyHive) { /* Dereference again */ ObDereferenceObject(KeyObject); @@ -777,13 +781,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmEnumerateKey(&DummyKcb, + Status = CmEnumerateKey(KeyObject->KeyControlBlock, Index, KeyInformationClass, KeyInformation, @@ -845,13 +844,8 @@ &EnumerateValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmEnumerateValueKey(&DummyKcb, + Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, Index, KeyValueInformationClass, KeyValueInformation, @@ -911,13 +905,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmQueryKey(&DummyKcb, + Status = CmQueryKey(KeyObject->KeyControlBlock, KeyInformationClass, KeyInformation, Length, @@ -976,13 +965,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmQueryValueKey(&DummyKcb, + Status = CmQueryValueKey(KeyObject->KeyControlBlock, *ValueName, KeyValueInformationClass, KeyValueInformation, @@ -1044,14 +1028,9 @@ /* Do the callback */ Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); if (NT_SUCCESS(Status)) - { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - + { /* Call the internal API */ - Status = CmSetValueKey(&DummyKcb, + Status = CmSetValueKey(KeyObject->KeyControlBlock, ValueName, Type, Data, @@ -1100,13 +1079,8 @@ &DeleteValueKeyInfo); if (NT_SUCCESS(Status)) { - /* HACK: Setup the Dummy KCB */ - CM_KEY_CONTROL_BLOCK DummyKcb = {0}; - DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; - DummyKcb.KeyCell = KeyObject->KeyCellOffset; - /* Call the internal API */ - Status = CmDeleteValueKey(&DummyKcb, *ValueName); + Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); /* Do the post callback */ PostOperationInfo.Object = (PVOID)KeyObject; 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 Tue Oct 30 23:50:18 2007 @@ -34,10 +34,8 @@ ERESOURCE CmpRegistryLock; -KTIMER CmiWorkerTimer; LIST_ENTRY CmiKeyObjectListHead; LIST_ENTRY CmiConnectedHiveList; -ULONG CmiTimer = 0; /* gets incremented every 5 seconds (CmiWorkerTimer) */ volatile BOOLEAN CmiHiveSyncEnabled = FALSE; volatile BOOLEAN CmiHiveSyncPending = FALSE; @@ -53,136 +51,6 @@ extern LIST_ENTRY CmiCallbackHead; extern FAST_MUTEX CmiCallbackLock; - -/* FUNCTIONS ****************************************************************/ - -/* Debugging helper functions: */ -/* CmiVerifyHiveListIntegrity */ -/* CmiVerifyHiveListIntegrityWhileLocked */ -/* These functions are normally unused. However, should any of the asserts */ -/* checking for registry loops in CmiWorkerThread start to trigger, it is */ -/* recommended to add liberal amounts of calls to this function throughout */ -/* suspect code. This function is due to its iterative nature not intended */ -/* to be called during normal circumstances, but as a debugging aid. */ -static -VOID -NTAPI -CmipVerifyHiveListIntegrity(BOOLEAN IsLocked) -{ - PLIST_ENTRY CurrentEntry; - if (!IsLocked) - { - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - } - - if (IsListEmpty(&CmiKeyObjectListHead)) - { - ASSERT(CmiKeyObjectListHead.Blink == CmiKeyObjectListHead.Flink); - } - /* walk the list both forwards and backwards */ - CurrentEntry = CmiKeyObjectListHead.Flink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - ASSERT(CurrentEntry->Blink != CurrentEntry); - ASSERT(CurrentEntry->Flink != CurrentEntry); - CurrentEntry = CurrentEntry->Flink; - } - - CurrentEntry = CmiKeyObjectListHead.Blink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - ASSERT(CurrentEntry->Blink != CurrentEntry); - ASSERT(CurrentEntry->Flink != CurrentEntry); - CurrentEntry = CurrentEntry->Blink; - } - - if (!IsLocked) - { - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - } -} - -VOID NTAPI CmiVerifyHiveListIntegrity() { CmipVerifyHiveListIntegrity(FALSE); } -VOID NTAPI CmiVerifyHiveListIntegrityWhileLocked() { CmipVerifyHiveListIntegrity(TRUE); } - - - -VOID -NTAPI -CmiWorkerThread(PVOID Param) -{ - NTSTATUS Status; - PLIST_ENTRY CurrentEntry; - PKEY_OBJECT CurrentKey; - ULONG Count; /* how many objects have been dereferenced each pass */ - - /* Loop forever, getting woken up every 5 seconds by CmiWorkerTimer */ - - while (1) - { - Status = KeWaitForSingleObject(&CmiWorkerTimer, - Executive, - KernelMode, - FALSE, - NULL); - if (Status == STATUS_SUCCESS) - { - DPRINT("CmiWorkerThread\n"); - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - CmiTimer++; - - Count = 0; - CurrentEntry = CmiKeyObjectListHead.Blink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); - if (CurrentKey->TimeStamp + 120 > CmiTimer) - { - /* The object was accessed in the last 10min */ - break; - } - if (1 == ObGetObjectPointerCount(CurrentKey) && - !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) - { - /* PointerCount is 1, and it's not marked for delete */ - ObDereferenceObject(CurrentKey); - if (CurrentEntry == CmiKeyObjectListHead.Blink) - { - DPRINT("Registry loop detected! Crashing\n"); - KEBUGCHECK(0); - } - CurrentEntry = CmiKeyObjectListHead.Blink; - Count++; - } - else - { - /* PointerCount was not 1, or it was marked for delete */ - if (CurrentEntry == CurrentEntry->Blink) - { - DPRINT("Registry loop detected! Crashing\n"); - KEBUGCHECK(0); - } - CurrentEntry = CurrentEntry->Blink; - } - } - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - DPRINT("Removed %d key objects\n", Count); - } - else - { - KEBUGCHECK(0); - } - } -} PVOID NTAPI @@ -234,7 +102,7 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Insert it into the global list (we don't have KCBs here) */ - InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); + InsertTailList(&CmiKeyObjectListHead, &KeyObject->KeyBodyList); ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -338,8 +206,8 @@ DPRINT ("SubName %S\n", SubName); /* Create the key */ - Status = CmpDoCreate(&ParentKey->RegistryHive->Hive, - ParentKey->KeyCellOffset, + Status = CmpDoCreate(ParentKey->KeyControlBlock->KeyHive, + ParentKey->KeyControlBlock->KeyCell, NULL, &RemainingPath, KernelMode, @@ -356,9 +224,8 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NewKey->KeyCellOffset = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyCell = (PVOID)HvGetCell(&RegistryHive->Hive, NewKey->KeyCellOffset); - NewKey->RegistryHive = RegistryHive; + NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; Status = RtlpCreateUnicodeString(&NewKey->Name, SubName, NonPagedPool); 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 Tue Oct 30 23:50:18 2007 @@ -366,7 +366,8 @@ UNICODE_STRING KeyName; PWSTR *Path = &RemainingName->Buffer; PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb; - + PCM_KEY_NODE Node; + ParsedKey = ParsedObject; VERIFY_KEY_OBJECT(ParsedKey); @@ -422,8 +423,11 @@ if (FoundObject == NULL) { /* Search for the subkey */ - BlockOffset = CmpFindSubKeyByName(&ParsedKey->RegistryHive->Hive, - ParsedKey->KeyCell, + Node = (PCM_KEY_NODE)HvGetCell(ParsedKey->KeyControlBlock->KeyHive, + ParsedKey->KeyControlBlock->KeyCell); + + BlockOffset = CmpFindSubKeyByName(ParsedKey->KeyControlBlock->KeyHive, + Node, &KeyName); if (BlockOffset == HCELL_NIL) { @@ -434,13 +438,13 @@ } /* Get the node */ - SubKeyCell = (PCM_KEY_NODE)HvGetCell(&ParsedKey->RegistryHive->Hive, BlockOffset); + SubKeyCell = (PCM_KEY_NODE)HvGetCell(ParsedKey->KeyControlBlock->KeyHive, BlockOffset); if ((SubKeyCell->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) { RtlInitUnicodeString(&LinkPath, NULL); - Status = CmiGetLinkTarget(ParsedKey->RegistryHive, + Status = CmiGetLinkTarget((PCMHIVE)ParsedKey->KeyControlBlock->KeyHive, SubKeyCell, &LinkPath); if (NT_SUCCESS(Status)) @@ -520,7 +524,7 @@ ObReferenceObject(FoundObject); /* Create the KCB */ - Kcb = CmpCreateKeyControlBlock(&ParsedKey->RegistryHive->Hive, + Kcb = CmpCreateKeyControlBlock(ParsedKey->KeyControlBlock->KeyHive, BlockOffset, SubKeyCell, ParentKcb, @@ -535,25 +539,25 @@ } FoundObject->KeyControlBlock = Kcb; - FoundObject->Flags = 0; - FoundObject->KeyCell = SubKeyCell; - FoundObject->KeyCellOffset = BlockOffset; - FoundObject->RegistryHive = ParsedKey->RegistryHive; - InsertTailList(&CmiKeyObjectListHead, &FoundObject->ListEntry); + ASSERT(FoundObject->KeyControlBlock->KeyHive == ParsedKey->KeyControlBlock->KeyHive); + InsertTailList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); RtlpCreateUnicodeString(&FoundObject->Name, KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); DPRINT("Created object 0x%p\n", FoundObject); } else { - if ((FoundObject->KeyCell->Flags & KEY_SYM_LINK) && + Node = (PCM_KEY_NODE)HvGetCell(FoundObject->KeyControlBlock->KeyHive, + FoundObject->KeyControlBlock->KeyCell); + + if ((Node->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) { DPRINT("Found link\n"); RtlInitUnicodeString(&LinkPath, NULL); - Status = CmiGetLinkTarget(FoundObject->RegistryHive, - FoundObject->KeyCell, + Status = CmiGetLinkTarget((PCMHIVE)FoundObject->KeyControlBlock->KeyHive, + Node, &LinkPath); if (NT_SUCCESS(Status)) { @@ -598,9 +602,8 @@ } } - RemoveEntryList(&FoundObject->ListEntry); - InsertHeadList(&CmiKeyObjectListHead, &FoundObject->ListEntry); - FoundObject->TimeStamp = CmiTimer; + RemoveEntryList(&FoundObject->KeyBodyList); + InsertHeadList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -650,10 +653,10 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - RemoveEntryList(&KeyObject->ListEntry); + RemoveEntryList(&KeyObject->KeyBodyList); RtlFreeUnicodeString(&KeyObject->Name); - ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); + ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); ObDereferenceObject (ParentKeyObject); @@ -812,7 +815,7 @@ if (Index < Parent->SubKeyCounts) { - if (CurKey->Flags & KO_MARKED_FOR_DELETE) + if (CurKey->KeyControlBlock->Delete) { CHECKPOINT; *ReturnedObject = NULL; 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 Tue Oct 30 23:50:18 2007 @@ -505,21 +505,13 @@ #define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) typedef struct _KEY_OBJECT { - CSHORT Type; - CSHORT Size; - ULONG Flags; + ULONG Type; UNICODE_STRING Name; - PCMHIVE RegistryHive; - HCELL_INDEX KeyCellOffset; - PCM_KEY_NODE KeyCell; struct _KEY_OBJECT *ParentKey; - LIST_ENTRY ListEntry; + LIST_ENTRY KeyBodyList; ULONG SubKeyCounts; ULONG SizeOfSubKeys; struct _KEY_OBJECT **SubKeys; - ULONG TimeStamp; - LIST_ENTRY HiveList; - CACHED_CHILD_LIST ValueCache; PCM_KEY_CONTROL_BLOCK KeyControlBlock; } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Tue Oct 30 23:50:18 2007 @@ -230,15 +230,11 @@ /* Now fill out the Cm object */ KeyBody->KeyControlBlock = Kcb; - KeyBody->KeyCell = KeyNode; - KeyBody->KeyCellOffset = *KeyCell; - KeyBody->Flags = 0; KeyBody->SubKeyCounts = 0; KeyBody->SubKeys = NULL; KeyBody->SizeOfSubKeys = 0; KeyBody->ParentKey = Parent; - KeyBody->RegistryHive = KeyBody->ParentKey->RegistryHive; - InsertTailList(&CmiKeyObjectListHead, &KeyBody->ListEntry); + InsertTailList(&CmiKeyObjectListHead, &KeyBody->KeyBodyList); Quickie: /* Check if we got here because of failure */ @@ -290,8 +286,7 @@ ExAcquirePushLockShared((PVOID)&((PCMHIVE)Hive)->FlusherLock); /* Check if the parent is being deleted */ - #define KO_MARKED_FOR_DELETE 0x00000001 - if (Parent->Flags & KO_MARKED_FOR_DELETE) + if (Parent->KeyControlBlock->Delete) { /* It has, quit */ ASSERT(FALSE); @@ -319,7 +314,7 @@ } /* Sanity check */ - ASSERT(Cell == Parent->KeyCellOffset); + ASSERT(Cell == Parent->KeyControlBlock->KeyCell); /* Get the parent type */ ParentType = HvGetCellType(Cell); @@ -332,7 +327,7 @@ } /* Don't allow children under symlinks */ - if (Parent->Flags & KEY_SYM_LINK) + if (Parent->KeyControlBlock->Flags & KEY_SYM_LINK) { /* Fail */ ASSERT(FALSE); @@ -376,8 +371,8 @@ } /* Sanity checks */ - ASSERT(KeyBody->ParentKey->KeyCellOffset == Cell); - ASSERT(&KeyBody->ParentKey->RegistryHive->Hive == Hive); + ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyCell == Cell); + ASSERT(KeyBody->ParentKey->KeyControlBlock->KeyHive == Hive); ASSERT(KeyBody->ParentKey == Parent); /* Update the timestamp */ 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 Tue Oct 30 23:50:18 2007 @@ -708,19 +708,14 @@ if (!Kcb) return FALSE; /* Initialize the object */ -#if 0 RootKey->Type = TAG('k', 'v', '0', '2'); RootKey->KeyControlBlock = Kcb; +#if 0 RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - RootKey->KeyControlBlock = Kcb; - RootKey->RegistryHive = CmiVolatileHive; - RootKey->KeyCellOffset = RootIndex; - RootKey->KeyCell = KeyCell; RootKey->ParentKey = RootKey; - RootKey->Flags = 0; RootKey->SubKeyCounts = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; @@ -759,9 +754,6 @@ UNICODE_STRING KeyName; HANDLE KeyHandle; NTSTATUS Status; - LARGE_INTEGER DueTime; - HANDLE ThreadHandle; - CLIENT_ID ThreadId; PCMHIVE HardwareHive; PVOID BaseAddress; ULONG Length; @@ -806,23 +798,6 @@ /* OLD CM: Initialize the key object list */ InitializeListHead(&CmiKeyObjectListHead); InitializeListHead(&CmiConnectedHiveList); - - /* OLD CM: Initialize the worker timer */ - KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); - - /* OLD CM: Initialize the worker thread */ - Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ThreadId, - CmiWorkerThread, - NULL); - if (!NT_SUCCESS(Status)) return FALSE; - - /* OLD CM: Start the timer */ - DueTime.QuadPart = -1; - KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ #endif /* Create the key object types */

1 0

[fireball] 29985: - Fix my mistakes when changing type of the Name field. LiveCD / make install_registry now works again. - Convert one more sizeof to FIELD_OFFSET (though sizeof() was operating properly in this particular case). See issue #2780 for more details.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 23:24:27 2007 New Revision: 29985 URL: http://svn.reactos.org/svn/reactos?rev=29985&view=rev Log: - Fix my mistakes when changing type of the Name field. LiveCD / make install_registry now works again. - Convert one more sizeof to FIELD_OFFSET (though sizeof() was operating properly in this particular case). See issue #2780 for more details. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=299… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Tue Oct 30 23:24:27 2007 @@ -278,7 +278,7 @@ Status = STATUS_SUCCESS; Storage = (CreateOptions & REG_OPTION_VOLATILE) ? Volatile : Stable; - NewBlockSize = sizeof(CM_KEY_NODE) + NameLength; + NewBlockSize = FIELD_OFFSET(CM_KEY_NODE, Name) + NameLength; NKBOffset = HvAllocateCell(&RegistryHive->Hive, NewBlockSize, Storage, HCELL_NIL); if (NKBOffset == HCELL_NIL) { @@ -450,7 +450,7 @@ for (i = 0; i < KeyCell->NameLength; i++) { - if (((PCHAR)KeyName->Buffer)[i] != (WCHAR)KeyCell->Name[i]) + if (KeyName->Buffer[i] != ((PCHAR)KeyCell->Name)[i]) return FALSE; } } @@ -488,8 +488,8 @@ /* FIXME: use _strnicmp */ for (i = 0; i < KeyCell->NameLength; i++) { - if (RtlUpcaseUnicodeChar(((PCHAR)KeyName->Buffer)[i]) != - RtlUpcaseUnicodeChar((WCHAR)KeyCell->Name[i])) + if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != + RtlUpcaseUnicodeChar(((PCHAR)KeyCell->Name)[i])) return FALSE; } }

1 0

[janderwald] 29984: - silence debug messages
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 22:09:27 2007 New Revision: 29984 URL: http://svn.reactos.org/svn/reactos?rev=29984&view=rev Log: - silence debug messages Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Tue Oct 30 22:09:27 2007 @@ -295,7 +295,7 @@ PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; - DPRINT1("LsaLookupSids(): stub. Always returning 'Administrator'\n"); + DPRINT("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) return STATUS_NONE_MAPPED; LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); @@ -354,7 +354,7 @@ static int count = 0; if (count++ < 20) { - DPRINT1("LsaOpenPolicy - stub\n"); + DPRINT("LsaOpenPolicy - stub\n"); } return STATUS_SUCCESS; }

1 0

[janderwald] 29983: - fix identation
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 22:08:00 2007 New Revision: 29983 URL: http://svn.reactos.org/svn/reactos?rev=29983&view=rev Log: - fix identation Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue Oct 30 22:08:00 2007 @@ -254,7 +254,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Zeichentabelle.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" END

1 0

[fireball] 29982: - Fix incorrect size calculation.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 21:41:34 2007 New Revision: 29982 URL: http://svn.reactos.org/svn/reactos?rev=29982&view=rev Log: - Fix incorrect size calculation. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=299… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Tue Oct 30 21:41:34 2007 @@ -201,7 +201,7 @@ Status = STATUS_SUCCESS; *HashBlock = NULL; - NewHashSize = sizeof(CM_KEY_FAST_INDEX) + + NewHashSize = FIELD_OFFSET(CM_KEY_FAST_INDEX, List) + (SubKeyCount * sizeof(CM_INDEX)); *HBOffset = HvAllocateCell(&RegistryHive->Hive, NewHashSize, Storage, HCELL_NIL);

1 0

[janderwald] 29981: - populate Open With with found entries - see http://windowsxp.mvps.org/OpenWith.htm - silence debug messages - invoke shell extension's InvokeCommand on a event
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 21:35:02 2007 New Revision: 29981 URL: http://svn.reactos.org/svn/reactos?rev=29981&view=rev Log: - populate Open With with found entries - see http://windowsxp.mvps.org/OpenWith.htm - silence debug messages - invoke shell extension's InvokeCommand on a event Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Tue Oct 30 21:35:02 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define YDEBUG +//#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -46,8 +46,10 @@ const IShellExtInitVtbl *lpvtblShellExtInit; LONG wId; volatile LONG ref; + WCHAR ** szArray; + UINT size; + UINT count; } SHEOWImpl; - static const IShellExtInitVtbl eivt; static const IContextMenu2Vtbl cmvt; @@ -145,7 +147,8 @@ { UINT count = 0; MENUITEMINFOW mii; - WCHAR szBuffer[50]; + WCHAR szBuffer[MAX_PATH]; + UINT index; static const WCHAR szChoose[] = { 'C','h','o','o','s','e',' ','P','r','o','g','r','a','m','.','.','.',0 }; ZeroMemory(&mii, sizeof(mii)); @@ -153,7 +156,25 @@ mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; mii.fType = MFT_STRING; mii.fState = MFS_ENABLED; - mii.wID = idCmdFirst; + + for (index = 0; index < This->count; index++) + { + mii.wID = idCmdFirst; + mii.dwTypeData = (LPWSTR)This->szArray[index]; + if (InsertMenuItemW(hMenu, -1, TRUE, &mii)) + { + idCmdFirst++; + count++; + } + } + + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.fType = MFT_SEPARATOR; + mii.wID = -1; + InsertMenuItemW(hMenu, -1, TRUE, &mii); + + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mii.fType = MFT_STRING; if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH_CHOOSE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) { @@ -161,8 +182,9 @@ wcscpy(szBuffer, szChoose); } + mii.wID = idCmdFirst; mii.dwTypeData = (LPWSTR)szBuffer; - if (InsertMenuItemW(hMenu, 0, TRUE, &mii)) + if (InsertMenuItemW(hMenu, -1, TRUE, &mii)) count++; return count; @@ -180,6 +202,7 @@ MENUITEMINFOW mii; USHORT items = 0; WCHAR szBuffer[100]; + BOOL bDefault = FALSE; HMENU hSubMenu = NULL; SHEOWImpl *This = impl_from_IContextMenu(iface); @@ -190,14 +213,26 @@ return E_FAIL; } - - hSubMenu = CreatePopupMenu(); - if (hSubMenu == NULL) - { - ERR("failed to create submenu"); - return E_FAIL; - } - items = AddItems(This, hSubMenu, idCmdFirst); + if (This->count) + { + hSubMenu = CreatePopupMenu(); + if (hSubMenu == NULL) + { + ERR("failed to create submenu"); + return E_FAIL; + } + items = AddItems(This, hSubMenu, idCmdFirst + 1); + } + else + { + /* no file association found */ + UINT pos = GetMenuDefaultItem(hmenu, TRUE, 0); + if (pos != -1) + { + /* replace default item with "Open With" action */ + bDefault = DeleteMenu(hmenu, pos, MF_BYPOSITION); + } + } ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -209,7 +244,14 @@ } mii.dwTypeData = (LPWSTR) szBuffer; mii.fState = MFS_ENABLED; - mii.wID = idCmdFirst + items; + if (bDefault) + { + mii.fState |= MFS_DEFAULT; + } + + mii.wID = idCmdFirst; + This->wId = idCmdFirst; + mii.fType = MFT_STRING; if (InsertMenuItemW( hmenu, 0, TRUE, &mii)) items++; @@ -222,10 +264,21 @@ SHEOWCm_fnInvokeCommand( IContextMenu2* iface, LPCMINVOKECOMMANDINFO lpici ) { SHEOWImpl *This = impl_from_IContextMenu(iface); - - TRACE("This %p\n", This); - - return E_FAIL; + TRACE("This %p wId %x count %u verb %x\n", This, This->wId, This->count, LOWORD(lpici->lpVerb)); + + if (This->wId > LOWORD(lpici->lpVerb) || This->count + This->wId < LOWORD(lpici->lpVerb)) + return E_FAIL; + + if (This->wId == LOWORD(lpici->lpVerb)) + { + /* show Open As dialog */ + return S_OK; + } + else + { + /* show program select dialog */ + return S_OK; + } } static HRESULT WINAPI @@ -264,6 +317,329 @@ SHEOWCm_fnHandleMenuMsg }; +BOOL +SHEOW_ResizeArray(SHEOWImpl *This) +{ + WCHAR ** new_array; + UINT ncount; + + if (This->count == 0) + ncount = 10; + else + ncount = This->count * 2; + + new_array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ncount * sizeof(WCHAR*)); + + if (!new_array) + return FALSE; + + if (This->szArray) + { + memcpy(new_array, This->szArray, This->count * sizeof(WCHAR*)); + HeapFree(GetProcessHeap(), 0, This->szArray); + } + + This->szArray = new_array; + This->size = ncount; + return TRUE; +} + + +void +SHEOW_AddOWItem(SHEOWImpl *This, WCHAR * szAppName) +{ + UINT index; + WCHAR * szPtr; + + if (This->count + 1 >= This->size || !This->szArray) + { + if (!SHEOW_ResizeArray(This)) + return; + } + + szPtr = wcsrchr(szAppName, '.'); + if (szPtr) + { + szPtr[0] = 0; + } + + for(index = 0; index < This->count; index++) + { + if (!wcsicmp(This->szArray[index], szAppName)) + return; + } + This->szArray[This->count] = wcsdup(szAppName); + + if (This->szArray[This->count]) + This->count++; +} + +UINT +SHEW_AddOpenWithProgId(SHEOWImpl *This, HKEY hKey) +{ + FIXME("implement me :)))\n"); + return 0; +} + + +UINT +SHEW_AddOpenWithItem(SHEOWImpl *This, HKEY hKey) +{ + + UINT NumItems = 0; + DWORD dwIndex = 0; + DWORD dwName, dwValue; + LONG result = ERROR_SUCCESS; + WCHAR szName[10]; + WCHAR szValue[MAX_PATH]; + WCHAR szMRUList[MAX_PATH] = {0}; + + static const WCHAR szMRU[] = {'M','R','U','L','i','s','t', 0 }; + + while(result == ERROR_SUCCESS) + { + dwName = sizeof(szName); + dwValue = sizeof(szValue); + + + result = RegEnumValueW(hKey, + dwIndex, + szName, + &dwName, + NULL, + NULL, + (LPBYTE)szValue, + &dwValue); + szName[9] = 0; + szValue[MAX_PATH-1] = 0; + + if (result == ERROR_SUCCESS) + { + if (wcsicmp(szValue, szMRU)) + { + SHEOW_AddOWItem(This, szValue); + NumItems++; + } + else + { + wcscpy(szMRUList, szValue); + } + } + dwIndex++; + } + + if (szMRUList[0]) + { + FIXME("handle MRUList\n"); + } + return NumItems; +} + + + +UINT +SHEOW_LoadItemFromHKCR(SHEOWImpl *This, WCHAR * szExt) +{ + HKEY hKey; + HKEY hSubKey; + LONG result; + UINT NumKeys = 0; + WCHAR szBuffer[30]; + WCHAR szResult[70]; + DWORD dwSize; + + static const WCHAR szCROW[] = { 'O','p','e','n','W','i','t','h','L','i','s','t', 0 }; + static const WCHAR szCROP[] = { 'O','p','e','n','W','i','t','h','P','r','o','g','I','D','s',0 }; + static const WCHAR szPT[] = { 'P','e','r','c','e','i','v','e','d','T','y','p','e', 0 }; + static const WCHAR szSys[] = { 'S','y','s','t','e','m','F','i','l','e','A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s','\\','O','p','e','n','W','i','t','h','L','i','s','t', 0 }; + + + TRACE("SHEOW_LoadItemFromHKCR entered with This %p szExt %s\n",This, debugstr_w(szExt)); + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, + szExt, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hKey); + if (result != ERROR_SUCCESS) + return NumKeys; + + result = RegOpenKeyExW(hKey, + szCROW, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hSubKey); + + if (result == ERROR_SUCCESS) + { + NumKeys = SHEW_AddOpenWithItem(This, hSubKey); + RegCloseKey(hSubKey); + } + + result = RegOpenKeyExW(hKey, + szCROP, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hSubKey); + + if (result == ERROR_SUCCESS) + { + NumKeys += SHEW_AddOpenWithProgId(This, hSubKey); + RegCloseKey(hSubKey); + } + + dwSize = sizeof(szBuffer); + + result = RegGetValueW(hKey, + NULL, + szPT, + RRF_RT_REG_SZ, + NULL, + szBuffer, + &dwSize); + szBuffer[29] = 0; + + if (result != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return NumKeys; + } + + sprintfW(szResult, szSys, szExt); + result = RegOpenKeyExW(hKey, + szCROW, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hSubKey); + + if (result == ERROR_SUCCESS) + { + NumKeys += SHEW_AddOpenWithProgId(This, hSubKey); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); + return NumKeys; +} + + + + +UINT +SHEOW_LoadItemFromHKCU(SHEOWImpl *This, WCHAR * szExt) +{ + WCHAR szBuffer[MAX_PATH]; + HKEY hKey; + UINT KeyCount = 0; + LONG result; + + static const WCHAR szOWPL[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','i','l','e','E','x','t','s', + '\\','%','s','\\','O','p','e','n','W','i','t','h','P','r','o','g','I','D','s',0 }; + + static const WCHAR szOpenWith[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','i','l','e','E','x','t','s', + '\\','%','s','\\','O','p','e','n','W','i','t','h','L','i','s','t', 0 }; + + TRACE("SHEOW_LoadItemFromHKCU entered with This %p szExt %s\n",This, debugstr_w(szExt)); + + /* process HKCU settings */ + sprintfW(szBuffer, szOWPL, szExt); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + result = RegOpenKeyExW(HKEY_CURRENT_USER, + szBuffer, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hKey); + + if (result == ERROR_SUCCESS) + { + KeyCount = SHEW_AddOpenWithProgId(This, hKey); + RegCloseKey(hKey); + } + + sprintfW(szBuffer, szOpenWith, szExt); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + result = RegOpenKeyExW(HKEY_CURRENT_USER, + szBuffer, + 0, + KEY_READ | KEY_QUERY_VALUE, + &hKey); + + if (result == ERROR_SUCCESS) + { + KeyCount += SHEW_AddOpenWithItem(This, hKey); + RegCloseKey(hKey); + } + return KeyCount; +} + +HRESULT +SHEOW_LoadOpenWithItems(SHEOWImpl *This, IDataObject *pdtobj) +{ + STGMEDIUM medium; + FORMATETC fmt; + HRESULT hr; + LPIDA pida; + LPCITEMIDLIST pidl_folder; + LPCITEMIDLIST pidl_child; + LPCITEMIDLIST pidl; + WCHAR szPath[MAX_PATH]; + LPWSTR szPtr; + + fmt.cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + + hr = IDataObject_GetData(pdtobj, &fmt, &medium); + + if (FAILED(hr)) + { + ERR("IDataObject_GetData failed with 0x%x\n", hr); + return hr; + } + + /*assert(pida->cidl==1);*/ + pida = (LPIDA)GlobalLock(medium.u.hGlobal); + + pidl_folder = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]); + pidl_child = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[1]); + + pidl = ILCombine(pidl_folder, pidl_child); + + GlobalUnlock(medium.u.hGlobal); + GlobalFree(medium.u.hGlobal); + + if (!pidl) + { + ERR("no mem\n"); + return E_OUTOFMEMORY; + } + if (!SHGetPathFromIDListW(pidl, szPath)) + { + SHFree(pidl); + ERR("SHGetPathFromIDListW failed\n"); + return FALSE; + } + + SHFree(pidl); + TRACE("szPath %s\n", debugstr_w(szPath)); + + szPtr = wcschr(szPath, '.'); + if (szPtr) + { + SHEOW_LoadItemFromHKCU(This, szPtr); + SHEOW_LoadItemFromHKCR(This, szPtr); + } + TRACE("count %u\n", This->count); + return S_OK; +} + + + + static HRESULT WINAPI SHEOW_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID ) @@ -272,7 +648,7 @@ TRACE("This %p\n", This); - return S_OK; + return SHEOW_LoadOpenWithItems(This, pdtobj); } static ULONG WINAPI SHEOW_ExtInit_AddRef(IShellExtInit *iface) Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Tue Oct 30 21:35:02 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define YDEBUG +//#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -45,6 +45,7 @@ /************************************************************************** * IContextMenu Implementation */ + typedef struct { const IContextMenu2Vtbl *lpVtbl; LONG ref; @@ -615,6 +616,24 @@ SHFree(pidlFQ); } } +HRESULT +DoShellExtensions(ItemCmImpl *This, LPCMINVOKECOMMANDINFO lpcmi) +{ + HRESULT hResult; + UINT i; + + TRACE("DoShellExtensions %p verb %x count %u\n",This, LOWORD(lpcmi->lpVerb), This->ecount); + for(i = 0; i < This->ecount; i++) + { + IContextMenu * cmenu = This->ecmenu[i]; + + hResult = cmenu->lpVtbl->InvokeCommand(cmenu, lpcmi); + if (SUCCEEDED(hResult)) + return hResult; + } + return NOERROR; +} + /************************************************************************** * ISvItemCm_fnInvokeCommand() @@ -669,6 +688,10 @@ DoProperties(iface, lpcmi->hwnd); break; default: + if (LOWORD(lpcmi->lpVerb) >= This->iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSHELast) + { + return DoShellExtensions(iface, lpcmi); + } FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); } }

1 0

[janderwald] 29980: - add required registry entries for "Open With" shell extension - currently commented out
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 19:00:50 2007 New Revision: 29980 URL: http://svn.reactos.org/svn/reactos?rev=29980&view=rev Log: - add required registry entries for "Open With" shell extension - currently commented out Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Tue Oct 30 19:00:50 2007 @@ -3,6 +3,11 @@ [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 + + +; Default key +;HKCR,"*","",0x00000000,"" +;HKCR,"*\shellex\ContextMenuHandlers\Open With","",0x00000000,"{09799AFB-AD67-11d1-ABCD-00C04FC30936}" ; Folders HKCR,"Folder","",0x00000000,"Folder" @@ -212,6 +217,14 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}","",0x00000000,"Shell Drag and Drop helper" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; Open With shell extension +;HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler" +;HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","",0x00000000,"shell32.dll" +;HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","ThreadingModel",0x00000000,"Apartment" +;HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\shellex\MayChangeDefaultMenu","",0x00000000,"" +;HKCR,"SystemFileAssociations","",0x00000000,"" + ; Recycle bin is not implemented ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Recycle Bin" Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Tue Oct 30 19:00:50 2007 @@ -47,6 +47,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 +;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012

1 0

[dreimer] 29979: Some more fixes
by dreimer＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: dreimer Date: Tue Oct 30 17:43:38 2007 New Revision: 29979 URL: http://svn.reactos.org/svn/reactos?rev=29979&view=rev Log: Some more fixes Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Tue Oct 30 17:43:38 2007 @@ -56,15 +56,15 @@ showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessage(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - otherobj = (SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - otherout = (SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = (UINT)SendDlgItemMessage(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = (UINT)SendDlgItemMessage(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemText(hwnd, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemText(hwnd, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemText(hwnd, ID_OUTDIR, outdir, MAX_PATH); + strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + otherobj = (SendDlgItemMessageW(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + otherout = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = (UINT)SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); + background = (UINT)SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (writelog) { @@ -150,11 +150,11 @@ for(UINT i = 0; i < sizeof(Colors) / sizeof(char *); i++) { - SendDlgItemMessage(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); - SendDlgItemMessage(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); - } - SendDlgItemMessage(Dlg, IDC_FONT, CB_SETCURSEL, 0xa, 0); - SendDlgItemMessage(Dlg, IDC_BACK, CB_SETCURSEL, 0, 0); + SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + } + SendDlgItemMessageW(Dlg, IDC_FONT, CB_SETCURSEL, 0xa, 0); + SendDlgItemMessageW(Dlg, IDC_BACK, CB_SETCURSEL, 0, 0); GetCurrentDirectory(MAX_PATH, Path); if ((wcslen(Path) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(Path, MINGWVERSION); @@ -222,7 +222,7 @@ ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); if (ILCreateFromPathW) { - GetDlgItemText(Dlg, Control, path, MAX_PATH); + GetDlgItemTextW(Dlg, Control, path, MAX_PATH); PathInfo.pidlRoot = ILCreateFromPathW(path); } FreeLibrary(hDLL); @@ -249,7 +249,7 @@ INT Dialog1, Dialog2; Dialog1 = ID_BROWSE; Dialog2 = ID_LOGDIR; - WriteLogSet = SendDlgItemMessage(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED; + WriteLogSet = SendDlgItemMessageW(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED; if (wParam == ID_OTHEROBJ) { Dialog1 = ID_BROWSEOBJ; @@ -276,9 +276,9 @@ if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { hFontOld = SelectObject((HDC)wParam, hFont); - SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); - SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); - return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); + SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); + SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); + return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); } break; }

1 0

[dreimer] 29978: Cleanup Code. (Thx to Ged Murphy) Update Info.txt
by dreimer＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: dreimer Date: Tue Oct 30 17:34:27 2007 New Revision: 29978 URL: http://svn.reactos.org/svn/reactos?rev=29978&view=rev Log: Cleanup Code. (Thx to Ged Murphy) Update Info.txt Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Tue Oct 30 17:34:27 2007 @@ -68,23 +68,18 @@ if (writelog) { - GetCurrentDirectory(MAX_PATH, checklog); - if (SetCurrentDirectory(logdir)) - { - SetCurrentDirectory(checklog); - } - else - { - wcscpy(checklog, logdir); - if (wcslen(checklog) < 1) - { - SetCurrentDirectory(checklog); - } - else if (!CreateDirectory(logdir, NULL)) - { - LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); - MessageBox(NULL, msgerror, NULL, MB_ICONERROR); - return FALSE; + if (logdir[0] != 0) + { + DWORD ret = GetCurrentDirectoryW(MAX_PATH, checklog); + if (ret != 0 && ret < MAX_PATH) + { + if (!SetCurrentDirectoryW(logdir)) + { + SetCurrentDirectoryW(checklog); + if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) + MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; + } } } } Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Tue Oct 30 17:34:27 2007 @@ -3,7 +3,6 @@ sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 -svnversion: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Additional Libs needed: LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm

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