Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[mjmartin] 43639: ehci_alloc, ohci_alloc, uhci_alloc: Initialize DPC before connecting interrupt as the driver has to already be prepared to handle interrupts when calling IoConnectInterrupt.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Oct 20 11:17:09 2009 New Revision: 43639 URL: http://svn.reactos.org/svn/reactos?rev=43639&view=rev Log: ehci_alloc, ohci_alloc, uhci_alloc: Initialize DPC before connecting interrupt as the driver has to already be prepared to handle interrupts when calling IoConnectInterrupt. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Tue Oct 20 11:17:09 2009 @@ -3682,6 +3682,8 @@ pdev_ext->res_interrupt.level, pdev_ext->res_interrupt.vector, &irql, &affinity); + KeInitializeDpc(&pdev_ext->ehci_dpc, ehci_dpc_callback, (PVOID) pdev_ext->ehci); + //connect the interrupt DbgPrint("ehci_alloc(): the int=0x%x\n", vector); if (IoConnectInterrupt(&pdev_ext->ehci_int, ehci_isr, pdev_ext->ehci, NULL, //&pdev_ext->ehci->frame_list_lock, @@ -3692,8 +3694,6 @@ ehci_release(pdev); return NULL; } - - KeInitializeDpc(&pdev_ext->ehci_dpc, ehci_dpc_callback, (PVOID) pdev_ext->ehci); return pdev; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Tue Oct 20 11:17:09 2009 @@ -479,6 +479,8 @@ pdev_ext->res_interrupt.level, pdev_ext->res_interrupt.vector, &irql, &affinity); + KeInitializeDpc(&pdev_ext->ehci_dpc, ehci_dpc_callback, (PVOID) pdev_ext->ehci); + //connect the interrupt DbgPrint("ehci_alloc(): the int=0x%x\n", vector); if ((status = IoConnectInterrupt(&pdev_ext->ehci_int, ehci_isr, pdev_ext->ehci, NULL, //&pdev_ext->ehci->frame_list_lock, @@ -490,8 +492,6 @@ ehci_release(pdev); return NULL; } - - KeInitializeDpc(&pdev_ext->ehci_dpc, ehci_dpc_callback, (PVOID) pdev_ext->ehci); #endif return pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Tue Oct 20 11:17:09 2009 @@ -840,6 +840,8 @@ &irql, &affinity); + KeInitializeDpc(&pdev_ext->uhci_dpc, uhci_dpc_callback, (PVOID) pdev_ext->uhci); + //connect the interrupt DbgPrint("uhci_alloc(): the int=0x%x\n", vector); if (IoConnectInterrupt(&pdev_ext->uhci_int, @@ -858,8 +860,6 @@ uhci_release(pdev); return NULL; } - - KeInitializeDpc(&pdev_ext->uhci_dpc, uhci_dpc_callback, (PVOID) pdev_ext->uhci); return pdev; }

14 years, 11 months

[cgutman] 43638: - Fix a typo in checksum calculation for datagrams with an odd number of octets - Allow packets with no checksum - Remove debug prints that got left behind

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 20 08:07:34 2009 New Revision: 43638 URL: http://svn.reactos.org/svn/reactos?rev=43638&view=rev Log: - Fix a typo in checksum calculation for datagrams with an odd number of octets - Allow packets with no checksum - Remove debug prints that got left behind Modified: trunk/reactos/lib/drivers/ip/network/checksum.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/lib/drivers/ip/network/checksum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/che… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/checksum.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/checksum.c [iso-8859-1] Tue Oct 20 08:07:34 2009 @@ -69,16 +69,14 @@ /* Pad the data if needed */ Pad = (DataLength & 1); - if (Pad) { - DbgPrint("Odd\n"); + if (Pad) DataLength++; - } else DbgPrint("Even\n"); /* Add from the UDP header and data */ for (i = 0; i < DataLength; i += 2) { TmpSum = ((PacketBuffer[i] << 8) & 0xFF00) + - ((Pad && i == DataLength - 1) ? 0 : (PacketBuffer[i+1] & 0x00FF)); + ((Pad && i == DataLength - 2) ? 0 : (PacketBuffer[i+1] & 0x00FF)); Sum += TmpSum; } Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Tue Oct 20 08:07:34 2009 @@ -267,7 +267,7 @@ i = UDPv4ChecksumCalculate(IPv4Header, (PUCHAR)UDPHeader, WH2N(UDPHeader->Length)); - if (i != DH2N(0x0000FFFF)) + if (i != DH2N(0x0000FFFF) && UDPHeader->Checksum != 0) { TI_DbgPrint(MIN_TRACE, ("Bad checksum on packet received.\n")); return;

14 years, 11 months

[cgutman] 43637: - Implement UDP checksum calculation - Fixes issues with DHCP (and any other UDP traffic) over bridged networking on vbox and issues with other hardware that doesn't like a checksum of 0 - See bug #4754

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 20 07:24:37 2009 New Revision: 43637 URL: http://svn.reactos.org/svn/reactos?rev=43637&view=rev Log: - Implement UDP checksum calculation - Fixes issues with DHCP (and any other UDP traffic) over bridged networking on vbox and issues with other hardware that doesn't like a checksum of 0 - See bug #4754 Modified: trunk/reactos/drivers/network/tcpip/include/checksum.h trunk/reactos/lib/drivers/ip/network/checksum.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/include/checksum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/checksum.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/checksum.h [iso-8859-1] Tue Oct 20 07:24:37 2009 @@ -22,6 +22,12 @@ int len, unsigned int sum); +ULONG +UDPv4ChecksumCalculate( + PIPv4_HEADER IPHeader, + PUCHAR PacketBuffer, + ULONG DataLength); + #define IPv4Checksum(Data, Count, Seed)(~ChecksumFold(ChecksumCompute(Data, Count, Seed))) #define TCPv4Checksum(Data, Count, Seed)(~ChecksumFold(csum_partial(Data, Count, Seed))) //#define TCPv4Checksum(Data, Count, Seed)(~ChecksumFold(ChecksumCompute(Data, Count, Seed))) Modified: trunk/reactos/lib/drivers/ip/network/checksum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/che… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/checksum.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/checksum.c [iso-8859-1] Tue Oct 20 07:24:37 2009 @@ -55,3 +55,53 @@ return Sum; } + +ULONG +UDPv4ChecksumCalculate( + PIPv4_HEADER IPHeader, + PUCHAR PacketBuffer, + ULONG DataLength) +{ + ULONG Sum = 0; + USHORT TmpSum; + ULONG i; + BOOLEAN Pad; + + /* Pad the data if needed */ + Pad = (DataLength & 1); + if (Pad) { + DbgPrint("Odd\n"); + DataLength++; + } else DbgPrint("Even\n"); + + /* Add from the UDP header and data */ + for (i = 0; i < DataLength; i += 2) + { + TmpSum = ((PacketBuffer[i] << 8) & 0xFF00) + + ((Pad && i == DataLength - 1) ? 0 : (PacketBuffer[i+1] & 0x00FF)); + Sum += TmpSum; + } + + /* Add the source address */ + for (i = 0; i < sizeof(IPv4_RAW_ADDRESS); i += 2) + { + TmpSum = ((((PUCHAR)&IPHeader->SrcAddr)[i] << 8) & 0xFF00) + + (((PUCHAR)&IPHeader->SrcAddr)[i+1] & 0x00FF); + Sum += TmpSum; + } + + /* Add the destination address */ + for (i = 0; i < sizeof(IPv4_RAW_ADDRESS); i += 2) + { + TmpSum = ((((PUCHAR)&IPHeader->DstAddr)[i] << 8) & 0xFF00) + + (((PUCHAR)&IPHeader->DstAddr)[i+1] & 0x00FF); + Sum += TmpSum; + } + + /* Add the proto number and length */ + Sum += IPPROTO_UDP + (DataLength - (Pad ? 1 : 0)); + + /* Fold the checksum and return the one's complement */ + return ~ChecksumFold(Sum); +} + Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Tue Oct 20 07:24:37 2009 @@ -19,6 +19,7 @@ PIP_ADDRESS LocalAddress, USHORT LocalPort, PIP_PACKET IPPacket, + PVOID Data, UINT DataLength) /* * FUNCTION: Adds an IPv4 and UDP header to an IP packet @@ -49,10 +50,20 @@ /* Port values are already big-endian values */ UDPHeader->SourcePort = LocalPort; UDPHeader->DestPort = RemotePort; - /* FIXME: Calculate UDP checksum and put it in UDP header */ UDPHeader->Checksum = 0; /* Length of UDP header and data */ UDPHeader->Length = WH2N(DataLength + sizeof(UDP_HEADER)); + + TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n", + IPPacket->Header, IPPacket->Data, + (PCHAR)IPPacket->Data - (PCHAR)IPPacket->Header)); + + RtlCopyMemory(IPPacket->Data, Data, DataLength); + + UDPHeader->Checksum = UDPv4ChecksumCalculate((PIPv4_HEADER)IPPacket->Header, + (PUCHAR)UDPHeader, + DataLength + sizeof(UDP_HEADER)); + UDPHeader->Checksum = WH2N(UDPHeader->Checksum); TI_DbgPrint(MID_TRACE, ("Packet: %d ip %d udp %d payload\n", (PCHAR)UDPHeader - (PCHAR)IPPacket->Header, @@ -105,7 +116,7 @@ switch (RemoteAddress->Type) { case IP_ADDRESS_V4: Status = AddUDPHeaderIPv4(RemoteAddress, RemotePort, - LocalAddress, LocalPort, Packet, DataLen); + LocalAddress, LocalPort, Packet, DataBuffer, DataLen); break; case IP_ADDRESS_V6: /* FIXME: Support IPv6 */ @@ -120,12 +131,6 @@ FreeNdisPacket(Packet->NdisPacket); return Status; } - - TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n", - Packet->Header, Packet->Data, - (PCHAR)Packet->Data - (PCHAR)Packet->Header)); - - RtlCopyMemory( Packet->Data, DataBuffer, DataLen ); TI_DbgPrint(MID_TRACE, ("Displaying packet\n")); @@ -258,7 +263,15 @@ UDPHeader = (PUDP_HEADER)IPPacket->Data; - /* FIXME: Calculate and validate UDP checksum */ + /* Calculate and validate UDP checksum */ + i = UDPv4ChecksumCalculate(IPv4Header, + (PUCHAR)UDPHeader, + WH2N(UDPHeader->Length)); + if (i != DH2N(0x0000FFFF)) + { + TI_DbgPrint(MIN_TRACE, ("Bad checksum on packet received.\n")); + return; + } /* Sanity checks */ i = WH2N(UDPHeader->Length);

14 years, 11 months

[cgutman] 43636: - Don't set AT_ARP for the loopback interface - Remove hacks in iphlpapi that hid this bug

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 20 05:54:27 2009 New Revision: 43636 URL: http://svn.reactos.org/svn/reactos?rev=43636&view=rev Log: - Don't set AT_ARP for the loopback interface - Remove hacks in iphlpapi that hid this bug Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Tue Oct 20 05:54:27 2009 @@ -513,8 +513,7 @@ for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) && - !isLoopback( tcpFile, &entitySet[i] ) ) { + hasArp( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -574,8 +573,7 @@ for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) && - !isLoopback( tcpFile, &entitySet[i] ) ) { + hasArp( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Tue Oct 20 05:54:27 2009 @@ -197,7 +197,7 @@ EntityList[EntityCount].tei_entity = AT_ENTITY; EntityList[EntityCount].tei_instance = ATCount; EntityList[EntityCount].context = Interface; - EntityList[EntityCount].flags = AT_ARP; + EntityList[EntityCount].flags = (Interface != Loopback) ? AT_ARP : AT_NULL; EntityCount++; TcpipReleaseSpinLock( &EntityListLock, OldIrql );

14 years, 11 months

[cgutman] 43635: - Copy correct data to our lookahead buffer. It was previously missing the media header which messed up the lookahead buffer size passed to ProtocolReceive - Fix the check for loopback indication. It was previously checking whether the source and destination packets were the same which makes no sense at all - Correct the offset and length passed to NdisCopyFromPacketToPacket. The caller's values of these don't include the header size but the packet does - Fixes a crash when runn

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 20 04:30:05 2009 New Revision: 43635 URL: http://svn.reactos.org/svn/reactos?rev=43635&view=rev Log: - Copy correct data to our lookahead buffer. It was previously missing the media header which messed up the lookahead buffer size passed to ProtocolReceive - Fix the check for loopback indication. It was previously checking whether the source and destination packets were the same which makes no sense at all - Correct the offset and length passed to NdisCopyFromPacketToPacket. The caller's values of these don't include the header size but the packet does - Fixes a crash when running "ping 10.0.2.15 -l 1800" on vbox with NAT Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Oct 20 04:30:05 2009 @@ -279,7 +279,8 @@ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { - BufferedLength = CopyPacketToBuffer(LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); + BufferedLength = CopyPacketToBuffer(LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead + + Adapter->MediumHeaderSize); Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); @@ -297,6 +298,12 @@ } ExFreePool(LookaheadBuffer); + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + { + Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; + } + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NDIS_STATUS_SUCCESS; } @@ -649,12 +656,12 @@ /* FIXME: Interrupts must be disabled for adapter */ /* XXX sd - why is that true? */ - if (Packet == Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()]) { + if (Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()]) { NDIS_DbgPrint(MAX_TRACE, ("LoopPacket\n")); /* NDIS is responsible for looping this packet */ NdisCopyFromPacketToPacket(Packet, - ByteOffset, - BytesToTransfer, + ByteOffset + Adapter->MediumHeaderSize, + BytesToTransfer + Adapter->MediumHeaderSize, Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()], 0, BytesTransferred);

