Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CMBATT] Fix two comments
by Eric Kohl 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c4fcd99d65af360d4be7… commit 5c4fcd99d65af360d4be7ccf3af54695ba3d8dcf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 5 21:42:41 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 5 21:43:06 2025 +0100 [CMBATT] Fix two comments --- drivers/bus/acpi/cmbatt/cmexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/bus/acpi/cmbatt/cmexec.c index b85b07709a3..6caf314617c 100644 --- a/drivers/bus/acpi/cmbatt/cmexec.c +++ b/drivers/bus/acpi/cmbatt/cmexec.c @@ -300,7 +300,7 @@ CmBattGetStaData(IN PDEVICE_OBJECT DeviceObject, ASSERT(StaData != NULL); *StaData = 0; - /* Request the _PSR method */ + /* Request the _STA method */ *(PULONG)InputBuffer.MethodName = 'ATS_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -346,7 +346,7 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject, ASSERT(UniqueId != NULL); *UniqueId = 0; - /* Request the _PSR method */ + /* Request the _UID method */ *(PULONG)InputBuffer.MethodName = 'DIU_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE;

1 0

[reactos] 02/02: [NTOS:IO] TAG_KINTERRUPT -> TAG_IO_INTERRUPT and change its value.
by Hermès Bélusca-Maïto 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a05b393c5b5cb54e45d2… commit 7a05b393c5b5cb54e45d2b14d2ba420cd28d5dac Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 5 21:12:50 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 5 21:16:56 2025 +0100 [NTOS:IO] TAG_KINTERRUPT -> TAG_IO_INTERRUPT and change its value. Change its value, as per the official Windows pooltag.txt file. --- ntoskrnl/include/internal/tag.h | 2 +- ntoskrnl/io/iomgr/irq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 4292f4b439d..4c71be47240 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -84,7 +84,7 @@ #define TAG_IOWI 'IWOI' #define TAG_IRP ' prI' #define TAG_IOBUF 'UBOI' -#define TAG_KINTERRUPT 'RSIK' +#define TAG_IO_INTERRUPT 'nioI' #define TAG_MDL ' LDM' #define TAG_IO_DEVNODE 'donD' #define TAG_PNP_NOTIFY 'NPnP' diff --git a/ntoskrnl/io/iomgr/irq.c b/ntoskrnl/io/iomgr/irq.c index 6e09f6b196e..c8e9c5527e6 100644 --- a/ntoskrnl/io/iomgr/irq.c +++ b/ntoskrnl/io/iomgr/irq.c @@ -60,7 +60,7 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, IoInterrupt = ExAllocatePoolZero(NonPagedPool, (Count - 1) * sizeof(KINTERRUPT) + sizeof(IO_INTERRUPT), - TAG_KINTERRUPT); + TAG_IO_INTERRUPT); if (!IoInterrupt) return STATUS_INSUFFICIENT_RESOURCES; /* Use the structure's spinlock, if none was provided */ @@ -105,7 +105,7 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, if (FirstRun) { /* We failed early so just free this */ - ExFreePoolWithTag(IoInterrupt, TAG_KINTERRUPT); + ExFreePoolWithTag(IoInterrupt, TAG_IO_INTERRUPT); } else { @@ -166,7 +166,7 @@ IoDisconnectInterrupt(PKINTERRUPT InterruptObject) } /* Free the I/O interrupt */ - ExFreePoolWithTag(IoInterrupt, TAG_KINTERRUPT); + ExFreePoolWithTag(IoInterrupt, TAG_IO_INTERRUPT); } NTSTATUS

1 0

[reactos] 01/02: [NTOS:IO] tag.h: Remove duplicated TAG_SYSB/TAG_SYS_BUF and rename it to TAG_IOBUF
by Hermès Bélusca-Maïto 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02cff5abc15e39a49a8b2… commit 02cff5abc15e39a49a8b2eef95e794bc616d1cb4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 4 17:19:29 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 5 21:09:08 2025 +0100 [NTOS:IO] tag.h: Remove duplicated TAG_SYSB/TAG_SYS_BUF and rename it to TAG_IOBUF --- ntoskrnl/include/internal/tag.h | 4 +--- ntoskrnl/io/iomgr/iofunc.c | 32 ++++++++++++++++---------------- ntoskrnl/io/iomgr/irp.c | 8 ++++---- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 35cf14d6ae6..4292f4b439d 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -59,7 +59,6 @@ #define TAG_IO_TIMER 'MTOI' #define TAG_DRIVER 'RVRD' #define TAG_DRIVER_EXTENSION 'EVRD' -#define TAG_SYSB 'BSYS' #define TAG_LOCK 'kclF' #define TAG_FILE_NAME 'MANF' #define TAG_FILE_SYSTEM 'SYSF' @@ -84,7 +83,7 @@ #define TAG_REINIT 'iRoI' #define TAG_IOWI 'IWOI' #define TAG_IRP ' prI' -#define TAG_SYS_BUF 'BSYS' +#define TAG_IOBUF 'UBOI' #define TAG_KINTERRUPT 'RSIK' #define TAG_MDL ' LDM' #define TAG_IO_DEVNODE 'donD' @@ -93,7 +92,6 @@ #define TAG_IO_RESOURCE 'CRSR' #define TAG_IO_TIMER 'MTOI' #define TAG_VPB ' BPV' -#define TAG_SYSB 'BSYS' #define TAG_RTLREGISTRY 'vrqR' #define TAG_PNP_DEVACTION 'aDpP' diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index f672f4b5af6..3c0cf9b69e2 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -529,7 +529,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PoolType, BufferLength, - TAG_SYS_BUF); + TAG_IOBUF); /* Check if we got a buffer */ if (InputBuffer) @@ -576,7 +576,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PoolType, InputBufferLength, - TAG_SYS_BUF); + TAG_IOBUF); /* Copy into the System Buffer */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, @@ -2047,7 +2047,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, AuxBuffer = ExAllocatePoolWithTag(NonPagedPool, CapturedFileName.Length + sizeof(UNICODE_STRING), - TAG_SYSB); + TAG_IOBUF); RtlCopyMemory((PVOID)((ULONG_PTR)AuxBuffer + sizeof(UNICODE_STRING)), CapturedFileName.Buffer, @@ -2064,7 +2064,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Free buffer and return the exception code */ - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -2100,7 +2100,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, if (!NT_SUCCESS(Status)) { /* Fail */ - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); return Status; } @@ -2108,7 +2108,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, if (FileObject->CompletionContext != NULL && ApcRoutine != NULL) { ObDereferenceObject(FileObject); - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); return STATUS_INVALID_PARAMETER; } @@ -2125,7 +2125,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, if (!NT_SUCCESS(Status)) { /* Fail */ - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); ObDereferenceObject(FileObject); return Status; } @@ -2143,7 +2143,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, { if (Event) ObDereferenceObject(Event); ObDereferenceObject(FileObject); - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); return Status; } @@ -2181,13 +2181,13 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Allocating failed, clean up and return the exception code */ IopCleanupAfterException(FileObject, Irp, Event, NULL); - if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_IOBUF); /* Return the exception code */ return _SEH2_GetExceptionCode(); @@ -2517,7 +2517,7 @@ NtQueryInformationFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -2985,7 +2985,7 @@ NtReadFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -3286,7 +3286,7 @@ NtSetInformationFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); /* Copy the data into it */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, @@ -4058,7 +4058,7 @@ NtWriteFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); /* Copy the data into it */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Buffer, Length); @@ -4385,7 +4385,7 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -4566,7 +4566,7 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle, { /* Allocate a buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_SYSB); + ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IOBUF); /* Copy the data into it */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length); diff --git a/ntoskrnl/io/iomgr/irp.c b/ntoskrnl/io/iomgr/irp.c index 2de843975e0..c6316c83f7f 100644 --- a/ntoskrnl/io/iomgr/irp.c +++ b/ntoskrnl/io/iomgr/irp.c @@ -210,7 +210,7 @@ IopCleanupIrp(IN PIRP Irp, if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { /* Free the buffer */ - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_IOBUF); } /* Check if this IRP has a user event, a file object, and is async */ @@ -778,7 +778,7 @@ IoBuildAsynchronousFsdRequest(IN ULONG MajorFunction, { /* Allocate the System Buffer */ Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYS_BUF); + ExAllocatePoolWithTag(NonPagedPool, Length, TAG_IOBUF); if (!Irp->AssociatedIrp.SystemBuffer) { /* Free the IRP and fail */ @@ -927,7 +927,7 @@ IoBuildDeviceIoControlRequest(IN ULONG IoControlCode, Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, BufferLength, - TAG_SYS_BUF); + TAG_IOBUF); if (!Irp->AssociatedIrp.SystemBuffer) { /* Free the IRP and fail */ @@ -970,7 +970,7 @@ IoBuildDeviceIoControlRequest(IN ULONG IoControlCode, Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, InputBufferLength, - TAG_SYS_BUF); + TAG_IOBUF); if (!Irp->AssociatedIrp.SystemBuffer) { /* Free the IRP and fail */

1 0

[reactos] 02/02: [PARTMGR] Few code enhancements.
by Hermès Bélusca-Maïto 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8653bb1b322afff64f036… commit 8653bb1b322afff64f0361b0d4e801f2ab889e7f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 5 18:06:45 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 5 20:10:26 2025 +0100 [PARTMGR] Few code enhancements. - PartMgrAddDevice(): If IoAttachDeviceToDeviceStack() fails, bail out immediately, instead of continuing initializing the device extension then deciding to fail. - PartitionCreateDevice(): Initialize the fields pertaining to parent device linking in the partition device extension, before the other fields (following in a similar way what's done in PartMgrAddDevice). --- drivers/storage/partmgr/partition.c | 6 +++--- drivers/storage/partmgr/partmgr.c | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/storage/partmgr/partition.c b/drivers/storage/partmgr/partition.c index f54ccf55596..e8a38e728ca 100644 --- a/drivers/storage/partmgr/partition.c +++ b/drivers/storage/partmgr/partition.c @@ -52,6 +52,9 @@ PartitionCreateDevice( PPARTITION_EXTENSION partExt = partitionDevice->DeviceExtension; RtlZeroMemory(partExt, sizeof(*partExt)); + partExt->DeviceObject = partitionDevice; + partExt->LowerDevice = FDObject; + partitionDevice->StackSize = FDObject->StackSize; partitionDevice->Flags |= DO_DIRECT_IO; @@ -77,9 +80,6 @@ PartitionCreateDevice( partExt->DetectedNumber = PdoNumber; // counts only partitions with PDO created partExt->VolumeNumber = volumeNum; - partExt->DeviceObject = partitionDevice; - partExt->LowerDevice = FDObject; - // The device is initialized partitionDevice->Flags &= ~DO_DEVICE_INITIALIZING; diff --git a/drivers/storage/partmgr/partmgr.c b/drivers/storage/partmgr/partmgr.c index fd3fd89c247..b1c37b5d964 100644 --- a/drivers/storage/partmgr/partmgr.c +++ b/drivers/storage/partmgr/partmgr.c @@ -1201,16 +1201,15 @@ PartMgrAddDevice( deviceExtension->IsFDO = TRUE; deviceExtension->DeviceObject = deviceObject; deviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(deviceObject, PhysicalDeviceObject); - deviceExtension->PhysicalDiskDO = PhysicalDeviceObject; - KeInitializeEvent(&deviceExtension->SyncEvent, SynchronizationEvent, TRUE); - - // the the attaching failed if (!deviceExtension->LowerDevice) { + // The attachment failed IoDeleteDevice(deviceObject); - return STATUS_DEVICE_REMOVED; } + deviceExtension->PhysicalDiskDO = PhysicalDeviceObject; + KeInitializeEvent(&deviceExtension->SyncEvent, SynchronizationEvent, TRUE); + deviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; // The device is initialized

1 0

[reactos] 01/02: [PARTMGR] Minor code formatting.
by Hermès Bélusca-Maïto 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1b835bdbf8efd009e0d7… commit e1b835bdbf8efd009e0d775ad974b7f84050d540 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 27 17:17:53 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 5 20:07:53 2025 +0100 [PARTMGR] Minor code formatting. --- drivers/storage/partmgr/partition.c | 13 ++++--------- drivers/storage/partmgr/partmgr.c | 20 +++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/storage/partmgr/partition.c b/drivers/storage/partmgr/partition.c index c7763027951..f54ccf55596 100644 --- a/drivers/storage/partmgr/partition.c +++ b/drivers/storage/partmgr/partition.c @@ -27,7 +27,7 @@ PartitionCreateDevice( UNICODE_STRING deviceName; UINT32 volumeNum; - // create the device object + // Create the partition/volume device object volumeNum = HarddiskVolumeNextId++; swprintf(nameBuf, L"\\Device\\HarddiskVolume%lu", volumeNum); @@ -41,7 +41,6 @@ PartitionCreateDevice( FILE_DEVICE_SECURE_OPEN, FALSE, &partitionDevice); - if (!NT_SUCCESS(status)) { ERR("Unable to create device object %wZ\n", &deviceName); @@ -81,10 +80,10 @@ PartitionCreateDevice( partExt->DeviceObject = partitionDevice; partExt->LowerDevice = FDObject; + // The device is initialized partitionDevice->Flags &= ~DO_DEVICE_INITIALIZING; *PDO = partitionDevice; - return status; } @@ -136,11 +135,9 @@ PartitionHandleStartDevice( return status; } + INFO("Partition interface %wZ\n", &interfaceName); PartExt->PartitionInterfaceName = interfaceName; status = IoSetDeviceInterfaceState(&interfaceName, TRUE); - - INFO("Partition interface %wZ\n", &interfaceName); - if (!NT_SUCCESS(status)) { RtlFreeUnicodeString(&interfaceName); @@ -157,11 +154,9 @@ PartitionHandleStartDevice( return status; } + INFO("Volume interface %wZ\n", &interfaceName); PartExt->VolumeInterfaceName = interfaceName; status = IoSetDeviceInterfaceState(&interfaceName, TRUE); - - INFO("Volume interface %wZ\n", &interfaceName); - if (!NT_SUCCESS(status)) { RtlFreeUnicodeString(&interfaceName); diff --git a/drivers/storage/partmgr/partmgr.c b/drivers/storage/partmgr/partmgr.c index 8d3a175d91a..fd3fd89c247 100644 --- a/drivers/storage/partmgr/partmgr.c +++ b/drivers/storage/partmgr/partmgr.c @@ -340,7 +340,6 @@ PartMgrUpdatePartitionDevices( pdoNumber, NewLayout->PartitionStyle, &partitionDevice); - if (!NT_SUCCESS(status)) { partEntry->PartitionNumber = 0; @@ -948,8 +947,8 @@ FdoHandleStartDevice( _In_ PFDO_EXTENSION FdoExtension, _In_ PIRP Irp) { - // obtain the disk device number - // this is not expected to change thus not in PartMgrRefreshDiskData + // Obtain the disk device number. + // It is not expected to change, thus not in PartMgrRefreshDiskData(). STORAGE_DEVICE_NUMBER deviceNumber; NTSTATUS status = IssueSyncIoControlRequest(IOCTL_STORAGE_GET_DEVICE_NUMBER, FdoExtension->LowerDevice, @@ -965,25 +964,22 @@ FdoHandleStartDevice( FdoExtension->DiskData.DeviceNumber = deviceNumber.DeviceNumber; - // register the disk interface - // partmgr.sys from Windows 8.1 also registers a mysterious GUID_DEVINTERFACE_HIDDEN_DISK here + // Register the disk interface. + // partmgr.sys from Windows 8.1 also registers a mysterious GUID_DEVINTERFACE_HIDDEN_DISK here. UNICODE_STRING interfaceName; status = IoRegisterDeviceInterface(FdoExtension->PhysicalDiskDO, &GUID_DEVINTERFACE_DISK, NULL, &interfaceName); - if(!NT_SUCCESS(status)) { ERR("Failed to register GUID_DEVINTERFACE_DISK, status %x\n", status); return status; } + INFO("Disk interface %wZ\n", &interfaceName); FdoExtension->DiskInterfaceName = interfaceName; status = IoSetDeviceInterfaceState(&interfaceName, TRUE); - - INFO("Disk interface %wZ\n", &interfaceName); - if (!NT_SUCCESS(status)) { RtlFreeUnicodeString(&interfaceName); @@ -1188,12 +1184,11 @@ PartMgrAddDevice( NTSTATUS status = IoCreateDevice(DriverObject, sizeof(FDO_EXTENSION), - 0, + NULL, FILE_DEVICE_BUS_EXTENDER, FILE_AUTOGENERATED_DEVICE_NAME | FILE_DEVICE_SECURE_OPEN, FALSE, &deviceObject); - if (!NT_SUCCESS(status)) { ERR("Failed to create FDO 0x%x\n", status); @@ -1218,9 +1213,8 @@ PartMgrAddDevice( } deviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; - // device is initialized + // The device is initialized deviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [WKSSVC] FIXME --> TRACE
by Eric Kohl 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0929e967283990ed8509e… commit 0929e967283990ed8509ef94cfa94c1a02436ec5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 5 16:56:09 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 5 16:56:09 2025 +0100 [WKSSVC] FIXME --> TRACE --- base/services/wkssvc/rpcserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index fc9cf12433b..b27e98f7973 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -113,7 +113,7 @@ NetpGetClientLogonId( goto done; } - FIXME("Client LUID: %lx\n", Statistics.AuthenticationId.LowPart); + TRACE("Client LUID: %lx\n", Statistics.AuthenticationId.LowPart); RtlCopyLuid(LogonId, &Statistics.AuthenticationId); done:

1 0

[reactos] 01/01: [NETAPI32][WKSSVC][IDL] Implement NetrWkstaUserEnum
by Eric Kohl 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faf62979728ec2e6a596e… commit faf62979728ec2e6a596ec6f3921e318f168bcfc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 5 16:38:04 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 5 16:38:04 2025 +0100 [NETAPI32][WKSSVC][IDL] Implement NetrWkstaUserEnum - TODO: Take PreferredMaximumLength and ResumeHandle into account --- base/services/wkssvc/rpcserver.c | 239 ++++++++++++++++++++++++++++++++++++- dll/win32/netapi32/wksta_new.c | 32 +++-- sdk/include/reactos/idl/wkssvc.idl | 13 +- 3 files changed, 267 insertions(+), 17 deletions(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index fe39af081bc..fc9cf12433b 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -447,12 +447,243 @@ NetrWkstaUserEnum( unsigned long *TotalEntries, unsigned long *ResumeHandle) { - ERR("NetrWkstaUserEnum(%p %p 0x%lx %p %p)\n", - ServerName, UserInfo, PreferredMaximumLength, TotalEntries, ResumeHandle); + MSV1_0_ENUMUSERS_REQUEST EnumRequest; + PMSV1_0_ENUMUSERS_RESPONSE EnumResponseBuffer = NULL; + MSV1_0_GETUSERINFO_REQUEST UserInfoRequest; + PMSV1_0_GETUSERINFO_RESPONSE UserInfoResponseBuffer = NULL; + PMSV1_0_GETUSERINFO_RESPONSE *UserInfoArray = NULL; + DWORD EnumResponseBufferSize = 0; + DWORD UserInfoResponseBufferSize = 0; + NTSTATUS Status, ProtocolStatus; + ULONG i, start, count; + PLUID pLogonId; + PULONG pEnumHandle; + DWORD dwResult = NERR_Success; + PWKSTA_USER_INFO_0 pUserInfo0 = NULL; + PWKSTA_USER_INFO_1 pUserInfo1 = NULL; - UNIMPLEMENTED; - return 0; + TRACE("NetrWkstaUserEnum(%p %p 0x%lx %p %p)\n", + ServerName, UserInfo, PreferredMaximumLength, TotalEntries, ResumeHandle); + + if (UserInfo->Level > 1) + { + ERR("Invalid Level %lu\n", UserInfo->Level); + return ERROR_INVALID_LEVEL; + } + + /* Enumerate all currently logged-on users */ + EnumRequest.MessageType = MsV1_0EnumerateUsers; + Status = LsaCallAuthenticationPackage(LsaHandle, + LsaAuthenticationPackage, + &EnumRequest, + sizeof(EnumRequest), + (PVOID*)&EnumResponseBuffer, + &EnumResponseBufferSize, + &ProtocolStatus); + + TRACE("LsaCallAuthenticationPackage Status 0x%08lx ResponseBufferSize %lu\n", Status, EnumResponseBufferSize); + if (!NT_SUCCESS(Status)) + { + dwResult = RtlNtStatusToDosError(Status); + goto done; + } + + TRACE("LoggedOnUsers: %lu\n", EnumResponseBuffer->NumberOfLoggedOnUsers); + TRACE("ResponseBuffer: 0x%p\n", EnumResponseBuffer); + TRACE("LogonIds: 0x%p\n", EnumResponseBuffer->LogonIds); + TRACE("EnumHandles: 0x%p\n", EnumResponseBuffer->EnumHandles); + if (EnumResponseBuffer->NumberOfLoggedOnUsers > 0) + { + pLogonId = EnumResponseBuffer->LogonIds; + pEnumHandle = EnumResponseBuffer->EnumHandles; + TRACE("pLogonId: 0x%p\n", pLogonId); + TRACE("pEnumHandle: 0x%p\n", pEnumHandle); + + UserInfoArray = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + EnumResponseBuffer->NumberOfLoggedOnUsers * sizeof(PMSV1_0_GETUSERINFO_RESPONSE)); + if (UserInfoArray == NULL) + { + dwResult = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + for (i = 0; i < EnumResponseBuffer->NumberOfLoggedOnUsers; i++) + { + TRACE("Logon %lu: 0x%08lx %lu\n", i, pLogonId->LowPart, *pEnumHandle); + + UserInfoRequest.MessageType = MsV1_0GetUserInfo; + UserInfoRequest.LogonId = *pLogonId; + Status = LsaCallAuthenticationPackage(LsaHandle, + LsaAuthenticationPackage, + &UserInfoRequest, + sizeof(UserInfoRequest), + (PVOID*)&UserInfoResponseBuffer, + &UserInfoResponseBufferSize, + &ProtocolStatus); + TRACE("LsaCallAuthenticationPackage:MsV1_0GetUserInfo Status 0x%08lx ResponseBufferSize %lu\n", Status, UserInfoResponseBufferSize); + if (!NT_SUCCESS(Status)) + { + dwResult = RtlNtStatusToDosError(Status); + goto done; + } + + UserInfoArray[i] = UserInfoResponseBuffer; + + TRACE("UserName: %wZ\n", &UserInfoArray[i]->UserName); + TRACE("LogonDomain: %wZ\n", &UserInfoArray[i]->LogonDomainName); + TRACE("LogonServer: %wZ\n", &UserInfoArray[i]->LogonServer); + + pLogonId++; + pEnumHandle++; + } + + if (PreferredMaximumLength == MAX_PREFERRED_LENGTH) + { + start = 0; + count = EnumResponseBuffer->NumberOfLoggedOnUsers; + } + else + { + FIXME("Calculate the start index and the number of matching array entries!"); + dwResult = ERROR_CALL_NOT_IMPLEMENTED; + goto done; + } + + switch (UserInfo->Level) + { + case 0: + pUserInfo0 = midl_user_allocate(count * sizeof(WKSTA_USER_INFO_0)); + if (pUserInfo0 == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo0, count * sizeof(WKSTA_USER_INFO_0)); + + for (i = 0; i < 0 + count; i++) + { + pUserInfo0[i].wkui0_username = midl_user_allocate(UserInfoArray[start + i]->UserName.Length + sizeof(WCHAR)); + if (pUserInfo0[i].wkui0_username == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo0[i].wkui0_username, UserInfoArray[start + i]->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo0[i].wkui0_username, UserInfoArray[start + i]->UserName.Buffer, UserInfoArray[start + i]->UserName.Length); + } + + UserInfo->WkstaUserInfo.Level0.EntriesRead = count; + UserInfo->WkstaUserInfo.Level0.Buffer = pUserInfo0; + *TotalEntries = EnumResponseBuffer->NumberOfLoggedOnUsers; + *ResumeHandle = 0; + break; + + case 1: + pUserInfo1 = midl_user_allocate(count * sizeof(WKSTA_USER_INFO_1)); + if (pUserInfo1 == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo1, count * sizeof(WKSTA_USER_INFO_1)); + + for (i = 0; i < 0 + count; i++) + { + pUserInfo1[i].wkui1_username = midl_user_allocate(UserInfoArray[start + i]->UserName.Length + sizeof(WCHAR)); + if (pUserInfo1[i].wkui1_username == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo1[i].wkui1_username, UserInfoArray[start + i]->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo1[i].wkui1_username, UserInfoArray[start + i]->UserName.Buffer, UserInfoArray[start + i]->UserName.Length); + + pUserInfo1[i].wkui1_logon_domain = midl_user_allocate(UserInfoArray[start + i]->LogonDomainName.Length + sizeof(WCHAR)); + if (pUserInfo1[i].wkui1_logon_domain == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo1[i].wkui1_logon_domain, UserInfoArray[start + i]->LogonDomainName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo1[i].wkui1_logon_domain, UserInfoArray[start + i]->LogonDomainName.Buffer, UserInfoArray[start + i]->LogonDomainName.Length); + + // FIXME: wkui1_oth_domains + + pUserInfo1[i].wkui1_logon_server = midl_user_allocate(UserInfoArray[start + i]->LogonServer.Length + sizeof(WCHAR)); + if (pUserInfo1[i].wkui1_logon_server == NULL) + { + ERR("\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo1[i].wkui1_logon_server, UserInfoArray[start + i]->LogonServer.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo1[i].wkui1_logon_server, UserInfoArray[start + i]->LogonServer.Buffer, UserInfoArray[start + i]->LogonServer.Length); + } + + UserInfo->WkstaUserInfo.Level1.EntriesRead = count; + UserInfo->WkstaUserInfo.Level1.Buffer = pUserInfo1; + *TotalEntries = EnumResponseBuffer->NumberOfLoggedOnUsers; + *ResumeHandle = 0; + break; + + break; + } + } + else + { + if (UserInfo->Level == 0) + { + UserInfo->WkstaUserInfo.Level0.Buffer = NULL; + UserInfo->WkstaUserInfo.Level0.EntriesRead = 0; + } + else + { + UserInfo->WkstaUserInfo.Level1.Buffer = NULL; + UserInfo->WkstaUserInfo.Level1.EntriesRead = 0; + } + + *TotalEntries = 0; + dwResult = NERR_Success; + } + +done: + if (UserInfoArray !=NULL) + { + + for (i = 0; i < EnumResponseBuffer->NumberOfLoggedOnUsers; i++) + { + if (UserInfoArray[i]->UserName.Buffer != NULL) + LsaFreeReturnBuffer(UserInfoArray[i]->UserName.Buffer); + + if (UserInfoArray[i]->LogonDomainName.Buffer != NULL) + LsaFreeReturnBuffer(UserInfoArray[i]->LogonDomainName.Buffer); + + if (UserInfoArray[i]->LogonServer.Buffer != NULL) + LsaFreeReturnBuffer(UserInfoArray[i]->LogonServer.Buffer); + + LsaFreeReturnBuffer(UserInfoArray[i]); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, UserInfoArray); + } + + if (EnumResponseBuffer != NULL) + LsaFreeReturnBuffer(EnumResponseBuffer); + + return dwResult; } diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index f427f3cd35f..48873eefbab 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -1057,8 +1057,8 @@ NetWkstaUserEnum( _Inout_ LPDWORD resumehandle) { WKSTA_USER_ENUM_STRUCT UserEnumInfo; - WKSTA_USER_INFO_0_CONTAINER Container0; - WKSTA_USER_INFO_1_CONTAINER Container1; +// WKSTA_USER_INFO_0_CONTAINER Container0; +// WKSTA_USER_INFO_1_CONTAINER Container1; NET_API_STATUS status; TRACE("NetWkstaUserEnum(%s, %d, %p, %d, %p, %p, %p)\n", debugstr_w(servername), @@ -1068,15 +1068,19 @@ NetWkstaUserEnum( switch (level) { case 0: - UserEnumInfo.WkstaUserInfo.Level0 = &Container0; - Container0.EntriesRead = 0; - Container0.Buffer = NULL; +// UserEnumInfo.WkstaUserInfo.Level0 = &Container0; +// Container0.EntriesRead = 0; +// Container0.Buffer = NULL; + UserEnumInfo.WkstaUserInfo.Level0.EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level0.Buffer = NULL; break; case 1: - UserEnumInfo.WkstaUserInfo.Level1 = &Container1; - Container1.EntriesRead = 0; - Container1.Buffer = NULL; +// UserEnumInfo.WkstaUserInfo.Level1 = &Container1; +// Container1.EntriesRead = 0; +// Container1.Buffer = NULL; + UserEnumInfo.WkstaUserInfo.Level1.EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level1.Buffer = NULL; break; default: @@ -1095,13 +1099,17 @@ NetWkstaUserEnum( switch (level) { case 0: - *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level0->Buffer; - *entriesread = UserEnumInfo.WkstaUserInfo.Level0->EntriesRead; +// *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level0->Buffer; +// *entriesread = UserEnumInfo.WkstaUserInfo.Level0->EntriesRead; + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level0.Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level0.EntriesRead; break; case 1: - *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level1->Buffer; - *entriesread = UserEnumInfo.WkstaUserInfo.Level1->EntriesRead; +// *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level1->Buffer; +// *entriesread = UserEnumInfo.WkstaUserInfo.Level1->EntriesRead; + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level1.Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level1.EntriesRead; break; } } diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index 88cf97f6057..6e5cce98ead 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -311,7 +311,7 @@ typedef struct _WKSTA_USER_INFO_1_CONTAINER unsigned long EntriesRead; [size_is(EntriesRead)] LPWKSTA_USER_INFO_1 Buffer; } WKSTA_USER_INFO_1_CONTAINER, *PWKSTA_USER_INFO_1_CONTAINER, *LPWKSTA_USER_INFO_1_CONTAINER; - +/* typedef struct _WKSTA_USER_ENUM_STRUCT { unsigned long Level; @@ -322,6 +322,17 @@ typedef struct _WKSTA_USER_ENUM_STRUCT [default] ; } WkstaUserInfo; } WKSTA_USER_ENUM_STRUCT, *PWKSTA_USER_ENUM_STRUCT, *LPWKSTA_USER_ENUM_STRUCT; +*/ +typedef struct _WKSTA_USER_ENUM_STRUCT +{ + unsigned long Level; + [switch_is(Level)] union _WKSTA_USER_ENUM_UNION + { + [case(0)] WKSTA_USER_INFO_0_CONTAINER Level0; + [case(1)] WKSTA_USER_INFO_1_CONTAINER Level1; + [default] ; + } WkstaUserInfo; +} WKSTA_USER_ENUM_STRUCT, *PWKSTA_USER_ENUM_STRUCT, *LPWKSTA_USER_ENUM_STRUCT; typedef struct _WKSTA_TRANSPORT_INFO_0_CONTAINER {

1 0

[reactos] 01/01: [MSV1_0] Protect the logon list from concurrent access
by Eric Kohl 05 Jan '25

05 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cdcbbd1a908716e505f8… commit 4cdcbbd1a908716e505f8b8fb4bdbb05153b7c65 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 5 16:30:40 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 5 16:30:40 2025 +0100 [MSV1_0] Protect the logon list from concurrent access --- dll/win32/msv1_0/msv1_0.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 46d6bff6f55..1d4d6efc448 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -27,6 +27,7 @@ typedef struct _LOGON_LIST_ENTRY BOOL PackageInitialized = FALSE; LIST_ENTRY LogonListHead; +RTL_RESOURCE LogonListResource; ULONG EnumCounter; /* FUNCTIONS ***************************************************************/ @@ -891,6 +892,8 @@ MsvpEnumerateUsers( return STATUS_INVALID_PARAMETER; } + RtlAcquireResourceShared(&LogonListResource, TRUE); + /* Count the currently logged-on users */ CurrentEntry = LogonListHead.Flink; while (CurrentEntry != &LogonListHead) @@ -973,6 +976,8 @@ MsvpEnumerateUsers( *ProtocolStatus = STATUS_SUCCESS; done: + RtlReleaseResource(&LogonListResource); + if (LocalBuffer != NULL) DispatchTable.FreeLsaHeap(LocalBuffer); @@ -1018,6 +1023,8 @@ MsvpGetUserInfo( TRACE("LogonId: 0x%lx\n", RequestBuffer->LogonId.LowPart); + RtlAcquireResourceShared(&LogonListResource, TRUE); + LogonEntry = GetLogonByLogonId(&RequestBuffer->LogonId); if (LogonEntry == NULL) { @@ -1100,6 +1107,8 @@ MsvpGetUserInfo( *ProtocolStatus = STATUS_SUCCESS; done: + RtlReleaseResource(&LogonListResource); + if (LocalBuffer != NULL) DispatchTable.FreeLsaHeap(LocalBuffer); @@ -1278,6 +1287,7 @@ LsaApInitializePackage(IN ULONG AuthenticationPackageId, if (!PackageInitialized) { InitializeListHead(&LogonListHead); + RtlInitializeResource(&LogonListResource); EnumCounter = 0; PackageInitialized = TRUE; } @@ -1333,7 +1343,9 @@ LsaApLogonTerminated( LogonEntry = GetLogonByLogonId(LogonId); if (LogonEntry != NULL) { + RtlAcquireResourceExclusive(&LogonListResource, TRUE); RemoveEntryList(&LogonEntry->ListEntry); + RtlReleaseResource(&LogonListResource); if (LogonEntry->UserName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, LogonEntry->UserName.Buffer); @@ -1702,7 +1714,9 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, LogonEntry->LogonType = LogonType; + RtlAcquireResourceExclusive(&LogonListResource, TRUE); InsertTailList(&LogonListHead, &LogonEntry->ListEntry); + RtlReleaseResource(&LogonListResource); } if (LogonType == Interactive || LogonType == Batch || LogonType == Service)

1 0

[reactos] 01/01: [SHELL32] Fix Control_RunDLL single comma syntax out of range dialog box numbers (#7595)
by Marcin Jabłoński 04 Jan '25

04 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b114e3a05104dfefede16… commit b114e3a05104dfefede16a9371fea64cbac7ac68 Author: Marcin Jabłoński <nnxcomputing(a)gmail.com> AuthorDate: Sat Jan 4 17:28:12 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 4 19:28:12 2025 +0300 [SHELL32] Fix Control_RunDLL single comma syntax out of range dialog box numbers (#7595) If an out of range dialog box number was given in a single comma syntax for Control_RunDLL(), it should be set to 0 to launch the default dialog box instead of failing. Addendum to dcf9eb060a9. CORE-19580 CORE-8981 --- dll/win32/shell32/wine/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index dbbca6a2e4a..b07cda047f4 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -1104,7 +1104,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } } - if (sp >= applet->count && wszDialogBoxName[0] == L'\0') + if (sp >= applet->count && (wszDialogBoxName[0] == L'\0' || wszDialogBoxName[0] == L'@')) { sp = 0; }

1 0

[reactos] 01/01: [SHELL32] Pump COM messages while initializing propsheet from IDataObject (#7571)
by Whindmar Saksit 03 Jan '25

03 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afc130ff3f5b089c02706… commit afc130ff3f5b089c0270686d1b76b3cb08133e38 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Jan 3 20:16:56 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 3 20:16:56 2025 +0100 [SHELL32] Pump COM messages while initializing propsheet from IDataObject (#7571) CORE-19933 --- dll/win32/shell32/dialogs/item_prop.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/dialogs/item_prop.cpp b/dll/win32/shell32/dialogs/item_prop.cpp index 90160a8062e..bcc6473144d 100644 --- a/dll/win32/shell32/dialogs/item_prop.cpp +++ b/dll/win32/shell32/dialogs/item_prop.cpp @@ -27,7 +27,7 @@ struct ShellPropSheetDialog HKEY *hKeys, UINT *cKeys); static HRESULT Show(const CLSID *pClsidDefault, IDataObject *pDO, - PFNINITIALIZE InitFunc, LPCWSTR InitString) + PFNINITIALIZE InitFunc, LPCWSTR InitString, HANDLE hEvent = NULL) { HRESULT hr; CRegKeyHandleArray keys; @@ -36,6 +36,8 @@ struct ShellPropSheetDialog WCHAR szCaption[MAX_PATH], *pszCaption = NULL; if (SUCCEEDED(SHELL_GetCaptionFromDataObject(pDO, szCaption, _countof(szCaption)))) pszCaption = szCaption; + if (hEvent) + SetEvent(hEvent); hr = SHOpenPropSheetW(pszCaption, keys, keys, pClsidDefault, pDO, NULL, NULL) ? S_OK : E_FAIL; return hr; } @@ -47,6 +49,7 @@ struct ShellPropSheetDialog CLSID ClsidDefault; const CLSID *pClsidDefault; IStream *pObjStream; + HANDLE hEvent; }; static void FreeData(DATA *pData) @@ -74,6 +77,7 @@ struct ShellPropSheetDialog pData->ClsidDefault = *pClsidDefault; pData->pClsidDefault = &pData->ClsidDefault; } + HANDLE hEvent = pData->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); HRESULT hr = S_OK; if (pDO) @@ -86,8 +90,21 @@ struct ShellPropSheetDialog pData->pObjStream->Release(); hr = E_FAIL; } - if (FAILED(hr)) + + if (SUCCEEDED(hr)) + { + if (hEvent) + { + DWORD index; + // Pump COM messages until InitFunc is done (for CORE-19933) + CoWaitForMultipleHandles(COWAIT_DEFAULT, INFINITE, 1, &hEvent, &index); + CloseHandle(hEvent); + } + } + else + { FreeData(pData); + } return hr; } @@ -97,7 +114,7 @@ struct ShellPropSheetDialog CComPtr<IDataObject> pDO; if (pData->pObjStream) CoGetInterfaceAndReleaseStream(pData->pObjStream, IID_PPV_ARG(IDataObject, &pDO)); - Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString); + Show(pData->pClsidDefault, pDO, pData->InitFunc, pData->InitString, pData->hEvent); FreeData(pData); return 0; }

1 0

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