Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USBOHCI_NEW] Simplify the MapTransferToTD routine and add some docs
by Victor Perevertkin 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fe397818a8f52daad011… commit 3fe397818a8f52daad011a237ab85dca81c5c8d0 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Jun 25 13:02:35 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Jun 25 13:02:35 2019 +0300 [USBOHCI_NEW] Simplify the MapTransferToTD routine and add some docs --- drivers/usb/usbohci_new/usbohci.c | 133 +++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 60 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index ef18ceb2a80..8e05468ef44 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -34,7 +34,7 @@ static const UCHAR Balance[OHCI_NUMBER_OF_INTERRUPTS] = }; VOID -NTAPI +NTAPI OHCI_DumpHcdED(POHCI_HCD_ED ED) { DPRINT("ED - %p\n", ED); @@ -45,7 +45,7 @@ OHCI_DumpHcdED(POHCI_HCD_ED ED) } VOID -NTAPI +NTAPI OHCI_DumpHcdTD(POHCI_HCD_TD TD) { DPRINT("TD - %p\n", TD); @@ -235,7 +235,7 @@ OHCI_InitializeTDs(IN POHCI_ENDPOINT OhciEndpoint, ASSERT(EndpointProperties->BufferLength > sizeof(OHCI_HCD_ED)); - TdCount = (EndpointProperties->BufferLength - sizeof(OHCI_HCD_ED)) / + TdCount = (EndpointProperties->BufferLength - sizeof(OHCI_HCD_ED)) / sizeof(OHCI_HCD_TD); OhciEndpoint->MaxTransferDescriptors = TdCount; @@ -689,7 +689,7 @@ OHCI_StartController(IN PVOID ohciExtension, /* 5.2.7.2 Interrupt */ /* Build structure of interrupt static EDs */ - for (ix = 0; ix < INTERRUPT_ENDPOINTs; ix++) + for (ix = 0; ix < INTERRUPT_ENDPOINTs; ix++) { IntED = &OhciExtension->HcResourcesVA->InterrruptHeadED[ix]; IntEdPA = OhciExtension->HcResourcesPA + FIELD_OFFSET(OHCI_HC_RESOURCES, InterrruptHeadED[ix]); @@ -770,7 +770,7 @@ OHCI_StartController(IN PVOID ohciExtension, FrameInterval.FrameIntervalToggle = 1; /* OHCI_MAXIMUM_OVERHEAD is the maximum overhead per frame */ - FrameInterval.FSLargestDataPacket = + FrameInterval.FSLargestDataPacket = ((FrameInterval.FrameInterval - OHCI_MAXIMUM_OVERHEAD) * 6) / 7; OhciExtension->FrameInterval = FrameInterval; @@ -1141,23 +1141,28 @@ OHCI_InterruptDpc(IN PVOID ohciExtension, } } +/** + * @brief Forms the next General Transfer Descriptor for the current transfer + * + * @param[in] OhciExtension The ohci extension + * @param[in] TransferedLen The consolidated length of all previous descriptors' buffers + * @param[in] OhciTransfer The ohci transfer + * @param[out] TD The transfer descriptor we are forming + * @param[in] SGList The scatter/gather list + * + * @return The length of all previous buffers summed with the length of the current buffer + */ +static ULONG -NTAPI OHCI_MapTransferToTD(IN POHCI_EXTENSION OhciExtension, - IN ULONG MaxPacketSize, - IN OUT ULONG TransferedLen, + IN ULONG TransferedLen, IN POHCI_TRANSFER OhciTransfer, - IN POHCI_HCD_TD TD, + OUT POHCI_HCD_TD TD, IN PUSBPORT_SCATTER_GATHER_LIST SGList) { PUSBPORT_SCATTER_GATHER_ELEMENT SgElement; - ULONG SgIdx; - ULONG SgRemain; - ULONG LengthThisTd; - ULONG BufferEnd; - ULONG Offset; - ULONG TransferLength; - ULONG Buffer; + ULONG SgIdx, CurrentTransferLen, BufferEnd, CurrentBuffer; + ULONG TransferDataLeft = OhciTransfer->TransferParameters->TransferBufferLength - TransferedLen; DPRINT_OHCI("OHCI_MapTransferToTD: TransferedLen - %x\n", TransferedLen); @@ -1177,53 +1182,54 @@ OHCI_MapTransferToTD(IN POHCI_EXTENSION OhciExtension, SGList->SgElementCount); ASSERT(SgIdx < SGList->SgElementCount); + ASSERT(TransferedLen == SgElement->SgOffset); - Offset = TransferedLen - SGList->SgElement[SgIdx].SgOffset; - Buffer = SGList->SgElement[SgIdx].SgPhysicalAddress.LowPart + Offset; + /* The buffer for a TD can be 0 to 8192 bytes long, + * and can span within mo more than two 4k pages (see OpenHCI spec 3.3.2) + * CurrentBuffer - the (physical) address of the first byte in the buffer + * BufferEnd - the address of the last byte in the buffer. It can be on a different physical 4k page + * when a controller will reach the end of a page from CurrentBuffer, it will take the first 20 bits + * of the BufferEnd as a next address (OpenHCI spec, 4.3.1.3.1) + */ - SgRemain = SGList->SgElementCount - SgIdx; + CurrentBuffer = SgElement->SgPhysicalAddress.LowPart; - if (SgRemain == 1) + if (TransferDataLeft <= SgElement->SgTransferLength) { - LengthThisTd = OhciTransfer->TransferParameters->TransferBufferLength - - TransferedLen - - Offset; - - BufferEnd = SGList->SgElement[SgIdx].SgPhysicalAddress.LowPart + - LengthThisTd; - } - else if (SgRemain == 2) - { - LengthThisTd = OhciTransfer->TransferParameters->TransferBufferLength - - TransferedLen; - - BufferEnd = SGList->SgElement[SgIdx + 1].SgPhysicalAddress.LowPart + - SGList->SgElement[SgIdx + 1].SgTransferLength; + CurrentTransferLen = TransferDataLeft; + BufferEnd = SgElement->SgPhysicalAddress.LowPart + CurrentTransferLen - 1; } else { - TransferLength = SGList->SgElement[SgIdx].SgTransferLength + - SGList->SgElement[SgIdx+1].SgTransferLength - - Offset; + PUSBPORT_SCATTER_GATHER_ELEMENT SgNextElement; + ASSERT(SGList->SgElementCount - SgIdx > 1); - BufferEnd = SGList->SgElement[SgIdx + 1].SgPhysicalAddress.LowPart + - SGList->SgElement[SgIdx + 1].SgTransferLength; + SgNextElement = &SGList->SgElement[SgIdx + 1]; - LengthThisTd = MaxPacketSize * (TransferLength / MaxPacketSize); + TransferDataLeft -= SgElement->SgTransferLength; + CurrentTransferLen = SgElement->SgTransferLength; - if (TransferLength > LengthThisTd) - BufferEnd -= (TransferLength - LengthThisTd); + if (TransferDataLeft <= SgNextElement->SgTransferLength) + { + CurrentTransferLen += TransferDataLeft; + BufferEnd = SgNextElement->SgPhysicalAddress.LowPart + TransferDataLeft - 1; + } + else + { + CurrentTransferLen += SgNextElement->SgTransferLength; + BufferEnd = SgNextElement->SgPhysicalAddress.LowPart + SgNextElement->SgTransferLength - 1; + } } - TD->HwTD.gTD.CurrentBuffer = Buffer; - TD->HwTD.gTD.BufferEnd = BufferEnd - 1; - TD->TransferLen = LengthThisTd; + TD->HwTD.gTD.CurrentBuffer = CurrentBuffer; + TD->HwTD.gTD.BufferEnd = BufferEnd; + TD->TransferLen = CurrentTransferLen; - return TransferedLen + LengthThisTd; + return TransferedLen + CurrentTransferLen; } POHCI_HCD_TD -NTAPI +NTAPI OHCI_AllocateTD(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint) { @@ -1244,7 +1250,7 @@ OHCI_AllocateTD(IN POHCI_EXTENSION OhciExtension, } ULONG -NTAPI +NTAPI OHCI_RemainTDs(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint) { @@ -1287,7 +1293,6 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, POHCI_HCD_TD NextTD; ULONG MaxTDs; ULONG TransferedLen; - ULONG MaxPacketSize; ULONG BufferEnd; UCHAR DataToggle; @@ -1357,8 +1362,6 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, PrevTD->HwTD.gTD.NextTD = TD2->PhysicalAddress; PrevTD->NextHcdTD = TD2; - MaxPacketSize = OhciEndpoint->EndpointProperties.TotalMaxPacketSize; - TransferedLen = 0; DataToggle = OHCI_TD_DATA_TOGGLE_DATA1; @@ -1378,7 +1381,6 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, DataToggle = OHCI_TD_DATA_TOGGLE_FROM_ED; TransferedLen = OHCI_MapTransferToTD(OhciExtension, - MaxPacketSize, TransferedLen, OhciTransfer, TD, @@ -1457,8 +1459,20 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, return MP_STATUS_SUCCESS; } +/** + * @brief Creates the transfer descriptor chain for the given transfer's buffer + * and attaches it to a given endpoint (for bulk or interrupt transfers) + * + * @param[in] OhciExtension The ohci extension + * @param[in] OhciEndpoint The ohci endpoint + * @param[in] TransferParameters The transfer parameters + * @param[in] OhciTransfer The ohci transfer + * @param[in] SGList The scatter/gather list + * + * @return MP_STATUS_SUCCESS or MP_STATUS_FAILURE if there are not enough TDs left + */ MPSTATUS -NTAPI +NTAPI OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint, IN PUSBPORT_TRANSFER_PARAMETERS TransferParameters, @@ -1469,7 +1483,6 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, POHCI_HCD_TD PrevTD; ULONG TransferedLen; ULONG MaxTDs; - ULONG MaxPacketSize; DPRINT_OHCI("OHCI_BulkOrInterruptTransfer: ... \n"); @@ -1515,10 +1528,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, if (TransferParameters->TransferBufferLength) { - MaxPacketSize = OhciEndpoint->EndpointProperties.TotalMaxPacketSize; - TransferedLen = OHCI_MapTransferToTD(OhciExtension, - MaxPacketSize, TransferedLen, OhciTransfer, TD, @@ -1554,6 +1564,9 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; PrevTD->NextHcdTD = TD; + /* The last TD in a chain is not used in a transfer. The controller does not access it + * so it will be used for chaining a next transfer to it (OpenHCI spec, 4.6) + */ TD->HwTD.gTD.NextTD = 0; TD->NextHcdTD = 0; @@ -1956,7 +1969,7 @@ OHCI_SetEndpointState(IN PVOID ohciExtension, } VOID -NTAPI +NTAPI OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint) { @@ -2151,7 +2164,7 @@ HandleDoneList: } VOID -NTAPI +NTAPI OHCI_PollIsoEndpoint(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint) { @@ -2371,7 +2384,7 @@ OHCI_GetEndpointStatus(IN PVOID ohciExtension, ED = OhciEndpoint->HcdED; if ((ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_HALT) && - !(ED->Flags & OHCI_HCD_ED_FLAG_RESET_ON_HALT)) + !(ED->Flags & OHCI_HCD_ED_FLAG_RESET_ON_HALT)) { EndpointStatus = USBPORT_ENDPOINT_HALT; }

1 0

[reactos] 03/03: [UNIATA] Update to version 0.47a. CORE-15930
by Thomas Faber 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fb5ca3beee8a0310c4cc… commit 3fb5ca3beee8a0310c4cc70fb9448206de29fe9c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jun 25 09:05:43 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 25 09:26:09 2019 +0200 [UNIATA] Update to version 0.47a. CORE-15930 --- drivers/storage/ide/uniata/atacmd_map.h | 2 +- drivers/storage/ide/uniata/bsmaster.h | 1 + drivers/storage/ide/uniata/id_ata.cpp | 2 +- drivers/storage/ide/uniata/id_sata.cpp | 12 ++++++------ drivers/storage/ide/uniata/id_sata.h | 2 +- drivers/storage/ide/uniata/todo.txt | 2 +- drivers/storage/ide/uniata/uniata_ver.h | 10 +++++----- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/storage/ide/uniata/atacmd_map.h b/drivers/storage/ide/uniata/atacmd_map.h index 2b62e372589..d2adb7eece4 100644 --- a/drivers/storage/ide/uniata/atacmd_map.h +++ b/drivers/storage/ide/uniata/atacmd_map.h @@ -1,5 +1,5 @@ -// Build Version 0.46e8 +// Build Version 0.47a UCHAR const AtaCommands48[256] = { diff --git a/drivers/storage/ide/uniata/bsmaster.h b/drivers/storage/ide/uniata/bsmaster.h index ac055b3be28..ed42cc7ba97 100644 --- a/drivers/storage/ide/uniata/bsmaster.h +++ b/drivers/storage/ide/uniata/bsmaster.h @@ -709,6 +709,7 @@ typedef struct _IDE_AHCI_PORT_REGISTERS { #define ATA_AHCI_P_CMD_HPCP 0x00040000 #define ATA_AHCI_P_CMD_ISP 0x00080000 #define ATA_AHCI_P_CMD_CPD 0x00100000 +#define ATA_AHCI_P_CMD_ESP 0x00200000 #define ATA_AHCI_P_CMD_ATAPI 0x01000000 #define ATA_AHCI_P_CMD_DLAE 0x02000000 #define ATA_AHCI_P_CMD_ALPE 0x04000000 diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index 4c8e15944e4..0a0c586a7ce 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -11281,7 +11281,7 @@ AtapiRegCheckDevValue( val = AtapiRegCheckDevLunValue( HwDeviceExtension, namex, chan, dev, Name, val); } - if(!(HwFlags & (UNIATA_AHCI | UNIATA_AHCI))) { + if(!(HwFlags & (UNIATA_SATA | UNIATA_AHCI))) { swprintf(namev, L"\\PATA"); swprintf(namex, L"Parameters%s", namev); val = AtapiRegCheckDevLunValue( diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index 32c4c9008d5..2c67131983c 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -1077,7 +1077,7 @@ UniataAhciDetect( v_Mj = ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f); v_Mn = ((version >> 4) & 0xf0) + (version & 0x0f); - KdPrint2((PRINT_PREFIX " AHCI version %#x.%02x controller with %d ports (mask %#x) detected\n", + KdPrint2((PRINT_PREFIX " AHCI version %x.%02x controller with %d ports (mask %#x) detected\n", v_Mj, v_Mn, NumberChannels, PI)); KdPrint((" AHCI SATA Gen %d\n", (((CAP & AHCI_CAP_ISS_MASK) >> 20)) )); @@ -2237,22 +2237,22 @@ UniataAhciBeginTransaction( if(CMD0 != CMD) { KdPrint2((" send CMD %#x, entries %#x\n", CMD, AHCI_CL->prd_length)); UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CMD, CMD); - UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); /* flush */ + CMD0 = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); /* flush */ } /* issue command to controller */ - //UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_ACT, 0x01 << tag); + //UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_ACT, 0x01 << tag); // Used for NCQ KdPrint2((" Set CI\n")); UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CI, 0x01 << tag); chan->AhciPrevCI |= 0x01 << tag; - CMD0 = CMD; + //CMD0 = CMD; CMD |= ATA_AHCI_P_CMD_ST | ((chan->ChannelCtrlFlags & CTRFLAGS_AHCI_PM) ? ATA_AHCI_P_CMD_PMA : 0); if(CMD != CMD0) { - KdPrint2((" Send CMD START\n")); + KdPrint2((" Send CMD START (%#x != %#x)\n", CMD, CMD0)); UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CMD, CMD); - UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); /* flush */ + CMD0 = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); /* flush */ } else { KdPrint2((" No CMD START, already active\n")); } diff --git a/drivers/storage/ide/uniata/id_sata.h b/drivers/storage/ide/uniata/id_sata.h index 692d6bdf6a4..4e742197f89 100644 --- a/drivers/storage/ide/uniata/id_sata.h +++ b/drivers/storage/ide/uniata/id_sata.h @@ -292,7 +292,7 @@ UniataAhciReadChannelPort4( IN ULONG io_port_ndx ) { - ULONG v = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&((chan)->BaseIoAHCI_Port), io_port_ndx); + volatile ULONG v = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&((chan)->BaseIoAHCI_Port), io_port_ndx); KdPrint3((PRINT_PREFIX "ReadChannelPort4 ch%d[%x] = %x\n", chan->lChannel, io_port_ndx, v)); return v; } // end UniataAhciReadChannelPort4() diff --git a/drivers/storage/ide/uniata/todo.txt b/drivers/storage/ide/uniata/todo.txt index ad16c0fc1e5..677b348d438 100644 --- a/drivers/storage/ide/uniata/todo.txt +++ b/drivers/storage/ide/uniata/todo.txt @@ -254,4 +254,4 @@ 158.implement .INF generator 159.fix bug with invalid INF section under XP+ (43e2) 160.add INF handler for SCSI\NET\VEN_UNIATA&PROD_MANAGEMENT_PORT -161. +161. \ No newline at end of file diff --git a/drivers/storage/ide/uniata/uniata_ver.h b/drivers/storage/ide/uniata/uniata_ver.h index 28a985f1e4b..2ff884e01af 100644 --- a/drivers/storage/ide/uniata/uniata_ver.h +++ b/drivers/storage/ide/uniata/uniata_ver.h @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "47" -#define UNIATA_VER_DOT 0.47.0.0 +#define UNIATA_VER_STR "47a" +#define UNIATA_VER_DOT 0.47.1.0 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 47 -#define UNIATA_VER_SUB_MJ 0 +#define UNIATA_VER_SUB_MJ 1 #define UNIATA_VER_SUB_MN 0 -#define UNIATA_VER_DOT_COMMA 0,47,0,0 -#define UNIATA_VER_DOT_STR "0.47.0.0" +#define UNIATA_VER_DOT_COMMA 0,47,1,0 +#define UNIATA_VER_DOT_STR "0.47.1.0" #define UNIATA_VER_YEAR 2019 #define UNIATA_VER_YEAR_STR "2019"

1 0

[reactos] 02/03: [ACPICA] Update to version 20190509. CORE-16138
by Thomas Faber 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e21126cb0fb48acc15e0… commit 2e21126cb0fb48acc15e020f40f66ea547fd02fb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jun 25 08:58:25 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 25 09:26:07 2019 +0200 [ACPICA] Update to version 20190509. CORE-16138 --- drivers/bus/acpi/acpica/events/evgpe.c | 8 -------- drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/platform/aclinux.h | 10 +++++----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index b293aee3469..7527a0031b7 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -132,14 +132,6 @@ AcpiEvEnableGpe ( ACPI_FUNCTION_TRACE (EvEnableGpe); - /* Clear the GPE (of stale events) */ - - Status = AcpiHwClearGpe(GpeEventInfo); - if (ACPI_FAILURE(Status)) - { - return_ACPI_STATUS(Status); - } - /* Enable the requested GPE */ Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index 75533de5e92..729bebb82a9 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190405 +#define ACPI_CA_VERSION 0x20190509 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/platform/aclinux.h b/drivers/bus/acpi/acpica/include/platform/aclinux.h index 0e7fe9de002..240d2196f7d 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinux.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinux.h @@ -97,6 +97,11 @@ #define ACPI_INIT_FUNCTION __init +/* Use a specific bugging default separate from ACPICA */ + +#undef ACPI_DEBUG_DEFAULT +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) + #ifndef CONFIG_ACPI /* External globals for __KERNEL__, stubs is needed */ @@ -113,11 +118,6 @@ #define ACPI_NO_ERROR_MESSAGES #undef ACPI_DEBUG_OUTPUT -/* Use a specific bugging default separate from ACPICA */ - -#undef ACPI_DEBUG_DEFAULT -#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) - /* External interface for __KERNEL__, stub is needed */ #define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \

1 0

[reactos] 01/03: [RTL] Fix failure check in RtlpCreateCriticalSectionSem.
by Thomas Faber 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e6581440eefb1f798af9… commit 0e6581440eefb1f798af9d80c18e02b88f037250 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jun 25 08:58:11 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 25 09:26:05 2019 +0200 [RTL] Fix failure check in RtlpCreateCriticalSectionSem. --- sdk/lib/rtl/critical.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index ff0d1a9732c..1f247f53ebf 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -80,7 +80,7 @@ RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) NULL) != NULL) { /* Someone else just created an event */ - if (hEvent != INVALID_HANDLE_VALUE) + if (hNewEvent != INVALID_HANDLE_VALUE) { DPRINT("Closing already created event: %p\n", hNewEvent); NtClose(hNewEvent);

1 0

[reactos] 01/01: [CMIDRIVER] Try to fix build 3
by Timo Kreuzer 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc0cd07d21d744b645c53… commit dc0cd07d21d744b645c53191e45c9cac3361429e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 25 09:04:59 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jun 25 09:11:01 2019 +0200 [CMIDRIVER] Try to fix build 3 --- drivers/wdm/audio/drivers/CMIDriver/common.hpp | 8 ++++++++ drivers/wdm/audio/drivers/CMIDriver/precomp.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/common.hpp b/drivers/wdm/audio/drivers/CMIDriver/common.hpp index 2701f147855..cc965602140 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/common.hpp +++ b/drivers/wdm/audio/drivers/CMIDriver/common.hpp @@ -38,6 +38,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "debug.hpp" #include "cmireg.hpp" + +PVOID +__cdecl +operator new( + size_t size, + POOL_TYPE pool_type, + ULONG tag); + class CCMIAdapter : public ICMIAdapter, public IAdapterPowerManagement, public CUnknown diff --git a/drivers/wdm/audio/drivers/CMIDriver/precomp.h b/drivers/wdm/audio/drivers/CMIDriver/precomp.h index 21599bca7b6..57b4be66e24 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/precomp.h +++ b/drivers/wdm/audio/drivers/CMIDriver/precomp.h @@ -6,11 +6,4 @@ #include "debug.hpp" -PVOID -__cdecl -operator new( - size_t size, - POOL_TYPE pool_type, - ULONG tag); - #endif /* _CMIDRIVER_PCH_ */

1 0

[reactos] 02/02: [FREELDR] Always change video mode back to text-mode before starting up ReactOS. CORE-16116
by Yaroslav Kibysh 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f37fb1f7f8950cdae899d… commit f37fb1f7f8950cdae899d86c401f3135374cd3b1 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Thu Jun 13 22:26:42 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 25 02:32:09 2019 +0200 [FREELDR] Always change video mode back to text-mode before starting up ReactOS. CORE-16116 - This allows getting the /NOGUIBOOT mode working correctly, as the latter expects text-mode. Then, usetup (via BLUE driver) will change to a different text-mode, or, GUI boot will change (via BOOTVID) to VGA 640*480 16-color. - Always hide the VGA cursor. - Remove also the deprecated boolean "Setup" in the *PrepareForReactOS() functions. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- boot/freeldr/freeldr/arch/arm/macharm.c | 2 +- boot/freeldr/freeldr/arch/i386/machpc.c | 4 ++-- boot/freeldr/freeldr/arch/i386/machxbox.c | 4 ++-- boot/freeldr/freeldr/arch/i386/pcvideo.c | 12 +++--------- boot/freeldr/freeldr/arch/i386/xboxvideo.c | 5 +++-- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 4 ++-- boot/freeldr/freeldr/include/arch/pc/machpc.h | 4 ++-- boot/freeldr/freeldr/include/machine.h | 6 +++--- boot/freeldr/freeldr/ntldr/winldr.c | 2 +- 9 files changed, 19 insertions(+), 24 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index 8d4465f8d79..d9daad3bf95 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -90,7 +90,7 @@ ArmInit(IN PARM_BOARD_CONFIGURATION_BLOCK BootContext) } VOID -ArmPrepareForReactOS(IN BOOLEAN Setup) +ArmPrepareForReactOS(VOID) { return; } diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 527b944dee3..4e21727a19b 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -1391,10 +1391,10 @@ PcMachInit(const char *CmdLine) } VOID -PcPrepareForReactOS(IN BOOLEAN Setup) +PcPrepareForReactOS(VOID) { /* On PC, prepare video and turn off the floppy motor */ - PcVideoPrepareForReactOS(Setup); + PcVideoPrepareForReactOS(); DiskStopFloppyMotor(); } diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 7dffa2baab6..c7873f0c0f3 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -211,10 +211,10 @@ XboxMachInit(const char *CmdLine) } VOID -XboxPrepareForReactOS(IN BOOLEAN Setup) +XboxPrepareForReactOS(VOID) { /* On XBOX, prepare video and turn off the floppy motor */ - XboxVideoPrepareForReactOS(Setup); + XboxVideoPrepareForReactOS(); DiskStopFloppyMotor(); } diff --git a/boot/freeldr/freeldr/arch/i386/pcvideo.c b/boot/freeldr/freeldr/arch/i386/pcvideo.c index 97327122ba8..6eb070fbb6c 100644 --- a/boot/freeldr/freeldr/arch/i386/pcvideo.c +++ b/boot/freeldr/freeldr/arch/i386/pcvideo.c @@ -1109,16 +1109,10 @@ PcVideoSync(VOID) } VOID -PcVideoPrepareForReactOS(IN BOOLEAN Setup) +PcVideoPrepareForReactOS(VOID) { - if (Setup) - { - PcVideoSetMode80x50_80x43(); - } - else - { - PcVideoSetBiosMode(0x12); - } + // PcVideoSetMode80x50_80x43(); + PcVideoSetMode80x25(); PcVideoHideShowTextCursor(FALSE); } diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c index cbb8b92c55a..cb54dd2bf5f 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c @@ -240,9 +240,10 @@ XboxBeep(VOID) } VOID -XboxVideoPrepareForReactOS(IN BOOLEAN Setup) +XboxVideoPrepareForReactOS(VOID) { - XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); + XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); + XboxVideoHideShowTextCursor(FALSE); } /* EOF */ diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index c2a20056976..93bcb7835f1 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -43,8 +43,8 @@ BOOLEAN XboxVideoIsPaletteFixed(VOID); VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XboxVideoSync(VOID); -VOID XboxVideoPrepareForReactOS(IN BOOLEAN Setup); -VOID XboxPrepareForReactOS(IN BOOLEAN Setup); +VOID XboxVideoPrepareForReactOS(VOID); +VOID XboxPrepareForReactOS(VOID); VOID XboxMemInit(VOID); PVOID XboxMemReserveMemory(ULONG MbToReserve); diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index e834eb383a0..444db26fa9a 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -44,8 +44,8 @@ BOOLEAN PcVideoIsPaletteFixed(VOID); VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID PcVideoSync(VOID); -VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); -VOID PcPrepareForReactOS(IN BOOLEAN Setup); +VOID PcVideoPrepareForReactOS(VOID); +VOID PcPrepareForReactOS(VOID); PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize); diff --git a/boot/freeldr/freeldr/include/machine.h b/boot/freeldr/freeldr/include/machine.h index c104036a489..abf6a4d343c 100644 --- a/boot/freeldr/freeldr/include/machine.h +++ b/boot/freeldr/freeldr/include/machine.h @@ -55,7 +55,7 @@ typedef struct tagMACHVTBL VOID (*VideoGetPaletteColor)(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID (*VideoSync)(VOID); VOID (*Beep)(VOID); - VOID (*PrepareForReactOS)(IN BOOLEAN Setup); + VOID (*PrepareForReactOS)(VOID); // NOTE: Not in the machine.c ... FREELDR_MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(FREELDR_MEMORY_DESCRIPTOR* Current); @@ -113,8 +113,8 @@ VOID MachInit(const char *CmdLine); MachVtbl.VideoSync() #define MachBeep() \ MachVtbl.Beep() -#define MachPrepareForReactOS(Setup) \ - MachVtbl.PrepareForReactOS(Setup) +#define MachPrepareForReactOS() \ + MachVtbl.PrepareForReactOS() #define MachDiskGetBootPath(Path, Size) \ MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) \ diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index e563188bc31..1127f2e88c7 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -832,7 +832,7 @@ LoadAndBootWindowsCommon( LoaderBlockVA = PaToVa(LoaderBlock); /* "Stop all motors", change videomode */ - MachPrepareForReactOS(Setup); + MachPrepareForReactOS(); /* Cleanup ini file */ IniCleanup();

1 0

[reactos] 01/02: [BLUE] Initialize the console with a default font for codepage 437.
by Hermès Bélusca-Maïto 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=306bcd9d73b8078a9a5aa… commit 306bcd9d73b8078a9a5aaafb87892a95a4d359ad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 25 02:21:25 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 25 02:32:09 2019 +0200 [BLUE] Initialize the console with a default font for codepage 437. --- drivers/setup/blue/blue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 7367cead5f6..1403c19ef57 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -211,6 +211,9 @@ ScrAcquireOwnership(PDEVICE_EXTENSION DeviceExtension) DeviceExtension->Rows = 30; #endif + /* Upload a default font for the default codepage 437 */ + ScrLoadFontTable(437); + DPRINT ("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, DeviceExtension->Rows, @@ -864,7 +867,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, if (!InbvCheckDisplayOwnership()) { - // Upload a font for the codepage if needed + /* Upload a font for the codepage if needed */ ScrLoadFontTable(CodePage); }

1 0

[reactos] 01/01: [CMIDRIVER] Try to fix build 2
by Timo Kreuzer 24 Jun '19

24 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aad40964753869a570727… commit aad40964753869a570727675880b49fe6d5b7a10 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 25 00:54:00 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jun 25 00:54:00 2019 +0200 [CMIDRIVER] Try to fix build 2 --- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 2 +- drivers/wdm/audio/drivers/CMIDriver/common.cpp | 48 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index 8713a2c59c6..f992fa463e3 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -28,7 +28,7 @@ if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(cmipci "-Wno-write-strings -Wno-switch") endif() -#add_pch(cmipci precomp.h SOURCE) +add_pch(cmipci precomp.h SOURCE) add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) if(ARCH STREQUAL "i386") diff --git a/drivers/wdm/audio/drivers/CMIDriver/common.cpp b/drivers/wdm/audio/drivers/CMIDriver/common.cpp index 8a539e01449..ff29510437f 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/common.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/common.cpp @@ -1,28 +1,28 @@ /* -Copyright (c) 2006-2008 dogbert <dogber1(a)gmail.com> -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Copyright (c) 2006-2008 dogbert <dogber1(a)gmail.com> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "common.hpp"

1 0

[reactos] 01/01: [CMIDRIVER] Try to fix build
by Timo Kreuzer 24 Jun '19

24 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a14b509974f5d0ef3dbdd… commit a14b509974f5d0ef3dbdd891df3788ab67c7c721 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jun 25 00:26:08 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jun 25 00:26:08 2019 +0200 [CMIDRIVER] Try to fix build --- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index f992fa463e3..8713a2c59c6 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -28,7 +28,7 @@ if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(cmipci "-Wno-write-strings -Wno-switch") endif() -add_pch(cmipci precomp.h SOURCE) +#add_pch(cmipci precomp.h SOURCE) add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) if(ARCH STREQUAL "i386")

1 0

[reactos] 01/01: [STDUNK][PORTCLS][CMIDriver] Fix issue with operator new/delete
by Timo Kreuzer 24 Jun '19

24 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99fa38809fd8ed38d4d59… commit 99fa38809fd8ed38d4d59fa1fcf3babb3216b895 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 25 12:22:04 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jun 24 21:17:00 2019 +0200 [STDUNK][PORTCLS][CMIDriver] Fix issue with operator new/delete Fix for MSVC warning "C2323: 'operator new': non-member operator new or delete functions may not be declared static or in a namespace other than the global namespace." See https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-what-s-new-2003-thr… section "Overloaded operator new and operator delete" --- CMakeLists.txt | 1 + drivers/wdm/audio/backpln/portcls/dma_slave.cpp | 10 +++++ drivers/wdm/audio/backpln/portcls/miniport.cpp | 26 +++++++++++ .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 2 +- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 10 +++++ drivers/wdm/audio/backpln/portcls/private.hpp | 7 +++ drivers/wdm/audio/drivers/CMIDriver/precomp.h | 7 +++ sdk/include/ddk/stdunk.h | 2 +- sdk/lib/drivers/libusb/libusb.h | 1 - sdk/lib/drivers/sound/stdunk/cunknown.cpp | 52 ++++++++++++++++++++++ 10 files changed, 115 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48b3b18a488..d7bf0a55574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,6 +186,7 @@ else() endif() # Other + add_definitions(-D_NEW_DELETE_OPERATORS_) if(ARCH STREQUAL "i386") add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) elseif(ARCH STREQUAL "amd64") diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index f299d3c57b4..a68d2779128 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -17,6 +17,16 @@ class CDmaChannelInit : public IDmaChannelInit { public: + inline + PVOID + operator new( + size_t Size, + POOL_TYPE PoolType, + ULONG Tag) + { + return ExAllocatePoolWithTag(PoolType, Size, Tag); + } + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); STDMETHODIMP_(ULONG) AddRef() diff --git a/drivers/wdm/audio/backpln/portcls/miniport.cpp b/drivers/wdm/audio/backpln/portcls/miniport.cpp index 992e29ea1e7..526a012c7b1 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport.cpp @@ -14,6 +14,32 @@ #include <debug.h> +PVOID +__cdecl +operator new( + size_t Size, + POOL_TYPE PoolType, + ULONG Tag) +{ + return ExAllocatePoolWithTag(PoolType, Size, Tag); +} + +void +__cdecl +operator delete( + PVOID ptr) +{ + ExFreePool(ptr); +} + +void +__cdecl +operator delete( + PVOID ptr, UINT_PTR) +{ + ExFreePool(ptr); +} + NTSTATUS NTAPI PcNewMiniport( diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index e13e0c48be8..957c84cf7ba 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -1708,7 +1708,7 @@ NewStream ) { CMiniportDMusUARTStream *pStream = - new(PoolType) CMiniportDMusUARTStream(); + new(PoolType, 'wNcP') CMiniportDMusUARTStream(); if (pStream) { diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index c9f86c34271..993ea92674b 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -18,6 +18,16 @@ class CPortPinWaveCyclic : public IPortPinWaveCyclic, public IServiceSink { public: + inline + PVOID + operator new( + size_t Size, + POOL_TYPE PoolType, + ULONG Tag) + { + return ExAllocatePoolWithTag(PoolType, Size, Tag); + } + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); STDMETHODIMP_(ULONG) AddRef() diff --git a/drivers/wdm/audio/backpln/portcls/private.hpp b/drivers/wdm/audio/backpln/portcls/private.hpp index ed756959fc3..17caee08bde 100644 --- a/drivers/wdm/audio/backpln/portcls/private.hpp +++ b/drivers/wdm/audio/backpln/portcls/private.hpp @@ -30,6 +30,13 @@ #define PC_ASSERT_IRQL(x) PC_ASSERT(KeGetCurrentIrql() <= (x)) #define PC_ASSERT_IRQL_EQUAL(x) PC_ASSERT(KeGetCurrentIrql()==(x)) +PVOID +__cdecl +operator new( + size_t Size, + POOL_TYPE PoolType, + ULONG Tag); + extern "C" NTSTATUS diff --git a/drivers/wdm/audio/drivers/CMIDriver/precomp.h b/drivers/wdm/audio/drivers/CMIDriver/precomp.h index 57b4be66e24..21599bca7b6 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/precomp.h +++ b/drivers/wdm/audio/drivers/CMIDriver/precomp.h @@ -6,4 +6,11 @@ #include "debug.hpp" +PVOID +__cdecl +operator new( + size_t size, + POOL_TYPE pool_type, + ULONG tag); + #endif /* _CMIDRIVER_PCH_ */ diff --git a/sdk/include/ddk/stdunk.h b/sdk/include/ddk/stdunk.h index 67ce3d8fcc8..6649bf99524 100644 --- a/sdk/include/ddk/stdunk.h +++ b/sdk/include/ddk/stdunk.h @@ -211,7 +211,7 @@ operator delete( ExFreePool(ptr); } -#endif /* ALLOCATION_OPERATORS_DEFINED */ +#endif /* _NEW_DELETE_OPERATORS_ */ #else /* Being compiled with C */ diff --git a/sdk/lib/drivers/libusb/libusb.h b/sdk/lib/drivers/libusb/libusb.h index 004c2f0a25d..ee0bf584d55 100644 --- a/sdk/lib/drivers/libusb/libusb.h +++ b/sdk/lib/drivers/libusb/libusb.h @@ -22,7 +22,6 @@ extern "C" // the following includes are required to get kcom to compile // #include <portcls.h> -#define _NEW_DELETE_OPERATORS_ #include <kcom.h> PVOID diff --git a/sdk/lib/drivers/sound/stdunk/cunknown.cpp b/sdk/lib/drivers/sound/stdunk/cunknown.cpp index d97e6405481..1296247fb9f 100644 --- a/sdk/lib/drivers/sound/stdunk/cunknown.cpp +++ b/sdk/lib/drivers/sound/stdunk/cunknown.cpp @@ -11,6 +11,58 @@ #include <stdunk.h> +inline +PVOID +KCOM_New( + size_t size, + POOL_TYPE pool_type, + ULONG tag) +{ + PVOID result; + + result = ExAllocatePoolWithTag(pool_type, size, tag); + + if (result) + RtlZeroMemory(result, size); + + return result; +} + +PVOID +__cdecl +operator new( + size_t size, + POOL_TYPE pool_type) +{ + return KCOM_New(size, pool_type, 'wNcP'); +} + +PVOID +__cdecl +operator new( + size_t size, + POOL_TYPE pool_type, + ULONG tag) +{ + return KCOM_New(size, pool_type, tag); +} + +void +__cdecl +operator delete( + PVOID ptr) +{ + ExFreePool(ptr); +} + +void +__cdecl +operator delete( + PVOID ptr, UINT_PTR) +{ + ExFreePool(ptr); +} + CUnknown::CUnknown(PUNKNOWN outer_unknown) { m_ref_count = 0;

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