14 years, 11 months

[cgutman] 43634: - Store the indicated packet so NdisTransferData can copy data from it when the caller requests data beyond our allocated lookahead buffer

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 20 03:35:37 2009 New Revision: 43634 URL: http://svn.reactos.org/svn/reactos?rev=43634&view=rev Log: - Store the indicated packet so NdisTransferData can copy data from it when the caller requests data beyond our allocated lookahead buffer Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Oct 20 03:35:37 2009 @@ -280,6 +280,7 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { BufferedLength = CopyPacketToBuffer(LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); + Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);

14 years, 11 months

[jimtabor] 43633: - Add more information for support with function MmPageEntireDriver. Not sure where to place the function since it uses numbers for IX86/AMD and not ARM. Enable MmDisablePagingExecutive without the register entry to support it.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 20 01:04:50 2009 New Revision: 43633 URL: http://svn.reactos.org/svn/reactos?rev=43633&view=rev Log: - Add more information for support with function MmPageEntireDriver. Not sure where to place the function since it uses numbers for IX86/AMD and not ARM. Enable MmDisablePagingExecutive without the register entry to support it. Modified: trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Tue Oct 20 01:04:50 2009 @@ -387,7 +387,7 @@ { L"Session Manager\\Memory Management", L"DisablePagingExecutive", - &DummyData, + &MmDisablePagingExecutive, NULL, NULL }, Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Oct 20 01:04:50 2009 @@ -14,6 +14,7 @@ extern ULONG MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; extern ULONG MmNumberOfPhysicalPages; +extern UCHAR MmDisablePagingExecutive; extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Tue Oct 20 01:04:50 2009 @@ -119,8 +119,32 @@ // // We should find the driver loader entry and return its base address // + //PMMPTE Pte; PLDR_DATA_TABLE_ENTRY pLdrDataTabEntry = MiLookupDataTableEntry(AddressWithinSection); - if (pLdrDataTabEntry) return pLdrDataTabEntry->DllBase; + if (pLdrDataTabEntry) + { + // + // Is Paging Disabled or Check if we had already mapped it in for this section + // + if ( (MmDisablePagingExecutive & 1) || pLdrDataTabEntry->SectionPointer ) + { + return pLdrDataTabEntry->DllBase; + } + // + // Flush all queued DPCs. + // + KeFlushQueuedDpcs(); + // + // Get the PTE for this section + // + //Pte = MiGetPteAddress(pLdrDataTabEntry->DllBase); + // + //MiSetPagingOfDriver( (Pte & (4,194,304 - 4) ) - 0x40000000 , + // (Pte & (4,194,304 - 4) ) - 0x40000000 + 4 * + // pLdrDataTabEntry->SizeOfImage >> PAGE_SHIFT - 4 ); + // + return pLdrDataTabEntry->DllBase; + } return NULL; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Oct 20 01:04:50 2009 @@ -50,6 +50,10 @@ PBOOLEAN Mm64BitPhysicalAddress = FALSE; ULONG MmReadClusterSize; +// +// 0 | 1 is on/off paging, 2 is undocumented +// +UCHAR MmDisablePagingExecutive = 1; // Forced to off PMMPTE MmSharedUserDataPte; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock;

14 years, 11 months

