Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BOOTDATA] Add 0845 (bn-bd) language (#2467)
by Serge Gautherie 26 Mar '20

26 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7209755748bc934bda71… commit d7209755748bc934bda71f35149cea3eb2d80215 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 26 02:05:05 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 26 02:05:05 2020 +0100 [BOOTDATA] Add 0845 (bn-bd) language (#2467) In accordance with the NLS value specified in base/setup/lib/lang/bn-BD.h CORE-16766 --- boot/bootdata/hivesys.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 5b45a5fa745..1c899493935 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1127,6 +1127,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0445",0x00000000,"l_intl.n HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0456",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","048f",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0490",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0845",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","Default",0x00000000,"0409" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","InstallLanguage",0x00000000,"0409"

1 0

[reactos] 01/01: [PING] Do not abort (as OoM) when request size = 0
by Serge Gautherie 25 Mar '20

25 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94f6db22d1c5a9e54eede… commit 94f6db22d1c5a9e54eede4abc1ddd9ab729bede2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Mar 7 13:20:28 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Mar 25 08:52:28 2020 +0300 [PING] Do not abort (as OoM) when request size = 0 --- base/applications/network/ping/ping.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/applications/network/ping/ping.c b/base/applications/network/ping/ping.c index 435fe03f55b..17afdfc5738 100644 --- a/base/applications/network/ping/ping.c +++ b/base/applications/network/ping/ping.c @@ -418,19 +418,22 @@ static void Ping(void) { - PVOID ReplyBuffer = NULL; + PVOID ReplyBuffer; PVOID SendBuffer = NULL; DWORD ReplySize = 0; DWORD Status; - SendBuffer = malloc(RequestSize); - if (SendBuffer == NULL) + if (RequestSize != 0) { - ConResPrintf(StdErr, IDS_NO_RESOURCES); - exit(1); - } + SendBuffer = malloc(RequestSize); + if (SendBuffer == NULL) + { + ConResPrintf(StdErr, IDS_NO_RESOURCES); + exit(1); + } - ZeroMemory(SendBuffer, RequestSize); + ZeroMemory(SendBuffer, RequestSize); + } if (Family == AF_INET6) {

1 0

[reactos] 01/01: [WIN32K] Fix bounds calculation when drawing with a pen
by Jérôme Gardou 24 Mar '20

24 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2928084e2f86f1b2b3921… commit 2928084e2f86f1b2b39214dfaf872e76c0561650 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 24 11:20:58 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 24 14:39:27 2020 +0100 [WIN32K] Fix bounds calculation when drawing with a pen --- win32ss/gdi/ntgdi/line.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c index 5274fa2c228..c922995925d 100644 --- a/win32ss/gdi/ntgdi/line.c +++ b/win32ss/gdi/ntgdi/line.c @@ -25,16 +25,16 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); - lWidth = pbrLine->lWidth; + lWidth = 0; // Setup bounds bounds.left = bounds.top = INT_MAX; bounds.right = bounds.bottom = INT_MIN; - if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || lWidth > 1) + if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || (pbrLine->lWidth > 1)) { /* Windows uses some heuristics to estimate the distance from the point that will be painted */ - lWidth = lWidth + 2; + lWidth = pbrLine->lWidth + 2; endcap = (PS_ENDCAP_MASK & pbrLine->ulPenStyle); join = (PS_JOIN_MASK & pbrLine->ulPenStyle); if (join == PS_JOIN_MITER)

1 0

[reactos] 01/01: [STORPROP] Add storprop.dll and implement the DiskClassInstaller stub
by Eric Kohl 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38788a2b0794eacd10fca… commit 38788a2b0794eacd10fca7febf450904b7d5a572 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 22 16:37:48 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 22 16:40:35 2020 +0100 [STORPROP] Add storprop.dll and implement the DiskClassInstaller stub --- dll/win32/CMakeLists.txt | 1 + dll/win32/storprop/CMakeLists.txt | 13 +++++++++ dll/win32/storprop/resource.h | 1 + dll/win32/storprop/storprop.c | 58 +++++++++++++++++++++++++++++++++++++++ dll/win32/storprop/storprop.rc | 12 ++++++++ dll/win32/storprop/storprop.spec | 10 +++++++ media/inf/disk.inf | 11 ++++++-- 7 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 015003826d4..d8ecf5ca50f 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -201,6 +201,7 @@ add_subdirectory(srclient) add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) +add_subdirectory(storprop) add_subdirectory(streamci) add_subdirectory(sxs) add_subdirectory(syssetup) diff --git a/dll/win32/storprop/CMakeLists.txt b/dll/win32/storprop/CMakeLists.txt new file mode 100644 index 00000000000..3244c669a6d --- /dev/null +++ b/dll/win32/storprop/CMakeLists.txt @@ -0,0 +1,13 @@ + +spec2def(storprop.dll storprop.spec) + +add_library(storprop MODULE + storprop.c + storprop.rc + ${CMAKE_CURRENT_BINARY_DIR}/storprop_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/storprop.def) + +set_module_type(storprop win32dll UNICODE) +target_link_libraries(storprop wine) +add_importlibs(storprop setupapi advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET storprop DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/storprop/resource.h b/dll/win32/storprop/resource.h new file mode 100644 index 00000000000..6f70f09beec --- /dev/null +++ b/dll/win32/storprop/resource.h @@ -0,0 +1 @@ +#pragma once diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c new file mode 100644 index 00000000000..09149c8d795 --- /dev/null +++ b/dll/win32/storprop/storprop.c @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Storage device properties + * COPYRIGHT: 2020 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <commctrl.h> +#include <setupapi.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hInstance = NULL; + +DWORD +WINAPI +DiskClassInstaller( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + DPRINT("DiskClassInstaller(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + return ERROR_DI_DO_DEFAULT; +} + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hinstDll, + _In_ DWORD dwReason, + _In_ LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + hInstance = hinstDll; + break; + + case DLL_PROCESS_DETACH: + hInstance = NULL; + break; + } + + return TRUE; +} + +/* EOF */ diff --git a/dll/win32/storprop/storprop.rc b/dll/win32/storprop/storprop.rc new file mode 100644 index 00000000000..594b67b6666 --- /dev/null +++ b/dll/win32/storprop/storprop.rc @@ -0,0 +1,12 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Storage device properties" +#define REACTOS_STR_INTERNAL_NAME "storprop" +#define REACTOS_STR_ORIGINAL_FILENAME "storprop.dll" +#include <reactos/version.rc> + diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec new file mode 100644 index 00000000000..f04a9ac8020 --- /dev/null +++ b/dll/win32/storprop/storprop.spec @@ -0,0 +1,10 @@ +@ stub CdromDisableDigitalPlayback +@ stub CdromEnableDigitalPlayback +@ stub CdromIsDigitalPlaybackEnabled +@ stdcall DiskClassInstaller(long ptr ptr) +@ stdcall DllMain(ptr long ptr) +@ stub DvdClassInstaller +@ stub DvdLauncher +@ stub DvdPropPageProvider +@ stub IdePropPageProvider +@ stub VolumePropPageProvider diff --git a/media/inf/disk.inf b/media/inf/disk.inf index 72d08fded36..e84f39822f7 100644 --- a/media/inf/disk.inf +++ b/media/inf/disk.inf @@ -12,14 +12,16 @@ Provider = %ReactOS% DriverVer = 10/19/1999,5.00.2157.1 [DestinationDirs] -DefaultDestDir = 12 +disk_CopyFiles.NT = 12 +storprop_CopyFiles.NT = 11 [ClassInstall32.NT] AddReg = DiskClass.NT.AddReg +Copyfiles = storprop_CopyFiles.NT [DiskClass.NT.AddReg] HKR, , , 0, %DiskClassName% -;HKR, , Installer32, 0, "StorProp.dll,DiskClassInstaller" +HKR, , Installer32, 0, "storprop.dll,DiskClassInstaller" HKR, , Icon, 0, "-53" HKR, , NoInstallClass, 0, 1 HKR, , SilentInstall, 0, 1 @@ -49,6 +51,11 @@ ServiceBinary = %12%\disk.sys [disk_CopyFiles.NT] disk.sys +;---------------------------- DISK INSTALLER ---------------------------- + +[storprop_CopyFiles.NT] +storprop.dll + ;-------------------------------- STRINGS ------------------------------- [Strings]

1 0

[reactos] 07/07: [ISAPNP] Create requirements and resource lists when detecting a device
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67141abef193080faa7a5… commit 67141abef193080faa7a59ee096844a2f56f828d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 22 14:20:52 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Create requirements and resource lists when detecting a device --- drivers/bus/isapnp/isapnp.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 5c5321b3308..e8862345cc0 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -3,6 +3,7 @@ * FILE: isapnp.c * PURPOSE: Driver entry * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + * Hervé Poussineau */ #include <isapnp.h> @@ -136,6 +137,198 @@ IsaFdoCreateDeviceIDs( return STATUS_SUCCESS; } +static +NTSTATUS +NTAPI +IsaFdoCreateRequirements( + IN PISAPNP_PDO_EXTENSION PdoExt) +{ + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; + RTL_BITMAP IrqBitmap[ARRAYSIZE(LogDev->Irq)]; + ULONG IrqData[ARRAYSIZE(LogDev->Irq)]; + ULONG ResourceCount = 0; + ULONG ListSize, i, j; + BOOLEAN FirstIrq = TRUE; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PIO_RESOURCE_DESCRIPTOR Descriptor; + + /* Count number of requirements */ + for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + { + if (!LogDev->Io[i].Description.Length) + break; + ResourceCount++; + } + for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + { + if (!LogDev->Irq[i].Description.Mask) + break; + IrqData[i] = LogDev->Irq[i].Description.Mask; + RtlInitializeBitMap(&IrqBitmap[i], &IrqData[i], 16); + ResourceCount += RtlNumberOfSetBits(&IrqBitmap[i]); + if (LogDev->Irq[i].Description.Information & 0x4) + { + /* Add room for level sensitive */ + ResourceCount += RtlNumberOfSetBits(&IrqBitmap[i]); + } + } + if (ResourceCount == 0) + return STATUS_SUCCESS; + + /* Allocate memory to store requirements */ + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + + ResourceCount * sizeof(IO_RESOURCE_DESCRIPTOR); + RequirementsList = ExAllocatePool(PagedPool, ListSize); + if (!RequirementsList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(RequirementsList, ListSize); + RequirementsList->ListSize = ListSize; + RequirementsList->InterfaceType = Isa; + RequirementsList->AlternativeLists = 1; + + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = ResourceCount; + + /* Store requirements */ + Descriptor = RequirementsList->List[0].Descriptors; + for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + { + if (!LogDev->Io[i].Description.Length) + break; + DPRINT("Device.Io[%d].Information = 0x%02x\n", i, LogDev->Io[i].Description.Information); + DPRINT("Device.Io[%d].Minimum = 0x%02x\n", i, LogDev->Io[i].Description.Minimum); + DPRINT("Device.Io[%d].Maximum = 0x%02x\n", i, LogDev->Io[i].Description.Maximum); + DPRINT("Device.Io[%d].Alignment = 0x%02x\n", i, LogDev->Io[i].Description.Alignment); + DPRINT("Device.Io[%d].Length = 0x%02x\n", i, LogDev->Io[i].Description.Length); + Descriptor->Type = CmResourceTypePort; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + if (LogDev->Io[i].Description.Information & 0x1) + Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + else + Descriptor->Flags = CM_RESOURCE_PORT_10_BIT_DECODE; + Descriptor->u.Port.Length = LogDev->Io[i].Description.Length; + Descriptor->u.Port.Alignment = LogDev->Io[i].Description.Alignment; + Descriptor->u.Port.MinimumAddress.LowPart = LogDev->Io[i].Description.Minimum; + Descriptor->u.Port.MaximumAddress.LowPart = LogDev->Io[i].Description.Maximum + LogDev->Io[i].Description.Length - 1; + Descriptor++; + } + for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + { + if (!LogDev->Irq[i].Description.Mask) + break; + DPRINT("Device.Irq[%d].Mask = 0x%02x\n", i, LogDev->Irq[i].Description.Mask); + DPRINT("Device.Irq[%d].Information = 0x%02x\n", i, LogDev->Irq[i].Description.Information); + for (j = 0; j < 15; j++) + { + if (!RtlCheckBit(&IrqBitmap[i], j)) + continue; + if (FirstIrq) + FirstIrq = FALSE; + else + Descriptor->Option = IO_RESOURCE_ALTERNATIVE; + Descriptor->Type = CmResourceTypeInterrupt; + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + Descriptor->u.Interrupt.MinimumVector = Descriptor->u.Interrupt.MaximumVector = j; + Descriptor++; + if (LogDev->Irq[i].Description.Information & 0x4) + { + /* Level interrupt */ + Descriptor->Option = IO_RESOURCE_ALTERNATIVE; + Descriptor->Type = CmResourceTypeInterrupt; + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + Descriptor->u.Interrupt.MinimumVector = Descriptor->u.Interrupt.MaximumVector = j; + Descriptor++; + } + } + } + + PdoExt->RequirementsList = RequirementsList; + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +IsaFdoCreateResources( + IN PISAPNP_PDO_EXTENSION PdoExt) +{ + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; + ULONG ResourceCount = 0; + ULONG ListSize, i; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + + /* Count number of required resources */ + for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + { + if (LogDev->Io[i].CurrentBase) + ResourceCount++; + else + break; + } + for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + { + if (LogDev->Irq[i].CurrentNo) + ResourceCount++; + else + break; + } + if (ResourceCount == 0) + return STATUS_SUCCESS; + + /* Allocate memory to store resources */ + ListSize = sizeof(CM_RESOURCE_LIST) + + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = ExAllocatePool(PagedPool, ListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(ResourceList, ListSize); + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Isa; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = ResourceCount; + + /* Store resources */ + ResourceCount = 0; + for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + { + if (!LogDev->Io[i].CurrentBase) + continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; + Descriptor->Type = CmResourceTypePort; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + if (LogDev->Io[i].Description.Information & 0x1) + Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + else + Descriptor->Flags = CM_RESOURCE_PORT_10_BIT_DECODE; + Descriptor->u.Port.Length = LogDev->Io[i].Description.Length; + Descriptor->u.Port.Start.LowPart = LogDev->Io[i].CurrentBase; + } + for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + { + if (!LogDev->Irq[i].CurrentNo) + continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; + Descriptor->Type = CmResourceTypeInterrupt; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + if (LogDev->Irq[i].CurrentType & 0x01) + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + else + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + Descriptor->u.Interrupt.Level = LogDev->Irq[i].CurrentNo; + Descriptor->u.Interrupt.Vector = LogDev->Irq[i].CurrentNo; + Descriptor->u.Interrupt.Affinity = -1; + } + + PdoExt->ResourceList = ResourceList; + PdoExt->ResourceListSize = ListSize; + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IsaPnpFillDeviceRelations( @@ -197,6 +390,13 @@ IsaPnpFillDeviceRelations( PdoExt->FdoExt = FdoExt; Status = IsaFdoCreateDeviceIDs(PdoExt); + + if (NT_SUCCESS(Status)) + Status = IsaFdoCreateRequirements(PdoExt); + + if (NT_SUCCESS(Status)) + Status = IsaFdoCreateResources(PdoExt); + if (!NT_SUCCESS(Status)) { IoDeleteDevice(IsaDevice->Pdo);

1 0

[reactos] 06/07: [ISAPNP] Read all tags when detecting devices, and keep interesting ones
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ca55678941e6a6951ce1… commit 0ca55678941e6a6951ce1bc78e2e749a6e97a2e1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 23:08:00 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Read all tags when detecting devices, and keep interesting ones Currently, we only keep device identification, IO ports and IRQs. --- drivers/bus/isapnp/fdo.c | 1 + drivers/bus/isapnp/hardware.c | 117 +++++++++++++++++++++++++++--------------- drivers/bus/isapnp/isapnp.c | 1 - drivers/bus/isapnp/isapnp.h | 17 +++++- drivers/bus/isapnp/isapnphw.h | 17 ++++++ drivers/bus/isapnp/pdo.c | 1 + 6 files changed, 109 insertions(+), 45 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index caa4b69c7e2..be044407f20 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -3,6 +3,7 @@ * FILE: fdo.c * PURPOSE: FDO-specific code * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + * Hervé Poussineau */ #include <isapnp.h> diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 53b71b78abb..36638e0632d 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -3,10 +3,10 @@ * FILE: hardware.c * PURPOSE: Hardware support code * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + * Hervé Poussineau */ #include <isapnp.h> -#include <isapnphw.h> #define NDEBUG #include <debug.h> @@ -189,6 +189,16 @@ ReadIrqNo( return ReadByte(ReadDataPort, ISAPNP_IRQNO(Index)); } +static +inline +USHORT +ReadIrqType( + IN PUCHAR ReadDataPort, + IN USHORT Index) +{ + return ReadByte(ReadDataPort, ISAPNP_IRQTYPE(Index)); +} + static inline VOID @@ -287,15 +297,19 @@ IsaPnpChecksum( static BOOLEAN -FindTag( +ReadTags( IN PUCHAR ReadDataPort, - IN USHORT WantedTag, - IN OUT PVOID Buffer, - IN ULONG Length) + IN USHORT LogDev, + IN OUT PISAPNP_LOGICAL_DEVICE LogDevice) { - USHORT Tag, TagLen; + BOOLEAN res = FALSE; + PVOID Buffer; + USHORT Tag, TagLen, MaxLen; + ULONG NumberOfIo = 0, NumberOfIrq = 0; - do + LogDev += 1; + + while (TRUE) { Tag = PeekByte(ReadDataPort); if (ISAPNP_IS_SMALL_TAG(Tag)) @@ -308,41 +322,55 @@ FindTag( TagLen = PeekByte(ReadDataPort) + (PeekByte(ReadDataPort) << 8); Tag = ISAPNP_LARGE_TAG_NAME(Tag); } + if (Tag == ISAPNP_TAG_END) + break; - if (Tag == WantedTag) + Buffer = NULL; + if (Tag == ISAPNP_TAG_LOGDEVID) { - if (Length > TagLen) - Length = TagLen; - - Peek(ReadDataPort, Buffer, Length); + MaxLen = sizeof(LogDevice->LogDevId); + Buffer = &LogDevice->LogDevId; + LogDev--; + } + else if (Tag == ISAPNP_TAG_IRQ && NumberOfIrq < ARRAYSIZE(LogDevice->Irq)) + { + MaxLen = sizeof(LogDevice->Irq[NumberOfIrq].Description); + Buffer = &LogDevice->Irq[NumberOfIrq].Description; + NumberOfIrq++; + } + else if (Tag == ISAPNP_TAG_IOPORT && NumberOfIo < ARRAYSIZE(LogDevice->Io)) + { + MaxLen = sizeof(LogDevice->Io[NumberOfIo].Description); + Buffer = &LogDevice->Io[NumberOfIo].Description; + NumberOfIo++; + } + else if (LogDev == 0) + { + DPRINT1("Found unknown tag 0x%x (len %d)\n", Tag, TagLen); + } - return TRUE; + if (Buffer && LogDev == 0) + { + res = TRUE; + if (MaxLen > TagLen) + { + Peek(ReadDataPort, Buffer, TagLen); + } + else + { + Peek(ReadDataPort, Buffer, MaxLen); + Peek(ReadDataPort, NULL, TagLen - MaxLen); + } } else { + /* We don't want to read informations on this + * logical device, or we don't know the tag. */ Peek(ReadDataPort, NULL, TagLen); } - } while (Tag != ISAPNP_TAG_END); + }; - return FALSE; -} - -static -BOOLEAN -FindLogDevId( - IN PUCHAR ReadDataPort, - IN USHORT LogDev, - IN OUT PISAPNP_LOGDEVID LogDeviceId) -{ - USHORT i; - - for (i = 0; i <= LogDev; i++) - { - if (!FindTag(ReadDataPort, ISAPNP_TAG_LOGDEVID, LogDeviceId, sizeof(*LogDeviceId))) - return FALSE; - } - - return TRUE; + return res; } static @@ -476,9 +504,9 @@ ProbeIsaPnpBus( { PISAPNP_LOGICAL_DEVICE LogDevice; ISAPNP_IDENTIFIER Identifier; - ISAPNP_LOGDEVID LogDevId; USHORT Csn; USHORT LogDev; + ULONG i; ASSERT(FdoExt->ReadDataPort); @@ -507,21 +535,26 @@ ProbeIsaPnpBus( return STATUS_SUCCESS; } - if (!FindLogDevId(FdoExt->ReadDataPort, LogDev, &LogDevId)) + if (!ReadTags(FdoExt->ReadDataPort, LogDev, LogDevice)) break; WriteLogicalDeviceNumber(LogDev); - LogDevice->VendorId[0] = ((LogDevId.VendorId >> 2) & 0x1f) + 'A' - 1, - LogDevice->VendorId[1] = (((LogDevId.VendorId & 0x3) << 3) | ((LogDevId.VendorId >> 13) & 0x7)) + 'A' - 1, - LogDevice->VendorId[2] = ((LogDevId.VendorId >> 8) & 0x1f) + 'A' - 1, - LogDevice->ProdId = RtlUshortByteSwap(LogDevId.ProdId); + LogDevice->VendorId[0] = ((LogDevice->LogDevId.VendorId >> 2) & 0x1f) + 'A' - 1, + LogDevice->VendorId[1] = (((LogDevice->LogDevId.VendorId & 0x3) << 3) | ((LogDevice->LogDevId.VendorId >> 13) & 0x7)) + 'A' - 1, + LogDevice->VendorId[2] = ((LogDevice->LogDevId.VendorId >> 8) & 0x1f) + 'A' - 1, + LogDevice->ProdId = RtlUshortByteSwap(LogDevice->LogDevId.ProdId); LogDevice->SerialNumber = Identifier.Serial; - LogDevice->IoAddr = ReadIoBase(FdoExt->ReadDataPort, 0); - LogDevice->IrqNo = ReadIrqNo(FdoExt->ReadDataPort, 0); + for (i = 0; i < ARRAYSIZE(LogDevice->Io); i++) + LogDevice->Io[i].CurrentBase = ReadIoBase(FdoExt->ReadDataPort, i); + for (i = 0; i < ARRAYSIZE(LogDevice->Irq); i++) + { + LogDevice->Irq[i].CurrentNo = ReadIrqNo(FdoExt->ReadDataPort, i); + LogDevice->Irq[i].CurrentType = ReadIrqType(FdoExt->ReadDataPort, i); + } DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x%08x IoBase: 0x%x IRQ:0x%x\n", - LogDevice->VendorId, LogDevice->ProdId, LogDevice->SerialNumber, LogDevice->IoAddr, LogDevice->IrqNo); + LogDevice->VendorId, LogDevice->ProdId, LogDevice->SerialNumber, LogDevice->Io[0].CurrentBase, LogDevice->Irq[0].CurrentNo); WaitForKey(); diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 6f22efcd014..5c5321b3308 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -6,7 +6,6 @@ */ #include <isapnp.h> -#include <isapnphw.h> #define NDEBUG #include <debug.h> diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 416ed2df55f..ea7fca25cb6 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -3,6 +3,7 @@ #include <wdm.h> #include <ntstrsafe.h> +#include <isapnphw.h> #ifdef __cplusplus extern "C" { @@ -15,13 +16,25 @@ typedef enum { dsStarted } ISAPNP_DEVICE_STATE; +typedef struct _ISAPNP_IO { + USHORT CurrentBase; + ISAPNP_IO_DESCRIPTION Description; +} ISAPNP_IO, PISAPNP_IO; + +typedef struct _ISAPNP_IRQ { + UCHAR CurrentNo; + UCHAR CurrentType; + ISAPNP_IRQ_DESCRIPTION Description; +} ISAPNP_IRQ, *PISAPNP_IRQ; + typedef struct _ISAPNP_LOGICAL_DEVICE { PDEVICE_OBJECT Pdo; + ISAPNP_LOGDEVID LogDevId; UCHAR VendorId[3]; USHORT ProdId; ULONG SerialNumber; - USHORT IoAddr; - UCHAR IrqNo; + ISAPNP_IO Io[8]; + ISAPNP_IRQ Irq[2]; UCHAR CSN; UCHAR LDN; LIST_ENTRY ListEntry; diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index eeef89951f0..86a55073615 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -101,6 +101,23 @@ typedef struct _ISAPNP_DEVICEID { USHORT ProdId; } ISAPNP_DEVICEID, *PISAPNP_DEVICEID; +#include <pshpack1.h> + +typedef struct _ISAPNP_IO_DESCRIPTION { + UCHAR Information; + USHORT Minimum; + USHORT Maximum; + UCHAR Alignment; + UCHAR Length; +} ISAPNP_IO_DESCRIPTION; + +typedef struct _ISAPNP_IRQ_DESCRIPTION { + USHORT Mask; + UCHAR Information; +} ISAPNP_IRQ_DESCRIPTION; + +#include <poppack.h> + #ifdef __cplusplus } #endif diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index d4a34cf78ec..7cd8c7d3812 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -3,6 +3,7 @@ * FILE: pdo.c * PURPOSE: PDO-specific code * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + * Hervé Poussineau */ #include <isapnp.h>

1 0

[reactos] 05/07: [ISAPNP] Create resource list ahead of IRP_MN_QUERY_RESOURCES
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61c1079a18ee2faaf5062… commit 61c1079a18ee2faaf50621d8caae1ac7d1ddd561 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 17:37:45 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Create resource list ahead of IRP_MN_QUERY_RESOURCES --- drivers/bus/isapnp/isapnp.c | 43 +++++++++++++++++++++++++++++++++++++++++++ drivers/bus/isapnp/isapnp.h | 2 ++ drivers/bus/isapnp/pdo.c | 36 ++++++++---------------------------- 3 files changed, 53 insertions(+), 28 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index c9025875ddc..6f22efcd014 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -379,6 +379,45 @@ IsaPnpCreateReadPortDORequirements( return STATUS_SUCCESS; } +static +NTSTATUS +NTAPI +IsaPnpCreateReadPortDOResources( + IN PISAPNP_PDO_EXTENSION PdoExt) +{ + USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; + ULONG ListSize, i; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + + ListSize = sizeof(CM_RESOURCE_LIST) + + (ARRAYSIZE(Ports) - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = ExAllocatePool(PagedPool, ListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(ResourceList, ListSize); + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Internal; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 2; + + for (i = 0; i < ARRAYSIZE(Ports); i++) + { + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + Descriptor->Type = CmResourceTypePort; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor->u.Port.Length = 0x01; + Descriptor->u.Port.Start.LowPart = Ports[i]; + } + + PdoExt->ResourceList = ResourceList; + PdoExt->ResourceListSize = ListSize; + return STATUS_SUCCESS; +} + static NTSTATUS NTAPI @@ -435,6 +474,10 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) if (!NT_SUCCESS(Status)) return Status; + Status = IsaPnpCreateReadPortDOResources(PdoExt); + if (!NT_SUCCESS(Status)) + return Status; + return Status; } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 2d45ce6cac7..416ed2df55f 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -54,6 +54,8 @@ typedef struct _ISAPNP_PDO_EXTENSION { UNICODE_STRING CompatibleIDs; UNICODE_STRING InstanceID; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PCM_RESOURCE_LIST ResourceList; + ULONG ResourceListSize; } ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; /* isapnp.c */ diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index cecb3d2000f..d4a34cf78ec 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -6,7 +6,6 @@ */ #include <isapnp.h> -#include <isapnphw.h> #define NDEBUG #include <debug.h> @@ -144,34 +143,18 @@ IsaPdoQueryResources( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; - ULONG ListSize, i; + ULONG ListSize; PCM_RESOURCE_LIST ResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - ListSize = sizeof(CM_RESOURCE_LIST) - + (ARRAYSIZE(Ports) - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = ExAllocatePool(NonPagedPool, ListSize); + if (!PdoExt->ResourceList) + return Irp->IoStatus.Status; + + ListSize = PdoExt->ResourceListSize; + ResourceList = ExAllocatePool(PagedPool, ListSize); if (!ResourceList) return STATUS_NO_MEMORY; - RtlZeroMemory(ResourceList, ListSize); - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = Internal; - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; - - for (i = 0; i < ARRAYSIZE(Ports); i++) - { - Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; - Descriptor->Type = CmResourceTypePort; - Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; - Descriptor->u.Port.Length = 0x01; - Descriptor->u.Port.Start.LowPart = Ports[i]; - } - + RtlCopyMemory(ResourceList, PdoExt->ResourceList, ListSize); Irp->IoStatus.Information = (ULONG_PTR)ResourceList; return STATUS_SUCCESS; } @@ -348,10 +331,7 @@ IsaPdoPnp( break; case IRP_MN_QUERY_RESOURCES: - if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) - Status = IsaPdoQueryResources(PdoExt, Irp, IrpSp); - else - DPRINT1("IRP_MN_QUERY_RESOURCES is UNIMPLEMENTED!\n"); + Status = IsaPdoQueryResources(PdoExt, Irp, IrpSp); break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS:

1 0

[reactos] 04/07: [ISAPNP] Create resource requirements ahead of IRP_MN_QUERY_RESOURCE_REQUIREMENTS
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=debec8c96ee50336ff5b2… commit debec8c96ee50336ff5b22ed24821e2c075b5729 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 16:58:21 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Create resource requirements ahead of IRP_MN_QUERY_RESOURCE_REQUIREMENTS --- drivers/bus/isapnp/isapnp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ drivers/bus/isapnp/isapnp.h | 1 + drivers/bus/isapnp/pdo.c | 47 +++++++------------------------------- 3 files changed, 64 insertions(+), 39 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 16fd14c489d..c9025875ddc 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -6,6 +6,7 @@ */ #include <isapnp.h> +#include <isapnphw.h> #define NDEBUG #include <debug.h> @@ -328,6 +329,56 @@ IsaReadWrite( return STATUS_NOT_SUPPORTED; } +static +NTSTATUS +NTAPI +IsaPnpCreateReadPortDORequirements( + IN PISAPNP_PDO_EXTENSION PdoExt) +{ + USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3e4, 0x204, 0x2e4, 0x354, 0x2f4 }; + ULONG ListSize, i; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PIO_RESOURCE_DESCRIPTOR Descriptor; + + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + + 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); + RequirementsList = ExAllocatePool(PagedPool, ListSize); + if (!RequirementsList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(RequirementsList, ListSize); + RequirementsList->ListSize = ListSize; + RequirementsList->AlternativeLists = 1; + + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports); + + for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2) + { + Descriptor = &RequirementsList->List[0].Descriptors[i]; + + /* Expected port */ + Descriptor[0].Type = CmResourceTypePort; + Descriptor[0].ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor[0].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor[0].u.Port.Length = Ports[i / 2] & 1 ? 0x01 : 0x04; + Descriptor[0].u.Port.Alignment = 0x01; + Descriptor[0].u.Port.MinimumAddress.LowPart = Ports[i / 2]; + Descriptor[0].u.Port.MaximumAddress.LowPart = Ports[i / 2] + Descriptor[0].u.Port.Length - 1; + + /* ... but mark it as optional */ + Descriptor[1].Option = IO_RESOURCE_ALTERNATIVE; + Descriptor[1].Type = CmResourceTypePort; + Descriptor[1].ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor[1].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor[1].u.Port.Alignment = 0x01; + } + + PdoExt->RequirementsList = RequirementsList; + return STATUS_SUCCESS; +} + static NTSTATUS NTAPI @@ -380,6 +431,10 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) if (!NT_SUCCESS(Status)) return Status; + Status = IsaPnpCreateReadPortDORequirements(PdoExt); + if (!NT_SUCCESS(Status)) + return Status; + return Status; } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 8417687867b..2d45ce6cac7 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -53,6 +53,7 @@ typedef struct _ISAPNP_PDO_EXTENSION { UNICODE_STRING HardwareIDs; UNICODE_STRING CompatibleIDs; UNICODE_STRING InstanceID; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; } ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; /* isapnp.c */ diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 2add8d4a2b3..cecb3d2000f 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -183,46 +183,18 @@ IsaPdoQueryResourceRequirements( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3e4, 0x204, 0x2e4, 0x354, 0x2f4 }; - ULONG ListSize, i; + ULONG ListSize; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; - PIO_RESOURCE_DESCRIPTOR Descriptor; - ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) - + 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); - RequirementsList = ExAllocatePool(NonPagedPool, ListSize); + if (!PdoExt->RequirementsList) + return Irp->IoStatus.Status; + + ListSize = PdoExt->RequirementsList->ListSize; + RequirementsList = ExAllocatePool(PagedPool, ListSize); if (!RequirementsList) return STATUS_NO_MEMORY; - RtlZeroMemory(RequirementsList, ListSize); - RequirementsList->ListSize = ListSize; - RequirementsList->AlternativeLists = 1; - - RequirementsList->List[0].Version = 1; - RequirementsList->List[0].Revision = 1; - RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports); - - for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2) - { - Descriptor = &RequirementsList->List[0].Descriptors[i]; - - /* Expected port */ - Descriptor[0].Type = CmResourceTypePort; - Descriptor[0].ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor[0].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; - Descriptor[0].u.Port.Length = Ports[i / 2] & 1 ? 0x01 : 0x04; - Descriptor[0].u.Port.Alignment = 0x01; - Descriptor[0].u.Port.MinimumAddress.LowPart = Ports[i / 2]; - Descriptor[0].u.Port.MaximumAddress.LowPart = Ports[i / 2] + Descriptor[0].u.Port.Length - 1; - - /* ... but mark it as optional */ - Descriptor[1].Option = IO_RESOURCE_ALTERNATIVE; - Descriptor[1].Type = CmResourceTypePort; - Descriptor[1].ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor[1].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; - Descriptor[1].u.Port.Alignment = 0x01; - } - + RtlCopyMemory(RequirementsList, PdoExt->RequirementsList, ListSize); Irp->IoStatus.Information = (ULONG_PTR)RequirementsList; return STATUS_SUCCESS; } @@ -383,10 +355,7 @@ IsaPdoPnp( break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: - if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) - Status = IsaPdoQueryResourceRequirements(PdoExt, Irp, IrpSp); - else - DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS is UNIMPLEMENTED!\n"); + Status = IsaPdoQueryResourceRequirements(PdoExt, Irp, IrpSp); break; case IRP_MN_QUERY_ID:

1 0

[reactos] 03/07: [ISAPNP] Fix capabilities for devices
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dcc6f8b94779c52c4836… commit 1dcc6f8b94779c52c48363ffc7f33ccb573ea599 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 14:59:02 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Fix capabilities for devices --- drivers/bus/isapnp/pdo.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 68e1714cd6f..2add8d4a2b3 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -65,13 +65,14 @@ IsaPdoQueryCapabilities( else { DeviceCapabilities->UniqueID = TRUE; - DeviceCapabilities->SilentInstall = TRUE; DeviceCapabilities->RawDeviceOK = TRUE; - for (i = 0; i < POWER_SYSTEM_MAXIMUM; i++) - DeviceCapabilities->DeviceState[i] = PowerDeviceD3; - DeviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; + DeviceCapabilities->SilentInstall = TRUE; } + for (i = 0; i < POWER_SYSTEM_MAXIMUM; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; + DeviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; + return STATUS_SUCCESS; }

1 0

[reactos] 02/07: [ISAPNP] Return a compatibleIDs only if defined
by Hervé Poussineau 22 Mar '20

22 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42724f47f841846a00eb5… commit 42724f47f841846a00eb50a55345b4804e49a70a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 14:58:36 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 22 14:29:38 2020 +0100 [ISAPNP] Return a compatibleIDs only if defined --- drivers/bus/isapnp/isapnp.c | 7 +++++++ drivers/bus/isapnp/isapnp.h | 1 + drivers/bus/isapnp/pdo.c | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 35f5041d904..16fd14c489d 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -335,6 +335,7 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) { UNICODE_STRING DeviceID = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0"); UNICODE_STRING HardwareIDs = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0\0"); + UNICODE_STRING CompatibleIDs = RTL_CONSTANT_STRING(L"\0\0"); UNICODE_STRING InstanceID = RTL_CONSTANT_STRING(L"0\0"); PISAPNP_PDO_EXTENSION PdoExt; @@ -367,6 +368,12 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) if (!NT_SUCCESS(Status)) return Status; + Status = IsaPnpDuplicateUnicodeString(0, + &CompatibleIDs, + &PdoExt->CompatibleIDs); + if (!NT_SUCCESS(Status)) + return Status; + Status = IsaPnpDuplicateUnicodeString(0, &InstanceID, &PdoExt->InstanceID); diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 4a68b5ee11d..8417687867b 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -51,6 +51,7 @@ typedef struct _ISAPNP_PDO_EXTENSION { PISAPNP_FDO_EXTENSION FdoExt; UNICODE_STRING DeviceID; UNICODE_STRING HardwareIDs; + UNICODE_STRING CompatibleIDs; UNICODE_STRING InstanceID; } ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 5d601c985ee..68e1714cd6f 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -93,7 +93,6 @@ IsaPdoQueryId( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); PUNICODE_STRING Source; PWCHAR Buffer; @@ -111,7 +110,7 @@ IsaPdoQueryId( case BusQueryCompatibleIDs: DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - Source = &EmptyString; + Source = &PdoExt->CompatibleIDs; break; case BusQueryInstanceID: @@ -125,6 +124,9 @@ IsaPdoQueryId( return Irp->IoStatus.Status; } + if (!Source->Buffer) + return Irp->IoStatus.Status; + Buffer = ExAllocatePool(PagedPool, Source->MaximumLength); if (!Buffer) return STATUS_NO_MEMORY;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs