Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/03: [KMTESTS:IO] Rewrite IoDeviceInterface kmtest Add new kernel-mode test for Device Interface functions, based on the patch by Mark Jansen. The previous one was buggy and crashed even on Windows. The new one doesn't fail, and works without bugs. Although there is missing one test case (for IoRegisterDeviceInterface). Also perhaps IoRegister/UnregisterPlugPlayNotification testcases should be keept, if they correspond to Device Interface functions. CORE-17361

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b2f00e70a08912601edb… commit 6b2f00e70a08912601edbb3264e71bee5f49b8cf Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Apr 8 21:03:02 2021 +0300 Commit: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> CommitDate: Sun Feb 2 23:30:38 2025 +0100 [KMTESTS:IO] Rewrite IoDeviceInterface kmtest Add new kernel-mode test for Device Interface functions, based on the patch by Mark Jansen. The previous one was buggy and crashed even on Windows. The new one doesn't fail, and works without bugs. Although there is missing one test case (for IoRegisterDeviceInterface). Also perhaps IoRegister/UnregisterPlugPlayNotification testcases should be keept, if they correspond to Device Interface functions. CORE-17361 --- .../rostests/kmtests/ntos_io/IoDeviceInterface.c | 374 ++++++++++----------- 1 file changed, 172 insertions(+), 202 deletions(-) diff --git a/modules/rostests/kmtests/ntos_io/IoDeviceInterface.c b/modules/rostests/kmtests/ntos_io/IoDeviceInterface.c index 58f15cb6c75..846c43901c6 100644 --- a/modules/rostests/kmtests/ntos_io/IoDeviceInterface.c +++ b/modules/rostests/kmtests/ntos_io/IoDeviceInterface.c @@ -1,11 +1,14 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite Device Interface functions test - * PROGRAMMER: Filip Navara <xnavara(a)volny.cz> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for Device Interface functions + * COPYRIGHT: Copyright 2011 Filip Navara <xnavara(a)volny.cz> + * Copyright 2011-2015 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2021-2024 Oleg Dubinskiy <oleg.dubinskiy(a)reactos.org> */ -/* TODO: what's with the prototypes at the top, what's with the if-ed out part? Doesn't process most results */ +/* TODO: Add IoRegisterDeviceInterface testcase */ #include <kmt_test.h> #include <poclass.h> @@ -13,113 +16,176 @@ #define NDEBUG #include <debug.h> -#if 0 -NTSTATUS -(NTAPI *IoGetDeviceInterfaces_Func)( - IN CONST GUID *InterfaceClassGuid, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN ULONG Flags, - OUT PWSTR *SymbolicLinkList); - -NTSTATUS NTAPI -ReactOS_IoGetDeviceInterfaces( - IN CONST GUID *InterfaceClassGuid, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN ULONG Flags, - OUT PWSTR *SymbolicLinkList); -#endif /* 0 */ - -static VOID DeviceInterfaceTest_Func() +/* Predefined GUIDs are required for IoGetDeviceInterfaceAlias and IoOpenDeviceInterfaceRegistryKey. + * Only they can provide the aliases and the needed subkeys, unlike manually declared test GUIDs. + * Since IoRegisterDeviceInterface testcase is missing, it is not possible to register the new device interface + * and get an alias/key handle of it using this test. */ +/* Invalid GUID */ +static const GUID GUID_NULL = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; +/* From our ks.h */ +static const GUID KSCATEGORY_BRIDGE = {0x085AFF00L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +static const GUID KSCATEGORY_CAPTURE = {0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_COMMUNICATIONSTRANSFORM = {0xCF1DDA2CL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_DATACOMPRESSOR = {0x1E84C900L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +static const GUID KSCATEGORY_DATADECOMPRESSOR = {0x2721AE20L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +static const GUID KSCATEGORY_DATATRANSFORM = {0x2EB07EA0L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +static const GUID KSCATEGORY_FILESYSTEM = {0x760FED5EL, 0x9357, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_INTERFACETRANSFORM = {0xCF1DDA2DL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_MEDIUMTRANSFORM = {0xCF1DDA2EL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_MIXER = {0xAD809C00L, 0x7B88, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +static const GUID KSCATEGORY_RENDER = {0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +static const GUID KSCATEGORY_SPLITTER = {0x0A4252A0L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; + +static const GUID* Types[] = { - NTSTATUS Status; - PWSTR SymbolicLinkList; - PWSTR SymbolicLinkListPtr; - GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}}; - - Status = IoGetDeviceInterfaces( - &Guid, - NULL, - 0, - &SymbolicLinkList); - - ok(NT_SUCCESS(Status), - "IoGetDeviceInterfaces failed with status 0x%X\n", - (unsigned int)Status); - if (!NT_SUCCESS(Status)) - { - return; - } - - DPRINT("IoGetDeviceInterfaces results:\n"); - for (SymbolicLinkListPtr = SymbolicLinkList; - SymbolicLinkListPtr[0] != 0 && SymbolicLinkListPtr[1] != 0; - SymbolicLinkListPtr += wcslen(SymbolicLinkListPtr) + 1) - { - DPRINT1("Symbolic Link: %S\n", SymbolicLinkListPtr); - } - -#if 0 - DPRINT("[PnP Test] Trying to get aliases\n"); - - for (SymbolicLinkListPtr = SymbolicLinkList; - SymbolicLinkListPtr[0] != 0 && SymbolicLinkListPtr[1] != 0; - SymbolicLinkListPtr += wcslen(SymbolicLinkListPtr) + 1) - { - UNICODE_STRING SymbolicLink; - UNICODE_STRING AliasSymbolicLink; - - SymbolicLink.Buffer = SymbolicLinkListPtr; - SymbolicLink.Length = SymbolicLink.MaximumLength = wcslen(SymbolicLinkListPtr); - RtlInitUnicodeString(&AliasSymbolicLink, NULL); - IoGetDeviceInterfaceAlias( - &SymbolicLink, - &AliasGuid, - &AliasSymbolicLink); - if (AliasSymbolicLink.Buffer != NULL) - { - DPRINT("[PnP Test] Original: %S\n", SymbolicLinkListPtr); - DPRINT("[PnP Test] Alias: %S\n", AliasSymbolicLink.Buffer); - } - } -#endif - - ExFreePool(SymbolicLinkList); + &GUID_NULL, + &KSCATEGORY_BRIDGE, + &KSCATEGORY_CAPTURE, + &KSCATEGORY_COMMUNICATIONSTRANSFORM, + &KSCATEGORY_DATACOMPRESSOR, + &KSCATEGORY_DATADECOMPRESSOR, + &KSCATEGORY_DATATRANSFORM, + &KSCATEGORY_FILESYSTEM, + &KSCATEGORY_INTERFACETRANSFORM, + &KSCATEGORY_MEDIUMTRANSFORM, + &KSCATEGORY_MIXER, + &KSCATEGORY_RENDER, + &KSCATEGORY_SPLITTER, +}; + +static +VOID +Test_IoOpenDeviceInterfaceRegistryKey( + _In_opt_ PCWSTR SymbolicLink) +{ + UNICODE_STRING KeyName, SymbolicLinkName; + HANDLE DeviceInterfaceKey; + NTSTATUS Status; + size_t n; + + RtlInitUnicodeString(&SymbolicLinkName, SymbolicLink); + RtlInitUnicodeString(&KeyName, L"ReactOS_kmtest"); + + /* It's okay to call this from a user process's thread */ + Status = IoOpenDeviceInterfaceRegistryKey(&SymbolicLinkName, KEY_CREATE_SUB_KEY, &DeviceInterfaceKey); + + if (skip(NT_SUCCESS(Status), "IoOpenDeviceInterfaceRegistryKey() failed: 0x%lx\n", Status)) + return; + + trace("IoOpenDeviceInterfaceRegistryKey() success: 0x%p\n", DeviceInterfaceKey); + + for (n = 0; n < RTL_NUMBER_OF(Types); ++n) + { + HANDLE DeviceInterfaceSubKey; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Try to create the non-volatile subkey to check whether the parent key is volatile */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + DeviceInterfaceKey, + NULL); + Status = ZwCreateKey(&DeviceInterfaceSubKey, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + + if (skip(NT_SUCCESS(Status), "ZwCreateKey() failed to create a subkey: %d 0x%lx\n", n, Status)) + continue; + + trace("ZwCreateKey(): successfully created subkey: %d 0x%p\n", n, DeviceInterfaceSubKey); + + ZwDeleteKey(DeviceInterfaceSubKey); + ZwClose(DeviceInterfaceSubKey); + } + + ZwClose(DeviceInterfaceKey); } static VOID -Test_IoRegisterDeviceInterface(VOID) +Test_IoGetDeviceInterfaceAlias( + _In_opt_ PCWSTR SymbolicLink) { - GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}}; - DEVICE_OBJECT DeviceObject; - EXTENDED_DEVOBJ_EXTENSION DeviceObjectExtension; - DEVICE_NODE DeviceNode; UNICODE_STRING SymbolicLinkName; - NTSTATUS Status; + size_t n; + + RtlInitUnicodeString(&SymbolicLinkName, SymbolicLink); + + for (n = 0; n < RTL_NUMBER_OF(Types); ++n) + { + UNICODE_STRING AliasSymbolicLinkName; + NTSTATUS Status = IoGetDeviceInterfaceAlias(&SymbolicLinkName, Types[n], &AliasSymbolicLinkName); - RtlInitUnicodeString(&SymbolicLinkName, L""); + if (skip(NT_SUCCESS(Status), "IoGetDeviceInterfaceAlias(): fail: %d 0x%x\n", n, Status)) + continue; - // Prepare our surrogate of a Device Object - DeviceObject.DeviceObjectExtension = (PDEVOBJ_EXTENSION)&DeviceObjectExtension; + trace("IoGetDeviceInterfaceAlias(): success: %d %wZ\n", n, &AliasSymbolicLinkName); + + /* Test IoOpenDeviceInterfaceRegistryKey with alias symbolic link too */ + Test_IoOpenDeviceInterfaceRegistryKey(AliasSymbolicLinkName.Buffer); + + RtlFreeUnicodeString(&AliasSymbolicLinkName); + } +} - // 1. DeviceNode = NULL - DeviceObjectExtension.DeviceNode = NULL; - Status = IoRegisterDeviceInterface(&DeviceObject, &Guid, NULL, - &SymbolicLinkName); +static +VOID +Test_IoSetDeviceInterfaceState( + _In_opt_ PCWSTR SymbolicLink) +{ + UNICODE_STRING SymbolicLinkName; + size_t n; - ok(Status == STATUS_INVALID_DEVICE_REQUEST, - "IoRegisterDeviceInterface returned 0x%08lX\n", Status); + RtlInitUnicodeString(&SymbolicLinkName, SymbolicLink); - // 2. DeviceNode->InstancePath is of a null length - DeviceObjectExtension.DeviceNode = &DeviceNode; - DeviceNode.InstancePath.Length = 0; - Status = IoRegisterDeviceInterface(&DeviceObject, &Guid, NULL, - &SymbolicLinkName); + for (n = 0; n < RTL_NUMBER_OF(Types); ++n) + { + NTSTATUS Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - ok(Status == STATUS_INVALID_DEVICE_REQUEST, - "IoRegisterDeviceInterface returned 0x%08lX\n", Status); + if (skip(NT_SUCCESS(Status), "IoSetDeviceInterfaceState(): failed to enable interface: %d 0x%x\n", n, Status)) + continue; - DeviceInterfaceTest_Func(); + trace("IoSetDeviceInterfaceState(): successfully enabled interface: %d %wZ\n", n, &SymbolicLinkName); + } +} + +static +VOID +Test_IoGetDeviceInterfaces( + _In_ const GUID* Guid) +{ + NTSTATUS Status; + PZZWSTR SymbolicLinkList; + PWSTR SymbolicLink; + UNICODE_STRING GuidString; + + Status = IoGetDeviceInterfaces(Guid, NULL, DEVICE_INTERFACE_INCLUDE_NONACTIVE, &SymbolicLinkList); + + RtlStringFromGUID(Guid, &GuidString); + if (skip(NT_SUCCESS(Status), "IoGetDeviceInterfaces failed with status 0x%x for '%wZ'\n", Status, &GuidString)) + { + RtlFreeUnicodeString(&GuidString); + return; + } + + trace("IoGetDeviceInterfaces '%wZ' results:\n", &GuidString); + RtlFreeUnicodeString(&GuidString); + + for (SymbolicLink = SymbolicLinkList; + SymbolicLink[0] != UNICODE_NULL; + SymbolicLink += wcslen(SymbolicLink) + 1) + { + trace("Symbolic Link: %S\n", SymbolicLink); + Test_IoGetDeviceInterfaceAlias(SymbolicLink); + Test_IoOpenDeviceInterfaceRegistryKey(SymbolicLink); + Test_IoSetDeviceInterfaceState(SymbolicLink); + } + + ExFreePool(SymbolicLinkList); } static UCHAR NotificationContext; @@ -181,112 +247,16 @@ Test_IoRegisterPlugPlayNotification(VOID) } } -static -VOID -Test_IoSetDeviceInterface(VOID) +START_TEST(IoDeviceInterface) { - NTSTATUS Status; - UNICODE_STRING SymbolicLinkName; - PWCHAR Buffer; - ULONG BufferSize; - - /* Invalid prefix or GUID */ - KmtStartSeh() - Status = IoSetDeviceInterfaceState(NULL, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - RtlInitEmptyUnicodeString(&SymbolicLinkName, NULL, 0); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\\\"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - - /* Valid prefix & GUID, invalid device node */ - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\\\?\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}\\"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); - - /* Must not read past the buffer */ - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - BufferSize = SymbolicLinkName.Length; - Buffer = KmtAllocateGuarded(BufferSize); - if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) + size_t n; + for (n = 0; n < RTL_NUMBER_OF(Types); ++n) { - RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); - SymbolicLinkName.Buffer = Buffer; - SymbolicLinkName.MaximumLength = BufferSize; - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); - KmtFreeGuarded(Buffer); + Test_IoGetDeviceInterfaces(Types[n]); } - - RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); - BufferSize = SymbolicLinkName.Length; - Buffer = KmtAllocateGuarded(BufferSize); - if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) - { - RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); - SymbolicLinkName.Buffer = Buffer; - SymbolicLinkName.MaximumLength = BufferSize; - KmtStartSeh() - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - KmtEndSeh(STATUS_SUCCESS) - ok_eq_hex(Status, STATUS_INVALID_PARAMETER); - KmtFreeGuarded(Buffer); - } -} - -START_TEST(IoDeviceInterface) -{ - // FIXME: This test crashes in Windows - (void)Test_IoRegisterDeviceInterface; + /* Test the invalid case behaviour */ + Test_IoGetDeviceInterfaceAlias(NULL); + Test_IoOpenDeviceInterfaceRegistryKey(NULL); + Test_IoSetDeviceInterfaceState(NULL); Test_IoRegisterPlugPlayNotification(); - Test_IoSetDeviceInterface(); }

9 months, 2 weeks

[reactos] 03/03: [NTOS:KE/x86] Detect more KeFeatureBits

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b002025d45e36cccaa57… commit 9b002025d45e36cccaa579e930c7aa8267c77c4d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 22 12:58:47 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Feb 1 19:45:21 2025 +0200 [NTOS:KE/x86] Detect more KeFeatureBits --- ntoskrnl/include/internal/i386/ke.h | 8 ++++++++ ntoskrnl/ke/i386/cpu.c | 8 ++++++++ ntoskrnl/ke/i386/kiinit.c | 11 +++++++++++ 3 files changed, 27 insertions(+) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index 596c58b418f..3d4675b30d8 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -22,6 +22,14 @@ extern "C" #define KD_BREAKPOINT_SIZE sizeof(UCHAR) #define KD_BREAKPOINT_VALUE 0xCC +/* CPUID 1 - ECX flags */ +#define X86_FEATURE_SSE3 0x00000001 +#define X86_FEATURE_SSSE3 0x00000200 +#define X86_FEATURE_SSE4_1 0x00080000 +#define X86_FEATURE_SSE4_2 0x00100000 +#define X86_FEATURE_XSAVE 0x04000000 +#define X86_FEATURE_RDRAND 0x40000000 + /* CPUID 1 - EDX flags */ #define X86_FEATURE_FPU 0x00000001 /* x87 FPU is present */ #define X86_FEATURE_VME 0x00000002 /* Virtual 8086 Extensions are present */ diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index ab639340443..a5d4912db43 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -361,6 +361,14 @@ KiGetFeatureBits(VOID) break; } + /* Get some features from ECX */ + if (CpuInfo.Ecx & X86_FEATURE_SSE3) FeatureBits |= KF_SSE3; + if (CpuInfo.Ecx & X86_FEATURE_SSSE3) FeatureBits |= KF_SSSE3; + if (CpuInfo.Ecx & X86_FEATURE_SSE4_1) FeatureBits |= KF_SSE4_1; + if (CpuInfo.Ecx & X86_FEATURE_SSE4_2) FeatureBits |= KF_SSE4_2; + if (CpuInfo.Ecx & X86_FEATURE_XSAVE) FeatureBits |= KF_XSTATE; + if (CpuInfo.Ecx & X86_FEATURE_RDRAND) FeatureBits |= KF_RDRAND; + /* Set the current features */ CpuFeatures = CpuInfo.Edx; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 4d576e86f8a..671adad67c3 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -572,6 +572,17 @@ KiInitializeKernel(IN PKPROCESS InitProcess, (KeFeatureBits & KF_3DNOW) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (KeFeatureBits & KF_RDTSC) ? TRUE: FALSE; + SharedUserData->ProcessorFeatures[PF_RDRAND_INSTRUCTION_AVAILABLE] = + (KeFeatureBits & KF_RDRAND) ? TRUE : FALSE; + // Note: On x86 we lack support for saving/restoring SSE state + SharedUserData->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_SSE3) ? TRUE : FALSE; + SharedUserData->ProcessorFeatures[PF_SSSE3_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_SSSE3) ? TRUE : FALSE; + SharedUserData->ProcessorFeatures[PF_SSE4_1_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_SSE4_1) ? TRUE : FALSE; + SharedUserData->ProcessorFeatures[PF_SSE4_2_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_SSE4_2) ? TRUE : FALSE; /* Set up the thread-related fields in the PRCB */ Prcb->CurrentThread = InitThread;

