Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 02/03: [NTOS:CM] Initially start the registry in read-only mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793ee786cdc2a7e1a1985… commit 793ee786cdc2a7e1a19856e63659cffe84689f16 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 14 22:15:58 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 17 22:09:45 2024 +0100 [NTOS:CM] Initially start the registry in read-only mode. Disable registry hive writes, until the IO subsystem is initialized and disk access is enabled (when the SM signals so after AUTOCHK). --- ntoskrnl/config/cmsysini.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 48bb2c1a3de..50283132745 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -24,7 +24,11 @@ PEPROCESS CmpSystemProcess; PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; BOOLEAN CmpFlushOnLockRelease; BOOLEAN CmpSpecialBootCondition; -BOOLEAN CmpNoWrite; + +/* Disable registry hive writes, until the IO subsystem is initialized + * and disk access is enabled (when the SM signals so after AUTOCHK) */ +BOOLEAN CmpNoWrite = TRUE; + BOOLEAN CmpWasSetupBoot; BOOLEAN CmpProfileLoaded; BOOLEAN CmpNoVolatileCreates; @@ -1469,9 +1473,10 @@ CmpInitializeHiveList(VOID) ULONG i; USHORT RegStart; PSECURITY_DESCRIPTOR SecurityDescriptor; + PAGED_CODE(); - /* Allow writing for now */ + /* Reenable hive writes now */ CmpNoWrite = FALSE; /* Build the file name and registry name strings */

11 months, 1 week

