Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 09/11: [VIDEOPRT] Correctly return failure in IRP_MJ_CREATE when HwInitialize fails

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea8cbbd4caf4f2b7ff6ea… commit ea8cbbd4caf4f2b7ff6ea79f8d9b615d54917a58 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Oct 13 08:01:20 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:31 2021 +0200 [VIDEOPRT] Correctly return failure in IRP_MJ_CREATE when HwInitialize fails CORE-17789 --- win32ss/drivers/videoprt/dispatch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index f80abe8c4f7..6ab73148530 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -405,18 +405,19 @@ IntVideoPortDispatchOpen( if (DriverExtension->InitializationData.HwInitialize(&DeviceExtension->MiniPortDeviceExtension)) { - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); } else { - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; } + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = FILE_OPENED; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return Status; } /*

3 years

[reactos] 08/11: [VIDEOPRT] Correctly return failure when adapter can't be found

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=807af6a4d13d5b280e0f1… commit 807af6a4d13d5b280e0f113124e8f5085cfc9f4e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Oct 9 07:21:53 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:31 2021 +0200 [VIDEOPRT] Correctly return failure when adapter can't be found This was wrong in both call chains (PNP case or legacy case) HwFindAdapter returns a VP_STATUS, while we were expecting a NTSTATUS. CORE-17789 --- win32ss/drivers/videoprt/videoprt.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index d49cd20f033..35580904a7b 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -345,6 +345,7 @@ IntVideoPortFindAdapter( { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + VP_STATUS vpStatus; VIDEO_PORT_CONFIG_INFO ConfigInfo; SYSTEM_BASIC_INFORMATION SystemBasicInfo; UCHAR Again = FALSE; @@ -405,32 +406,27 @@ IntVideoPortFindAdapter( DriverExtension->InitializationData.HwDeviceExtensionSize); /* FIXME: Need to figure out what string to pass as param 3. */ - Status = DriverExtension->InitializationData.HwFindAdapter( + vpStatus = DriverExtension->InitializationData.HwFindAdapter( &DeviceExtension->MiniPortDeviceExtension, DriverExtension->HwContext, NULL, &ConfigInfo, &Again); - if (Status == ERROR_DEV_NOT_EXIST) + if (vpStatus == ERROR_DEV_NOT_EXIST) { continue; } - else if (Status == NO_ERROR) - { - break; - } else { - ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); - goto Failure; + break; } } } else { /* FIXME: Need to figure out what string to pass as param 3. */ - Status = DriverExtension->InitializationData.HwFindAdapter( + vpStatus = DriverExtension->InitializationData.HwFindAdapter( &DeviceExtension->MiniPortDeviceExtension, DriverExtension->HwContext, NULL, @@ -438,9 +434,10 @@ IntVideoPortFindAdapter( &Again); } - if (Status != NO_ERROR) + if (vpStatus != NO_ERROR) { - ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); + ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", vpStatus); + Status = STATUS_UNSUCCESSFUL; goto Failure; }

3 years

[reactos] 07/11: [VIDEOPRT] Correctly report legacy resources in IRP_MN_FILTER_RESOURCE_REQUIREMENTS

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87b74f290153179742ee5… commit 87b74f290153179742ee588e9e1b234cc90a75e5 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:36:24 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:31 2021 +0200 [VIDEOPRT] Correctly report legacy resources in IRP_MN_FILTER_RESOURCE_REQUIREMENTS It was broken since first commit 25eae4b9164de7d7cab433bb21c810113241dfab (r54237) CORE-17789 --- win32ss/drivers/videoprt/dispatch.c | 8 ++++---- win32ss/drivers/videoprt/resource.c | 12 +++++++----- win32ss/drivers/videoprt/videoprt.h | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index 77339574f40..f80abe8c4f7 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -1028,11 +1028,11 @@ IntVideoPortDispatchFdoPnp( break; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) - Status = IntVideoPortFilterResourceRequirements(DeviceObject, Irp); + /* Call lower drivers, and ignore result (that's probably STATUS_NOT_SUPPORTED) */ + (VOID)IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + /* Now, fill resource requirements list */ + Status = IntVideoPortFilterResourceRequirements(DeviceObject, IrpSp, Irp); Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); break; diff --git a/win32ss/drivers/videoprt/resource.c b/win32ss/drivers/videoprt/resource.c index 7f44ea0dab3..cd85c9feb43 100644 --- a/win32ss/drivers/videoprt/resource.c +++ b/win32ss/drivers/videoprt/resource.c @@ -76,6 +76,7 @@ IntVideoPortGetLegacyResources( NTSTATUS NTAPI IntVideoPortFilterResourceRequirements( IN PDEVICE_OBJECT DeviceObject, + IN PIO_STACK_LOCATION IrpStack, IN PIRP Irp) { PDRIVER_OBJECT DriverObject; @@ -83,7 +84,8 @@ IntVideoPortFilterResourceRequirements( PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; PVIDEO_ACCESS_RANGE AccessRanges; ULONG AccessRangeCount, ListSize, i; - PIO_RESOURCE_REQUIREMENTS_LIST ResList, OldResList = (PVOID)Irp->IoStatus.Information; + PIO_RESOURCE_REQUIREMENTS_LIST ResList; + PIO_RESOURCE_REQUIREMENTS_LIST OldResList = IrpStack->Parameters.FilterResourceRequirements.IoResourceRequirementList; PIO_RESOURCE_DESCRIPTOR CurrentDescriptor; NTSTATUS Status; @@ -163,8 +165,8 @@ IntVideoPortFilterResourceRequirements( if (CurrentDescriptor->Type == CmResourceTypePort) { CurrentDescriptor->u.Port.Length = AccessRanges[i].RangeLength; - CurrentDescriptor->u.Port.MinimumAddress = - CurrentDescriptor->u.Port.MaximumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Port.MinimumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Port.MaximumAddress.QuadPart = AccessRanges[i].RangeStart.QuadPart + AccessRanges[i].RangeLength - 1; CurrentDescriptor->u.Port.Alignment = 1; if (AccessRanges[i].RangePassive & VIDEO_RANGE_PASSIVE_DECODE) CurrentDescriptor->Flags |= CM_RESOURCE_PORT_PASSIVE_DECODE; @@ -174,8 +176,8 @@ IntVideoPortFilterResourceRequirements( else { CurrentDescriptor->u.Memory.Length = AccessRanges[i].RangeLength; - CurrentDescriptor->u.Memory.MinimumAddress = - CurrentDescriptor->u.Memory.MaximumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Memory.MinimumAddress = AccessRanges[i].RangeStart; + CurrentDescriptor->u.Memory.MaximumAddress.QuadPart = AccessRanges[i].RangeStart.QuadPart + AccessRanges[i].RangeLength - 1; CurrentDescriptor->u.Memory.Alignment = 1; CurrentDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; } diff --git a/win32ss/drivers/videoprt/videoprt.h b/win32ss/drivers/videoprt/videoprt.h index 6ff90e2dd2a..61363fafadc 100644 --- a/win32ss/drivers/videoprt/videoprt.h +++ b/win32ss/drivers/videoprt/videoprt.h @@ -234,6 +234,7 @@ IntVideoPortSetupInterrupt( NTSTATUS NTAPI IntVideoPortFilterResourceRequirements( IN PDEVICE_OBJECT DeviceObject, + IN PIO_STACK_LOCATION IrpStack, IN PIRP Irp); NTSTATUS NTAPI

3 years

[reactos] 06/11: [VGAMP] Correctly check and report legacy resources (VGA I/O ports and memory)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=951dc66c6695cceebaeda… commit 951dc66c6695cceebaeda16b874847d43e263cda Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:40:13 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VGAMP] Correctly check and report legacy resources (VGA I/O ports and memory) As we are a non PNP driver, the call chain will be DriverEntry -> VidePortInitialize -> VideoPortFindAdapter -> HwFindAdapter. If legacy resources are available, we will fail VGAFindAdapter, so DriverEntry will fail, so vgamp.sys driver won't be used. CORE-17789 --- win32ss/drivers/miniport/vga/vgamp.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/win32ss/drivers/miniport/vga/vgamp.c b/win32ss/drivers/miniport/vga/vgamp.c index f4cd3a26c41..4b892cc281e 100644 --- a/win32ss/drivers/miniport/vga/vgamp.c +++ b/win32ss/drivers/miniport/vga/vgamp.c @@ -10,6 +10,13 @@ #include <dderror.h> #include <devioctl.h> +VIDEO_ACCESS_RANGE VGAAccessRange[] = +{ + { {{0x3b0}}, 0x3bb - 0x3b0 + 1, 1, 0, 0 }, + { {{0x3c0}}, 0x3df - 0x3c0 + 1, 1, 0, 0 }, + { {{0xa0000}}, 0x20000, 0, 0, 0 }, +}; + // ------------------------------------------------------- Public Interface // DriverEntry @@ -45,6 +52,8 @@ DriverEntry(IN PVOID Context1, /* InitData.HwInterrupt = VGAInterrupt; */ InitData.HwResetHw = VGAResetHw; /* InitData.HwTimer = VGATimer; */ + InitData.HwLegacyResourceList = VGAAccessRange; + InitData.HwLegacyResourceCount = ARRAYSIZE(VGAAccessRange); return VideoPortInitialize(Context1, Context2, &InitData, NULL); } @@ -82,12 +91,21 @@ VGAFindAdapter(PVOID DeviceExtension, PVIDEO_PORT_CONFIG_INFO ConfigInfo, PUCHAR Again) { - /* FIXME: Determine if the adapter is present */ - *Again = FALSE; + VP_STATUS Status; + + /* FIXME: Determine if the adapter is present */ + *Again = FALSE; + + if (ConfigInfo->Length < sizeof(VIDEO_PORT_CONFIG_INFO)) + return ERROR_INVALID_PARAMETER; + + Status = VideoPortVerifyAccessRanges(DeviceExtension, ARRAYSIZE(VGAAccessRange), VGAAccessRange); + if (Status != NO_ERROR) + return Status; - ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; - ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; - return NO_ERROR; + ConfigInfo->VdmPhysicalVideoMemoryAddress = VGAAccessRange[2].RangeStart; + ConfigInfo->VdmPhysicalVideoMemoryLength = VGAAccessRange[2].RangeLength; + return NO_ERROR; /* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Map resources into system memory for the adapter */

3 years

[reactos] 05/11: [VBEMP] Correctly report legacy resources (VGA I/O ports and memory)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dd94572e5eb4bdfe529c… commit 6dd94572e5eb4bdfe529c807e341b3c149af5e08 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:39:06 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VBEMP] Correctly report legacy resources (VGA I/O ports and memory) CORE-17789 --- win32ss/drivers/miniport/vbe/vbemp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/vbe/vbemp.c b/win32ss/drivers/miniport/vbe/vbemp.c index 68692647f6e..c577902366d 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.c +++ b/win32ss/drivers/miniport/vbe/vbemp.c @@ -36,6 +36,13 @@ #define LOWORD(l) ((USHORT)((ULONG_PTR)(l))) #define HIWORD(l) ((USHORT)(((ULONG_PTR)(l)>>16)&0xFFFF)) +VIDEO_ACCESS_RANGE VBEAccessRange[] = +{ + { {{0x3b0}}, 0x3bb - 0x3b0 + 1, 1, 1, 0 }, + { {{0x3c0}}, 0x3df - 0x3c0 + 1, 1, 1, 0 }, + { {{0xa0000}}, 0x20000, 0, 1, 0 }, +}; + /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ ULONG NTAPI @@ -53,6 +60,8 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2) InitData.HwSetPowerState = VBESetPowerState; InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION); + InitData.HwLegacyResourceList = VBEAccessRange; + InitData.HwLegacyResourceCount = ARRAYSIZE(VBEAccessRange); return VideoPortInitialize(Context1, Context2, &InitData, NULL); } @@ -76,8 +85,11 @@ VBEFindAdapter( if (VideoPortIsNoVesa()) return ERROR_DEV_NOT_EXIST; - ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; - ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; + if (ConfigInfo->Length < sizeof(VIDEO_PORT_CONFIG_INFO)) + return ERROR_INVALID_PARAMETER; + + ConfigInfo->VdmPhysicalVideoMemoryAddress = VBEAccessRange[2].RangeStart; + ConfigInfo->VdmPhysicalVideoMemoryLength = VBEAccessRange[2].RangeLength; return NO_ERROR; }

3 years

[reactos] 04/11: [VBEMP] Fail HwInitialize (ie IRP_MJ_CREATE) when /NOVESA switch is present

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3379de392489da92ed63f… commit 3379de392489da92ed63f84bba93a96e03a7ef9e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Oct 13 08:02:01 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [VBEMP] Fail HwInitialize (ie IRP_MJ_CREATE) when /NOVESA switch is present In that case, we want a simple VGA driver to drive the graphic adapter. CORE-17789 --- win32ss/drivers/miniport/vbe/vbemp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/drivers/miniport/vbe/vbemp.c b/win32ss/drivers/miniport/vbe/vbemp.c index 14eaac91061..68692647f6e 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.c +++ b/win32ss/drivers/miniport/vbe/vbemp.c @@ -180,6 +180,13 @@ VBEInitialize(PVOID HwDeviceExtension) ULONG CurrentMode; PVBE_MODEINFO VbeModeInfo; + if (VideoPortIsNoVesa()) + { + VBEDeviceExtension->Int10Interface.Version = 0; + VBEDeviceExtension->Int10Interface.Size = 0; + return FALSE; + } + /* * Get the Int 10 interface that we will use for allocating real * mode memory and calling the video BIOS.

3 years

[reactos] 03/11: [ISAPNP] Generate a name for PDO, as required

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac13f37d0a4a0cff9096c… commit ac13f37d0a4a0cff9096c22be12e2ea6e57c5d01 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 20:53:38 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [ISAPNP] Generate a name for PDO, as required --- drivers/bus/isapnp/isapnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 877d69bf5a5..0ff17876e75 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -1246,7 +1246,7 @@ IsaPnpCreateReadPortDO( sizeof(ISAPNP_PDO_EXTENSION), NULL, FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &FdoExt->ReadPortPdo); if (!NT_SUCCESS(Status))

3 years

[reactos] 02/11: [NTOS:IO] Remove final NULL char of PDO name before writing to registry

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a86c3794a6d47bd5c9f4c… commit a86c3794a6d47bd5c9f4c06eacd6eecfc49181b4 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 20:50:38 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [NTOS:IO] Remove final NULL char of PDO name before writing to registry Otherwise, if a PDO has no name (bad!), you'll see two "(Default)" entries in HKLM\HARDWARE\RESOURCEMAP\PnP Manager\PnpManager --- ntoskrnl/io/pnpmgr/pnpres.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c index 1cdf1d85b84..57eabfe69c2 100644 --- a/ntoskrnl/io/pnpmgr/pnpres.c +++ b/ntoskrnl/io/pnpmgr/pnpres.c @@ -915,7 +915,7 @@ IopUpdateResourceMap( ASSERT(FALSE); } - NameU.Length = (USHORT)OldLength; + NameU.Length = (USHORT)OldLength - sizeof(UNICODE_NULL); /* Remove final NULL */ RtlAppendUnicodeStringToString(&NameU, &RawSuffix); @@ -933,7 +933,7 @@ IopUpdateResourceMap( } /* "Remove" the suffix by setting the length back to what it used to be */ - NameU.Length = (USHORT)OldLength; + NameU.Length = (USHORT)OldLength - sizeof(UNICODE_NULL); /* Remove final NULL */ RtlAppendUnicodeStringToString(&NameU, &TranslatedSuffix);

3 years

[reactos] 01/11: [DEVMGR] Display current assigned resources, instead of boot resources

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=500f00de6a38a379cdfde… commit 500f00de6a38a379cdfdea3b805150620a6d58ef Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 19:31:27 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:30 2021 +0200 [DEVMGR] Display current assigned resources, instead of boot resources --- dll/win32/devmgr/properties/hwresource.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/devmgr/properties/hwresource.cpp b/dll/win32/devmgr/properties/hwresource.cpp index a3e1a88b65e..6803c716431 100644 --- a/dll/win32/devmgr/properties/hwresource.cpp +++ b/dll/win32/devmgr/properties/hwresource.cpp @@ -363,7 +363,7 @@ GetResourceList( CStringW keyName = L"SYSTEM\\CurrentControlSet\\Enum\\"; keyName += pszDeviceID; - keyName += L"\\LogConf"; + keyName += L"\\Control"; dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &hKey); if (dwError != ERROR_SUCCESS) @@ -373,7 +373,7 @@ GetResourceList( } dwSize = 0; - RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, NULL, &dwSize); + RegQueryValueExW(hKey, L"AllocConfig", NULL, NULL, NULL, &dwSize); if (dwSize == 0) goto done; @@ -381,7 +381,7 @@ GetResourceList( if (pResourceList == NULL) goto done; - dwError = RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, (LPBYTE)pResourceList, &dwSize); + dwError = RegQueryValueExW(hKey, L"AllocConfig", NULL, NULL, (LPBYTE)pResourceList, &dwSize); if (dwError != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, pResourceList);

3 years

[reactos] 01/01: [SHELL32] Bypass OpenWith for Delete and F2 (Rename) Keys (#4032) CORE-17810

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cee171f5d20c0d3c26837… commit cee171f5d20c0d3c268372085ca4f32bc44d6740 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Oct 14 16:03:53 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 14 23:03:53 2021 +0200 [SHELL32] Bypass OpenWith for Delete and F2 (Rename) Keys (#4032) CORE-17810 Logspam started during 0.4.9-dev'ing when zipfldr got committed, logspam became much worse by 0.4.10-dev-599-g 932df378bf35146a56c796bec36c5c689109fbd6 But the actual bug of 'calling those functions when not needed' is much older than that. I do intend to port this improvement back into older rls-branches. --- dll/win32/shell32/CDefView.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 00e310397f4..1a15523491d 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1573,19 +1573,21 @@ cleanup: LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) { HRESULT hResult; - HMENU hMenu; - - hMenu = CreatePopupMenu(); - if (!hMenu) - return 0; + HMENU hMenu = NULL; hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; + if ((uCommand != FCIDM_SHVIEW_DELETE) && (uCommand != FCIDM_SHVIEW_RENAME)) + { + hMenu = CreatePopupMenu(); + if (!hMenu) + return 0; - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); - if (FAILED_UNEXPECTEDLY( hResult)) - goto cleanup; + hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (FAILED_UNEXPECTEDLY(hResult)) + goto cleanup; + } if (bUseSelection) {

3 years

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2021