[tkreuzer] 43632: [NTOSKRNKL] - add Ke386SetGs, Ke386SetSs macros for amd64 - fix IMAGE_FILE_MACHINE_ARCHITECTURE for amd64, fixes WinDbg kernel version detection - goto KiSystemStartupReal from KiSystemStartup directly, old boot method is now deprecated

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 20 00:49:04 2009 New Revision: 43632 URL: http://svn.reactos.org/svn/reactos?rev=43632&view=rev Log: [NTOSKRNKL] - add Ke386SetGs, Ke386SetSs macros for amd64 - fix IMAGE_FILE_MACHINE_ARCHITECTURE for amd64, fixes WinDbg kernel version detection - goto KiSystemStartupReal from KiSystemStartup directly, old boot method is now deprecated Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Tue Oct 20 00:49:04 2009 @@ -132,8 +132,10 @@ #define Ke386GetSs() _Ke386GetSeg(ss) #define Ke386GetFs() _Ke386GetSeg(fs) #define Ke386SetFs(X) _Ke386SetSeg(fs, X) +#define Ke386SetGs(X) _Ke386SetSeg(gs, X) #define Ke386SetDs(X) _Ke386SetSeg(ds, X) #define Ke386SetEs(X) _Ke386SetSeg(es, X) +#define Ke386SetSs(X) _Ke386SetSeg(ss, X) #elif defined(_MSC_VER) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Tue Oct 20 00:49:04 2009 @@ -67,7 +67,7 @@ extern ULONG Ke386CacheAlignment; -#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_I386 +#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_AMD64 // // INT3 is 1 byte long Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Tue Oct 20 00:49:04 2009 @@ -621,7 +621,12 @@ KiSystemStartup(IN ULONG_PTR Dummy, IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { - KiRosPrepareForSystemStartup(Dummy, LoaderBlock); + FrLdrDbgPrint = ((PLOADER_PARAMETER_BLOCK)Dummy)->u.Amd64.DbgPrint; + FrLdrDbgPrint("Hello from KiSystemStartup!!!\n"); + + KiSystemStartupReal((PLOADER_PARAMETER_BLOCK)Dummy); + +// KiRosPrepareForSystemStartup(Dummy, LoaderBlock); } @@ -669,7 +674,7 @@ Ke386SetFs(KGDT_32_R3_TEB | RPL_MASK); /* LDT is unused */ - __sldt(0); +// __lldt(0); /* Align stack to 16 bytes */ LoaderBlock->KernelStack &= ~(16 - 1); @@ -719,6 +724,8 @@ } // DPRINT1("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); + + DbgBreakPointWithStatus(0); /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock);

14 years, 11 months

[tkreuzer] 43631: - use tabs in rbuild file - comment out mmebuddy for amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 20 00:43:14 2009 New Revision: 43631 URL: http://svn.reactos.org/svn/reactos?rev=43631&view=rev Log: - use tabs in rbuild file - comment out mmebuddy for amd64 Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/sound.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/sound.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/sound.rbuild [iso-8859-1] Tue Oct 20 00:43:14 2009 @@ -1,22 +1,24 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="legacy"> - <xi:include href="legacy/legacy.rbuild" /> - </directory> - <directory name="shared"> - <xi:include href="shared/shared.rbuild" /> - </directory> - <directory name="soundblaster"> - <xi:include href="soundblaster/soundblaster.rbuild" /> - </directory> - <directory name="uartmidi"> - <xi:include href="uartmidi/uartmidi.rbuild" /> - </directory> -  - <directory name="mment4"> - <xi:include href="mment4/mment4.rbuild" /> - </directory> -</group> + <directory name="legacy"> + <xi:include href="legacy/legacy.rbuild" /> + </directory> + <directory name="shared"> + <xi:include href="shared/shared.rbuild" /> + </directory> + <directory name="soundblaster"> + <xi:include href="soundblaster/soundblaster.rbuild" /> + </directory> + <directory name="uartmidi"> + <xi:include href="uartmidi/uartmidi.rbuild" /> + </directory> + <ifnot property="ARCH" value="amd64"> + <directory name="mmebuddy"> + <xi:include href="mmebuddy/mmebuddy.rbuild" /> + </directory> + </ifnot> + <directory name="mment4"> + <xi:include href="mment4/mment4.rbuild" /> + </directory> +</group>

14 years, 11 months

[tkreuzer] 43630: Add midl compiler flags

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 20 00:39:23 2009 New Revision: 43630 URL: http://svn.reactos.org/svn/reactos?rev=43630&view=rev Log: Add midl compiler flags Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Tue Oct 20 00:39:23 2009 @@ -42,6 +42,7 @@ <compilerflag>-U_X86_</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> + <compilerflag compiler="midl">-m64 --win64</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag>

14 years, 11 months

← Newer
1
...
23
24
25
26
27
28
29
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009