9 months, 2 weeks

[reactos] 02/03: [NTOS:KE/x64] Add detection of SSE 4.2

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d09eb6f856c81c298b99e… commit d09eb6f856c81c298b99eccf7721f0653d564823 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 3 10:16:07 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Feb 1 19:45:21 2025 +0200 [NTOS:KE/x64] Add detection of SSE 4.2 --- ntoskrnl/ke/amd64/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 90519e56181..4fe811aaa42 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -206,6 +206,7 @@ KiGetFeatureBits(VOID) if (VersionInfo.Ecx.Bits.SSSE3) FeatureBits |= KF_SSSE3; if (VersionInfo.Ecx.Bits.CMPXCHG16B) FeatureBits |= KF_CMPXCHG16B; if (VersionInfo.Ecx.Bits.SSE4_1) FeatureBits |= KF_SSE4_1; + if (VersionInfo.Ecx.Bits.SSE4_2) FeatureBits |= KF_SSE4_2; if (VersionInfo.Ecx.Bits.XSAVE) FeatureBits |= KF_XSTATE; if (VersionInfo.Ecx.Bits.RDRAND) FeatureBits |= KF_RDRAND;

9 months, 2 weeks

[reactos] 01/03: [NTOS] Make KeFeatureBits 64 bit

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be3dde7698ec3b9bbad02… commit be3dde7698ec3b9bbad020f970dd5ae39d6c2c79 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 29 21:55:20 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Feb 1 19:45:21 2025 +0200 [NTOS] Make KeFeatureBits 64 bit --- ntoskrnl/ex/sysinfo.c | 8 +++++++- ntoskrnl/include/internal/i386/ke.h | 2 +- ntoskrnl/include/internal/ke.h | 2 +- ntoskrnl/ke/amd64/krnlinit.c | 2 +- ntoskrnl/ke/i386/cpu.c | 4 ++-- ntoskrnl/ke/i386/kiinit.c | 7 ++++--- ntoskrnl/ke/krnlinit.c | 2 +- sdk/include/ndk/amd64/ketypes.h | 3 +++ sdk/include/ndk/extypes.h | 4 ++++ sdk/include/ndk/i386/ketypes.h | 6 ++++++ 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 75e3dd452fd..6c6547bf3b8 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -664,7 +664,13 @@ QSI_DEF(SystemProcessorInformation) #else Spi->MaximumProcessors = 0; #endif - Spi->ProcessorFeatureBits = KeFeatureBits; + + /* According to Geoff Chappell, on Win 8.1 x64 / Win 10 x86, where this + field is extended to 64 bits, it continues to produce only the low 32 + bits. For the full value, use SYSTEM_PROCESSOR_FEATURES_INFORMATION. + See https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/ex/sysinfo/pr… + */ + Spi->ProcessorFeatureBits = (ULONG)KeFeatureBits; DPRINT("Arch %u Level %u Rev 0x%x\n", Spi->ProcessorArchitecture, Spi->ProcessorLevel, Spi->ProcessorRevision); diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index 81194e91e0e..596c58b418f 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -462,7 +462,7 @@ NTAPI KiSetProcessorType(VOID); CODE_SEG("INIT") -ULONG +ULONG64 NTAPI KiGetFeatureBits(VOID); diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index c5fcd5b8af3..5af00103476 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -103,7 +103,7 @@ extern BOOLEAN ExCmosClockIsSane; extern USHORT KeProcessorArchitecture; extern USHORT KeProcessorLevel; extern USHORT KeProcessorRevision; -extern ULONG KeFeatureBits; +extern ULONG64 KeFeatureBits; extern KNODE KiNode0; extern PKNODE KeNodeBlock[1]; extern UCHAR KeNumberNodes; diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index d7aea4db738..f580cacbba9 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -233,7 +233,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, ULONG i; /* Set boot-level flags */ - KeFeatureBits = Prcb->FeatureBits; + KeFeatureBits = Prcb->FeatureBits | (ULONG64)Prcb->FeatureBitsHigh << 32; /* Initialize 8/16 bit SList support */ RtlpUse16ByteSLists = (KeFeatureBits & KF_CMPXCHG16B) ? TRUE : FALSE; diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 598a21d9de1..ab639340443 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -209,13 +209,13 @@ KiSetProcessorType(VOID) } CODE_SEG("INIT") -ULONG +ULONG64 NTAPI KiGetFeatureBits(VOID) { PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; - ULONG FeatureBits = KF_WORKING_PTE; + ULONG64 FeatureBits = KF_WORKING_PTE; CPU_INFO CpuInfo, DummyCpuInfo; UCHAR Ccr1; BOOLEAN ExtendedCPUID = TRUE; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index e3ec9ed94bf..4d576e86f8a 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -384,7 +384,7 @@ KiVerifyCpuFeatures(PKPRCB Prcb) KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x386, 0, 0, 0); // 3. Finally, obtain CPU features. - ULONG FeatureBits = KiGetFeatureBits(); + ULONG64 FeatureBits = KiGetFeatureBits(); // 4. Verify it supports everything we need. if (!(FeatureBits & KF_RDTSC)) @@ -423,7 +423,8 @@ KiVerifyCpuFeatures(PKPRCB Prcb) } // 5. Save feature bits. - Prcb->FeatureBits = FeatureBits; + Prcb->FeatureBits = (ULONG)FeatureBits; + Prcb->FeatureBitsHigh = FeatureBits >> 32; } CODE_SEG("INIT") @@ -445,7 +446,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Set boot-level flags */ if (Number == 0) - KeFeatureBits = Prcb->FeatureBits; + KeFeatureBits = Prcb->FeatureBits | (ULONG64)Prcb->FeatureBitsHigh << 32; /* Set the default NX policy (opt-in) */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; diff --git a/ntoskrnl/ke/krnlinit.c b/ntoskrnl/ke/krnlinit.c index 4ffdb0bd104..edb455abfc5 100644 --- a/ntoskrnl/ke/krnlinit.c +++ b/ntoskrnl/ke/krnlinit.c @@ -19,7 +19,7 @@ USHORT KeProcessorArchitecture; USHORT KeProcessorLevel; USHORT KeProcessorRevision; -ULONG KeFeatureBits; +ULONG64 KeFeatureBits; /* System call count */ ULONG KiServiceLimit = NUMBER_OF_SYSCALLS; diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 08c94196db3..5d65d4a3508 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -939,8 +939,11 @@ typedef struct _KPRCB ULONG CacheCount; #endif #ifdef __REACTOS__ +#if (NTDDI_VERSION < NTDDI_WINBLUE) + // On Win 8.1+ the FeatureBits field is extended to 64 bits ULONG FeatureBitsHigh; #endif +#endif } KPRCB, *PKPRCB; // diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index 2b190f1ca30..251a7a0e6f2 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -761,7 +761,11 @@ typedef struct _SYSTEM_PROCESSOR_INFORMATION #else USHORT MaximumProcessors; #endif +#if (NTDDI_VERSION >= NTDDI_WIN10) || ((NTDDI_VERSION >= NTDDI_WINBLUE) && defined(_WIN64)) + ULONG64 ProcessorFeatureBits; +#else ULONG ProcessorFeatureBits; +#endif } SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION; // Class 2 diff --git a/sdk/include/ndk/i386/ketypes.h b/sdk/include/ndk/i386/ketypes.h index 757fd4e82d4..e97f243b6c0 100644 --- a/sdk/include/ndk/i386/ketypes.h +++ b/sdk/include/ndk/i386/ketypes.h @@ -781,6 +781,12 @@ typedef struct _KPRCB ULONG PackageProcessorSet; ULONG CoreProcessorSet; #endif +#ifdef __REACTOS__ +#if (NTDDI_VERSION < NTDDI_WIN10) + // On Win 10+ the FeatureBits field is extended to 64 bits + ULONG FeatureBitsHigh; +#endif +#endif } KPRCB, *PKPRCB; //