[reactos] 01/03: [NTOS:CM][CMLIB] Minor code styling

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76f1da5631489642fe1c8… commit 76f1da5631489642fe1c8201ce2bd6afc8f32fb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 20 20:28:13 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 17 22:09:37 2024 +0100 [NTOS:CM][CMLIB] Minor code styling In particular remove some extra-parentheses around single code tokens, and replace few "DPRINT1 + while (TRUE);" by UNIMPLEMENTED_DBGBREAK. + Improve some comments. --- ntoskrnl/config/cmapi.c | 33 ++++++++++++++--------------- ntoskrnl/config/cmcontrl.c | 3 +-- ntoskrnl/config/cminit.c | 22 ++++++++++---------- ntoskrnl/config/cmkcbncb.c | 18 ++++++++-------- ntoskrnl/config/cmlazy.c | 12 +++++------ ntoskrnl/config/cmparse.c | 14 ++++++------- ntoskrnl/config/cmse.c | 2 +- ntoskrnl/config/cmsysini.c | 20 +++++++++--------- ntoskrnl/config/cmvalche.c | 20 +++++++++--------- ntoskrnl/config/ntapi.c | 14 ++++++------- sdk/lib/cmlib/hivewrt.c | 52 ++++++++++++++++++++++------------------------ 11 files changed, 103 insertions(+), 107 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 8e3e3edd69a..4d4edfde77a 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -67,8 +67,7 @@ CmpIsHiveAlreadyLoaded(IN HANDLE KeyHandle, if (Hive->Frozen) { /* FIXME: TODO */ - DPRINT1("ERROR: Hive is frozen\n"); - while (TRUE); + UNIMPLEMENTED_DBGBREAK("ERROR: Hive is frozen\n"); } } @@ -105,22 +104,22 @@ CmpDoFlushAll(IN BOOLEAN ForceFlush) CmpLockHiveFlusherExclusive(Hive); /* Check for illegal state */ - if ((ForceFlush) && (Hive->UseCount)) + if (ForceFlush && Hive->UseCount) { /* Registry needs to be locked down */ CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); - DPRINT1("FIXME: Hive is damaged and needs fixup\n"); - while (TRUE); + UNIMPLEMENTED_DBGBREAK("FIXME: Hive is damaged and needs fixup\n"); } /* Only sync if we are forced to or if it won't cause a hive shrink */ - if ((ForceFlush) || (!HvHiveWillShrink(&Hive->Hive))) + if (ForceFlush || !HvHiveWillShrink(&Hive->Hive)) { /* Do the sync */ Status = HvSyncHive(&Hive->Hive); /* If something failed - set the flag and continue looping */ - if (!NT_SUCCESS(Status)) Result = FALSE; + if (!NT_SUCCESS(Status)) + Result = FALSE; } else { @@ -708,8 +707,8 @@ DoAgain: } /* We need the exclusive KCB lock now */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* Acquire exclusive lock */ CmpConvertKcbSharedToExclusive(Kcb); @@ -873,7 +872,7 @@ DoAgain: Kcb->KcbLastWriteTime = Parent->LastWriteTime; /* Check if the cell is cached */ - if ((Found) && (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))) + if (Found && CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) { /* Shouldn't happen */ ASSERT(FALSE); @@ -884,7 +883,7 @@ DoAgain: CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ @@ -901,8 +900,8 @@ DoAgain: /* Release the cells */ Quickie: - if ((ParentCell != HCELL_NIL) && (Hive)) HvReleaseCell(Hive, ParentCell); - if ((ChildCell != HCELL_NIL) && (Hive)) HvReleaseCell(Hive, ChildCell); + if ((ParentCell != HCELL_NIL) && Hive) HvReleaseCell(Hive, ParentCell); + if ((ChildCell != HCELL_NIL) && Hive) HvReleaseCell(Hive, ChildCell); /* Release the locks */ if (FlusherLocked) CmpUnlockHiveFlusher((PCMHIVE)Hive); @@ -972,9 +971,9 @@ CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, if (ChildCell == HCELL_NIL) goto Quickie; /* We found the value, mark all relevant cells dirty */ - if (!((HvMarkCellDirty(Hive, Cell, FALSE)) && - (HvMarkCellDirty(Hive, Parent->ValueList.List, FALSE)) && - (HvMarkCellDirty(Hive, ChildCell, FALSE)))) + if (!(HvMarkCellDirty(Hive, Cell, FALSE) && + HvMarkCellDirty(Hive, Parent->ValueList.List, FALSE) && + HvMarkCellDirty(Hive, ChildCell, FALSE))) { /* Not enough log space, fail */ Status = STATUS_NO_LOG_SPACE; @@ -1037,7 +1036,7 @@ CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ diff --git a/ntoskrnl/config/cmcontrl.c b/ntoskrnl/config/cmcontrl.c index fdce4c9ab6d..07f65dcea97 100644 --- a/ntoskrnl/config/cmcontrl.c +++ b/ntoskrnl/config/cmcontrl.c @@ -208,8 +208,7 @@ CmGetSystemControlValues(IN PVOID SystemHiveData, } /* Sanity check if this is a small key */ - ASSERT((IsSmallKey ? - (Length <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmallKey ? (Length <= CM_KEY_VALUE_SMALL) : TRUE); /* Copy the data in the buffer */ RtlCopyMemory(ControlVector->Buffer, Buffer, Length); diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index 15dc4f0d77c..5bee7e5a526 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -49,14 +49,14 @@ CmpInitializeHive( * - An alternate hive that is not linked to a correct file type. * - A lonely alternate hive not backed up with its corresponding primary hive. */ - if (((External) && ((Primary) || (Log))) || - ((Log) && !(Primary)) || - (!(CmpShareSystemHives) && (HiveFlags & HIVE_VOLATILE) && - ((Primary) || (External) || (Log))) || - ((OperationType == HINIT_MEMORY) && (!HiveData)) || - ((Log) && (FileType != HFILE_TYPE_LOG)) || - ((Alternate) && (FileType != HFILE_TYPE_ALTERNATE)) || - ((Alternate) && !(Primary))) + if ((External && (Primary || Log)) || + (Log && !Primary) || + (!CmpShareSystemHives && (HiveFlags & HIVE_VOLATILE) && + (Primary || External || Log)) || + ((OperationType == HINIT_MEMORY) && !HiveData) || + (Log && (FileType != HFILE_TYPE_LOG)) || + (Alternate && (FileType != HFILE_TYPE_ALTERNATE)) || + (Alternate && !Primary)) { /* Fail the request */ return STATUS_INVALID_PARAMETER; @@ -338,7 +338,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, NULL); /* Check if we can create the hive */ - if ((CreateAllowed) && !(CmpShareSystemHives)) + if (CreateAllowed && !CmpShareSystemHives) { /* Open only or create */ CreateDisposition = FILE_OPEN_IF; @@ -357,7 +357,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, (NoBuffering ? FILE_NO_INTERMEDIATE_BUFFERING : 0); /* Set share and access modes */ - if ((CmpMiniNTBoot) && (CmpShareSystemHives)) + if (CmpMiniNTBoot && CmpShareSystemHives) { /* We're on Live CD or otherwise sharing */ DesiredAccess = FILE_READ_DATA; @@ -568,7 +568,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, FILE_SYNCHRONOUS_IO_NONALERT | IoFlags, NULL, 0); - if ((NT_SUCCESS(Status)) && (MarkAsSystemHive)) + if (NT_SUCCESS(Status) && MarkAsSystemHive) { /* We opened it, mark it as a system hive */ Status = ZwFsControlFile(*Log, diff --git a/ntoskrnl/config/cmkcbncb.c b/ntoskrnl/config/cmkcbncb.c index b7b7b0ef9cb..4f70ad91778 100644 --- a/ntoskrnl/config/cmkcbncb.c +++ b/ntoskrnl/config/cmkcbncb.c @@ -619,11 +619,11 @@ CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, CMP_ASSERT_KCB_LOCK(Kcb); /* Check if we should do a direct delete */ - if (((CmpHoldLazyFlush) && + if ((CmpHoldLazyFlush && !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && !(Kcb->Flags & KEY_SYM_LINK)) || (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || - (Kcb->Delete)) + Kcb->Delete) { /* Clean up the KCB*/ CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); @@ -683,7 +683,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, NodeName = *KeyName; /* Remove leading slash */ - while ((NodeName.Length) && (*NodeName.Buffer == OBJ_NAME_PATH_SEPARATOR)) + while (NodeName.Length && (*NodeName.Buffer == OBJ_NAME_PATH_SEPARATOR)) { /* Move the buffer by one */ NodeName.Buffer++; @@ -764,7 +764,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, else { /* Check if we're not creating a fake one, but it used to be fake */ - if ((Kcb->ExtFlags & CM_KCB_KEY_NON_EXIST) && !(IsFake)) + if ((Kcb->ExtFlags & CM_KCB_KEY_NON_EXIST) && !IsFake) { /* Set the hive and cell */ Kcb->KeyHive = Hive; @@ -801,7 +801,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, { /* Reference the parent */ if (((Parent->TotalLevels + 1) < 512) && - (CmpReferenceKeyControlBlock(Parent))) + CmpReferenceKeyControlBlock(Parent)) { /* Link it */ Kcb->ParentKcb = Parent; @@ -863,14 +863,14 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, } /* Check if this is a KCB inside a frozen hive */ - if ((Kcb) && (((PCMHIVE)Hive)->Frozen) && (!(Kcb->Flags & KEY_SYM_LINK))) + if (Kcb && ((PCMHIVE)Hive)->Frozen && !(Kcb->Flags & KEY_SYM_LINK)) { /* Don't add these to the delay close */ Kcb->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; } /* Sanity check */ - ASSERT((!Kcb) || (Kcb->Delete == FALSE)); + ASSERT(!Kcb || !Kcb->Delete); /* Check if we had locked the hashes */ if (!HashLock) @@ -950,7 +950,7 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) /* Sanity checks for deleted and fake keys */ if ((!MyKcb->KeyCell && !MyKcb->Delete) || !MyKcb->KeyHive || - MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST) + (MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST)) { /* Failure */ CmpFree(KeyName, 0); @@ -1109,7 +1109,7 @@ DelistKeyBodyFromKCB(IN PCM_KEY_BODY KeyBody, for (i = 0; i < 4; i++) { /* Add it into the list */ - if (InterlockedCompareExchangePointer((VOID*)&KeyBody->KeyControlBlock-> + if (InterlockedCompareExchangePointer((PVOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], NULL, KeyBody) == KeyBody) diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index ed03247a8c7..6c128cb3954 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -92,9 +92,9 @@ CmpDoFlushNextHive(_In_ BOOLEAN ForceFlush, CmHive->FlushCount = CmpLazyFlushCount; } } - else if ((CmHive->Hive.DirtyCount) && - (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) && - (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH))) + else if (CmHive->Hive.DirtyCount && + !(CmHive->Hive.HiveFlags & HIVE_VOLATILE) && + !(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) { /* Use another lazy flusher for this hive */ ASSERT(CmHive->FlushCount == CmpLazyFlushCount); @@ -145,7 +145,7 @@ CmpLazyFlushDpcRoutine(IN PKDPC Dpc, { /* Check if we should queue the lazy flush worker */ DPRINT("Flush pending: %s, Holding lazy flush: %s.\n", CmpLazyFlushPending ? "yes" : "no", CmpHoldLazyFlush ? "yes" : "no"); - if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) + if (!CmpLazyFlushPending && !CmpHoldLazyFlush) { CmpLazyFlushPending = TRUE; ExQueueWorkItem(&CmpLazyWorkItem, DelayedWorkQueue); @@ -160,7 +160,7 @@ CmpLazyFlush(VOID) PAGED_CODE(); /* Check if we should set the lazy flush timer */ - if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) + if (!CmpNoWrite && !CmpHoldLazyFlush) { /* Do it */ DueTime.QuadPart = Int32x32To64(CmpLazyFlushIntervalInSeconds, @@ -400,7 +400,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, (Status == STATUS_ACCOUNT_EXPIRED) || (Status == STATUS_ACCOUNT_DISABLED) || (Status == STATUS_ACCOUNT_RESTRICTION)) && - (ImpersonationContext)) + ImpersonationContext) { /* We failed due to an account/security error, impersonate SYSTEM */ Status = SeImpersonateClientEx(ImpersonationContext, NULL); diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index b9bc5c7e596..db2ec0e9705 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -39,7 +39,7 @@ CmpGetNextName(IN OUT PUNICODE_STRING RemainingName, } /* Check if we have a path separator */ - while ((RemainingName->Length) && + while (RemainingName->Length && (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR)) { /* Skip it */ @@ -50,7 +50,7 @@ CmpGetNextName(IN OUT PUNICODE_STRING RemainingName, /* Start loop at where the current buffer is */ NextName->Buffer = RemainingName->Buffer; - while ((RemainingName->Length) && + while (RemainingName->Length && (*RemainingName->Buffer != OBJ_NAME_PATH_SEPARATOR)) { /* Move to the next character */ @@ -1873,7 +1873,7 @@ CmpParseKey(IN PVOID ParseObject, PAGED_CODE(); /* Loop path separators at the end */ - while ((RemainingName->Length) && + while (RemainingName->Length && (RemainingName->Buffer[(RemainingName->Length / sizeof(WCHAR)) - 1] == OBJ_NAME_PATH_SEPARATOR)) { @@ -1888,7 +1888,7 @@ CmpParseKey(IN PVOID ParseObject, Current = *RemainingName; /* Check if this is a create */ - if (!(ParseContext) || !(ParseContext->CreateOperation)) + if (!ParseContext || !ParseContext->CreateOperation) { /* It isn't, so no context */ ParseContext = NULL; @@ -2043,7 +2043,7 @@ CmpParseKey(IN PVOID ParseObject, { /* Get the next component */ Result = CmpGetNextName(&Current, &NextName, &Last); - if ((Result) && (NextName.Length)) + if (Result && NextName.Length) { /* See if this is a sym link */ if (!(Kcb->Flags & KEY_SYM_LINK)) @@ -2150,7 +2150,7 @@ KeyCachedOpenNow: else { /* Check if this was the last key for a create */ - if ((Last) && (ParseContext)) + if (Last && ParseContext) { /* Check if we're doing a link node */ if (ParseContext->CreateLink) @@ -2246,7 +2246,7 @@ KeyCachedOpenNow: break; } } - else if ((Result) && (Last)) + else if (Result && Last) { /* Opening the root. Is this an exit node? */ if (Node->Flags & KEY_HIVE_EXIT) diff --git a/ntoskrnl/config/cmse.c b/ntoskrnl/config/cmse.c index 6c8c55472b8..add246cebe2 100644 --- a/ntoskrnl/config/cmse.c +++ b/ntoskrnl/config/cmse.c @@ -40,7 +40,7 @@ CmpHiveRootSecurityDescriptor(VOID) Sid[3] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CMSD); /* Make sure all SIDs were allocated */ - if (!(Sid[0]) || !(Sid[1]) || !(Sid[2]) || !(Sid[3])) + if (!Sid[0] || !Sid[1] || !Sid[2] || !Sid[3]) { /* Bugcheck */ KeBugCheckEx(REGISTRY_ERROR, 11, 1, 0, 0); diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index d28a5b5d20d..48bb2c1a3de 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -228,7 +228,7 @@ CmpQueryKeyName(IN PVOID ObjectBody, /* Check if the provided buffer is too small to fit even anything */ if ((Length <= sizeof(OBJECT_NAME_INFORMATION)) || - ((Length < (*ReturnLength)) && (BytesToCopy < sizeof(WCHAR)))) + ((Length < *ReturnLength) && (BytesToCopy < sizeof(WCHAR)))) { /* Free the buffer allocated by CmpConstructName */ ExFreePoolWithTag(KeyName, TAG_CM); @@ -238,7 +238,7 @@ CmpQueryKeyName(IN PVOID ObjectBody, } /* Check if the provided buffer can be partially written */ - if (Length < (*ReturnLength)) + if (Length < *ReturnLength) { /* Yes, indicate so in the return status */ Status = STATUS_INFO_LENGTH_MISMATCH; @@ -687,7 +687,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; /* Check if we failed or got a non DWORD-value */ - if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) + if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_DWORD)) { Status = STATUS_SUCCESS; goto Cleanup; @@ -728,7 +728,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Status = NtOpenKey(&ProfileHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS (Status)) + if (!NT_SUCCESS(Status)) { /* Cleanup and exit */ Status = STATUS_SUCCESS; @@ -1319,8 +1319,8 @@ CmpLoadHiveThread(IN PVOID StartContext) &CmHive, &CmpMachineHiveList[i].Allocate, CM_CHECK_REGISTRY_PURGE_VOLATILES); - if (!(NT_SUCCESS(Status)) || - (!(CmpShareSystemHives) && !(CmHive->FileHandles[HFILE_TYPE_LOG]))) + if (!NT_SUCCESS(Status) || + (!CmpShareSystemHives && !CmHive->FileHandles[HFILE_TYPE_LOG])) { /* * We failed, or could not get a log file (unless @@ -1356,7 +1356,7 @@ CmpLoadHiveThread(IN PVOID StartContext) TRUE, FALSE, &ClusterSize); - if (!(NT_SUCCESS(Status)) || !(AlternateHandle)) + if (!NT_SUCCESS(Status) || !AlternateHandle) { /* Couldn't open the hive or its alternate file, raise a hard error */ ErrorParameters = &FileName; @@ -2111,14 +2111,14 @@ CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1, Index1 = GET_HASH_INDEX(ConvKey1); Index2 = GET_HASH_INDEX(ConvKey2); ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey2)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); /* See which one is highest */ if (Index1 < Index2) { /* Grab them in the proper order */ ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); CmpReleaseKcbLockByKey(ConvKey2); CmpReleaseKcbLockByKey(ConvKey1); } @@ -2128,7 +2128,7 @@ CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1, if (Index1 != Index2) { ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); CmpReleaseKcbLockByKey(ConvKey1); } CmpReleaseKcbLockByKey(ConvKey2); diff --git a/ntoskrnl/config/cmvalche.c b/ntoskrnl/config/cmvalche.c index fe82bea8163..c63e03b4c51 100644 --- a/ntoskrnl/config/cmvalche.c +++ b/ntoskrnl/config/cmvalche.c @@ -69,8 +69,8 @@ CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, else { /* Make sure the KCB is locked exclusive */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* We need the exclusive lock */ return SearchNeedExclusiveLock; @@ -79,7 +79,7 @@ CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, /* Select the value list as our cell, and get the actual list array */ CellToRelease = ChildList->ValueList; *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); - if (!(*CellData)) return SearchFail; + if (!*CellData) return SearchFail; /* FIXME: Here we would cache the value */ @@ -229,7 +229,7 @@ CmpFindValueByNameFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (SearchResult != SearchSuccess) { /* We either failed or need the exclusive lock */ - ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT((SearchResult == SearchFail) || !CmpIsKcbLockedExclusive(Kcb)); ASSERT(Cell == HCELL_NIL); return SearchResult; } @@ -260,7 +260,7 @@ CmpFindValueByNameFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (SearchResult != SearchSuccess) { /* We either failed or need the exclusive lock */ - ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT((SearchResult == SearchFail) || !CmpIsKcbLockedExclusive(Kcb)); ASSERT(Cell == HCELL_NIL); return SearchResult; } @@ -552,7 +552,7 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, } /* Sanity check */ - ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE); /* Make sure we have a valid buffer */ if (Buffer) @@ -658,7 +658,7 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, } /* Sanity check */ - ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE); /* Make sure we have a valid buffer */ if (Buffer) @@ -719,8 +719,8 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (Kcb->Flags & KEY_SYM_LINK) { /* We need the exclusive lock */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* We need the exclusive lock */ return SearchNeedExclusiveLock; @@ -734,7 +734,7 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 5e8f356a229..5bf9ec5af0b 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -805,7 +805,7 @@ NtQueryValueKey(IN HANDLE KeyHandle, goto Quit; /* Make sure the name is aligned properly */ - if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + if (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) { /* It isn't, so we'll fail */ Status = STATUS_INVALID_PARAMETER; @@ -813,7 +813,7 @@ NtQueryValueKey(IN HANDLE KeyHandle, } /* Ignore any null characters at the end */ - while ((ValueNameCopy.Length) && + while (ValueNameCopy.Length && !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) { /* Skip it */ @@ -947,9 +947,9 @@ NtSetValueKey(IN HANDLE KeyHandle, KeyHandle, &ValueNameCopy, TitleIndex, Type, DataSize); /* Make sure the name is aligned, not too long, and the data under 4GB */ - if ( (ValueNameCopy.Length > 32767) || - ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) || - (DataSize > 0x80000000)) + if ((ValueNameCopy.Length > 32767) || + (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) || + (DataSize > 0x80000000)) { /* Fail */ Status = STATUS_INVALID_PARAMETER; @@ -957,7 +957,7 @@ NtSetValueKey(IN HANDLE KeyHandle, } /* Ignore any null characters at the end */ - while ((ValueNameCopy.Length) && + while (ValueNameCopy.Length && !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) { /* Skip it */ @@ -1039,7 +1039,7 @@ NtDeleteValueKey(IN HANDLE KeyHandle, goto Quit; /* Make sure the name is aligned properly */ - if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + if (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) { /* It isn't, so we'll fail */ Status = STATUS_INVALID_PARAMETER; diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index d95e8559196..eff699ac876 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -101,7 +101,7 @@ HvpWriteLog( * The hive log we are going to write data into * has to be writable and with a sane storage. */ - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->BaseBlock->Length == RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); @@ -109,12 +109,11 @@ HvpWriteLog( HvpValidateBaseHeader(RegistryHive); /* - * The sequences can diverge in an occurrence of forced - * shutdown of the system such as during a power failure, - * the hardware crapping itself or during a system crash - * when one of the sequences have been modified during - * writing into the log or hive. In such cases the hive - * needs a repair. + * The sequences can diverge during a forced system shutdown + * occurrence, such as during a power failure, a hardware + * failure or during a system crash, and when one of the + * sequences have been modified during writing into the log + * or hive. In such cases the hive needs a repair. */ if (RegistryHive->BaseBlock->Sequence1 != RegistryHive->BaseBlock->Sequence2) @@ -324,7 +323,7 @@ HvpWriteHive( ULONG LastIndex; PVOID Block; - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->BaseBlock->Length == RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); ASSERT(RegistryHive->BaseBlock->RootCell != HCELL_NIL); @@ -333,12 +332,11 @@ HvpWriteHive( HvpValidateBaseHeader(RegistryHive); /* - * The sequences can diverge in an occurrence of forced - * shutdown of the system such as during a power failure, - * the hardware crapping itself or during a system crash - * when one of the sequences have been modified during - * writing into the log or hive. In such cases the hive - * needs a repair. + * The sequences can diverge during a forced system shutdown + * occurrence, such as during a power failure, a hardware + * failure or during a system crash, and when one of the + * sequences have been modified during writing into the log + * or hive. In such cases the hive needs a repair. */ if (RegistryHive->BaseBlock->Sequence1 != RegistryHive->BaseBlock->Sequence2) @@ -372,11 +370,11 @@ HvpWriteHive( while (BlockIndex < RegistryHive->Storage[Stable].Length) { /* - * If we have to syncrhonize the registry hive we + * If we have to synchronize the registry hive we * want to look for dirty blocks to reflect the new * updates done to the hive. Otherwise just write * all the blocks as if we were doing a regular - * writing of the hive. + * hive write. */ if (OnlyDirty) { @@ -420,9 +418,9 @@ HvpWriteHive( /* * Increment the secondary sequence number and - * update the checksum. A successful transaction - * writing of hive is both of sequences are the - * same indicating the writing operation didn't + * update the checksum. A successful hive write + * transaction is when both of sequences are the + * same, indicating the write operation didn't * fail. */ RegistryHive->BaseBlock->Sequence2++; @@ -476,7 +474,7 @@ HvSyncHive( BOOLEAN HardErrors; #endif - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); /* @@ -522,8 +520,8 @@ HvSyncHive( KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); #endif - /* Update the log file of hive if present */ - if (RegistryHive->Log == TRUE) + /* Update the hive log file if present */ + if (RegistryHive->Log) { if (!HvpWriteLog(RegistryHive)) { @@ -546,7 +544,7 @@ HvSyncHive( } /* Update the alternate hive file if present */ - if (RegistryHive->Alternate == TRUE) + if (RegistryHive->Alternate) { if (!HvpWriteHive(RegistryHive, TRUE, HFILE_TYPE_ALTERNATE)) { @@ -615,7 +613,7 @@ CMAPI HvWriteHive( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); #if !defined(_BLDR_) @@ -653,9 +651,9 @@ CMAPI HvWriteAlternateHive( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); - ASSERT(RegistryHive->Alternate == TRUE); + ASSERT(RegistryHive->Alternate); #if !defined(_BLDR_) /* Update hive header modification time */ @@ -691,7 +689,7 @@ CMAPI HvSyncHiveFromRecover( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); /* Call the private API call to do the deed for us */

11 months, 1 week

[reactos] 01/01: [SHELL32][CONTROL] Added basic IOpenControlPanel support (#6248)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d41dec2e07f919235406c… commit d41dec2e07f919235406ca3a4d47e8b6ae1aa588 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Jan 17 17:07:21 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 17:07:21 2024 +0100 [SHELL32][CONTROL] Added basic IOpenControlPanel support (#6248) Add a basic IOpenControlPanel implementation that supports Vista canonical registry names. Implements `control.exe /name company.name [/page id]` and `IOpenControlPanel` handling of Vista-style canonical registry names. The documented `Microsoft.*` names don't work because they are simply not in our registry but "[Executable Control Panel Items](https://learn.microsoft.com/en-us/windows/win32/shell/how-to-registe…" registered by 3rd-party ISVs will function correctly in control.exe and the COM API. Notes: - `IOpenControlPanel` is implemented in CControlPanelFolder.cpp because it is supposed to have tighter integration with that shell folder than it does in this PR. - `IOpenControlPanel` is also supposed to handle .cpl files with canonical names registered under [`Extended Properties`](https://learn.microsoft.com/en-us/windows/win32/shell/how-to-r… but the control panel folder does not implement `IShellFolder2::GetDetailsEx` yet, so it will have to wait. - These "Executable Control Panel Items" are also supposed to be displayed in the control panel itself but this PR does not address that. The `ITEMIDLIST` format for those needs investigation... - The Wow64 handling is perhaps not correct but it does not matter, `ShellExecuteEx` gets to deal with whatever is in the `...\shell\open\command` key. `CControlPanelFolder` would have to take more care when it starts reading those keys so it knows when to append "(32-bit)" to the display name. - `%s%s` because .cpl canonical names don't have the `::` prefix according to Geoff Chappell. - Always returns `CPVIEW_CLASSIC` because our `CControlPanelFolder` does not support the category view. --- base/applications/control/CMakeLists.txt | 2 + base/applications/control/control.c | 63 +++++++++- dll/win32/shell32/folders/CControlPanelFolder.cpp | 141 ++++++++++++++++++++++ dll/win32/shell32/folders/CControlPanelFolder.h | 21 ++++ dll/win32/shell32/res/rgs/controlpanel.rgs | 22 ++++ dll/win32/shell32/shell32.cpp | 1 + sdk/include/psdk/shlguid.h | 1 + sdk/include/psdk/shobjidl.idl | 31 +++++ 8 files changed, 281 insertions(+), 1 deletion(-) diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt index 06e49c19229..827d6fa4be3 100644 --- a/base/applications/control/CMakeLists.txt +++ b/base/applications/control/CMakeLists.txt @@ -2,5 +2,7 @@ add_rc_deps(control.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/config.ico) add_executable(control control.c control.rc) set_module_type(control win32gui UNICODE) +add_delay_importlibs(control ole32) +target_link_libraries(control uuid) add_importlibs(control advapi32 shell32 user32 msvcrt kernel32) add_cd_file(TARGET control DESTINATION reactos/system32 FOR all) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index a13000c1153..3a39694d1c9 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -4,12 +4,14 @@ * PURPOSE: ReactOS System Control Panel * COPYRIGHT: Copyright 2004 Gero Kuehn (reactos.filter(a)gkware.com) * Copyright 2008 Colin Finck (colin(a)reactos.org) - * Copyright 2014 Herm�s B�lusca-Ma�to (hermes.belusca-maito(a)reactos.org) + * Copyright 2014 Hermès Bélusca-Maïto (hermes.belusca-maito(a)reactos.org) */ #include <stdio.h> #define WIN32_NO_STATUS +#define COBJMACROS + #include <windef.h> #include <winbase.h> @@ -17,6 +19,9 @@ #include <winreg.h> #include <shellapi.h> #include <strsafe.h> +#include <objbase.h> +#include <shobjidl.h> +#include <shlguid.h> #include "resource.h" @@ -34,6 +39,35 @@ VOID WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); +static BOOL +IsSwitch(LPCWSTR Switch, LPCWSTR Arg) +{ + if (*Arg == '/' || *Arg == '-') + { + return !lstrcmpiW(Arg+1, Switch); + } + return FALSE; +} + +static HRESULT +OpenControlPanelItem(LPCWSTR Name, LPCWSTR Page) +{ + HRESULT hr = CoInitialize(0); + if (SUCCEEDED(hr)) + { + IOpenControlPanel *pOCP; + hr = CoCreateInstance(&CLSID_OpenControlPanel, NULL, CLSCTX_INPROC_SERVER, + &IID_IOpenControlPanel, (void**)&pOCP); + if (SUCCEEDED(hr)) + { + hr = IOpenControlPanel_Open(pOCP, Name, Page, NULL); + IOpenControlPanel_Release(pOCP); + } + CoUninitialize(); + } + return hr; +} + static INT OpenShellFolder(LPWSTR lpFolderCLSID) { @@ -73,11 +107,16 @@ wWinMain(HINSTANCE hInstance, INT nCmdShow) { HKEY hKey; + LPWSTR *argv; + int argc; /* Show the control panel window if no argument or "panel" was passed */ if (*lpCmdLine == 0 || !_wcsicmp(lpCmdLine, L"panel")) return OpenShellFolder(L""); + /* Map legacy control panels */ + if (!_wcsicmp(lpCmdLine, L"sticpl.cpl")) lpCmdLine = (LPWSTR) L"scannercamera"; + /* Check one of the built-in control panel handlers */ if (!_wcsicmp(lpCmdLine, L"admintools")) return OpenShellFolder(L"\\::{D20EA4E1-3957-11d2-A40B-0C5020524153}"); else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl,,2"); @@ -99,6 +138,28 @@ wWinMain(HINSTANCE hInstance, else if (!_wcsicmp(lpCmdLine, L"userpasswords")) return RunControlPanel(L"nusrmgr.cpl"); /* Graphical User Account Manager */ else if (!_wcsicmp(lpCmdLine, L"userpasswords2")) return RUNDLL(L"netplwiz.dll,UsersRunDll"); /* Dialog based advanced User Account Manager */ + /* https://learn.microsoft.com/en-us/windows/win32/shell/executing-control-pan… */ + argv = CommandLineToArgvW(lpCmdLine, &argc); + if (argv) + { + UINT argi = 0; + HRESULT hr = -1; + if (argc >= 2 && IsSwitch(L"name", argv[argi + 0])) + { + LPCWSTR pszPage = NULL; + if (argc >= 4 && IsSwitch(L"page", argv[argi + 2])) + { + pszPage = argv[argi + 3]; + } + hr = OpenControlPanelItem(argv[argi + 1], pszPage); + } + LocalFree(argv); + if (hr != -1) + { + return SUCCEEDED(hr); + } + } + /* It is none of them, so look for a handler in the registry */ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls", diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index be71cc8f714..085b074ee18 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -773,3 +773,144 @@ HRESULT WINAPI CCPLItemMenu::HandleMenuMsg( return E_NOTIMPL; } + +/************************************************************************** +* COpenControlPanel +*/ + +static HRESULT GetParsingName(PCIDLIST_ABSOLUTE pidl, PWSTR*Name) +{ + PIDLIST_ABSOLUTE pidlFree = NULL; + if (IS_INTRESOURCE(pidl)) + { + HRESULT hr = SHGetSpecialFolderLocation(NULL, (UINT)(SIZE_T)pidl, &pidlFree); + if (FAILED(hr)) + return hr; + pidl = pidlFree; + } + HRESULT hr = SHGetNameFromIDList(pidl, SIGDN_DESKTOPABSOLUTEPARSING, Name); + ILFree(pidlFree); + return hr; +} + +static HRESULT CreateCplAbsoluteParsingPath(LPCWSTR Prefix, LPCWSTR InFolderParse, PWSTR Buf, UINT cchBuf) +{ + PWSTR cpfolder; + HRESULT hr = GetParsingName((PCIDLIST_ABSOLUTE)CSIDL_CONTROLS, &cpfolder); + if (SUCCEEDED(hr)) + { + hr = StringCchPrintfW(Buf, cchBuf, L"%s\\%s%s", cpfolder, Prefix, InFolderParse); + SHFree(cpfolder); + } + return hr; +} + +static HRESULT FindExeCplClass(LPCWSTR Canonical, HKEY hKey, BOOL Wow64, LPWSTR clsid) +{ + HRESULT hr = HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + HKEY hNSKey; + WCHAR key[MAX_PATH], buf[MAX_PATH]; + wsprintfW(key, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\NameSpace", + Wow64 ? L"ControlPanelWOW64" : L"ControlPanel"); + LSTATUS error = RegOpenKeyExW(hKey, key, 0, KEY_READ, &hNSKey); + if (error) + return HRESULT_FROM_WIN32(error); + for (DWORD i = 0; RegEnumKeyW(hNSKey, i, key, _countof(key)) == ERROR_SUCCESS; ++i) + { + IID validate; + if (SUCCEEDED(IIDFromString(key, &validate))) + { + wsprintfW(buf, L"CLSID\\%s", key); + DWORD cb = sizeof(buf); + if (RegGetValueW(HKEY_CLASSES_ROOT, buf, L"System.ApplicationName", + RRF_RT_REG_SZ, NULL, buf, &cb) == ERROR_SUCCESS) + { + if (!lstrcmpiW(buf, Canonical)) + { + lstrcpyW(clsid, key); + hr = S_OK; + } + } + } + } + RegCloseKey(hNSKey); + return hr; +} + +static HRESULT FindExeCplClass(LPCWSTR Canonical, LPWSTR clsid) +{ + HRESULT hr = E_FAIL; + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_CURRENT_USER, FALSE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_CURRENT_USER, TRUE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_LOCAL_MACHINE, FALSE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_LOCAL_MACHINE, TRUE, clsid); + return hr; +} + +HRESULT WINAPI COpenControlPanel::Open(LPCWSTR pszName, LPCWSTR pszPage, IUnknown *punkSite) +{ + WCHAR path[MAX_PATH], clspath[MAX_PATH]; + HRESULT hr = S_OK; + SHELLEXECUTEINFOW sei = { sizeof(sei), SEE_MASK_FLAG_DDEWAIT }; + sei.lpFile = path; + sei.nShow = SW_SHOW; + if (!pszName) + { + GetSystemDirectoryW(path, _countof(path)); + PathAppendW(path, L"control.exe"); + } + else + { + LPWSTR clsid = clspath + wsprintfW(clspath, L"CLSID\\"); + if (SUCCEEDED(hr = FindExeCplClass(pszName, clsid))) + { + if (SUCCEEDED(hr = CreateCplAbsoluteParsingPath(L"::", clsid, path, _countof(path)))) + { + // NT6 will execute "::{26EE0668-A00A-44D7-9371-BEB064C98683}\0\::{clsid}[\pszPage]" + // but we don't support parsing that so we force the class instead. + sei.fMask |= SEE_MASK_CLASSNAME; + sei.lpClass = clspath; + } + } + } + + if (SUCCEEDED(hr)) + { + DWORD error = ShellExecuteExW(&sei) ? ERROR_SUCCESS : GetLastError(); + hr = HRESULT_FROM_WIN32(error); + } + return hr; +} + +HRESULT WINAPI COpenControlPanel::GetPath(LPCWSTR pszName, LPWSTR pszPath, UINT cchPath) +{ + HRESULT hr; + if (!pszName) + { + PWSTR cpfolder; + if (SUCCEEDED(hr = GetParsingName((PCIDLIST_ABSOLUTE)CSIDL_CONTROLS, &cpfolder))) + { + hr = StringCchCopyW(pszPath, cchPath, cpfolder); + SHFree(cpfolder); + } + } + else + { + WCHAR clsid[38 + 1]; + if (SUCCEEDED(hr = FindExeCplClass(pszName, clsid))) + { + hr = CreateCplAbsoluteParsingPath(L"::", clsid, pszPath, cchPath); + } + } + return hr; +} + +HRESULT WINAPI COpenControlPanel::GetCurrentView(CPVIEW *pView) +{ + *pView = CPVIEW_CLASSIC; + return S_OK; +} diff --git a/dll/win32/shell32/folders/CControlPanelFolder.h b/dll/win32/shell32/folders/CControlPanelFolder.h index 1fa7969aff4..deb29a5f2e1 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.h +++ b/dll/win32/shell32/folders/CControlPanelFolder.h @@ -111,4 +111,25 @@ public: END_COM_MAP() }; +class COpenControlPanel : + public CComCoClass<COpenControlPanel, &CLSID_OpenControlPanel>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOpenControlPanel +{ + public: + // IOpenControlPanel + virtual HRESULT WINAPI Open(LPCWSTR pszName, LPCWSTR pszPage, IUnknown *punkSite); + virtual HRESULT WINAPI GetPath(LPCWSTR pszName, LPWSTR pszPath, UINT cchPath); + virtual HRESULT WINAPI GetCurrentView(CPVIEW *pView); + + static HRESULT WINAPI UpdateRegistry(BOOL bRegister) { return S_OK; } // CControlPanelFolder does it for us + DECLARE_NOT_AGGREGATABLE(COpenControlPanel) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(COpenControlPanel) + COM_INTERFACE_ENTRY_IID(IID_IOpenControlPanel, IOpenControlPanel) + END_COM_MAP() +}; + #endif /* _SHFLDR_CPANEL_H_ */ diff --git a/dll/win32/shell32/res/rgs/controlpanel.rgs b/dll/win32/shell32/res/rgs/controlpanel.rgs index 79a1794d573..d53211d1799 100644 --- a/dll/win32/shell32/res/rgs/controlpanel.rgs +++ b/dll/win32/shell32/res/rgs/controlpanel.rgs @@ -51,3 +51,25 @@ HKLM } } } + +HKCR +{ + NoRemove CLSID + { + ForceRemove {06622D85-6856-4460-8DE1-A81921B41C4B} = s 'COpenControlPanel' + { + val AppID = s '{06622D85-6856-4460-8DE1-A81921B41C4B}' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } + NoRemove AppID + { + ForceRemove {06622D85-6856-4460-8DE1-A81921B41C4B} = s 'COpenControlPanel' + { + val DllSurrogate = s '' + } + } +} diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp index 011d5b2980b..91e5ed22c84 100644 --- a/dll/win32/shell32/shell32.cpp +++ b/dll/win32/shell32/shell32.cpp @@ -280,6 +280,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_Shell, CShellDispatch) OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper) OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder) + OBJECT_ENTRY(CLSID_OpenControlPanel, COpenControlPanel) OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder) OBJECT_ENTRY(CLSID_NetworkPlaces, CNetFolder) OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder) diff --git a/sdk/include/psdk/shlguid.h b/sdk/include/psdk/shlguid.h index 132f2963fdc..adada9427cd 100644 --- a/sdk/include/psdk/shlguid.h +++ b/sdk/include/psdk/shlguid.h @@ -231,6 +231,7 @@ DEFINE_GUID(CLSID_NewMenu, 0xd969A300, 0xe7FF, 0x11D0, 0xA9, 0x3B, DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x8, 0x00, 0x2B, 0x2E, 0x12, 0x62); DEFINE_GUID(CLSID_InternetButtons, 0x1E796980, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x0, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_OpenControlPanel, 0x06622D85, 0x6856, 0x4460, 0x8D, 0xE1, 0xA8, 0x19, 0x21, 0xB4, 0x1C, 0x4B); DEFINE_GUID(SID_SMenuBandChild, 0xed9cc020, 0x08b9, 0x11d1, 0x98, 0x23, 0x0, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(SID_SMenuBandParent, 0x8c278eec, 0x3eab, 0x11d1, 0x8c, 0xb0, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index ef9e51d16e1..7a75dff0f09 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -2360,6 +2360,37 @@ interface IExplorerCommandProvider : IUnknown [out, iid_is(riid)] void **ppv); }; + +/***************************************************************************** + * IOpenControlPanel interface (Vista+) + */ +[ + object, + uuid(D11AD862-66DE-4DF4-BF6C-1F5621996AF1), + pointer_default(unique) +] +interface IOpenControlPanel : IUnknown +{ + typedef [v1_enum] enum CPVIEW + { + CPVIEW_CLASSIC = 0, + CPVIEW_CATEGORY = 1, + CPVIEW_ALLITEMS = CPVIEW_CLASSIC, + CPVIEW_HOME = CPVIEW_CATEGORY + } CPVIEW; + + HRESULT Open( + [in, optional] LPCWSTR pszName, + [in, optional] LPCWSTR pszPage, + [in, optional] IUnknown *punkSite); + HRESULT GetPath( + [in, optional] LPCWSTR pszName, + [out, string, size_is(cchPath)] LPWSTR pszPath, + [in] UINT cchPath); + HRESULT GetCurrentView( + [out] CPVIEW *pView); +} + #endif // __REACTOS__ /*****************************************************************************

11 months, 1 week

[reactos] 01/01: Fix Cursor Position in "...file name:" box when opening from Explorer 'Search' toolbar (#6333)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb43301bad62b3ae290b7… commit fb43301bad62b3ae290b784c64227ea7d63fe533 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Jan 17 09:42:18 2024 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 07:42:18 2024 -0800 Fix Cursor Position in "...file name:" box when opening from Explorer 'Search' toolbar (#6333) Original patch by @I_Kill_Bugs. Fix Cursor being in middle of '...file name:' edit box when using 'Search' from the Explorer toolbar. JIRA issue: CORE-19407 --- dll/win32/comctl32/edit.c | 5 +++++ win32ss/user/user32/controls/edit.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 5185605eb72..fc6b53755ef 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -1752,6 +1752,11 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, #ifdef __REACTOS__ HKL hKL = GetKeyboardLayout(0); POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + + /* Don't set caret if not focused */ + if ((es->flags & EF_FOCUSED) == 0) + return; + SetCaretPos(pt.x, pt.y); if (!ImmIsIME(hKL)) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index d48e8e3b034..9b0eac86988 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1907,6 +1907,11 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, #ifdef __REACTOS__ HKL hKL = GetKeyboardLayout(0); POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + + /* Don't set caret if not focused */ + if ((es->flags & EF_FOCUSED) == 0) + return; + SetCaretPos(pt.x, pt.y); if (!ImmIsIME(hKL))

11 months, 1 week

[reactos] 01/01: [MKISOFS] CMakeLists.txt: Add a check for Clang and its version (#6369)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2505489d2952f1df5c27b… commit 2505489d2952f1df5c27bdc1a5a242b582da70ba Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Jan 17 16:32:46 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 16:32:46 2024 +0100 [MKISOFS] CMakeLists.txt: Add a check for Clang and its version (#6369) GCC 8.4 and Clang 13.0.1: `cc1: note: unrecognized command-line option ‘-Wno-deprecated-non-prototype’ may have been intended to silence earlier diagnostics` Addendum to commit 4e3bf252d --- sdk/tools/mkisofs/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index bd25bf36403..1b4c2116035 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -107,10 +107,12 @@ else() # Silence compilers checking for invalid formatting sequences. target_compile_options(libschily PRIVATE "-Wno-format") - # mkisofs uses K&R-style function definitions to support very old compilers. - # This causes warnings with modern compilers. - target_compile_options(libmdigest PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(libschily PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(libsiconv PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(mkisofs PRIVATE "-Wno-deprecated-non-prototype") + if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "15") + # mkisofs uses K&R-style function definitions to support very old compilers. + # This causes warnings with modern compilers. + target_compile_options(libmdigest PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libschily PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libsiconv PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(mkisofs PRIVATE "-Wno-deprecated-non-prototype") + endif() endif()

11 months, 1 week

[reactos] 01/01: [TRANSLATION] Improve Portuguese (pt-PT) translation (#6171)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a453ca2e304fe227719… commit d4a453ca2e304fe22771910680fea4b2c5c527cb Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Jan 17 11:07:21 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 16:07:21 2024 +0100 [TRANSLATION] Improve Portuguese (pt-PT) translation (#6171) Updates for DESK.CPL, INPUT.CPL, EXPLORER.EXE, SHELL32.DLL --- base/shell/explorer/lang/pt-PT.rc | 20 ++++++++++---------- dll/cpl/desk/lang/pt-PT.rc | 8 ++++---- dll/cpl/input/lang/pt-PT.rc | 36 ++++++++++++++++++------------------ dll/win32/shell32/lang/pt-PT.rc | 22 +++++++++++----------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index dcc1584103d..35d813c7a9d 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -79,8 +79,8 @@ BEGIN AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter a barra de tarefas sobre outras janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 - AUTOCHECKBOX "&Mostrar Iniciação Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "Mostrar Iniciação &Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "Mostrar icones &pequenos", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,15 +103,15 @@ CAPTION "Área de Notificação" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 - LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 + GROUPBOX "Icones", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Pode manter a área de notificação organizada ocultando os ícones em que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Icones de sistema", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Seleccione quais ícones do sistema serão sempre visiveis.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "Mostrar &segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "&Área de trabalho", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -187,8 +187,8 @@ BEGIN GROUPBOX "Seleccione o tamanho do icone dos programas ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "Icons &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "icones &pequenos", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "Icones &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Icones &pequenos", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "Programas ", IDC_STATIC, 7, 49, 238, 70 LTEXT "O menu 'Iniciar' comtém atalhos para os programas que usa frequentemente. Ao limpar a lista de atalhos, não elimina os programas.", IDC_STATIC, 14, 63, 224, 20 LTEXT "&Numero de programas no menu 'Iniciar':", IDC_STATIC, 14, 86, 112, 8 diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index bfc159d4c4b..e14a8ec08ab 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -3,14 +3,14 @@ * Traduzido por: Jose Carlos Jesus 05-08-2019 zecarlos1957(a)hotmail.com */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_THEMES DIALOGEX 0, 0, 246, 210 CAPTION "Temas" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Um tema é um plano de fundo, além de um conjunto de sons, ícones e outros elementos para ajudá-lo a personalizar seu computador com um clique.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Um tema é um plano de fundo, além de um conjunto de sons, ícones e outros elementos para ajudá-lo a personalizar o seu computador com um clique.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Tema:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Guardar &como...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Padrão" - IDS_CLEARTYPEEFFECT "FreeType Antialiased" + IDS_CLEARTYPEEFFECT "FreeType suavizado" END STRINGTABLE @@ -298,7 +298,7 @@ BEGIN IDS_ELEMENT_6 "Itens seleccionados" IDS_ELEMENT_7 "Janela" IDS_ELEMENT_8 "Barra de deslocamento" - IDS_ELEMENT_9 "Objetos 3D" + IDS_ELEMENT_9 "Objectos 3D" IDS_ELEMENT_10 "Título da paleta" IDS_ELEMENT_11 "Barra de título" IDS_ELEMENT_12 "Caixa de mensagem" diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index 7972707e353..08a75c707da 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -1,15 +1,15 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Definições" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Idioma de entrada padrão", -1, 5, 5, 246, 55 - LTEXT "Seleccione um dos idiomas de entrada instalados para utilizar quando o computador for iniciado.", -1, 15, 15, 230, 23 + GROUPBOX "&Idioma de teclado predefinido", -1, 5, 5, 246, 55 + LTEXT "Seleccione um dos idiomas de teclado instalados para utilizar quando o computador for iniciado.", -1, 15, 15, 230, 23 COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "&Serviços instalados", -1, 5, 65, 246, 125 - LTEXT "Seleccione os serviços desejados para cada idioma de entrada mostrado na lista. Utilize os botões 'Adicionar' e 'Remover' para modificar a lista.", -1, 15, 78, 230, 25 + LTEXT "Seleccione os serviços que deseja para cada um dos idiomas de teclado mostrado na lista. Utilize os botões 'Adicionar' e 'Remover' para modificar a lista.", -1, 15, 78, 230, 25 CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80 PUSHBUTTON "&Adicionar...", IDC_ADD_BUTTON, 175, 105, 70, 14 PUSHBUTTON "&Remover", IDC_REMOVE_BUTTON, 175, 125, 70, 14 @@ -21,7 +21,7 @@ END IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Definições avançadas" +CAPTION "Avançadas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configuração do sistema", -1, 7, 7, 240, 70 @@ -37,7 +37,7 @@ BEGIN GROUPBOX "Para desactivar Caps Lock", -1, 7, 7, 258, 26 AUTORADIOBUTTON "Pressione a tecla CAPS LOC&K", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "Pressione a tecla SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Teclas de acesso para idiomas de entrada", -1, 7, 37, 258, 95 + GROUPBOX "Teclas de acesso para idiomas de teclado", -1, 7, 37, 258, 95 LTEXT "Acção", -1, 14, 47, 60, 9 RTEXT "Seqüência de &teclas", -1, 177, 47, 79, 9 CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE @@ -48,12 +48,12 @@ END IDD_ADD DIALOGEX 20, 20, 227, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Adicionar idioma de entrada" +CAPTION "Adicionar idioma de teclado" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10 + LTEXT "&Idioma de teclado:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Esquema do teclado/IME:", -1, 7, 36, 110, 10 + LTEXT "&Esquema de teclado/IME:", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 @@ -65,7 +65,7 @@ CAPTION "Alterar seqüência de teclas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "Alternar &idiomas de entrada", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "Alternar &idiomas de teclado", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_CTRL_LANG, 29, 31, 30, 11 @@ -81,10 +81,10 @@ END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Propriedades do idioma de entrada" +CAPTION "Propriedades do idioma de teclado" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8 + LTEXT "Idioma de teclado:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Esquema do teclado/IME:", -1, 7, 21, 110, 10 COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -94,23 +94,23 @@ END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Serviços de texto e idiomas de entrada" + IDS_CPLSYSTEMNAME "Serviços de texto e idiomas de introdução" IDS_CPLSYSTEMDESCRIPTION "Personaliza configurações para entrada de texto de idiomas" IDS_KEYBOARD "Teclado" IDS_NONE "(Nenhum)" IDS_UNKNOWN "(Desconhecido)" - IDS_RESTART "Deseja reiniciar o seu computador agora?" + IDS_RESTART "Deseja reiniciar o computador agora?" IDS_WHATS_THIS "O que é isto?" IDS_LANGUAGE "Idioma" - IDS_LAYOUT "Esquema do teclado" - IDS_REM_QUESTION "Deseja remover o esquema do teclado selecionado?" + IDS_LAYOUT "Esquema de teclado" + IDS_REM_QUESTION "Deseja remover o esquema de teclado seleccionado?" IDS_CONFIRMATION "Confirmação" IDS_LAYOUT_EXISTS "Este esquema já existe." IDS_LAYOUT_EXISTS2 "Este esquema já existe e não pode ser adicionado." IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" - IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" + IDS_SWITCH_BET_INLANG "Alternar entre idiomas de teclado" + IDS_REBOOT_NOW "Tem de reiniciar o computador para que as novas definições surtam efeito.\nPretende reiniciar o computador agora?" END STRINGTABLE diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 6ea2041f42c..0c835e9f397 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -341,7 +341,7 @@ BEGIN GROUPBOX "Desfragmentação", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opção vai desfragmentar os ficheiros no volume.", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragmentar agora...", 14001, 130, 105, 90, 15, WS_TABSTOP + PUSHBUTTON "Desfragmentar agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Cópia de segurança", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opção vai verificar os ficheiros do volume.", -1, 40, 150, 160, 20 @@ -447,7 +447,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Tipos de Ficheiro" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 180, 10 + LTEXT "&Tipos de ficheiro registados:", -1, 7, 10, 180, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 259, 99 PUSHBUTTON "&Novo...", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP PUSHBUTTON "&Eliminar...", IDC_FILETYPES_DELETE, 200, 123, 65, 14, WS_TABSTOP @@ -488,7 +488,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Pretende terminar a sessão?", -1, 49, 15, 156, 8 - DEFPUSHBUTTON "&Terminar a sessão", IDOK, 49, 38, 67, 14 + DEFPUSHBUTTON "&Terminar sessão", IDOK, 49, 38, 67, 14 PUSHBUTTON "Cancelar", IDCANCEL, 123, 38, 67, 14 END @@ -499,11 +499,11 @@ BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 PUSHBUTTON "&Mudar de utilizador", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP - PUSHBUTTON "&Terminar a sessão", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Terminar sessão", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "Terminar sessão ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 150, 19 CTEXT "Mudar de utilizador", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 - CTEXT "Terminar a sessão", IDC_LOG_OFF_STATIC, 116, 70, 55, 11 + CTEXT "Terminar sessão", IDC_LOG_OFF_STATIC, 116, 70, 55, 11 END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 @@ -550,7 +550,7 @@ CAPTION "Conteúdo misto" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS pode executar a mesma acção de cada vez que inserir um disco ou um dispositivo com este tipo de ficheiro:", 1001, 30, 7, 193, 20 + LTEXT "O ReactOS pode executar a mesma acção de cada vez que inserir um disco ou um dispositivo com este tipo de ficheiro:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "O que pretende que o ReactOS faça?", 1002, 32, 41, 190, 8 @@ -566,7 +566,7 @@ CAPTION "Autoplay" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS pode executar sempre a mesma acção de cada vez que inserir um disco ou um dispositivo.", 1001, 32, 7, 190, 22 + LTEXT "O ReactOS pode executar sempre a mesma acção de cada vez que inserir um disco ou um dispositivo.", 1001, 32, 7, 190, 22 LTEXT "O que pretende que o ReactOS faça?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "&Executar sempre a acção seleccionada", 1004, 32, 143, 190, 8 @@ -871,7 +871,7 @@ BEGIN IDS_NETHOOD "Vizinhança na rede" IDS_TEMPLATES "Modelos" IDS_APPDATA "Dados de Programas" - IDS_PRINTHOOD "PrintHood" + IDS_PRINTHOOD "Impressoras" IDS_LOCAL_APPDATA "Definições locais\\Dados de Programas" IDS_INTERNET_CACHE "Definições locais\\Ficheiros Temporários da Internet" IDS_COOKIES "Cookies" @@ -891,7 +891,7 @@ BEGIN IDS_NEWITEMFORMAT "Novo %s" IDS_DRIVE_FIXED "Disco Local" - IDS_DRIVE_CDROM "CD Drive" + IDS_DRIVE_CDROM "Unidade de CD-ROM" IDS_DRIVE_NETWORK "Disco de Rede" IDS_DRIVE_FLOPPY "3.5 Floppy" IDS_DRIVE_REMOVABLE "Disco removível" @@ -905,7 +905,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< &Retroceder" - FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "No&vo" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Opções das Pastas" @@ -984,7 +984,7 @@ BEGIN IDS_EXE_DESCRIPTION "Descrição:" IDS_MENU_EMPTY "(Vazio)" - IDS_OBJECTS "%d Objetos" + IDS_OBJECTS "%d Objectos" IDS_OBJECTS_SELECTED "%d Objectos seleccionados" IDS_TITLE_MYCOMP "O Meu Computador"

11 months, 1 week

[reactos] 01/01: [MSUTB] Add CTrayIconItem (#6371)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89d8b472af5b5c3960cbe… commit 89d8b472af5b5c3960cbe92f9521b9d866398798 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 17 12:42:54 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 12:42:54 2024 +0900 [MSUTB] Add CTrayIconItem (#6371) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CTrayIconItem class. - Add delay link to shell32.dll. --- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/msutb.cpp | 107 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index d4259dc7cda..dd79a30d8c5 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32) +add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32 shell32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 4ba8f878913..ec7e1ea24cb 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -30,6 +30,113 @@ END_OBJECT_MAP() CMsUtbModule gModule; +/***********************************************************************/ + +class CTrayIconWnd +{ +public: + //FIXME + HWND GetNotifyWnd() { return NULL; }; +}; + +/***********************************************************************/ + +class CTrayIconItem +{ +protected: + HWND m_hWnd; + UINT m_uCallbackMessage; + UINT m_uNotifyIconID; + DWORD m_dwIconAddOrModify; + BOOL m_bIconAdded; + CTrayIconWnd *m_pTrayIconWnd; + DWORD m_dw; + GUID m_guid; + RECT m_rcMenu; + POINT m_ptCursor; + + CTrayIconItem(CTrayIconWnd *pTrayIconWnd); + + BOOL _Init(HWND hWnd, UINT uCallbackMessage, UINT uNotifyIconID, const GUID& rguid); + BOOL UpdateMenuRectPoint(); + BOOL RemoveIcon(); + + STDMETHOD_(BOOL, SetIcon)(HICON hIcon, LPCTSTR pszTip); + STDMETHOD_(LRESULT, OnMsg)(WPARAM wParam, LPARAM lParam) { return 0; }; + STDMETHOD_(LRESULT, OnDelayMsg)(LPARAM lParam) { return 0; }; +}; + +/*********************************************************************** + * CTrayIconItem + */ + +CTrayIconItem::CTrayIconItem(CTrayIconWnd *pTrayIconWnd) +{ + m_dwIconAddOrModify = NIM_ADD; + m_pTrayIconWnd = pTrayIconWnd; +} + +BOOL +CTrayIconItem::_Init( + HWND hWnd, + UINT uCallbackMessage, + UINT uNotifyIconID, + const GUID& rguid) +{ + m_hWnd = hWnd; + m_uCallbackMessage = uCallbackMessage; + m_uNotifyIconID = uNotifyIconID; + m_guid = rguid; + return TRUE; +} + +BOOL CTrayIconItem::RemoveIcon() +{ + if (m_dwIconAddOrModify == NIM_MODIFY) + { + NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + NotifyIcon.uCallbackMessage = m_uCallbackMessage; + ::Shell_NotifyIcon(NIM_DELETE, &NotifyIcon); + } + + m_dwIconAddOrModify = NIM_ADD; + m_bIconAdded = TRUE; + return TRUE; +} + +BOOL CTrayIconItem::SetIcon(HICON hIcon, LPCTSTR pszTip) +{ + if (!hIcon) + return FALSE; + + NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE; + NotifyIcon.uCallbackMessage = m_uCallbackMessage; + NotifyIcon.hIcon = hIcon; + if (pszTip) + { + NotifyIcon.uFlags |= NIF_TIP; + StringCchCopy(NotifyIcon.szTip, _countof(NotifyIcon.szTip), pszTip); + } + + ::Shell_NotifyIcon(m_dwIconAddOrModify, &NotifyIcon); + + m_dwIconAddOrModify = NIM_MODIFY; + m_bIconAdded = NIM_MODIFY; + return TRUE; +} + +BOOL CTrayIconItem::UpdateMenuRectPoint() +{ + HWND hNotifyWnd = m_pTrayIconWnd->GetNotifyWnd(); + ::GetClientRect(hNotifyWnd, &m_rcMenu); + ::ClientToScreen(hNotifyWnd, (LPPOINT)&m_rcMenu); + ::ClientToScreen(hNotifyWnd, (LPPOINT)&m_rcMenu.right); + ::GetCursorPos(&m_ptCursor); + return TRUE; +} + /*********************************************************************** * GetLibTls (MSUTB.@) *

11 months, 1 week

[reactos] 01/01: [SDK] cicuif.h: Add CUIFWndFrame (#6370)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae54529024469878b75e7… commit ae54529024469878b75e7637ebb9a6b91684c4ee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 17 12:42:18 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 12:42:18 2024 +0900 [SDK] cicuif.h: Add CUIFWndFrame (#6370) Supporting TIPs... JIRA issue: CORE-19360 Implement CUIFWndFrame class. --- sdk/include/reactos/cicero/cicuif.h | 215 ++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 64388328801..c5f4bfcc845 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -849,6 +849,33 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFWndFrame : public CUIFObject +{ +protected: + DWORD m_dwHitTest; + POINT m_ptHit; + RECT m_rcWnd; + INT m_cxFrame; + INT m_cyFrame; + INT m_cxMin; + INT m_cyMin; + +public: + CUIFWndFrame(CUIFObject *pParent, LPCRECT prc, DWORD style); + + void GetFrameSize(LPSIZE pSize); + DWORD HitTest(LONG x, LONG y); + + STDMETHOD_(void, OnMouseMove)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC) override; + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -4622,3 +4649,191 @@ CUIFToolbarButton::SetToolTip(LPCWSTR pszToolTip) if (m_pToolbarMenuButton) m_pToolbarMenuButton->SetToolTip(pszToolTip); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFWndFrame::CUIFWndFrame( + CUIFObject *pParent, + LPCRECT prc, + DWORD style) : CUIFObject(pParent, 0, prc, style) +{ + m_iPartId = 7; + m_iStateId = 0; + m_pszClassList = L"WINDOW"; + m_dwHitTest = 0; + m_cxFrame = m_cyFrame = 0; + + if (m_pScheme) + { + if ((m_style & 0xF) && (m_style & 0xF) <= 2) + { + m_cxFrame = m_pScheme->CxSizeFrame(); + m_cyFrame = m_pScheme->CySizeFrame(); + } + else + { + m_cxFrame = m_pScheme->CxWndBorder(); + m_cyFrame = m_pScheme->CyWndBorder(); + } + } + + m_cxMin = GetSystemMetrics(SM_CXMIN); + m_cyMin = GetSystemMetrics(SM_CYMIN); +} + +inline void CUIFWndFrame::GetFrameSize(LPSIZE pSize) +{ + pSize->cx = m_cxFrame; + pSize->cy = m_cyFrame; +} + +inline DWORD CUIFWndFrame::HitTest(LONG x, LONG y) +{ + DWORD dwFlags = 0; + if ( m_rc.left <= x && x < m_rc.left + m_cxFrame) + dwFlags |= 0x10; + if (m_rc.top <= y && y < m_rc.top + m_cyFrame ) + dwFlags |= 0x20; + if (m_rc.right - m_cxFrame <= x && x < m_rc.right) + dwFlags |= 0x40; + if (m_rc.bottom - m_cyFrame <= y && y < m_rc.bottom) + dwFlags |= 0x80; + return dwFlags; +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnMouseMove(LONG x, LONG y) +{ + if (!IsCapture()) + return; + + POINT Point; + ::ClientToScreen(*m_pWindow, &Point); + + RECT rc = m_rcWnd; + + if (m_dwHitTest & 0x10) + rc.left = Point.x + m_rcWnd.left - m_ptHit.x; + + if (m_dwHitTest & 0x20) + rc.top = Point.y + m_rcWnd.top - m_ptHit.y; + + if (m_dwHitTest & 0x40) + { + rc.right = Point.x + m_rcWnd.right - m_ptHit.x; + if (rc.right <= rc.left + m_cxMin) + rc.right = rc.left + m_cxMin; + } + + if (m_dwHitTest & 0x80) + { + rc.bottom = Point.y + m_rcWnd.bottom - m_ptHit.y; + if (rc.bottom <= rc.top + m_cyMin) + rc.bottom = rc.top + m_cyMin; + } + + m_pWindow->Move(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnLButtonDown(LONG x, LONG y) +{ + POINT Point = { x, y }; + DWORD hitTest = m_style & HitTest(x, y); + if (!hitTest) + return; + + ::ClientToScreen(*m_pWindow, &Point); + m_ptHit = Point; + m_pWindow = m_pWindow; + m_dwHitTest = hitTest; + ::GetWindowRect(*m_pWindow, &m_rcWnd); + StartCapture(); +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnLButtonUp(LONG x, LONG y) +{ + if (IsCapture()) + EndCapture(); +} + +inline STDMETHODIMP_(BOOL) +CUIFWndFrame::OnPaintTheme(HDC hDC) +{ + if (FAILED(EnsureThemeData(*m_pWindow))) + return FALSE; + + RECT rc = m_rc; + rc.right = m_cxFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 5, 1, NULL))) + return FALSE; + + rc = m_rc; + rc.left = rc.right - m_cxFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 10, 4, NULL))) + return FALSE; + + rc = m_rc; + rc.bottom = m_cyFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 5, 2, NULL))) + return FALSE; + + rc = m_rc; + rc.top = rc.bottom - m_cyFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 10, 8, NULL))) + return FALSE; + + return TRUE; +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnPaintNoTheme(HDC hDC) +{ + if (!m_pScheme) + return; + + DWORD type = 0; + if ((m_style & 0xF) == 1) + type = 1; + else if ( (m_style & 0xF) == 2 ) + type = 2; + + m_pScheme->DrawWndFrame(hDC, &m_rc, type, m_cxFrame, m_cyFrame); +} + +inline STDMETHODIMP_(BOOL) +CUIFWndFrame::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + DWORD dwHitTest = m_dwHitTest; + if (!IsCapture()) + dwHitTest = m_style & HitTest(x, y); + + LPTSTR pszCursor = NULL; + switch (dwHitTest) + { + case 0x30: + case 0xC0: + pszCursor = IDC_SIZENWSE; + break; + case 0x90: + case 0x60: + pszCursor = IDC_SIZENESW; + break; + case 0x10: + case 0x40: + pszCursor = IDC_SIZEWE; + break; + case 0x20: + case 0x80: + pszCursor = IDC_SIZENS; + break; + default: + return FALSE; + } + + HCURSOR hCursor = ::LoadCursor(NULL, pszCursor); + ::SetCursor(hCursor); + return TRUE; +}

11 months, 1 week

[reactos] 01/01: [SDK][VIRTIO][NETKVM] Make VirtIO a separate library (#6280)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823fdb19d75b29352b162… commit 823fdb19d75b29352b1621e16f5c955153d90ed3 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Wed Jan 17 02:55:35 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 16 17:55:35 2024 -0800 [SDK][VIRTIO][NETKVM] Make VirtIO a separate library (#6280) * [SDK][VIRTIO][NETKVM] Make VirtIO a separate library This is to avoid code duplication when more VirtIO drivers are brought in. This will also be used on development of a VirtIO XDDM GPU Driver. * [VIRTIO] Sync with upstream --- drivers/network/dd/netkvm/CMakeLists.txt | 10 +++------- media/doc/3rd Party Files.txt | 8 +++++++- sdk/lib/drivers/CMakeLists.txt | 1 + sdk/lib/drivers/virtio/CMakeLists.txt | 17 +++++++++++++++++ .../dd/netkvm => sdk/lib/drivers}/virtio/LICENSE | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/VirtIO.h | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCICommon.c | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCILegacy.c | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCIModern.c | 5 +++++ .../lib/drivers}/virtio/VirtIORing-Packed.c | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/VirtIORing.c | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/kdebugprint.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/linux/types.h | 0 .../lib/drivers}/virtio/linux/virtio_config.h | 0 .../lib/drivers}/virtio/linux/virtio_types.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/osdep.h | 2 ++ .../dd/netkvm => sdk/lib/drivers}/virtio/virtio_pci.h | 0 .../lib/drivers}/virtio/virtio_pci_common.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/virtio_ring.h | 0 .../drivers}/virtio/windows/virtio_ring_allocation.h | 0 20 files changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/network/dd/netkvm/CMakeLists.txt b/drivers/network/dd/netkvm/CMakeLists.txt index 26ff48a184b..7aa1ca6d146 100644 --- a/drivers/network/dd/netkvm/CMakeLists.txt +++ b/drivers/network/dd/netkvm/CMakeLists.txt @@ -1,5 +1,6 @@ -include_directories(BEFORE Common virtio) +include_directories(BEFORE Common + ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/virtio) add_definitions( -DNDIS_MINIPORT_DRIVER @@ -11,16 +12,12 @@ list(APPEND SOURCE Common/ParaNdis-VirtIO.c Common/ParaNdis-Debug.c Common/sw-offload.c - virtio/VirtIOPCICommon.c - virtio/VirtIOPCILegacy.c - virtio/VirtIOPCIModern.c - virtio/VirtIORing.c - virtio/VirtIORing-Packed.c wxp/ParaNdis5-Driver.c wxp/ParaNdis5-Impl.c wxp/ParaNdis5-Oid.c) add_library(netkvm MODULE ${SOURCE} wxp/parandis.rc) +target_link_libraries(netkvm virtio) set_module_type(netkvm kernelmodedriver) add_importlibs(netkvm ndis ntoskrnl hal) add_cd_file(TARGET netkvm DESTINATION reactos/system32/drivers FOR all) @@ -29,7 +26,6 @@ add_driver_inf(netkvm netkvm.inf) if(NOT MSVC) target_compile_options(netkvm PRIVATE -Wno-unused-function - -Wno-unknown-pragmas -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b39199a5cd6..83175a78dd9 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -74,6 +74,12 @@ Used Version: 20221020 License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) URL: https://acpica.org/ +Title: VirtIO Windows guest driver library +Path: sdk/lib/drivers/virtio +Used Version: git commit 4c4d181 +License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) +URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/VirtIO + Title: WinBtrfs Path: dll/shellext/shellbtrfs Path: drivers/filesystems/btrfs @@ -115,7 +121,7 @@ Title: VirtIO NetKVM Windows guest driver Path: drivers/network/dd/netkvm Used Version: git commit 5e01b36 License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) -URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/NetKVM/… +URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/03ca1696b9474d… Title: Microsoft CDROM Storage Class Driver Path: drivers/storage/class/cdrom diff --git a/sdk/lib/drivers/CMakeLists.txt b/sdk/lib/drivers/CMakeLists.txt index 2dd4251706e..4e43c7f8bec 100644 --- a/sdk/lib/drivers/CMakeLists.txt +++ b/sdk/lib/drivers/CMakeLists.txt @@ -9,4 +9,5 @@ add_subdirectory(rdbsslib) add_subdirectory(rtlver) add_subdirectory(rxce) add_subdirectory(sound) +add_subdirectory(virtio) add_subdirectory(wdf) diff --git a/sdk/lib/drivers/virtio/CMakeLists.txt b/sdk/lib/drivers/virtio/CMakeLists.txt new file mode 100644 index 00000000000..c7cffcc09a7 --- /dev/null +++ b/sdk/lib/drivers/virtio/CMakeLists.txt @@ -0,0 +1,17 @@ + +list(APPEND SOURCE + VirtIOPCICommon.c + VirtIOPCILegacy.c + VirtIOPCIModern.c + VirtIORing.c + VirtIORing-Packed.c) + +add_library(virtio ${SOURCE}) +add_dependencies(virtio xdk) + +if(NOT MSVC) + target_compile_options(virtio PRIVATE + -Wno-unused-function + -Wno-unknown-pragmas + -Wno-attributes) +endif() diff --git a/drivers/network/dd/netkvm/virtio/LICENSE b/sdk/lib/drivers/virtio/LICENSE similarity index 100% rename from drivers/network/dd/netkvm/virtio/LICENSE rename to sdk/lib/drivers/virtio/LICENSE diff --git a/drivers/network/dd/netkvm/virtio/VirtIO.h b/sdk/lib/drivers/virtio/VirtIO.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIO.h rename to sdk/lib/drivers/virtio/VirtIO.h diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCICommon.c b/sdk/lib/drivers/virtio/VirtIOPCICommon.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIOPCICommon.c rename to sdk/lib/drivers/virtio/VirtIOPCICommon.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCILegacy.c b/sdk/lib/drivers/virtio/VirtIOPCILegacy.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIOPCILegacy.c rename to sdk/lib/drivers/virtio/VirtIOPCILegacy.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c b/sdk/lib/drivers/virtio/VirtIOPCIModern.c similarity index 98% rename from drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c rename to sdk/lib/drivers/virtio/VirtIOPCIModern.c index 8a44a2b3465..7d303069d90 100644 --- a/drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c +++ b/sdk/lib/drivers/virtio/VirtIOPCIModern.c @@ -184,6 +184,11 @@ static void vio_modern_reset(VirtIODevice *vdev) * including MSI-X interrupts, if any. */ while (ioread8(vdev, &vdev->common->device_status)) { + u16 val; + if (pci_read_config_word(vdev, 0, &val) || val == 0xffff) { + DPrintf(0, "PCI config space is not readable, probably the device is removed\n", 0); + break; + } vdev_sleep(vdev, 1); } } diff --git a/drivers/network/dd/netkvm/virtio/VirtIORing-Packed.c b/sdk/lib/drivers/virtio/VirtIORing-Packed.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIORing-Packed.c rename to sdk/lib/drivers/virtio/VirtIORing-Packed.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIORing.c b/sdk/lib/drivers/virtio/VirtIORing.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIORing.c rename to sdk/lib/drivers/virtio/VirtIORing.c diff --git a/drivers/network/dd/netkvm/virtio/kdebugprint.h b/sdk/lib/drivers/virtio/kdebugprint.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/kdebugprint.h rename to sdk/lib/drivers/virtio/kdebugprint.h diff --git a/drivers/network/dd/netkvm/virtio/linux/types.h b/sdk/lib/drivers/virtio/linux/types.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/types.h rename to sdk/lib/drivers/virtio/linux/types.h diff --git a/drivers/network/dd/netkvm/virtio/linux/virtio_config.h b/sdk/lib/drivers/virtio/linux/virtio_config.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/virtio_config.h rename to sdk/lib/drivers/virtio/linux/virtio_config.h diff --git a/drivers/network/dd/netkvm/virtio/linux/virtio_types.h b/sdk/lib/drivers/virtio/linux/virtio_types.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/virtio_types.h rename to sdk/lib/drivers/virtio/linux/virtio_types.h diff --git a/drivers/network/dd/netkvm/virtio/osdep.h b/sdk/lib/drivers/virtio/osdep.h similarity index 96% rename from drivers/network/dd/netkvm/virtio/osdep.h rename to sdk/lib/drivers/virtio/osdep.h index b1c98145060..36a929294f4 100644 --- a/drivers/network/dd/netkvm/virtio/osdep.h +++ b/sdk/lib/drivers/virtio/osdep.h @@ -24,8 +24,10 @@ #endif #ifndef __REACTOS__ +#if !defined(ENOSPC) #define ENOSPC 1 #endif +#endif #if !defined(__cplusplus) && !defined(bool) // Important note: in MSFT C++ bool length is 1 bytes diff --git a/drivers/network/dd/netkvm/virtio/virtio_pci.h b/sdk/lib/drivers/virtio/virtio_pci.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_pci.h rename to sdk/lib/drivers/virtio/virtio_pci.h diff --git a/drivers/network/dd/netkvm/virtio/virtio_pci_common.h b/sdk/lib/drivers/virtio/virtio_pci_common.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_pci_common.h rename to sdk/lib/drivers/virtio/virtio_pci_common.h diff --git a/drivers/network/dd/netkvm/virtio/virtio_ring.h b/sdk/lib/drivers/virtio/virtio_ring.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_ring.h rename to sdk/lib/drivers/virtio/virtio_ring.h diff --git a/drivers/network/dd/netkvm/virtio/windows/virtio_ring_allocation.h b/sdk/lib/drivers/virtio/windows/virtio_ring_allocation.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/windows/virtio_ring_allocation.h rename to sdk/lib/drivers/virtio/windows/virtio_ring_allocation.h

11 months, 1 week

[reactos] 02/02: [NTOS:KE/x64] Fix boot process affinity

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96d5b6281d67b25165b29… commit 96d5b6281d67b25165b293b4bbfb8e85fddf91a0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 23 13:23:40 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 16 08:15:53 2024 +0100 [NTOS:KE/x64] Fix boot process affinity --- ntoskrnl/ke/amd64/krnlinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index 234628a3d46..34d1a6621f6 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -292,7 +292,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR;

11 months, 1 week

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2024