9 months, 2 weeks

[reactos] 01/01: [SHELL32] CMenuBand must set ShowWindow value for InvokeCommand (#7695)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77e4217919a2e5cf8b4fe… commit 77e4217919a2e5cf8b4fef8db32e64678307e746 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Feb 1 13:50:22 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 1 13:50:22 2025 +0100 [SHELL32] CMenuBand must set ShowWindow value for InvokeCommand (#7695) --- dll/win32/shell32/shellmenu/CMenuBand.cpp | 1 + dll/win32/shell32/shlexec.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shellmenu/CMenuBand.cpp b/dll/win32/shell32/shellmenu/CMenuBand.cpp index 486f745c6b0..36c58121984 100644 --- a/dll/win32/shell32/shellmenu/CMenuBand.cpp +++ b/dll/win32/shell32/shellmenu/CMenuBand.cpp @@ -865,6 +865,7 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y) cmi.fMask |= CMIC_MASK_SHIFT_DOWN; if (GetKeyState(VK_CONTROL) < 0) cmi.fMask |= CMIC_MASK_CONTROL_DOWN; + cmi.nShow = SW_SHOW; hr = contextMenu->InvokeCommand(&cmi); TRACE("InvokeCommand returned hr=%08x\n", hr); } diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 9e3af71a27f..cf04d935742 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1461,7 +1461,7 @@ static HRESULT shellex_run_context_menu_default(IShellExtInit *obj, memset(&ici, 0, sizeof ici); ici.cbSize = sizeof ici; - ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NO_CONSOLE | SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); + ici.fMask = (sei->fMask & SEE_CMIC_COMMON_BASICFLAGS) | CMIC_MASK_UNICODE; ici.nShow = sei->nShow; ici.lpVerb = MAKEINTRESOURCEA(def); ici.hwnd = sei->hwnd; @@ -1794,7 +1794,7 @@ SHELL_InvokePidl( // Invoke a command CMINVOKECOMMANDINFO ici = { sizeof(ici) }; - ici.fMask = (sei->fMask & (SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); + ici.fMask = (sei->fMask & SEE_CMIC_COMMON_BASICFLAGS) & ~CMIC_MASK_UNICODE; // FIXME: Unicode? ici.nShow = sei->nShow; ici.hwnd = sei->hwnd; char szVerb[VERBKEY_CCHMAX];

9 months, 2 weeks

[reactos] 01/01: [SHDOCVW][EXPLORER][RSHELL][SDK] Populate WinList_* stubs (#7691)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee19792605da47f5ea783… commit ee19792605da47f5ea783596383c0b35f93a2bef Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 1 07:14:36 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 1 07:14:36 2025 +0900 [SHDOCVW][EXPLORER][RSHELL][SDK] Populate WinList_* stubs (#7691) Implementing missing features... JIRA issue: CORE-9368 - Modify shdocvw.spec. - Add dll/win32/shdocvw/winlist.cpp. - Add stubs of WinList_* functions. - Add WinList_* function prototypes to <shdocvw_undoc.h>. - Adapt explorer and rshell to new WinList_Init prototype. --- base/shell/explorer/precomp.h | 3 +- base/shell/explorer/rshell.cpp | 6 +- base/shell/rshell/misc.cpp | 6 - dll/win32/shdocvw/CMakeLists.txt | 3 +- dll/win32/shdocvw/shdocvw.spec | 12 +- dll/win32/shdocvw/shdocvw_main.c | 2 + dll/win32/shdocvw/winlist.cpp | 255 ++++++++++++++++++++++++++++++++++++ sdk/include/reactos/shdocvw_undoc.h | 33 ++++- sdk/include/reactos/undocshell.h | 1 - 9 files changed, 300 insertions(+), 21 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index df60ef3a6f5..f90ec62f1a8 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -42,6 +42,7 @@ #include <shlwapi_undoc.h> #include <shlobj_undoc.h> #include <shlguid_undoc.h> +#include <shdocvw_undoc.h> #include <undocshell.h> #include <ui/rosctrls.h> @@ -119,7 +120,7 @@ VOID InitRSHELL(VOID); HRESULT WINAPI _CStartMenu_CreateInstance(REFIID riid, void **ppv); HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); -DWORD WINAPI _WinList_Init(void); +BOOL WINAPI _WinList_Init(void); void WINAPI _ShellDDEInit(BOOL bInit); HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv); HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); diff --git a/base/shell/explorer/rshell.cpp b/base/shell/explorer/rshell.cpp index 9767c23504d..bdd5571ade6 100644 --- a/base/shell/explorer/rshell.cpp +++ b/base/shell/explorer/rshell.cpp @@ -105,9 +105,9 @@ BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop) return FALSE; } -typedef DWORD(WINAPI* PWINLIST_INIT)(void); +typedef BOOL (WINAPI *PWINLIST_INIT)(void); -DWORD WINAPI _WinList_Init(void) +BOOL WINAPI _WinList_Init(void) { HINSTANCE hFallback; @@ -131,7 +131,7 @@ DWORD WINAPI _WinList_Init(void) } } - return 0; + return FALSE; } typedef void (WINAPI *PSHELLDDEINIT)(BOOL bInit); diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index d0ed8c83e1b..8e0403f4cfd 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -52,12 +52,6 @@ extern "C" HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); } -DWORD WINAPI WinList_Init(void) -{ - /* do something here (perhaps we may want to add our own implementation fo win8) */ - return 0; -} - class CRShellModule : public CComModule { public: diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 119e8aaf882..6d178708672 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -37,7 +37,8 @@ add_library(shdocvw_sublib OBJECT CNSCBand.cpp mrulist.cpp objects.cpp - utility.cpp) + utility.cpp + winlist.cpp) target_link_libraries(shdocvw_sublib PRIVATE atl_classes) target_compile_definitions(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_DEFINITIONS>) target_compile_options(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_OPTIONS>) diff --git a/dll/win32/shdocvw/shdocvw.spec b/dll/win32/shdocvw/shdocvw.spec index 0a8bd10cd84..e0b72b28de3 100644 --- a/dll/win32/shdocvw/shdocvw.spec +++ b/dll/win32/shdocvw/shdocvw.spec @@ -8,7 +8,7 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) 110 stdcall -noname WinList_Init() -111 stub -noname WinList_Terminate +111 stdcall -noname WinList_Terminate() @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stub DllRegisterWindowClasses @@ -74,11 +74,11 @@ 174 stub -noname SHIsGlobalOffline 175 stub -noname DetectAndFixAssociations 176 stub -noname EnsureWebViewRegSettings -177 stub -noname WinList_NotifyNewLocation -178 stub -noname WinList_FindFolderWindow -179 stub -noname WinList_GetShellWindows -180 stub -noname WinList_RegisterPending -181 stub -noname WinList_Revoke +177 stdcall -noname WinList_NotifyNewLocation(ptr long ptr) +178 stdcall -noname WinList_FindFolderWindow(ptr long ptr ptr) +179 stdcall -noname WinList_GetShellWindows(long) +180 stdcall -noname WinList_RegisterPending(long ptr long ptr) +181 stdcall -noname WinList_Revoke(long) 182 stdcall SetQueryNetSessionCount(long) 183 stub -noname SHMapNbspToSp 184 stub SetShellOfflineState diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index c817bbb3c5f..65e3c733c79 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -236,6 +236,7 @@ static BOOL SHDOCVW_LoadShell32(void) return ((SHDOCVW_hshell32 = LoadLibraryA("shell32.dll")) != NULL); } +#ifndef __REACTOS__ /* See winlist.cpp */ /*********************************************************************** * @ (SHDOCVW.110) * @@ -247,6 +248,7 @@ DWORD WINAPI WinList_Init(void) FIXME("(), stub!\n"); return 0x0deadfeed; } +#endif /* ndef __REACTOS__ */ /*********************************************************************** * @ (SHDOCVW.118) diff --git a/dll/win32/shdocvw/winlist.cpp b/dll/win32/shdocvw/winlist.cpp new file mode 100644 index 00000000000..72562d77b42 --- /dev/null +++ b/dll/win32/shdocvw/winlist.cpp @@ -0,0 +1,255 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CLSID_ShellWindows and WinList_* functions + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "objects.h" + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +static VARIANT s_vaEmpty = { VT_EMPTY }; + +static HRESULT +InitVariantFromBuffer( + _Out_ LPVARIANTARG pvarg, + _In_ LPCVOID pv, + _In_ SIZE_T cb) +{ + VariantInit(pvarg); + + LPSAFEARRAY pArray = SafeArrayCreateVector(VT_UI1, 0, cb); + if (!pArray) + { + ERR("!pArray\n"); + return E_OUTOFMEMORY; + } + + V_ARRAY(pvarg) = pArray; + V_VT(pvarg) = VT_ARRAY | VT_UI1; + CopyMemory(pArray->pvData, pv, cb); + return S_OK; +} + +static HRESULT +InitVariantFromIDList( + _Out_ LPVARIANTARG pvarg, + _In_ LPCITEMIDLIST pidl) +{ + return InitVariantFromBuffer(pvarg, pidl, ILGetSize(pidl)); +} + +static HRESULT +VariantClearLazy(_Inout_ LPVARIANTARG pvarg) +{ + switch (V_VT(pvarg)) + { + case VT_EMPTY: + case VT_BOOL: + case VT_I4: + case VT_UI4: + break; + case VT_UNKNOWN: + if (V_UNKNOWN(pvarg)) + V_UNKNOWN(pvarg)->Release(); + break; + case VT_DISPATCH: + if (V_DISPATCH(pvarg)) + V_DISPATCH(pvarg)->Release(); + break; + case VT_SAFEARRAY: + SafeArrayDestroy(V_ARRAY(pvarg)); + break; + default: + return VariantClear(pvarg); + } + V_VT(pvarg) = VT_EMPTY; + return S_OK; +} + +/************************************************************************* + * WinList_Init (SHDOCVW.110) + * + * Retired in NT 6.1. + */ +EXTERN_C +BOOL WINAPI +WinList_Init(VOID) +{ + FIXME("()\n"); + return FALSE; +} + +/************************************************************************* + * WinList_Terminate (SHDOCVW.111) + * + * NT 4.71 and higher. Retired in NT 6.1. + */ +EXTERN_C +VOID WINAPI +WinList_Terminate(VOID) +{ + FIXME("()\n"); +} + +/************************************************************************* + * WinList_GetShellWindows (SHDOCVW.179) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nn-exdisp-ishell… + */ +EXTERN_C +IShellWindows* WINAPI +WinList_GetShellWindows( + _In_ BOOL bCreate) +{ + FIXME("(%d)\n", bCreate); + return NULL; +} + +/************************************************************************* + * WinList_NotifyNewLocation (SHDOCVW.177) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_NotifyNewLocation( + _In_ IShellWindows *pShellWindows, + _In_ LONG lCookie, + _In_ LPCITEMIDLIST pidl) +{ + TRACE("(%p, %ld, %p)\n", pShellWindows, lCookie, pidl); + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellWindows->OnNavigate(lCookie, &varg); + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_FindFolderWindow (SHDOCVW.178) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_FindFolderWindow( + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_opt_ PLONG phwnd, // Stores a window handle but LONG type + _Out_opt_ IWebBrowserApp **ppWebBrowserApp) +{ + UNREFERENCED_PARAMETER(dwUnused); + + TRACE("(%p, %ld, %p, %p)\n", pidl, dwUnused, phwnd, ppWebBrowserApp); + + if (ppWebBrowserApp) + *ppWebBrowserApp = NULL; + + if (phwnd) + *phwnd = 0; + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(ppWebBrowserApp != NULL)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IDispatch> pDispatch; + const INT options = SWFO_INCLUDEPENDING | (ppWebBrowserApp ? SWFO_NEEDDISPATCH : 0); + hr = pShellWindows->FindWindowSW(&varg, &s_vaEmpty, SWC_BROWSER, phwnd, options, &pDispatch); + if (pDispatch && ppWebBrowserApp) + hr = pDispatch->QueryInterface(IID_PPV_ARG(IWebBrowserApp, ppWebBrowserApp)); + + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_RegisterPending (SHDOCVW.180) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_RegisterPending( + _In_ DWORD dwThreadId, + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_ PLONG plCookie) +{ + TRACE("(%ld, %p, %ld, %p)\n", dwThreadId, pidl, dwUnused, plCookie); + + if (!pidl) + { + ERR("!pidl\n"); + return E_UNEXPECTED; + } + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(FALSE)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_UNEXPECTED; + } + + VARIANTARG varg; + HRESULT hr = InitVariantFromIDList(&varg, pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellWindows->RegisterPending(dwThreadId, &varg, &s_vaEmpty, SWC_BROWSER, plCookie); + VariantClearLazy(&varg); + return hr; +} + +/************************************************************************* + * WinList_Revoke (SHDOCVW.181) + * + * NT 5.0 and higher. + * @see https://learn.microsoft.com/en-us/windows/win32/api/exdisp/nf-exdisp-ishell… + */ +EXTERN_C +HRESULT WINAPI +WinList_Revoke( + _In_ LONG lCookie) +{ + TRACE("(%ld)\n", lCookie); + + CComPtr<IShellWindows> pShellWindows(WinList_GetShellWindows(TRUE)); + if (!pShellWindows) + { + ERR("!pShellWindows\n"); + return E_FAIL; + } + + return pShellWindows->Revoke(lCookie); +} diff --git a/sdk/include/reactos/shdocvw_undoc.h b/sdk/include/reactos/shdocvw_undoc.h index 57e3ee8b9d7..31be12fa29c 100644 --- a/sdk/include/reactos/shdocvw_undoc.h +++ b/sdk/include/reactos/shdocvw_undoc.h @@ -2,14 +2,16 @@ * PROJECT: ReactOS Headers * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: shdocvw.dll undocumented APIs - * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2024-2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once +#include <exdisp.h> // For IShellWindows + #ifdef __cplusplus extern "C" { -#endif /* defined(__cplusplus) */ +#endif BOOL WINAPI IEILIsEqual( @@ -17,6 +19,31 @@ IEILIsEqual( _In_ LPCITEMIDLIST pidl2, _In_ BOOL bUnknown); +BOOL WINAPI WinList_Init(VOID); +VOID WINAPI WinList_Terminate(VOID); +HRESULT WINAPI WinList_Revoke(_In_ LONG lCookie); +IShellWindows* WINAPI WinList_GetShellWindows(_In_ BOOL bCreate); + +HRESULT WINAPI +WinList_NotifyNewLocation( + _In_ IShellWindows *pShellWindows, + _In_ LONG lCookie, + _In_ LPCITEMIDLIST pidl); + +HRESULT WINAPI +WinList_FindFolderWindow( + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_opt_ PLONG phwnd, + _Out_opt_ IWebBrowserApp **ppWebBrowserApp); + +HRESULT WINAPI +WinList_RegisterPending( + _In_ DWORD dwThreadId, + _In_ LPCITEMIDLIST pidl, + _In_ DWORD dwUnused, + _Out_ PLONG plCookie); + #ifdef __cplusplus } /* extern "C" */ -#endif /* defined(__cplusplus) */ +#endif diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 187a74f4d44..52ef6f27f0b 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -928,7 +928,6 @@ BOOL WINAPI SHSettingsChanged(LPCVOID unused, LPCWSTR pszKey); #define TABDMC_LOADINPROC 2 void WINAPI ShellDDEInit(BOOL bInit); -DWORD WINAPI WinList_Init(void); IStream* WINAPI SHGetViewStream(LPCITEMIDLIST, DWORD, LPCTSTR, LPCTSTR, LPCTSTR);

9 months, 2 weeks

[reactos] 01/01: [SHELL32] SEE_MASK_IDLIST should not assume the PIDL is always a FS path (#7693)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f335322ace05590c3edc7… commit f335322ace05590c3edc74de58f90ee070307c5a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Jan 31 21:15:13 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 21:15:13 2025 +0100 [SHELL32] SEE_MASK_IDLIST should not assume the PIDL is always a FS path (#7693) CORE-16898 CORE-14177 --- dll/win32/shell32/shlexec.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 371f6ad44eb..9e3af71a27f 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2076,10 +2076,10 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if (sei_tmp.fMask & SEE_MASK_IDLIST && (sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) != SEE_MASK_INVOKEIDLIST) { - CComPtr<IShellExecuteHookW> pSEH; - - HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); + LPCITEMIDLIST pidl = (LPCITEMIDLIST)sei_tmp.lpIDList; + CComPtr<IShellExecuteHookW> pSEH; + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); if (SUCCEEDED(hr)) { hr = pSEH->Execute(&sei_tmp); @@ -2087,7 +2087,14 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) return TRUE; } - SHGetPathFromIDListW((LPCITEMIDLIST)sei_tmp.lpIDList, wszApplicationName); + hr = SHGetNameAndFlagsW(pidl, SHGDN_FORPARSING, wszApplicationName, dwApplicationNameLen, NULL); + if (FAILED(hr)) + { + if (dwApplicationNameLen) + *wszApplicationName = UNICODE_NULL; + if (!_ILIsDesktop(pidl)) + TRACE("Unable to get PIDL parsing path\n"); + } appKnownSingular = TRUE; TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); }

9 months, 3 weeks

[reactos] 01/01: [SHELL32] Don't close Run dialog on execution failure (#7686)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6265add14704b955b9ea3… commit 6265add14704b955b9ea325713ec6e6f6e0e7e10 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Jan 31 12:52:20 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 12:52:20 2025 +0100 [SHELL32] Don't close Run dialog on execution failure (#7686) CORE-19983 --- dll/win32/shell32/dialogs/dialogs.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index a01a442a500..44f8935211a 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -583,7 +583,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA INT ic; WCHAR *psz, *pszExpanded, *parent = NULL; DWORD cchExpand; - SHELLEXECUTEINFOW sei; + SHELLEXECUTEINFOW sei = { sizeof(sei) }; NMRUNFILEDLGW nmrfd; ic = GetWindowTextLengthW(htxt); @@ -593,9 +593,6 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA return TRUE; } - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - /* * Allocate a new MRU entry, we need to add two characters * for the terminating "\\1" part, then the NULL character. @@ -694,7 +691,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA EndDialog(hwnd, IDOK); break; } - else if (SUCCEEDED(ShellExecuteExW(&sei))) + else if (ShellExecuteExW(&sei)) { /* Call GetWindowText again in case the contents of the edit box have changed. */ GetWindowTextW(htxt, psz, ic + 1);

9 months, 3 weeks

[reactos] 01/01: [SHELL32] Load shell icon size from registry (#7683)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dddceeb10d3d1afa41d7c… commit dddceeb10d3d1afa41d7ce36cfa0494d00566c76 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 31 08:21:05 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 08:21:05 2025 +0900 [SHELL32] Load shell icon size from registry (#7683) Improve usability. Re-trial of #7679 with different approach. JIRA issue: CORE-12905 - Add ShellSmallIconSize, ShellLargeIconSize, and ShellIconBPP global variables in iconcache.cpp. - Add SIC_GetMetricsValue, SIC_GetLargeIconSize, SIC_GetSmallIconSize, and SIC_GetIconBPP helper functions in iconcache.cpp. - Load shell icon size from registry key "HKEY_CURRENT_USER\\Control Panel\\Desktop\\WindowMetrics". - Load icon BPP (bits per pixel) from registry. - Fix SIC_Initialize and SIC_LoadIcon functions for icon size. - Fix SHGetFileInfoW function for SHGFI_SHELLICONSIZE flag. --- dll/win32/shell32/iconcache.cpp | 124 ++++++++++++++++++---------------- dll/win32/shell32/wine/shell32_main.c | 37 ++++++---- dll/win32/shell32/wine/shell32_main.h | 3 + 3 files changed, 93 insertions(+), 71 deletions(-) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 9fb41f9389c..392d5fa75ea 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -1,21 +1,9 @@ /* - * shell icon cache (SIC) - * - * Copyright 1998, 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Shell Icon Cache (SIC) + * COPYRIGHT: Copyright 1998, 1999 Juergen Schmied + * Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -39,6 +27,9 @@ static HDPA sic_hdpa = 0; static HIMAGELIST ShellSmallIconList; static HIMAGELIST ShellBigIconList; +INT ShellSmallIconSize = 0; +INT ShellLargeIconSize = 0; +INT ShellIconBPP = 0; // Bits Per Pixel namespace { @@ -52,6 +43,48 @@ CRITICAL_SECTION_DEBUG critsect_debug = CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; } +// Load metric value from registry +static INT +SIC_GetMetricsValue( + _In_ PCWSTR pszValueName, + _In_ INT nDefaultValue) +{ + WCHAR szValue[64]; + DWORD cbValue = sizeof(szValue); + DWORD error = SHGetValueW(HKEY_CURRENT_USER, L"Control Panel\\Desktop\\WindowMetrics", + pszValueName, NULL, szValue, &cbValue); + if (error) + return nDefaultValue; + szValue[_countof(szValue) - 1] = UNICODE_NULL; // Avoid buffer overrun + return _wtoi(szValue); +} + +static INT +SIC_GetLargeIconSize(VOID) +{ + // NOTE: Shell icon size is always square + INT nDefaultSize = GetSystemMetrics(SM_CXICON); + INT nIconSize = SIC_GetMetricsValue(L"Shell Icon Size", nDefaultSize); + return (nIconSize > 0) ? nIconSize : nDefaultSize; +} + +static INT +SIC_GetSmallIconSize(VOID) +{ + // NOTE: Shell icon size is always square + INT nDefaultSize = GetSystemMetrics(SM_CXSMICON); + INT nIconSize = SIC_GetMetricsValue(L"Shell Small Icon Size", nDefaultSize); + return (nIconSize > 0) ? nIconSize : nDefaultSize; +} + +static INT +SIC_GetIconBPP(VOID) // Bits Per Pixel +{ + INT nDefaultBPP = SHGetCurColorRes(); + INT nIconBPP = SIC_GetMetricsValue(L"Shell Icon BPP", nDefaultBPP); + return (nIconBPP > 0) ? nIconBPP : nDefaultBPP; +} + /***************************************************************************** * SIC_CompareEntries * @@ -386,14 +419,15 @@ leave: */ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) { - HICON hiconLarge=0; - HICON hiconSmall=0; + HICON hiconLarge = NULL, hiconSmall = NULL; UINT ret; - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, NULL, 1, LR_COPYFROMRESOURCE); - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, ShellLargeIconSize, ShellLargeIconSize, + &hiconLarge, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, ShellSmallIconSize, ShellSmallIconSize, + &hiconSmall, NULL, 1, LR_COPYFROMRESOURCE); - if ( !hiconLarge || !hiconSmall) + if (!hiconLarge || !hiconSmall) { WARN("failure loading icon %i from %s (%p %p)\n", dwSourceIndex, debugstr_w(sSourceFile), hiconLarge, hiconSmall); if(hiconLarge) DestroyIcon(hiconLarge); @@ -481,9 +515,6 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) BOOL SIC_Initialize(void) { HICON hSm = NULL, hLg = NULL; - INT cx_small, cy_small; - INT cx_large, cy_large; - HDC hDC; INT bpp; DWORD ilMask; BOOL result = FALSE; @@ -502,16 +533,10 @@ BOOL SIC_Initialize(void) return FALSE; } - hDC = CreateICW(L"DISPLAY", NULL, NULL, NULL); - if (!hDC) - { - ERR("Failed to create information context (error %d)\n", GetLastError()); - goto end; - } - - bpp = GetDeviceCaps(hDC, BITSPIXEL); - DeleteDC(hDC); + ShellSmallIconSize = SIC_GetSmallIconSize(); + ShellLargeIconSize = SIC_GetLargeIconSize(); + bpp = ShellIconBPP = SIC_GetIconBPP(); // Bits Per Pixel if (bpp <= 4) ilMask = ILC_COLOR4; else if (bpp <= 8) @@ -527,27 +552,14 @@ BOOL SIC_Initialize(void) ilMask |= ILC_MASK; - cx_small = GetSystemMetrics(SM_CXSMICON); - cy_small = GetSystemMetrics(SM_CYSMICON); - cx_large = GetSystemMetrics(SM_CXICON); - cy_large = GetSystemMetrics(SM_CYICON); - - ShellSmallIconList = ImageList_Create(cx_small, - cy_small, - ilMask, - 100, - 100); + ShellSmallIconList = ImageList_Create(ShellSmallIconSize, ShellSmallIconSize, ilMask, 100, 100); if (!ShellSmallIconList) { ERR("Failed to create the small icon list.\n"); goto end; } - ShellBigIconList = ImageList_Create(cx_large, - cy_large, - ilMask, - 100, - 100); + ShellBigIconList = ImageList_Create(ShellLargeIconSize, ShellLargeIconSize, ilMask, 100, 100); if (!ShellBigIconList) { ERR("Failed to create the big icon list.\n"); @@ -555,11 +567,8 @@ BOOL SIC_Initialize(void) } /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_small, - cy_small, + hSm = (HICON)LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, ShellSmallIconSize, ShellSmallIconSize, LR_SHARED | LR_DEFAULTCOLOR); if (!hSm) { @@ -567,11 +576,8 @@ BOOL SIC_Initialize(void) goto end; } - hLg = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_large, - cy_large, + hLg = (HICON)LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, ShellLargeIconSize, ShellLargeIconSize, LR_SHARED | LR_DEFAULTCOLOR); if (!hLg) { diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 04967da66d1..0a24d36e4ec 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -607,9 +607,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (flags & SHGFI_SELECTED) FIXME("set icon to selected, stub\n"); - if (flags & SHGFI_SHELLICONSIZE) - FIXME("set icon to shell size, stub\n"); - /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { @@ -700,16 +697,32 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { UINT ret; - if (flags & SHGFI_SMALLICON) - ret = PrivateExtractIconsW( sTemp,icon_idx, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), - &psfi->hIcon, 0, 1, 0); + INT cxIcon, cyIcon; + + /* Get icon size */ + if (flags & SHGFI_SHELLICONSIZE) + { + if (flags & SHGFI_SMALLICON) + cxIcon = cyIcon = ShellSmallIconSize; + else + cxIcon = cyIcon = ShellLargeIconSize; + } else - ret = PrivateExtractIconsW( sTemp, icon_idx, - GetSystemMetrics( SM_CXICON), - GetSystemMetrics( SM_CYICON), - &psfi->hIcon, 0, 1, 0); + { + if (flags & SHGFI_SMALLICON) + { + cxIcon = GetSystemMetrics(SM_CXSMICON); + cyIcon = GetSystemMetrics(SM_CYSMICON); + } + else + { + cxIcon = GetSystemMetrics(SM_CXICON); + cyIcon = GetSystemMetrics(SM_CYICON); + } + } + + ret = PrivateExtractIconsW(sTemp, icon_idx, cxIcon, cyIcon, + &psfi->hIcon, 0, 1, 0); if (ret != 0 && ret != (UINT)-1) { IconNotYetLoaded=FALSE; diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h index fa5bafd8880..b631c67a5ef 100644 --- a/dll/win32/shell32/wine/shell32_main.h +++ b/dll/win32/shell32/wine/shell32_main.h @@ -44,6 +44,9 @@ BOOL SIC_Initialize(void); void SIC_Destroy(void) DECLSPEC_HIDDEN; BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN; +extern INT ShellLargeIconSize; +extern INT ShellSmallIconSize; +extern INT ShellIconBPP; /* Classes Root */ HRESULT HCR_GetProgIdKeyOfExtension(PCWSTR szExtension, PHKEY phKey, BOOL AllowFallback);

9 months, 3 weeks

[reactos] 01/01: [SDK][SHELL32][SHLWAPI][SHLWAPI_APITEST] Split IShellFolder helpers hack (#7685)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=909468c4dc6c21661b6b3… commit 909468c4dc6c21661b6b3a75c2ec120ed7a05e34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 31 08:15:36 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 31 08:15:36 2025 +0900 [SDK][SHELL32][SHLWAPI][SHLWAPI_APITEST] Split IShellFolder helpers hack (#7685) Splitting the hack will improve our code quality. JIRA issue: N/A - Add sdk/include/reactos/ishellfolder_helpers.h header file. - Split conflicting code. --- dll/win32/shell32/precomp.h | 2 +- dll/win32/shlwapi/utils.cpp | 9 +--- .../apitests/shlwapi/IShellFolderHelpers.cpp | 2 +- sdk/include/reactos/ishellfolder_helpers.h | 51 ++++++++++++++++++++++ sdk/include/reactos/shlobj_undoc.h | 1 - sdk/include/reactos/shlwapi_undoc.h | 35 --------------- 6 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 6d65aeac056..267ed1d44c9 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -42,8 +42,8 @@ #include <shlguid_undoc.h> #include <shlobj_undoc.h> -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> #include <shellapi.h> #undef ShellExecute diff --git a/dll/win32/shlwapi/utils.cpp b/dll/win32/shlwapi/utils.cpp index 8cfb8ab2d61..51a881363c7 100644 --- a/dll/win32/shlwapi/utils.cpp +++ b/dll/win32/shlwapi/utils.cpp @@ -21,15 +21,8 @@ #include <shlguid_undoc.h> #include <atlstr.h> -/* - * HACK! - */ -#undef IShellFolder_GetDisplayNameOf -#undef IShellFolder_ParseDisplayName -#undef IShellFolder_CompareIDs - -#define SHLWAPI_ISHELLFOLDER_HELPERS /* HACK! */ #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> #include <strsafe.h> diff --git a/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp b/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp index 588ef3f329c..0a94af1c3e7 100644 --- a/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp +++ b/modules/rostests/apitests/shlwapi/IShellFolderHelpers.cpp @@ -10,8 +10,8 @@ #include <shlwapi.h> #include <versionhelpers.h> -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> +#include <ishellfolder_helpers.h> static INT s_nStep = 0; diff --git a/sdk/include/reactos/ishellfolder_helpers.h b/sdk/include/reactos/ishellfolder_helpers.h new file mode 100644 index 00000000000..28591f71589 --- /dev/null +++ b/sdk/include/reactos/ishellfolder_helpers.h @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS header + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: SHLWAPI IShellFolder helpers + * COPYRIGHT: Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +/* HACK! These function names are conflicting with <shobjidl.h> functions. */ +#undef IShellFolder_GetDisplayNameOf +#undef IShellFolder_ParseDisplayName +#undef IShellFolder_CompareIDs + +HRESULT WINAPI +IShellFolder_GetDisplayNameOf( + _In_ IShellFolder *psf, + _In_ LPCITEMIDLIST pidl, + _In_ SHGDNF uFlags, + _Out_ LPSTRRET lpName, + _In_ DWORD dwRetryFlags); + +/* Flags for IShellFolder_GetDisplayNameOf */ +#define SFGDNO_RETRYWITHFORPARSING 0x00000001 +#define SFGDNO_RETRYALWAYS 0x80000000 + +HRESULT WINAPI +IShellFolder_ParseDisplayName( + _In_ IShellFolder *psf, + _In_ HWND hwndOwner, + _In_ LPBC pbcReserved, + _In_ LPOLESTR lpszDisplayName, + _Out_ ULONG *pchEaten, + _Out_ PIDLIST_RELATIVE *ppidl, + _Out_ ULONG *pdwAttributes); + +EXTERN_C HRESULT WINAPI +IShellFolder_CompareIDs( + _In_ IShellFolder *psf, + _In_ LPARAM lParam, + _In_ PCUIDLIST_RELATIVE pidl1, + _In_ PCUIDLIST_RELATIVE pidl2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index b0392644ecd..c7f080ede36 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -9,7 +9,6 @@ #pragma once -#define SHLWAPI_ISHELLFOLDER_HELPERS #include <shlwapi_undoc.h> // For ASSOCQUERY #ifdef __cplusplus diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index d4b2cf3fd1d..2ca22001c21 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -376,41 +376,6 @@ DWORD WINAPI SHGetObjectCompatFlags(IUnknown *pUnk, const CLSID *clsid); #define SHACF_WIN95SHLEXEC 0x00000200 /* Geoff Chappell */ DWORD WINAPI SHGetAppCompatFlags(DWORD dwMask); -/* - * HACK! These functions are conflicting with <shobjidl.h> inline functions... - * We provide a macro option SHLWAPI_ISHELLFOLDER_HELPERS for using these functions. - */ -#ifdef SHLWAPI_ISHELLFOLDER_HELPERS -HRESULT WINAPI -IShellFolder_GetDisplayNameOf( - _In_ IShellFolder *psf, - _In_ LPCITEMIDLIST pidl, - _In_ SHGDNF uFlags, - _Out_ LPSTRRET lpName, - _In_ DWORD dwRetryFlags); - -/* Flags for IShellFolder_GetDisplayNameOf */ -#define SFGDNO_RETRYWITHFORPARSING 0x00000001 -#define SFGDNO_RETRYALWAYS 0x80000000 - -HRESULT WINAPI -IShellFolder_ParseDisplayName( - _In_ IShellFolder *psf, - _In_ HWND hwndOwner, - _In_ LPBC pbcReserved, - _In_ LPOLESTR lpszDisplayName, - _Out_ ULONG *pchEaten, - _Out_ PIDLIST_RELATIVE *ppidl, - _Out_ ULONG *pdwAttributes); - -EXTERN_C HRESULT WINAPI -IShellFolder_CompareIDs( - _In_ IShellFolder *psf, - _In_ LPARAM lParam, - _In_ PCUIDLIST_RELATIVE pidl1, - _In_ PCUIDLIST_RELATIVE pidl2); -#endif /* SHLWAPI_ISHELLFOLDER_HELPERS */ - /***************************************************************************** * IAssociationElementOld interface *

9 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs