Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tthompson] 71662: [NTFS] Fix Up AddFixupArray - It needs to accept a PNTFS_RECORD_HEADER for parameter 2, not a PFILE_RECORD_HEADER.
by tthompson＠svn.reactos.org 23 Jun '16

23 Jun '16

Author: tthompson Date: Thu Jun 23 15:37:19 2016 New Revision: 71662 URL: http://svn.reactos.org/svn/reactos?rev=71662&view=rev Log: [NTFS] Fix Up AddFixupArray - It needs to accept a PNTFS_RECORD_HEADER for parameter 2, not a PFILE_RECORD_HEADER. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jun 23 15:37:19 2016 @@ -701,7 +701,7 @@ DPRINT("UpdateFileRecord(%p, %I64x, %p)\n", Vcb, index, file); // Add the fixup array to prepare the data for writing to disk - AddFixupArray(Vcb, file); + AddFixupArray(Vcb, &file->Ntfs); // write the file record to the master file table Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); @@ -750,27 +750,24 @@ NTSTATUS AddFixupArray(PDEVICE_EXTENSION Vcb, - PFILE_RECORD_HEADER Record) + PNTFS_RECORD_HEADER Record) { USHORT *pShortToFixUp; - unsigned int ArrayEntryCount = Record->BytesAllocated / Vcb->NtfsInfo.BytesPerSector; + unsigned int ArrayEntryCount = Record->UsaCount - 1; unsigned int Offset = Vcb->NtfsInfo.BytesPerSector - 2; int i; - PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->Ntfs.UsaOffset); + PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->UsaOffset); DPRINT("AddFixupArray(%p, %p)\n fixupArray->USN: %u, ArrayEntryCount: %u\n", Vcb, Record, fixupArray->USN, ArrayEntryCount); - if (Record->BytesAllocated % Vcb->NtfsInfo.BytesPerSector != 0) - ArrayEntryCount++; - fixupArray->USN++; for (i = 0; i < ArrayEntryCount; i++) { DPRINT("USN: %u\tOffset: %u\n", fixupArray->USN, Offset); - pShortToFixUp = (USHORT*)((UCHAR*)Record + Offset); + pShortToFixUp = (USHORT*)((PCHAR)Record + Offset); fixupArray->Array[i] = *pShortToFixUp; *pShortToFixUp = fixupArray->USN; Offset += Vcb->NtfsInfo.BytesPerSector; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jun 23 15:37:19 2016 @@ -811,7 +811,7 @@ NTSTATUS AddFixupArray(PDEVICE_EXTENSION Vcb, - PFILE_RECORD_HEADER Record); + PNTFS_RECORD_HEADER Record); NTSTATUS ReadLCN(PDEVICE_EXTENSION Vcb,

1 0

[zhu] 71661: Backlogging successful. Server is able to simultaneously receive messages from two different clients. Crashes on client exit due to referencing deallocated memory.
by zhu＠svn.reactos.org 23 Jun '16

23 Jun '16

Author: zhu Date: Thu Jun 23 15:28:39 2016 New Revision: 71661 URL: http://svn.reactos.org/svn/reactos?rev=71661&view=rev Log: Backlogging successful. Server is able to simultaneously receive messages from two different clients. Crashes on client exit due to referencing deallocated memory. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/opt.h Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Thu Jun 23 15:28:39 2016 @@ -31,11 +31,13 @@ NTSTATUS PrepareIrpForCancel( PIRP Irp, - PDRIVER_CANCEL CancelRoutine + PDRIVER_CANCEL CancelRoutine, + UCHAR CancelMode ) { PIO_STACK_LOCATION IrpSp; - PADDRESS_FILE AddressFile; + PTCP_CONTEXT Context; + PTCP_REQUEST Request; KIRQL OldIrql; DPRINT1("Prepare for cancel\n"); @@ -44,14 +46,27 @@ if (!Irp->Cancel) { + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_ADDRESS_FILE); + if (!Request) + { + return STATUS_NO_MEMORY; + } + Request->PendingIrp = Irp; + Request->CancelMode = CancelMode; + IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; - AddressFile->ConnectionContext->PendingIrp = Irp; + Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + InsertTailList(&Context->RequestListHead, &Request->ListEntry); IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql); + + DPRINT1("Prepared for cancel\n"); + return STATUS_SUCCESS; } + + DPRINT1("Already cancelled\n"); IoReleaseCancelSpinLock(OldIrql); @@ -70,7 +85,10 @@ ) { PIO_STACK_LOCATION IrpSp; - PADDRESS_FILE AddressFile; + PTCP_CONTEXT Context; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PTCP_REQUEST Request; UCHAR MinorFunction; KIRQL OldIrql; @@ -79,51 +97,68 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + switch ((ULONG)IrpSp->FileObject->FsContext2) + { + case TDI_TRANSPORT_ADDRESS_FILE : + goto DGRAM_CANCEL; + case TDI_CONNECTION_FILE : + Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + goto TCP_CANCEL; + default : + DPRINT1("Cancellation error\n"); + goto FINISH; + } + +TCP_CANCEL: MinorFunction = IrpSp->MinorFunction; - Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; - switch(MinorFunction) { + case TDI_SEND: + DPRINT1("TDI_SEND Cancel\n"); + break; + case TDI_LISTEN: + DPRINT1("TDI_LISTEN Cancel\n"); + break; + case TDI_CONNECT: + DPRINT1("TDI_CONNECT Cancel\n"); + break; case TDI_RECEIVE: DPRINT1("TDI_RECEIVE Cancel\n"); - goto TCP_CANCEL; - case TDI_RECEIVE_DATAGRAM: - DPRINT1("TDI_RECEIVE_DATAGRAM cancelling is handled within TcpIpReceiveDatagram()\n"); - goto DGRAM_CANCEL; - case TDI_SEND: - DPRINT1("TDI_SEND Cancel\n"); - goto TCP_CANCEL; - case TDI_SEND_DATAGRAM: - DPRINT1("TDI_SEND_DATAGRAM Cancel\n"); - goto DGRAM_CANCEL; - case TDI_LISTEN: - DPRINT1("TDI_LISTEN Cancel\n"); - goto TCP_CANCEL; - case TDI_CONNECT: - DPRINT1("TDI_CONNECT Cancel\n"); - goto TCP_CANCEL; + break; case TDI_DISCONNECT: DPRINT1("TDI_DISCONNECT Cancel\n"); - goto TCP_CANCEL; + break; default: - DPRINT1("Invalid MinorFunction for cancelling IRP\n"); - return; - } - -TCP_CANCEL: - if (AddressFile->ConnectionContext) - { - if (AddressFile->ConnectionContext->lwip_tcp_pcb) + DPRINT1("Invalid MinorFunction for TCP_CANCEL\n"); + goto FINISH; + } + + Head = &Context->RequestListHead; + Entry = Head->Flink; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingIrp == Irp) { - tcp_abort(AddressFile->ConnectionContext->lwip_tcp_pcb); - AddressFile->ConnectionContext->PendingIrp = NULL; - AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; - DPRINT1("TCP_CANCEL\n"); + RemoveEntryList(Entry); + switch (Request->CancelMode) + { + case TCP_REQUEST_CANCEL_MODE_ABORT: + tcp_abort(Context->lwip_tcp_pcb); + break; + case TCP_REQUEST_CANCEL_MODE_CLOSE: + tcp_close(Context->lwip_tcp_pcb); + break; + } + Context->lwip_tcp_pcb = NULL; + Request->PendingIrp = NULL; + goto FINISH; } - } + Entry = Entry->Flink; + } + DPRINT1("No matching TCP_REQUEST found\n"); goto FINISH; DGRAM_CANCEL: @@ -136,7 +171,8 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - DPRINT1("\n CancelRequestRoutine\n Exiting\n"); + DPRINT1("\n CancelRequestRoutine Exiting\n"); + return; } @@ -263,26 +299,55 @@ err_t err) { PIRP Irp; - PIO_STACK_LOCATION IrpSp; KIRQL OldIrql; + PTCP_REQUEST Request; PADDRESS_FILE AddressFile; + PTCP_CONTEXT Context; + + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PLIST_ENTRY Temp; DPRINT1("lwIP TCP Accept Callback\n"); AddressFile = (PADDRESS_FILE)arg; - Irp = AddressFile->ConnectionContext->PendingIrp; + if (AddressFile->ContextCount == 0) + { + DPRINT1("\n Callback on address file with no contexts\n"); + return ERR_ABRT; + } + Head = &AddressFile->ConnectionContext->ListEntry; + Entry = Head->Blink; + Irp = NULL; + while (Entry != Head) + { + Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); + if (Context->lwip_tcp_pcb == AddressFile->ConnectionContext->lwip_tcp_pcb) + { + if (IsListEmpty(&Context->RequestListHead)) + { + DPRINT1("Context has empty request list\n"); + return ERR_ABRT; + } + Request = CONTAINING_RECORD(Context->RequestListHead.Flink, + TCP_REQUEST, ListEntry); + Irp = Request->PendingIrp; + if (!Irp) + { + DPRINT1("Found cancelled IRP\n"); + Temp = Entry->Blink; + RemoveEntryList(Entry); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + Entry = Temp; + continue; + } + break; + } + Entry = Entry->Blink; + } if (!Irp) { - DPRINT1("Callback on canceled IRP\n"); - return ERR_ABRT; - } - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - if (AddressFile != IrpSp->FileObject->FsContext) - { - DPRINT1("AddressFile Mismatch\n"); - tcp_abort(AddressFile->ConnectionContext->lwip_tcp_pcb); - AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + DPRINT1("Could not find a listening tcp_pcb\n"); return ERR_ABRT; } @@ -291,10 +356,14 @@ Irp->Cancel = FALSE; IoReleaseCancelSpinLock(OldIrql); - AddressFile->ConnectionContext->lwip_tcp_pcb = newpcb; + Context->lwip_tcp_pcb = newpcb; + tcp_accepted(AddressFile->ConnectionContext->lwip_tcp_pcb); + RemoveEntryList(&Request->ListEntry); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_OK; } @@ -308,17 +377,18 @@ u16_t len ) { - PADDRESS_FILE AddressFile; + PTCP_REQUEST Request; PIRP Irp; KIRQL OldIrql; DPRINT1("lwIP TCP Sent Callback\n"); - AddressFile = (PADDRESS_FILE)arg; - Irp = AddressFile->ConnectionContext->PendingIrp; + Request = (PTCP_REQUEST)arg; + Irp = Request->PendingIrp; if (!Irp) { - DPRINT1("Callback on canceled IRP\n"); + DPRINT1("Callback on cancelled IRP\n"); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_ABRT; } @@ -330,6 +400,9 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = len; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_OK; } @@ -346,7 +419,8 @@ { PIRP Irp; PNDIS_BUFFER Buffer; - PADDRESS_FILE AddressFile; + PTCP_CONTEXT Context; + PTCP_REQUEST Request; PIO_STACK_LOCATION IrpSp; PTDI_REQUEST_KERNEL_RECEIVE ReceiveInfo; KIRQL OldIrql; @@ -359,11 +433,36 @@ DPRINT1("lwIP TCP Receive Callback\n"); - AddressFile = (PADDRESS_FILE)arg; - Irp = AddressFile->ConnectionContext->PendingIrp; + if (err != ERR_OK) + { + DPRINT1("lwIP Error %d\n", err); + return ERR_ABRT; + } + + Request = (PTCP_REQUEST)arg; + Irp = Request->PendingIrp; if (!Irp) { - DPRINT1("Callback on canceled IRP\n"); + DPRINT1("Callback on cancelled IRP\n"); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + return ERR_ABRT; + } + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + if (!Context->lwip_tcp_pcb) + { + DPRINT1("Context pcb is NULL\n"); + return ERR_ABRT; + } + if (Context->lwip_tcp_pcb != tpcb) + { + DPRINT1("Receive tcp_pcb mismatch\n"); + tcp_abort(tpcb); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_ABRT; } @@ -373,7 +472,6 @@ IoReleaseCancelSpinLock(OldIrql); Buffer = (PNDIS_BUFFER)Irp->MdlAddress; - IrpSp = IoGetCurrentIrpStackLocation(Irp); ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; NdisQueryBuffer(Buffer, &CurrentDestLocation, &RemainingDestBytes); @@ -432,10 +530,15 @@ RETURN: DPRINT1("Receive CopiedLength = %d\n", CopiedLength); + + tcp_recved(tpcb, CopiedLength); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = CopiedLength; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_OK; } @@ -493,19 +596,35 @@ struct tcp_pcb *tpcb, err_t err) { - PADDRESS_FILE AddressFile; + PTCP_REQUEST Request; + PTCP_CONTEXT Context; + PIO_STACK_LOCATION IrpSp; PIRP Irp; KIRQL OldIrql; DPRINT1("lwIP TCP Connected Callback\n"); - AddressFile = (PADDRESS_FILE)arg; - Irp = AddressFile->ConnectionContext->PendingIrp; + Request = (PTCP_REQUEST)arg; + Irp = Request->PendingIrp; if (!Irp) { - DPRINT1("Callback on canceled IRP\n"); + DPRINT1("Callback on cancelled IRP\n"); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_ABRT; } + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + if (Context->AddressFile->ConnectionContext->lwip_tcp_pcb == tpcb) + { + DPRINT1("Same as old pcb\n"); + } + else + { + DPRINT1("Connected callback assigns new pcb\n"); + } + Context->lwip_tcp_pcb = tpcb; + Context->AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); @@ -514,6 +633,9 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); return ERR_OK; } @@ -648,7 +770,7 @@ InitializeListHead(&TcpContext->ListEntry); TcpContext->AddressFile = AddressFile; TcpContext->Protocol = IPPROTO_TCP; - TcpContext->PendingIrp = NULL; + InitializeListHead(&TcpContext->RequestListHead); TcpContext->lwip_tcp_pcb = tcp_new(); AddressFile->ConnectionContext = TcpContext; AddressFile->ContextCount = 0; @@ -696,6 +818,7 @@ Success: IrpSp->FileObject->FsContext = AddressFile; IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; + return STATUS_SUCCESS; } @@ -741,6 +864,7 @@ } Context->Protocol = Protocol; RtlCopyMemory(&Context->RequestAddress, Address, sizeof(*Address)); + InitializeListHead(&Context->RequestListHead); Context->lwip_tcp_pcb = NULL; IrpSp->FileObject->FsContext = (PVOID)Context; @@ -776,10 +900,12 @@ /* remove the lwip pcb */ if (AddressFile->Protocol == IPPROTO_UDP) udp_remove(AddressFile->lwip_udp_pcb); - else if (AddressFile->Protocol == IPPROTO_TCP && AddressFile->ConnectionContext) - { + else if (AddressFile->Protocol == IPPROTO_TCP) + { + DPRINT1("Closing TCP address\n"); if (AddressFile->ContextCount != 0) { + DPRINT1("Closing open contexts\n"); Head = &AddressFile->ConnectionContext->ListEntry; Entry = Head->Flink; while (Entry != Head) @@ -788,6 +914,17 @@ CurrentContext = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); RemoveEntryList(Entry); + if (!IsListEmpty(&CurrentContext->RequestListHead)) + { + DPRINT1("Address has non-empty request queue\n"); + return STATUS_NOT_IMPLEMENTED; + } + if (CurrentContext->lwip_tcp_pcb != AddressFile->ConnectionContext->lwip_tcp_pcb + && CurrentContext->lwip_tcp_pcb) + { + DPRINT1("Freeing connected tcp_pcb\n"); + tcp_abort(CurrentContext->lwip_tcp_pcb); + } ExFreePoolWithTag(CurrentContext, TAG_ADDRESS_FILE); AddressFile->ContextCount--; Entry = Temp; @@ -801,7 +938,6 @@ if (AddressFile->ConnectionContext->lwip_tcp_pcb) { tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); - AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; } ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_ADDRESS_FILE); } @@ -896,7 +1032,8 @@ _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE *AddressFile; + PTCP_CONTEXT Context; + PTCP_REQUEST Request; PTDI_REQUEST_KERNEL_CONNECT Parameters; PTRANSPORT_ADDRESS RemoteTransportAddress; @@ -908,14 +1045,14 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); /* Check this is really a connection file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - DPRINT1("File object not an address file\n"); + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) + { + DPRINT1("File object not a connection context\n"); return STATUS_FILE_INVALID; } - AddressFile = IrpSp->FileObject->FsContext; - if (AddressFile->Protocol != IPPROTO_TCP) + Context = IrpSp->FileObject->FsContext; + if (Context->AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; @@ -932,10 +1069,10 @@ SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port); DPRINT1("\n Local Address\n Address: %08x\n Port: %04x\n", - AddressFile->ConnectionContext->lwip_tcp_pcb->local_ip, - AddressFile->ConnectionContext->lwip_tcp_pcb->local_port); - - lwip_err = tcp_connect(AddressFile->ConnectionContext->lwip_tcp_pcb, + Context->lwip_tcp_pcb->local_ip, + Context->lwip_tcp_pcb->local_port); + + lwip_err = tcp_connect(Context->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_Connected_callback); @@ -978,9 +1115,12 @@ } case (ERR_OK) : { -// DPRINT1("lwip ERR_OK\n"); - PrepareIrpForCancel(Irp, CancelRequestRoutine); - tcp_arg(AddressFile->ConnectionContext->lwip_tcp_pcb, AddressFile); + PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_ABORT); + Request = CONTAINING_RECORD( + Context->RequestListHead.Blink, + TCP_REQUEST, + ListEntry); + tcp_arg(Context->lwip_tcp_pcb, Request); break; } default : @@ -1127,9 +1267,6 @@ } KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - IrpSp->FileObject->FsContext = AddressFile; - IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; Status = STATUS_SUCCESS; LEAVE: @@ -1144,32 +1281,23 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; - PTCP_CONTEXT CurrentContext; PADDRESS_FILE AddressFile; KIRQL OldIrql; - LIST_ENTRY *Head; - LIST_ENTRY *Entry; IrpSp = IoGetCurrentIrpStackLocation(Irp); - if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { + if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) + { + DPRINT1("Disassociating something that is not a connection context\n"); return STATUS_FILE_INVALID; } - AddressFile = IrpSp->FileObject->FsContext; + Context = IrpSp->FileObject->FsContext; + AddressFile = Context->AddressFile; if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; } - - Context = AddressFile->ConnectionContext; - if (!Context) - { - DPRINT1("No connection context\n"); - return STATUS_INVALID_PARAMETER; - } - if (Context->Protocol != IPPROTO_TCP) { DPRINT1("Address File and Context have mismatching protocols\n"); @@ -1177,26 +1305,17 @@ } KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - - Head = &AddressFile->ConnectionContext->ListEntry; - Entry = Head->Flink; - if (Entry == Head) - { - DPRINT1("Disassociating from empty context list\n"); - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - if (AddressFile->ContextCount < 1) - { - DPRINT1("Invalid ContextCount\n"); - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - CurrentContext = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); - RemoveEntryList(Entry); - ExFreePoolWithTag(CurrentContext, TAG_ADDRESS_FILE); + RemoveEntryList(&Context->ListEntry); + if (!IsListEmpty(&Context->RequestListHead)) + { + DPRINT1("Disassociating context with pending requests\n"); + } + if (Context->lwip_tcp_pcb != AddressFile->ConnectionContext->lwip_tcp_pcb) + { + tcp_abort(Context->lwip_tcp_pcb); + } + ExFreePoolWithTag(Context, TAG_ADDRESS_FILE); AddressFile->ContextCount--; - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); return STATUS_SUCCESS; @@ -1211,29 +1330,31 @@ PADDRESS_FILE AddressFile; PTCP_CONTEXT ConnectionContext; + KIRQL OldIrql; + struct tcp_pcb *lpcb; IrpSp = IoGetCurrentIrpStackLocation(Irp); - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - DPRINT1("Not an address file\n"); + /* Check this is really a context file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) + { + DPRINT1("Not a connection context\n"); return STATUS_FILE_INVALID; } - /* Get address file */ - AddressFile = IrpSp->FileObject->FsContext; - ConnectionContext = AddressFile->ConnectionContext; + /* Get context file */ + ConnectionContext = IrpSp->FileObject->FsContext; + AddressFile = ConnectionContext->AddressFile; if (ConnectionContext->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_LISTEN for a non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; } - PrepareIrpForCancel(Irp, CancelRequestRoutine); - if (AddressFile->ContextCount <= 1) - { + if (AddressFile->ContextCount == 1) + { + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); /* Call down into lwip to initiate a listen */ lpcb = tcp_listen(ConnectionContext->lwip_tcp_pcb); DPRINT1("lwip tcp_listen returned\n"); @@ -1245,13 +1366,15 @@ DPRINT1("lwip tcp_listen error\n"); return STATUS_INVALID_ADDRESS; } - else - { - ConnectionContext->lwip_tcp_pcb = lpcb; - } + AddressFile->ConnectionContext->lwip_tcp_pcb = lpcb; + ConnectionContext->lwip_tcp_pcb = lpcb; + tcp_arg(ConnectionContext->lwip_tcp_pcb, AddressFile); tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); - tcp_arg(ConnectionContext->lwip_tcp_pcb, AddressFile); - } + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + } + + PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE); return STATUS_PENDING; } @@ -1262,8 +1385,8 @@ { PIO_STACK_LOCATION IrpSp; PTDI_REQUEST_KERNEL_SEND Request; - PADDRESS_FILE AddressFile; PTCP_CONTEXT Context; + PTCP_REQUEST TcpRequest; PVOID Buffer; UINT Len; @@ -1272,19 +1395,12 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); Request = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; - if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) - { - DPRINT1("TcpIpSend without a TDI_TRANSPORT_ADDRESS_FILE\n"); + if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) + { + DPRINT1("TcpIpSend without a TDI_CONNECTION_FILE\n"); return STATUS_INVALID_PARAMETER; } - AddressFile = IrpSp->FileObject->FsContext; - - if (!AddressFile->ConnectionContext) - { - DPRINT1("TcpIpSend with no TCP_CONTEXT\n"); - return STATUS_INVALID_PARAMETER; - } - Context = AddressFile->ConnectionContext; + Context = IrpSp->FileObject->FsContext; if (!Irp->MdlAddress) { @@ -1323,8 +1439,10 @@ return STATUS_NOT_IMPLEMENTED; } - PrepareIrpForCancel(Irp, CancelRequestRoutine); - tcp_arg(Context->lwip_tcp_pcb, AddressFile); + PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_ABORT); + TcpRequest = CONTAINING_RECORD(Context->RequestListHead.Blink, + TCP_REQUEST, ListEntry); + tcp_arg(Context->lwip_tcp_pcb, TcpRequest); tcp_sent(Context->lwip_tcp_pcb, lwip_tcp_sent_callback); return STATUS_PENDING; @@ -1335,39 +1453,39 @@ _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp; - PADDRESS_FILE AddressFile; PTCP_CONTEXT Context; + PTCP_REQUEST Request; PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; IrpSp = IoGetCurrentIrpStackLocation(Irp); - if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) + if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) { DPRINT1("TcpIpReceive on something that is not an address file\n"); return STATUS_INVALID_PARAMETER; } - AddressFile = IrpSp->FileObject->FsContext; - - if (!AddressFile->ConnectionContext) - { - DPRINT1("Receiving on TCP address file with no connection context\n"); - return STATUS_INVALID_ADDRESS; - } - Context = AddressFile->ConnectionContext; + Context = IrpSp->FileObject->FsContext; if (!Context->lwip_tcp_pcb) { DPRINT1("Connection context does not contain a lwIP tcp_pcb\n"); return STATUS_INVALID_ADDRESS; } + if (Context->lwip_tcp_pcb == Context->AddressFile->ConnectionContext->lwip_tcp_pcb) + { + DPRINT1("Has the pcb been assigned by a lwIP callback?\n"); + return STATUS_INVALID_ADDRESS; + } RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); - PrepareIrpForCancel(Irp, CancelRequestRoutine); + PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE); + Request = CONTAINING_RECORD(Context->RequestListHead.Blink, + TCP_REQUEST, ListEntry); + tcp_arg(Context->lwip_tcp_pcb, Request); tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); - tcp_arg(Context->lwip_tcp_pcb, AddressFile); return STATUS_PENDING; } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Thu Jun 23 15:28:39 2016 @@ -1,5 +1,8 @@ #pragma once + +#define TCP_REQUEST_CANCEL_MODE_ABORT 1 +#define TCP_REQUEST_CANCEL_MODE_CLOSE 2 typedef struct _ADDRESS_FILE { LIST_ENTRY ListEntry; @@ -23,9 +26,15 @@ PADDRESS_FILE AddressFile; IPPROTO Protocol; TDI_ADDRESS_IP RequestAddress; - PIRP PendingIrp; + LIST_ENTRY RequestListHead; struct tcp_pcb* lwip_tcp_pcb; } TCP_CONTEXT, *PTCP_CONTEXT; + +typedef struct _TCP_REQUEST { + LIST_ENTRY ListEntry; + PIRP PendingIrp; + UCHAR CancelMode; +} TCP_REQUEST, *PTCP_REQUEST; void TcpIpInitializeAddresses(void); Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Thu Jun 23 15:28:39 2016 @@ -346,6 +346,7 @@ ) { PIO_STACK_LOCATION IrpSp; + PTCP_CONTEXT Context; NTSTATUS Status; ULONG_PTR FileType; @@ -366,6 +367,11 @@ } Status = TcpIpCloseAddress(IrpSp->FileObject->FsContext); break; + case TDI_CONNECTION_FILE: + DPRINT1("TCPIP Close Connection Context\n"); + Context = IrpSp->FileObject->FsContext; + Status = TcpIpCloseAddress(Context->AddressFile); + break; case TDI_CONTROL_CHANNEL_FILE: /* We didn't allocate anything for this. */ Status = STATUS_SUCCESS; @@ -394,13 +400,26 @@ { NTSTATUS Status; PIO_STACK_LOCATION IrpSp; + PTCP_CONTEXT Context; PADDRESS_FILE AddressFile; DPRINT1("TcpIpDispatchInternal\n"); IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = IrpSp->FileObject->FsContext; + switch ((ULONG)IrpSp->FileObject->FsContext2) + { + case TDI_TRANSPORT_ADDRESS_FILE : + AddressFile = IrpSp->FileObject->FsContext; + break; + case TDI_CONNECTION_FILE : + Context = IrpSp->FileObject->FsContext; + AddressFile = Context->AddressFile; + break; + default : + DPRINT1("Unknown FileObject type\n"); + break; + } switch (IrpSp->MinorFunction) { @@ -423,7 +442,6 @@ if (Status == STATUS_NOT_IMPLEMENTED) { DPRINT1("Received TDI_RECEIVE for non-TCP protocol\n"); - } break; case TDI_RECEIVE_DATAGRAM: Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/opt.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/opt.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/opt.h [iso-8859-1] Thu Jun 23 15:28:39 2016 @@ -1023,7 +1023,7 @@ * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb. */ #ifndef TCP_LISTEN_BACKLOG -#define TCP_LISTEN_BACKLOG 0 +#define TCP_LISTEN_BACKLOG 1 #endif /**

1 0

[tthompson] 71660: [NTFS] When writing to a file, increase the file size if trying to write past the end. *FindAttribute() has been given an optional pointer to a ULONG that will receive the offset...
by tthompson＠svn.reactos.org 22 Jun '16

22 Jun '16

Author: tthompson Date: Wed Jun 22 21:20:50 2016 New Revision: 71660 URL: http://svn.reactos.org/svn/reactos?rev=71660&view=rev Log: [NTFS] When writing to a file, increase the file size if trying to write past the end. *FindAttribute() has been given an optional pointer to a ULONG that will receive the offset of the found attribute from the beginning of the record. This is to allow for found attributes to be written back into their file records. +SetAttributeDataLength() +UpdateFileRecord() - Updates a file record in the master file table at a given index. +AddFixupArray() - Prepares a file record or directory index for writing to the disk. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -150,6 +150,8 @@ PNTFS_ATTR_RECORD InternalGetNextAttribute(PFIND_ATTR_CONTXT Context) { + PNTFS_ATTR_RECORD NextAttribute; + if (Context->CurrAttr == (PVOID)-1) { return NULL; @@ -165,7 +167,10 @@ return NULL; } - Context->CurrAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + Context->Offset += ((ULONG_PTR)NextAttribute - (ULONG_PTR)Context->CurrAttr); + Context->CurrAttr = NextAttribute; + if (Context->CurrAttr < Context->LastAttr && Context->CurrAttr->Type != AttributeEnd) { @@ -186,7 +191,9 @@ } else if (Context->CurrAttr->Length != 0) { - Context->CurrAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + Context->Offset += ((ULONG_PTR)NextAttribute - (ULONG_PTR)Context->CurrAttr); + Context->CurrAttr = NextAttribute; } else { @@ -223,6 +230,7 @@ Context->LastAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse); Context->NonResidentStart = NULL; Context->NonResidentEnd = NULL; + Context->Offset = FileRecord->AttributeOffset; if (Context->FirstAttr->Type == AttributeEnd) { @@ -246,6 +254,7 @@ else { *Attribute = Context->CurrAttr; + Context->Offset = (UCHAR*)Context->CurrAttr - (UCHAR*)FileRecord; } return STATUS_SUCCESS; @@ -307,7 +316,8 @@ FileNameAttr = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); DbgPrint(" (%x) '%.*S' ", FileNameAttr->NameType, FileNameAttr->NameLength, FileNameAttr->Name); - DbgPrint(" '%x' ", FileNameAttr->FileAttributes); + DbgPrint(" '%x' \n", FileNameAttr->FileAttributes); + DbgPrint(" AllocatedSize: %I64u\nDataSize: %I64u\n", FileNameAttr->AllocatedSize, FileNameAttr->DataSize); } @@ -481,8 +491,8 @@ { FindRun(Attribute,0,&lcn, &runcount); - DbgPrint(" AllocatedSize %I64u DataSize %I64u\n", - Attribute->NonResident.AllocatedSize, Attribute->NonResident.DataSize); + DbgPrint(" AllocatedSize %I64u DataSize %I64u InitilizedSize %I64u\n", + Attribute->NonResident.AllocatedSize, Attribute->NonResident.DataSize, Attribute->NonResident.InitializedSize); DbgPrint(" logical clusters: %I64u - %I64u\n", lcn, lcn + runcount - 1); } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -47,7 +47,7 @@ NTSTATUS Status; PNTFS_ATTR_CONTEXT DataContext; - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Stream, StreamLength, &DataContext); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Stream, StreamLength, &DataContext, NULL); if (NT_SUCCESS(Status)) { Size = AttributeDataLength(&DataContext->Record); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -568,7 +568,7 @@ } else if (Colon != 0) { - Status = FindAttribute(Vcb, FileRecord, AttributeData, Colon, wcslen(Colon), &DataContext); + Status = FindAttribute(Vcb, FileRecord, AttributeData, Colon, wcslen(Colon), &DataContext, NULL); if (!NT_SUCCESS(Status)) { return STATUS_OBJECT_NAME_NOT_FOUND; @@ -741,7 +741,7 @@ return Status; } - Status = FindAttribute(Vcb, FileRecord, Type, Name, NameLength, &AttrCtxt); + Status = FindAttribute(Vcb, FileRecord, Type, Name, NameLength, &AttrCtxt, NULL); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(FileRecord, TAG_NTFS); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -295,7 +295,7 @@ return Status; } - Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, L"", 0, &DeviceExt->MFTContext); + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, L"", 0, &DeviceExt->MFTContext, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Can't find data attribute for Master File Table.\n"); @@ -333,7 +333,7 @@ NtfsDumpFileAttributes(DeviceExt, VolumeRecord); /* Get volume name */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, L"", 0, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, L"", 0, &AttrCtxt, NULL); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { @@ -374,7 +374,7 @@ DeviceExt->VolumeFcb = VolumeFcb; /* Get volume information */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, L"", 0, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, L"", 0, &AttrCtxt, NULL); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { @@ -804,7 +804,7 @@ return Status; } - Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext); + Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed find $DATA for bitmap: %lx\n", Status); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -81,13 +81,24 @@ } +/** +* @name FindAttribute +* @implemented +* +* Searches a file record for an attribute matching the given type and name. +* +* @param Offset +* Optional pointer to a ULONG that will receive the offset of the found attribute +* from the beginning of the record. Can be set to NULL. +*/ NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, ULONG Type, PCWSTR Name, ULONG NameLength, - PNTFS_ATTR_CONTEXT * AttrCtx) + PNTFS_ATTR_CONTEXT * AttrCtx, + PULONG Offset) { BOOLEAN Found; NTSTATUS Status; @@ -123,6 +134,10 @@ /* Found it, fill up the context and return. */ DPRINT("Found context\n"); *AttrCtx = PrepareAttributeContext(Attribute); + + if (Offset != NULL) + *Offset = Context.Offset; + FindCloseAttribute(&Context); return STATUS_SUCCESS; } @@ -155,6 +170,61 @@ return AttrRecord->Resident.ValueLength; } + +NTSTATUS +SetAttributeDataLength(PFILE_OBJECT FileObject, + PNTFS_FCB Fcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER DataSize) +{ + if (AttrContext->Record.IsNonResident) + { + // do we need to increase the allocation size? + if (AttrContext->Record.NonResident.AllocatedSize < DataSize->QuadPart) + { + DPRINT1("FixMe: Increasing allocation size is unimplemented!\n"); + return STATUS_NOT_IMPLEMENTED; + } + + // TODO: is the file compressed, encrypted, or sparse? + + // NOTE: we need to have acquired the main resource exclusively, as well as(?) the PagingIoResource + + // TODO: update the allocated size on-disk + DPRINT("Allocated Size: %I64u\n", AttrContext->Record.NonResident.AllocatedSize); + + AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; + AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; + + Fcb->RFCB.FileSize = *DataSize; + Fcb->RFCB.ValidDataLength = *DataSize; + + DPRINT("Data Size: %I64u\n", Fcb->RFCB.FileSize.QuadPart); + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // copy the attribute back into the FileRecord + RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // write the updated file record back to disk + UpdateFileRecord(Fcb->Vcb, Fcb->MFTIndex, FileRecord); + + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); + } + else + { + // we can't yet handle resident attributes + DPRINT1("FixMe: Can't handle increasing length of resident attribute\n"); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} ULONG ReadAttribute(PDEVICE_EXTENSION Vcb, @@ -615,8 +685,39 @@ return FixupUpdateSequenceArray(Vcb, &file->Ntfs); } - -NTSTATUS +/** +* UpdateFileRecord +* @implemented +* Writes a file record to the master file table, at a given index. +*/ +NTSTATUS +UpdateFileRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG index, + PFILE_RECORD_HEADER file) +{ + ULONG BytesWritten; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("UpdateFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + + // Add the fixup array to prepare the data for writing to disk + AddFixupArray(Vcb, file); + + // write the file record to the master file table + Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); + + // TODO: Update MFT mirror + + if (!NT_SUCCESS(Status)) + { + DPRINT1("UpdateFileRecord failed: %I64u written, %u expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); + } + + return Status; +} + + +NTSTATUS FixupUpdateSequenceArray(PDEVICE_EXTENSION Vcb, PNTFS_RECORD_HEADER Record) { @@ -630,6 +731,8 @@ USACount = Record->UsaCount - 1; /* Exclude the USA Number. */ Block = (USHORT*)((PCHAR)Record + Vcb->NtfsInfo.BytesPerSector - 2); + DPRINT("FixupUpdateSequenceArray(%p, %p)\nUSANumber: %u\tUSACount: %u\n", Vcb, Record, USANumber, USACount); + while (USACount) { if (*Block != USANumber) @@ -645,6 +748,36 @@ return STATUS_SUCCESS; } +NTSTATUS +AddFixupArray(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER Record) +{ + USHORT *pShortToFixUp; + unsigned int ArrayEntryCount = Record->BytesAllocated / Vcb->NtfsInfo.BytesPerSector; + unsigned int Offset = Vcb->NtfsInfo.BytesPerSector - 2; + int i; + + PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->Ntfs.UsaOffset); + + DPRINT("AddFixupArray(%p, %p)\n fixupArray->USN: %u, ArrayEntryCount: %u\n", Vcb, Record, fixupArray->USN, ArrayEntryCount); + + if (Record->BytesAllocated % Vcb->NtfsInfo.BytesPerSector != 0) + ArrayEntryCount++; + + fixupArray->USN++; + + for (i = 0; i < ArrayEntryCount; i++) + { + DPRINT("USN: %u\tOffset: %u\n", fixupArray->USN, Offset); + + pShortToFixUp = (USHORT*)((UCHAR*)Record + Offset); + fixupArray->Array[i] = *pShortToFixUp; + *pShortToFixUp = fixupArray->USN; + Offset += Vcb->NtfsInfo.BytesPerSector; + } + + return STATUS_SUCCESS; +} NTSTATUS ReadLCN(PDEVICE_EXTENSION Vcb, @@ -783,7 +916,7 @@ return STATUS_OBJECT_PATH_NOT_FOUND; } - Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx, NULL); if (!NT_SUCCESS(Status)) { DPRINT("Corrupted filesystem!\n"); @@ -853,7 +986,7 @@ } ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); - Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx, NULL); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(MftRecord, TAG_NTFS); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -483,7 +483,14 @@ PNTFS_ATTR_RECORD LastAttr; PNTFS_ATTR_RECORD NonResidentStart; PNTFS_ATTR_RECORD NonResidentEnd; + ULONG Offset; } FIND_ATTR_CONTXT, *PFIND_ATTR_CONTXT; + +typedef struct +{ + USHORT USN; + USHORT Array[]; +} FIXUP_ARRAY, *PFIXUP_ARRAY; extern PNTFS_GLOBAL_DATA NtfsGlobalData; @@ -555,7 +562,7 @@ IN LONGLONG StartingOffset, IN ULONG Length, IN ULONG SectorSize, - IN PUCHAR Buffer); + IN const PUCHAR Buffer); NTSTATUS NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, @@ -759,6 +766,15 @@ ULONGLONG AttributeDataLength(PNTFS_ATTR_RECORD AttrRecord); +NTSTATUS +SetAttributeDataLength(PFILE_OBJECT FileObject, + PNTFS_FCB Fcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER DataSize); + ULONG AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord); @@ -766,6 +782,11 @@ ReadFileRecord(PDEVICE_EXTENSION Vcb, ULONGLONG index, PFILE_RECORD_HEADER file); + +NTSTATUS +UpdateFileRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG index, + PFILE_RECORD_HEADER file); NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, @@ -773,7 +794,8 @@ ULONG Type, PCWSTR Name, ULONG NameLength, - PNTFS_ATTR_CONTEXT * AttrCtx); + PNTFS_ATTR_CONTEXT * AttrCtx, + PULONG Offset); VOID ReadVCN(PDEVICE_EXTENSION Vcb, @@ -788,6 +810,10 @@ PNTFS_RECORD_HEADER Record); NTSTATUS +AddFixupArray(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER Record); + +NTSTATUS ReadLCN(PDEVICE_EXTENSION Vcb, ULONGLONG lcn, ULONG count, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -95,7 +95,7 @@ } - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext, NULL); if (!NT_SUCCESS(Status)) { NTSTATUS BrowseStatus; @@ -306,6 +306,7 @@ PNTFS_FCB Fcb; PFILE_RECORD_HEADER FileRecord; PNTFS_ATTR_CONTEXT DataContext; + ULONG AttributeOffset; ULONGLONG StreamSize; DPRINT("NtfsWriteFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, WriteOffset, IrpFlags, LengthWritten); @@ -358,9 +359,10 @@ DPRINT("Found record for %wS\n", Fcb->ObjectName); - // Find the attribute (in the NTFS sense of the word) with the data stream for our file + // Find the attribute with the data stream for our file DPRINT("Finding Data Attribute...\n"); - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext, + &AttributeOffset); // Did we fail to find the attribute? if (!NT_SUCCESS(Status)) @@ -402,13 +404,39 @@ // Are we trying to write beyond the end of the stream? if (WriteOffset + Length > StreamSize) { - // TODO: allocate additional clusters as needed and expand stream - DPRINT1("WriteOffset: %lu\tLength: %lu\tStreamSize: %I64u\n", WriteOffset, Length, StreamSize); - DPRINT1("TODO: Stream embiggening (appending files) is not yet supported!\n"); - ReleaseAttributeContext(DataContext); - ExFreePoolWithTag(FileRecord, TAG_NTFS); - *LengthWritten = 0; // We didn't write anything - return STATUS_ACCESS_DENIED; // temporarily; we don't change file sizes yet + // is increasing the stream size allowed? + if (!(Fcb->Flags & FCB_IS_VOLUME) && + !(IrpFlags & IRP_PAGING_IO)) + { + LARGE_INTEGER DataSize; + ULONGLONG AllocationSize; + + DataSize.QuadPart = WriteOffset + Length; + + AllocationSize = ROUND_UP(DataSize.QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); + + // set the attribute data length + Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, DeviceExt, &DataSize); + + if (!NT_SUCCESS(Status)) + { + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + *LengthWritten = 0; + return Status; + } + + // now we need to update this file's size in every directory index entry that references it + // (saved for a later commit) + } + else + { + // TODO - just fail for now + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + *LengthWritten = 0; + return STATUS_ACCESS_DENIED; + } } DPRINT("Length: %lu\tWriteOffset: %lu\tStreamSize: %I64u\n", Length, WriteOffset, StreamSize); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Wed Jun 22 21:20:50 2016 @@ -62,7 +62,7 @@ return 0; } - Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext); + Status = FindAttribute(DeviceExt, BitmapRecord, AttributeData, L"", 0, &DataContext, NULL); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(BitmapRecord, TAG_NTFS);

1 0

[apriyadarshi] 71659: Implemented AhciBuild_PRDT
by apriyadarshi＠svn.reactos.org 22 Jun '16

22 Jun '16

Author: apriyadarshi Date: Wed Jun 22 16:08:45 2016 New Revision: 71659 URL: http://svn.reactos.org/svn/reactos?rev=71659&view=rev Log: Implemented AhciBuild_PRDT Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] Wed Jun 22 16:08:45 2016 @@ -82,9 +82,9 @@ AhciBuild_PRDT Flags - NOT_IMPLEMENTED + IMPLEMENTED Comment - Need to configure command table according to Srb function + NONE AhciProcessSrb Flags Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Wed Jun 22 16:08:45 2016 @@ -259,7 +259,7 @@ // software should perform the appropriate error recovery actions based on whether // non-queued commands were being issued or native command queuing commands were being issued. - DebugPrint("\tFata Error: %x\n", PxIS.Status); + DebugPrint("\tFatal Error: %x\n", PxIS.Status); } // Normal Command Completion @@ -781,7 +781,7 @@ /** * @name AhciBuild_PRDT - * @not_implemented + * @implemented * * Build PRDT for data transfer * @@ -797,9 +797,32 @@ __in PAHCI_SRB_EXTENSION SrbExtension ) { + ULONG index; + PAHCI_COMMAND_TABLE cmdTable; + PLOCAL_SCATTER_GATHER_LIST sgl; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + DebugPrint("AhciBuild_PRDT()\n"); - return -1; + sgl = &SrbExtension->Sgl; + cmdTable = (PAHCI_COMMAND_TABLE)SrbExtension; + AdapterExtension = PortExtension->AdapterExtension; + + NT_ASSERT(sgl != NULL); + NT_ASSERT(sgl->NumberOfElements < MAXIMUM_AHCI_PRDT_ENTRIES); + + for (index = 0; index < sgl->NumberOfElements; index++) + { + NT_ASSERT(sgl->List[index].Length <= MAXIMUM_TRANSFER_LENGTH); + + cmdTable->PRDT[index].DBA = sgl->List[index].PhysicalAddress.LowPart; + if (IsAdapterCAPS64(AdapterExtension->CAP)) + { + cmdTable->PRDT[index].DBAU = sgl->List[index].PhysicalAddress.HighPart; + } + } + + return sgl->NumberOfElements; }// -- AhciBuild_PRDT(); /** @@ -830,24 +853,24 @@ NT_ASSERT(Srb->PathId == PortExtension->PortNumber); - SrbExtension = Srb->SrbExtension; + SrbExtension = GetSrbExtension(Srb); AdapterExtension = PortExtension->AdapterExtension; NT_ASSERT(SrbExtension != NULL); NT_ASSERT(SrbExtension->AtaFunction != 0); if ((SrbExtension->AtaFunction == ATA_FUNCTION_ATA_IDENTIFY) && - (SrbExtension->Task.CommandReg == IDE_COMMAND_NOT_VALID)) + (SrbExtension->CommandReg == IDE_COMMAND_NOT_VALID)) { // Here we are safe to check SIG register sig = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SIG); if (sig == 0x101) { - SrbExtension->Task.CommandReg = IDE_COMMAND_IDENTIFY; + SrbExtension->CommandReg = IDE_COMMAND_IDENTIFY; } else { - SrbExtension->Task.CommandReg = IDE_COMMAND_ATAPI_IDENTIFY; + SrbExtension->CommandReg = IDE_COMMAND_ATAPI_IDENTIFY; } } @@ -992,7 +1015,7 @@ tmpSrb = RemoveQueue(&PortExtension->SrbQueue); if (tmpSrb != NULL) { - NT_ASSERT(Srb->PathId == PathId); + NT_ASSERT(tmpSrb->PathId == PathId); AhciProcessSrb(PortExtension, tmpSrb, slotIndex); } else @@ -1045,7 +1068,7 @@ DebugPrint("DeviceInquiryRequest()\n"); - SrbExtension = Srb->SrbExtension; + SrbExtension = GetSrbExtension(Srb); // 3.6.1 // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data @@ -1055,7 +1078,7 @@ NT_ASSERT(SrbExtension != NULL); SrbExtension->AtaFunction = ATA_FUNCTION_ATA_IDENTIFY; - SrbExtension->Task.CommandReg = IDE_COMMAND_NOT_VALID; + SrbExtension->CommandReg = IDE_COMMAND_NOT_VALID; } else { @@ -1211,7 +1234,7 @@ NT_ASSERT(Queue->Head < MAXIMUM_QUEUE_BUFFER_SIZE); NT_ASSERT(Queue->Tail < MAXIMUM_QUEUE_BUFFER_SIZE); - if (Queue->Head == ((Queue->Tail + 1) % MAXIMUM_QUEUE_BUFFER_SIZE)) + if (Queue->Tail == ((Queue->Head + 1) % MAXIMUM_QUEUE_BUFFER_SIZE)) return FALSE; Queue->Buffer[Queue->Head++] = Srb; @@ -1251,3 +1274,34 @@ return Srb; }// -- RemoveQueue(); + +/** + * @name GetSrbExtension + * @implemented + * + * GetSrbExtension from Srb make sure It is properly aligned + * + * @param Srb + * + * @return + * return SrbExtension + * + */ +__inline +PAHCI_SRB_EXTENSION +GetSrbExtension ( + __in PSCSI_REQUEST_BLOCK Srb + ) +{ + ULONG Offset; + ULONG_PTR SrbExtension; + + SrbExtension = Srb->SrbExtension; + Offset = SrbExtension % 128; + + // CommandTable should be 128 byte aligned + if (Offset != 0) + Offset = 128 - Offset; + + return (PAHCI_SRB_EXTENSION)(SrbExtension + Offset); +}// -- PAHCI_SRB_EXTENSION(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Wed Jun 22 16:08:45 2016 @@ -12,6 +12,7 @@ #define DEBUG 1 #define MAXIMUM_AHCI_PORT_COUNT 25 +#define MAXIMUM_AHCI_PRDT_ENTRIES 32 #define MAXIMUM_QUEUE_BUFFER_SIZE 255 #define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB @@ -202,6 +203,28 @@ ULONG Status; } AHCI_COMMAND_HEADER_DESCRIPTION; +typedef struct _AHCI_PRDT +{ + ULONG DBA; + ULONG DBAU; + ULONG RSV0; + + ULONG DBC : 22; + ULONG RSV1 : 9; + ULONG I : 1; +} AHCI_PRDT, *PAHCI_PRDT; + +// 4.2.3 Command Table +typedef struct _AHCI_COMMAND_TABLE +{ + // (16 * 32) + 64 + 16 + 48 = 648 + // 128 byte aligned :D + UCHAR CFIS[64]; + UCHAR ACMD[16]; + UCHAR RSV0[48]; + AHCI_PRDT PRDT[MAXIMUM_AHCI_PRDT_ENTRIES]; +} AHCI_COMMAND_TABLE, *PAHCI_COMMAND_TABLE; + // 4.2.2 Command Header typedef struct _AHCI_COMMAND_HEADER { @@ -318,19 +341,21 @@ AHCI_PORT_EXTENSION PortExtension[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; -typedef struct _ATA_REGISTER -{ - UCHAR CommandReg; - ULONG Reserved; -} ATA_REGISTER; +typedef struct _LOCAL_SCATTER_GATHER_LIST +{ + ULONG NumberOfElements; + ULONG_PTR Reserved; + STOR_SCATTER_GATHER_ELEMENT List[MAXIMUM_AHCI_PRDT_ENTRIES]; +} LOCAL_SCATTER_GATHER_LIST, *PLOCAL_SCATTER_GATHER_LIST; typedef struct _AHCI_SRB_EXTENSION { + AHCI_COMMAND_TABLE CommandTable; ULONG AtaFunction; ULONG Flags; - ATA_REGISTER Task; + ULONG CommandReg; ULONG SlotIndex; - ULONG Reserved[4]; + LOCAL_SCATTER_GATHER_LIST Sgl; } AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION; ////////////////////////////////////////////////////////////// @@ -375,3 +400,9 @@ RemoveQueue ( __inout PAHCI_QUEUE Queue ); + +__inline +PAHCI_SRB_EXTENSION +GetSrbExtension( + __in PSCSI_REQUEST_BLOCK Srb + );

1 0

[zhu] 71658: Partial support for lwIP backlogging. Extra connection contexts are stored in a seemingly valid linked list, but their associated TDI_LISTEN IRPs are overwritten on new TDI_LISTEN call...
by zhu＠svn.reactos.org 21 Jun '16

21 Jun '16

Author: zhu Date: Tue Jun 21 18:04:55 2016 New Revision: 71658 URL: http://svn.reactos.org/svn/reactos?rev=71658&view=rev Log: Partial support for lwIP backlogging. Extra connection contexts are stored in a seemingly valid linked list, but their associated TDI_LISTEN IRPs are overwritten on new TDI_LISTEN calls because they are not yet logged. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Tue Jun 21 18:04:55 2016 @@ -34,6 +34,8 @@ PDRIVER_CANCEL CancelRoutine ) { + PIO_STACK_LOCATION IrpSp; + PADDRESS_FILE AddressFile; KIRQL OldIrql; DPRINT1("Prepare for cancel\n"); @@ -42,7 +44,11 @@ if (!Irp->Cancel) { + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + AddressFile->ConnectionContext->PendingIrp = Irp; IoSetCancelRoutine(Irp, CancelRoutine); + IoReleaseCancelSpinLock(OldIrql); return STATUS_SUCCESS; } @@ -82,20 +88,25 @@ switch(MinorFunction) { case TDI_RECEIVE: + DPRINT1("TDI_RECEIVE Cancel\n"); goto TCP_CANCEL; case TDI_RECEIVE_DATAGRAM: DPRINT1("TDI_RECEIVE_DATAGRAM cancelling is handled within TcpIpReceiveDatagram()\n"); goto DGRAM_CANCEL; - break; case TDI_SEND: + DPRINT1("TDI_SEND Cancel\n"); goto TCP_CANCEL; case TDI_SEND_DATAGRAM: + DPRINT1("TDI_SEND_DATAGRAM Cancel\n"); goto DGRAM_CANCEL; case TDI_LISTEN: + DPRINT1("TDI_LISTEN Cancel\n"); goto TCP_CANCEL; case TDI_CONNECT: + DPRINT1("TDI_CONNECT Cancel\n"); goto TCP_CANCEL; case TDI_DISCONNECT: + DPRINT1("TDI_DISCONNECT Cancel\n"); goto TCP_CANCEL; default: DPRINT1("Invalid MinorFunction for cancelling IRP\n"); @@ -105,10 +116,16 @@ TCP_CANCEL: if (AddressFile->ConnectionContext) { - tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); - DPRINT1("TCP_CANCEL\n"); - goto FINISH; - } + if (AddressFile->ConnectionContext->lwip_tcp_pcb) + { + tcp_abort(AddressFile->ConnectionContext->lwip_tcp_pcb); + AddressFile->ConnectionContext->PendingIrp = NULL; + AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + DPRINT1("TCP_CANCEL\n"); + } + } + goto FINISH; + DGRAM_CANCEL: DPRINT1("DGRAM_CANCEL\n"); @@ -252,9 +269,22 @@ DPRINT1("lwIP TCP Accept Callback\n"); - Irp = (PIRP)arg; + AddressFile = (PADDRESS_FILE)arg; + Irp = AddressFile->ConnectionContext->PendingIrp; + if (!Irp) + { + DPRINT1("Callback on canceled IRP\n"); + return ERR_ABRT; + } IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = (PADDRESS_FILE)IrpSp->FileObject->FsContext; + + if (AddressFile != IrpSp->FileObject->FsContext) + { + DPRINT1("AddressFile Mismatch\n"); + tcp_abort(AddressFile->ConnectionContext->lwip_tcp_pcb); + AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + return ERR_ABRT; + } IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); @@ -278,6 +308,29 @@ u16_t len ) { + PADDRESS_FILE AddressFile; + PIRP Irp; + KIRQL OldIrql; + + DPRINT1("lwIP TCP Sent Callback\n"); + + AddressFile = (PADDRESS_FILE)arg; + Irp = AddressFile->ConnectionContext->PendingIrp; + if (!Irp) + { + DPRINT1("Callback on canceled IRP\n"); + return ERR_ABRT; + } + + IoAcquireCancelSpinLock(&OldIrql); + IoSetCancelRoutine(Irp, NULL); + Irp->Cancel = FALSE; + IoReleaseCancelSpinLock(OldIrql); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = len; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return ERR_OK; } @@ -293,6 +346,7 @@ { PIRP Irp; PNDIS_BUFFER Buffer; + PADDRESS_FILE AddressFile; PIO_STACK_LOCATION IrpSp; PTDI_REQUEST_KERNEL_RECEIVE ReceiveInfo; KIRQL OldIrql; @@ -305,7 +359,13 @@ DPRINT1("lwIP TCP Receive Callback\n"); - Irp = (PIRP)arg; + AddressFile = (PADDRESS_FILE)arg; + Irp = AddressFile->ConnectionContext->PendingIrp; + if (!Irp) + { + DPRINT1("Callback on canceled IRP\n"); + return ERR_ABRT; + } IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); @@ -316,18 +376,23 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; - if (ReceiveInfo->ReceiveLength <= p->len) - { - RtlCopyMemory(Buffer, p->payload, ReceiveInfo->ReceiveLength); - CopiedLength = ReceiveInfo->ReceiveLength; + NdisQueryBuffer(Buffer, &CurrentDestLocation, &RemainingDestBytes); + + DPRINT1("\n PTDI_REQUEST_KERNEL_RECEIVE->ReceiveLength = %d\n NDIS_BUFFER length = %d\n pbuf->tot_len = %d\n", + ReceiveInfo->ReceiveLength, + RemainingDestBytes, + p->tot_len); + + if (RemainingDestBytes <= p->len) + { + RtlCopyMemory(CurrentDestLocation, p->payload, RemainingDestBytes); + CopiedLength = RemainingDestBytes; goto RETURN; } else { CopiedLength = 0; - RemainingDestBytes = ReceiveInfo->ReceiveLength; RemainingSrceBytes = p->len; - CurrentDestLocation = (UCHAR*)Buffer; CurrentSrceLocation = p->payload; while (1) @@ -345,6 +410,7 @@ RemainingSrceBytes = p->next->len; CurrentSrceLocation = p->next->payload; + pbuf_free(p); p = p->next; continue; @@ -365,6 +431,8 @@ } RETURN: + DPRINT1("Receive CopiedLength = %d\n", CopiedLength); + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = CopiedLength; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -425,12 +493,19 @@ struct tcp_pcb *tpcb, err_t err) { + PADDRESS_FILE AddressFile; PIRP Irp; KIRQL OldIrql; DPRINT1("lwIP TCP Connected Callback\n"); - Irp = (PIRP)arg; + AddressFile = (PADDRESS_FILE)arg; + Irp = AddressFile->ConnectionContext->PendingIrp; + if (!Irp) + { + DPRINT1("Callback on canceled IRP\n"); + return ERR_ABRT; + } IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); @@ -452,15 +527,16 @@ ) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - ADDRESS_FILE *AddressFile; + PADDRESS_FILE AddressFile; + PTCP_CONTEXT TcpContext; LIST_ENTRY* ListEntry; KIRQL OldIrql; - ULONG *temp; +// ULONG *temp; USHORT Port = 1; - temp = (ULONG*)Address; +/* temp = (ULONG*)Address; DPRINT1("\n TcpIpCreateAddress Input Dump\n %08x %08x %08x %08x\n", temp[3], temp[2], temp[1], temp[0]); @@ -470,7 +546,7 @@ DPRINT1("\n IrpSp Dump\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], temp[3], temp[2], temp[1], temp[0]); - } + }*/ /* See if this port is already taken, and find a free one if needed. */ KeAcquireSpinLock(&AddressListLock, &OldIrql); @@ -524,7 +600,7 @@ ip4_addr_set_u32(&IpAddr, Address->in_addr); while (lwip_netif) { - DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); +// DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) { break; @@ -566,15 +642,16 @@ ip_addr_t IpAddr; ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - AddressFile->ConnectionContext = NULL; -/* tcp_bind(AddressFile->lwip_tcp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); - DPRINT1("\n Attempt Bind to Address\n Port: %04x\n Address: %08x\n", - AddressFile->Address.sin_port, - IpAddr);*/ - temp = (ULONG*)&AddressFile->Address; - DPRINT1("\n Dump: %08x %08x\n", - temp[1], - temp[0]); + + TcpContext + = ExAllocatePoolWithTag(NonPagedPool, sizeof(TCP_CONTEXT), TAG_ADDRESS_FILE); + InitializeListHead(&TcpContext->ListEntry); + TcpContext->AddressFile = AddressFile; + TcpContext->Protocol = IPPROTO_TCP; + TcpContext->PendingIrp = NULL; + TcpContext->lwip_tcp_pcb = tcp_new(); + AddressFile->ConnectionContext = TcpContext; + AddressFile->ContextCount = 0; break; } case IPPROTO_UDP: @@ -633,11 +710,11 @@ PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; - ULONG *temp; +// ULONG *temp; IrpSp = IoGetCurrentIrpStackLocation(Irp); - temp = (ULONG*)Address; +/* temp = (ULONG*)Address; DPRINT1("\n TcpIpCreateAddress Input Dump\n %08x %08x %08x %08x\n", temp[3], temp[2], temp[1], temp[0]); @@ -649,7 +726,7 @@ temp[7], temp[6], temp[5], temp[4], temp[3], temp[2], temp[1], temp[0]); } - } + }*/ Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_ADDRESS_FILE); if (!Context) @@ -663,12 +740,8 @@ return STATUS_INVALID_PARAMETER; } Context->Protocol = Protocol; - Context->RequestAddress = *Address; - Context->lwip_tcp_pcb = tcp_new(); - if (Context->lwip_tcp_pcb == NULL) - { - return STATUS_NO_MEMORY; - } + RtlCopyMemory(&Context->RequestAddress, Address, sizeof(*Address)); + Context->lwip_tcp_pcb = NULL; IrpSp->FileObject->FsContext = (PVOID)Context; IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; @@ -682,6 +755,11 @@ _Inout_ ADDRESS_FILE* AddressFile ) { + LIST_ENTRY *Entry; + LIST_ENTRY *Temp; + LIST_ENTRY *Head; + PTCP_CONTEXT CurrentContext; + KIRQL OldIrql; /* Lock the global address list */ @@ -700,9 +778,30 @@ udp_remove(AddressFile->lwip_udp_pcb); else if (AddressFile->Protocol == IPPROTO_TCP && AddressFile->ConnectionContext) { + if (AddressFile->ContextCount != 0) + { + Head = &AddressFile->ConnectionContext->ListEntry; + Entry = Head->Flink; + while (Entry != Head) + { + Temp = Entry->Flink; + + CurrentContext = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); + RemoveEntryList(Entry); + ExFreePoolWithTag(CurrentContext, TAG_ADDRESS_FILE); + AddressFile->ContextCount--; + Entry = Temp; + } + if (AddressFile->ContextCount != 0) + { + DPRINT1("Still contexts remaining after deallocation\n"); + return STATUS_UNSUCCESSFUL; + } + } if (AddressFile->ConnectionContext->lwip_tcp_pcb) { tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); + AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; } ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_ADDRESS_FILE); } @@ -840,7 +939,7 @@ (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_Connected_callback); - DPRINT1("lwip error %d\n", lwip_err); +// DPRINT1("lwip error %d\n", lwip_err); switch (lwip_err) { case (ERR_VAL) : @@ -879,9 +978,9 @@ } case (ERR_OK) : { - DPRINT1("lwip ERR_OK\n"); +// DPRINT1("lwip ERR_OK\n"); PrepareIrpForCancel(Irp, CancelRequestRoutine); - tcp_arg(AddressFile->ConnectionContext->lwip_tcp_pcb, Irp); + tcp_arg(AddressFile->ConnectionContext->lwip_tcp_pcb, AddressFile); break; } default : @@ -905,6 +1004,7 @@ PADDRESS_FILE AddressFile; PTDI_REQUEST_KERNEL_ASSOCIATE RequestInfo; PFILE_OBJECT FileObject; + KIRQL OldIrql; err_t lwip_err; NTSTATUS Status; @@ -918,6 +1018,13 @@ goto LEAVE; } Context = IrpSp->FileObject->FsContext; + + if (Context->lwip_tcp_pcb || Context->Protocol != IPPROTO_TCP) + { + DPRINT1("Connection context is not a new TCP context\n"); + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } /* Get address file */ RequestInfo = (PTDI_REQUEST_KERNEL_ASSOCIATE)&IrpSp->Parameters; @@ -949,71 +1056,80 @@ return STATUS_INVALID_PARAMETER; } + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + if (AddressFile->Address.in_addr == 0) { // should really look through address file list for an interface AddressFile->Address.in_addr = 0x0100007f; } - DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", +/* DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", AddressFile->Address.sin_port, - AddressFile->Address.in_addr); - - /* Finally calling into lwip to perform socket bind */ - ip_set_option(Context->lwip_tcp_pcb, SOF_REUSEADDR); - lwip_err = tcp_bind( - Context->lwip_tcp_pcb, - (ip_addr_t *)&AddressFile->Address.in_addr, - AddressFile->Address.sin_port); - ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); - DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", - lwip_err, - Context->lwip_tcp_pcb->local_ip, - Context->lwip_tcp_pcb->local_port, - Context->lwip_tcp_pcb->remote_ip, - Context->lwip_tcp_pcb->remote_port); - + AddressFile->Address.in_addr);*/ + + Context->AddressFile = AddressFile; + Context->lwip_tcp_pcb = AddressFile->ConnectionContext->lwip_tcp_pcb; + InsertTailList(&AddressFile->ConnectionContext->ListEntry, + &Context->ListEntry); + AddressFile->ContextCount++; + + if (AddressFile->ContextCount <= 1) + { + /* Finally calling into lwip to perform socket bind */ + lwip_err = tcp_bind( + Context->lwip_tcp_pcb, + (ip_addr_t *)&AddressFile->Address.in_addr, + AddressFile->Address.sin_port); + ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); + DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", + lwip_err, + Context->lwip_tcp_pcb->local_ip, + Context->lwip_tcp_pcb->local_port, + Context->lwip_tcp_pcb->remote_ip, + Context->lwip_tcp_pcb->remote_port); + + if (lwip_err != ERR_OK) + { + switch (lwip_err) + { + case (ERR_BUF) : + { + DPRINT1("lwIP ERR_BUFF\n"); + Status = STATUS_NO_MEMORY; + goto LEAVE; + } + case (ERR_VAL) : + { + DPRINT1("lwIP ERR_VAL\n"); + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + case (ERR_USE) : + { + DPRINT1("lwIP ERR_USE\n"); + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + case (ERR_OK) : + { + DPRINT1("lwIP ERR_OK\n"); + break; + } + default : + { + DPRINT1("lwIP unexpected error\n"); + Status = STATUS_NOT_IMPLEMENTED; + goto LEAVE; + } + } + } + } + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + IrpSp->FileObject->FsContext = AddressFile; IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; - - if (lwip_err != ERR_OK) - { - switch (lwip_err) - { - case (ERR_BUF) : - { - DPRINT1("lwIP ERR_BUFF\n"); - Status = STATUS_NO_MEMORY; - goto LEAVE; - } - case (ERR_VAL) : - { - DPRINT1("lwIP ERR_VAL\n"); - Status = STATUS_INVALID_PARAMETER; - goto LEAVE; - } - case (ERR_USE) : - { - DPRINT1("lwIP ERR_USE\n"); - Status = STATUS_ADDRESS_ALREADY_EXISTS; - goto LEAVE; - } - case (ERR_OK) : - { - DPRINT1("lwIP ERR_OK\n"); - break; - } - default : - { - DPRINT1("lwIP unexpected error\n"); - Status = STATUS_NOT_IMPLEMENTED; - goto LEAVE; - } - } - } - - Context->AddressFile = AddressFile; - AddressFile->ConnectionContext = Context; Status = STATUS_SUCCESS; LEAVE: @@ -1028,7 +1144,11 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + PTCP_CONTEXT CurrentContext; PADDRESS_FILE AddressFile; + KIRQL OldIrql; + LIST_ENTRY *Head; + LIST_ENTRY *Entry; IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) @@ -1055,6 +1175,29 @@ DPRINT1("Address File and Context have mismatching protocols\n"); return STATUS_INVALID_ADDRESS; } + + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + + Head = &AddressFile->ConnectionContext->ListEntry; + Entry = Head->Flink; + if (Entry == Head) + { + DPRINT1("Disassociating from empty context list\n"); + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + return STATUS_INVALID_ADDRESS; + } + if (AddressFile->ContextCount < 1) + { + DPRINT1("Invalid ContextCount\n"); + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + return STATUS_INVALID_ADDRESS; + } + CurrentContext = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); + RemoveEntryList(Entry); + ExFreePoolWithTag(CurrentContext, TAG_ADDRESS_FILE); + AddressFile->ContextCount--; + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); return STATUS_SUCCESS; } @@ -1088,26 +1231,27 @@ return STATUS_INVALID_ADDRESS; } - /* Call down into lwip to initiate a listen */ - lpcb = tcp_listen(ConnectionContext->lwip_tcp_pcb); - DPRINT1("lwip tcp_listen returned\n"); - if (lpcb == NULL) - { - /* tcp_listen returning NULL can mean - either INVALID_ADDRESS or NO_MEMORY - if SO_REUSE is enabled in lwip options */ - DPRINT1("lwip tcp_listen error\n"); - return STATUS_INVALID_ADDRESS; - } - else - { - ConnectionContext->lwip_tcp_pcb = lpcb; - } - PrepareIrpForCancel(Irp, CancelRequestRoutine); - - tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); - tcp_arg(ConnectionContext->lwip_tcp_pcb, Irp); + if (AddressFile->ContextCount <= 1) + { + /* Call down into lwip to initiate a listen */ + lpcb = tcp_listen(ConnectionContext->lwip_tcp_pcb); + DPRINT1("lwip tcp_listen returned\n"); + if (lpcb == NULL) + { + /* tcp_listen returning NULL can mean + either INVALID_ADDRESS or NO_MEMORY + if SO_REUSE is enabled in lwip options */ + DPRINT1("lwip tcp_listen error\n"); + return STATUS_INVALID_ADDRESS; + } + else + { + ConnectionContext->lwip_tcp_pcb = lpcb; + } + tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); + tcp_arg(ConnectionContext->lwip_tcp_pcb, AddressFile); + } return STATUS_PENDING; } @@ -1120,7 +1264,8 @@ PTDI_REQUEST_KERNEL_SEND Request; PADDRESS_FILE AddressFile; PTCP_CONTEXT Context; - PNDIS_BUFFER Buffer; + PVOID Buffer; + UINT Len; err_t lwip_err; @@ -1146,7 +1291,11 @@ DPRINT1("TcpIpSendEmpty\n"); return STATUS_INVALID_PARAMETER; } - Buffer = (PNDIS_BUFFER)Irp->MdlAddress; + NdisQueryBuffer(Irp->MdlAddress, &Buffer, &Len); + + DPRINT1("\n PTDI_REQUEST_KERNEL_SEND->SendLength = %d\n NDIS_BUFFER Length = %d\n", + Request->SendLength, + Len); if (!Context->lwip_tcp_pcb) { @@ -1174,7 +1323,8 @@ return STATUS_NOT_IMPLEMENTED; } - tcp_arg(Context->lwip_tcp_pcb, Irp); + PrepareIrpForCancel(Irp, CancelRequestRoutine); + tcp_arg(Context->lwip_tcp_pcb, AddressFile); tcp_sent(Context->lwip_tcp_pcb, lwip_tcp_sent_callback); return STATUS_PENDING; @@ -1188,6 +1338,8 @@ PADDRESS_FILE AddressFile; PTCP_CONTEXT Context; + PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; + IrpSp = IoGetCurrentIrpStackLocation(Irp); if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) @@ -1210,9 +1362,12 @@ return STATUS_INVALID_ADDRESS; } + RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; + DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); + PrepareIrpForCancel(Irp, CancelRequestRoutine); tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); - tcp_arg(Context->lwip_tcp_pcb, Irp); + tcp_arg(Context->lwip_tcp_pcb, AddressFile); return STATUS_PENDING; } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Tue Jun 21 18:04:55 2016 @@ -4,6 +4,7 @@ typedef struct _ADDRESS_FILE { LIST_ENTRY ListEntry; LONG RefCount; + LONG ContextCount; IPPROTO Protocol; TDI_ADDRESS_IP Address; TCPIP_INSTANCE Instance; @@ -18,13 +19,11 @@ } ADDRESS_FILE, *PADDRESS_FILE; typedef struct _TCP_CONTEXT { - ADDRESS_FILE *AddressFile; LIST_ENTRY ListEntry; + PADDRESS_FILE AddressFile; IPPROTO Protocol; TDI_ADDRESS_IP RequestAddress; - LONG RefCount; - KSPIN_LOCK Lock; - KIRQL OldIrql; + PIRP PendingIrp; struct tcp_pcb* lwip_tcp_pcb; } TCP_CONTEXT, *PTCP_CONTEXT; Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Tue Jun 21 18:04:55 2016 @@ -212,7 +212,7 @@ IPPROTO Protocol; // ADDRESS_FILE *AddressFile; - ULONG *temp; +// ULONG *temp; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -265,23 +265,18 @@ } /* All good. */ - temp = (ULONG*)Address; +/* temp = (ULONG*)Address; DPRINT1("\nPTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); + temp[3], temp[2], temp[1], temp[0]);*/ Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); if (Status != STATUS_SUCCESS) { goto Quickie; } - -/* AddressFile = IrpSp->FileObject->FsContext; - tcp_bind(AddressFile->lwip_tcp_pcb, - (ip_addr_t*)&AddressFile->Address.in_addr, - AddressFile->Address.sin_port);*/ - DPRINT1("\nPTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", +/* DPRINT1("\nPTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); + temp[3], temp[2], temp[1], temp[0]);*/ break; } @@ -307,19 +302,19 @@ goto Quickie; } - temp = (ULONG*)Protocol; +/* temp = (ULONG*)Protocol; DPRINT1("\n Protocol: %08x\n", temp); - temp = (ULONG*)Address; + temp = (ULONG*)Address;*/ /* All good. */ - DPRINT1("\n PTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", +/* DPRINT1("\n PTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); + temp[3], temp[2], temp[1], temp[0]);*/ Status = TcpIpCreateContext(Irp, &Address->Address[0].Address[0], Protocol); - DPRINT1("\n PTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", +/* DPRINT1("\n PTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); + temp[3], temp[2], temp[1], temp[0]);*/ break; } @@ -386,7 +381,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - return Irp->IoStatus.Status; + return Status; } static

1 0

[spetreolle] 71657: Add AHK_Tests to ignore list.
by spetreolle＠svn.reactos.org 21 Jun '16

21 Jun '16

Author: spetreolle Date: Tue Jun 21 14:58:04 2016 New Revision: 71657 URL: http://svn.reactos.org/svn/reactos?rev=71657&view=rev Log: Add AHK_Tests to ignore list. Modified: trunk/reactos/modules/ (props changed) Propchange: trunk/reactos/modules/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 21 14:58:04 2016 @@ -12,3 +12,4 @@ bootcd_extras livecd_extras hybridcd_extras +AHK_Tests

1 0

[gedmurphy] 71656: Let's see if reverting the doxyfile makes doxygen useful again (or just breaks it)
by gedmurphy＠svn.reactos.org 21 Jun '16

21 Jun '16

Author: gedmurphy Date: Tue Jun 21 09:02:06 2016 New Revision: 71656 URL: http://svn.reactos.org/svn/reactos?rev=71656&view=rev Log: Let's see if reverting the doxyfile makes doxygen useful again (or just breaks it) Modified: trunk/reactos/Doxyfile [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=71656&r1=7165…

1 0

[apriyadarshi] 71655: Please look at notes.txt for implementation and progress status.
by apriyadarshi＠svn.reactos.org 20 Jun '16

20 Jun '16

Author: apriyadarshi Date: Mon Jun 20 11:49:22 2016 New Revision: 71655 URL: http://svn.reactos.org/svn/reactos?rev=71655&view=rev Log: Please look at notes.txt for implementation and progress status. Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt (with props) Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] Mon Jun 20 11:49:22 2016 @@ -0,0 +1,154 @@ +AhciPortInitialize + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AhciAllocateResourceForAdapter + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AhciHwInitialize + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AhciInterruptHandler + Flags + IMPLEMENTED + TESTED + Comment + Fatal Error not supported + Error Recovery not supported + +AhciHwInterrupt + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AhciHwStartIo + Flags + IMPLEMENTED + TESTED + Comment + Adapter based IO request not supported + Need to implement more srb functions + +AhciHwResetBus + Flags + NOT_IMPLEMENTED + Comment + Adapter master bus reset not implemented + +AhciHwFindAdapter + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +DriverEntry + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AhciATA_CFIS + Flags + NOT_IMPLEMENTED + Comment + Need to configure command table according to Srb function + +AhciATAPI_CFIS + Flags + NOT_IMPLEMENTED + Comment + Need to configure command table according to Srb function + +AhciBuild_PRDT + Flags + NOT_IMPLEMENTED + Comment + Need to configure command table according to Srb function + +AhciProcessSrb + Flags + IMPLEMENTED + Comment + Only ATA/ATAPI type CFIS supported + Also I am not sure about FIS alignment in SrbExtension. + +AhciActivatePort + Flags + NOT_IMPLEMENTED + Comment + NONE + +AhciProcessIO + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +DeviceInquiryRequest + Flags + IMPLEMENTED + TESTED + Comment + EVPD is not sending Data buffer for IDENTIFY command. + Need to implement VPD + +AhciAdapterReset + Flags + NOT_IMPLEMENTED + Comment + NONE + +AhciZeroMemory + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +IsPortValid + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +AddQueue + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE + +RemoveQueue + Flags + IMPLEMENTED + FULLY_SUPPORTED + TESTED + Comment + NONE Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Mon Jun 20 11:49:22 2016 @@ -66,13 +66,13 @@ // ï· PxFB and PxFBU (if CAP.S64A is set to â1â) // Note: Assuming 32bit support only StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->CLB, commandListPhysical.LowPart); - if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) + if (IsAdapterCAPS64(adapterExtension->CAP)) { StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->CLBU, commandListPhysical.HighPart); } StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FB, receivedFISPhysical.LowPart); - if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) + if (IsAdapterCAPS64(adapterExtension->CAP)) { StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FBU, receivedFISPhysical.HighPart); } @@ -355,7 +355,7 @@ /** * @name AhciHwStartIo - * @implemented + * @not_implemented * * The Storport driver calls the HwStorStartIo routine one time for each incoming I/O request. * @@ -627,7 +627,7 @@ // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC - if ((ghc & AHCI_Global_HBA_CONTROL_AE) != 0)//Hmm, controller was already in power state + if ((ghc & AHCI_Global_HBA_CONTROL_AE) != 0)// Hmm, controller was already in power state { // reset controller to have it in known state DebugPrint("\tAE Already set, Reset()\n"); @@ -672,7 +672,7 @@ for (index = 0; index < adapterExtension->PortCount; index++) { - if ((adapterExtension->PortImplemented & (0x1<<index)) != 0) + if ((adapterExtension->PortImplemented & (0x1 << index)) != 0) AhciPortInitialize(&adapterExtension->PortExtension[index]); } @@ -740,25 +740,178 @@ }// -- DriverEntry(); /** - * @name AhciProcessSrb + * @name AhciATA_CFIS * @not_implemented * - * Prepare Srb for IO processing + * create ATA CFIS from Srb * * @param PortExtension * @param Srb + * + */ +VOID +AhciATA_CFIS ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in PAHCI_SRB_EXTENSION SrbExtension + ) +{ + DebugPrint("AhciATA_CFIS()\n"); + +}// -- AhciATA_CFIS(); + +/** + * @name AhciATAPI_CFIS + * @not_implemented + * + * create ATAPI CFIS from Srb + * + * @param PortExtension + * @param Srb + * + */ +VOID +AhciATAPI_CFIS ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in PAHCI_SRB_EXTENSION SrbExtension + ) +{ + DebugPrint("AhciATAPI_CFIS()\n"); + +}// -- AhciATAPI_CFIS(); + +/** + * @name AhciBuild_PRDT + * @not_implemented + * + * Build PRDT for data transfer + * + * @param PortExtension + * @param Srb + * + * @return + * Return number of entries in PRDT. + */ +ULONG +AhciBuild_PRDT ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in PAHCI_SRB_EXTENSION SrbExtension + ) +{ + DebugPrint("AhciBuild_PRDT()\n"); + + return -1; +}// -- AhciBuild_PRDT(); + +/** + * @name AhciProcessSrb + * @implemented + * + * Prepare Srb for IO processing + * + * @param PortExtension + * @param Srb + * @param SlotIndex * */ VOID AhciProcessSrb ( __in PAHCI_PORT_EXTENSION PortExtension, - __in PSCSI_REQUEST_BLOCK Srb - ) -{ + __in PSCSI_REQUEST_BLOCK Srb, + __in ULONG SlotIndex + ) +{ + ULONG prdtlen, sig, length; + PAHCI_SRB_EXTENSION SrbExtension; + PAHCI_COMMAND_HEADER CommandHeader; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + STOR_PHYSICAL_ADDRESS CommandTablePhysicalAddress; + DebugPrint("AhciProcessSrb()\n"); NT_ASSERT(Srb->PathId == PortExtension->PortNumber); + SrbExtension = Srb->SrbExtension; + AdapterExtension = PortExtension->AdapterExtension; + + NT_ASSERT(SrbExtension != NULL); + NT_ASSERT(SrbExtension->AtaFunction != 0); + + if ((SrbExtension->AtaFunction == ATA_FUNCTION_ATA_IDENTIFY) && + (SrbExtension->Task.CommandReg == IDE_COMMAND_NOT_VALID)) + { + // Here we are safe to check SIG register + sig = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SIG); + if (sig == 0x101) + { + SrbExtension->Task.CommandReg = IDE_COMMAND_IDENTIFY; + } + else + { + SrbExtension->Task.CommandReg = IDE_COMMAND_ATAPI_IDENTIFY; + } + } + + NT_ASSERT(SlotIndex < AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)); + SrbExtension->SlotIndex = SlotIndex; + + // program the CFIS in the CommandTable + CommandHeader = &PortExtension->CommandList[SlotIndex]; + + if (IsAtaCommand(SrbExtension->AtaFunction)) + { + AhciATA_CFIS(PortExtension, SrbExtension); + } + else if (IsAtapiCommand(SrbExtension->AtaFunction)) + { + AhciATAPI_CFIS(PortExtension, SrbExtension); + } + + prdtlen = 0; + if (IsDataTransferNeeded(SrbExtension)) + { + prdtlen = AhciBuild_PRDT(PortExtension, SrbExtension); + NT_ASSERT(prdtlen != -1); + } + + // Program the command header + CommandHeader->DI.PRDTL = prdtlen; // number of entries in PRD table + CommandHeader->DI.CFL = 5; + CommandHeader->DI.W = (SrbExtension->Flags & ATA_FLAGS_DATA_OUT) ? 1 : 0; + CommandHeader->DI.P = 0; // ATA Specifications says so + CommandHeader->DI.PMP = 0; // Port Multiplier + + // Reset -- Manual Configuation + CommandHeader->DI.R = 0; + CommandHeader->DI.B = 0; + CommandHeader->DI.C = 0; + + CommandHeader->PRDBC = 0; + + CommandHeader->Reserved[0] = 0; + CommandHeader->Reserved[1] = 0; + CommandHeader->Reserved[2] = 0; + CommandHeader->Reserved[3] = 0; + + // set CommandHeader CTBA + // I am really not sure if SrbExtension is 128 byte aligned or not + // Command FIS will not work if it is not so. + CommandTablePhysicalAddress = StorPortGetPhysicalAddress(AdapterExtension, + NULL, + SrbExtension, + &length); + + // command table alignment + NT_ASSERT((CommandTablePhysicalAddress.LowPart % 128) == 0); + + CommandHeader->CTBA0 = CommandTablePhysicalAddress.LowPart; + + if (IsAdapterCAPS64(AdapterExtension->CAP)) + { + CommandHeader->CTBA_U0 = CommandTablePhysicalAddress.HighPart; + } + + // mark this slot + PortExtension->OccupiedSlots |= SlotIndex; return; }// -- AhciProcessSrb(); @@ -803,7 +956,7 @@ STOR_LOCK_HANDLE lockhandle; PSCSI_REQUEST_BLOCK tmpSrb; PAHCI_PORT_EXTENSION PortExtension; - ULONG commandSlotMask, occupiedSlots, slotIndex; + ULONG commandSlotMask, occupiedSlots, slotIndex, NCS; DebugPrint("AhciProcessIO()\n"); DebugPrint("\tPathId: %d\n", PathId); @@ -824,13 +977,14 @@ StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); occupiedSlots = PortExtension->OccupiedSlots; // Busy command slots for given port - commandSlotMask = (1 << AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP)) - 1; // available slots mask + NCS = AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); + commandSlotMask = (1 << NCS) - 1; // available slots mask commandSlotMask = (commandSlotMask & ~occupiedSlots); if(commandSlotMask != 0) { // iterate over HBA port slots - for (slotIndex = 0; slotIndex <= AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); slotIndex++) + for (slotIndex = 0; slotIndex < NCS; slotIndex++) { // find first free slot if ((commandSlotMask & (1 << slotIndex)) != 0) @@ -839,7 +993,7 @@ if (tmpSrb != NULL) { NT_ASSERT(Srb->PathId == PathId); - AhciProcessSrb(PortExtension, tmpSrb); + AhciProcessSrb(PortExtension, tmpSrb, slotIndex); } else { @@ -887,14 +1041,21 @@ { PVOID DataBuffer; ULONG DataBufferLength; + PAHCI_SRB_EXTENSION SrbExtension; DebugPrint("DeviceInquiryRequest()\n"); + + SrbExtension = Srb->SrbExtension; // 3.6.1 // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) { DebugPrint("\tEVPD Inquired\n"); + NT_ASSERT(SrbExtension != NULL); + + SrbExtension->AtaFunction = ATA_FUNCTION_ATA_IDENTIFY; + SrbExtension->Task.CommandReg = IDE_COMMAND_NOT_VALID; } else { Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Mon Jun 20 11:49:22 2016 @@ -6,6 +6,7 @@ */ #include <ntddk.h> +#include <ata.h> #include <storport.h> #define DEBUG 1 @@ -20,7 +21,22 @@ #define AHCI_Global_HBA_CONTROL_MRSM (1 << 2) #define AHCI_Global_HBA_CONTROL_AE (1 << 31) #define AHCI_Global_HBA_CAP_S64A (1 << 31) -#define AHCI_Global_Port_CMD_IDLE ((1 << 0) | (1 << 4) | (1 << 14) | (1 << 15)) // PxCMD.ST, PxCMD.CR, PxCMD.FRE and PxCMD.FR + +// ATA Functions +#define ATA_FUNCTION_ATA_COMMAND 0x100 +#define ATA_FUNCTION_ATA_IDENTIFY 0x101 + +// ATAPI Functions +#define ATA_FUNCTION_ATAPI_COMMAND 0x200 + +// ATA Flags +#define ATA_FLAGS_DATA_IN (1 << 1) +#define ATA_FLAGS_DATA_OUT (1 << 2) + +#define IsAtaCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATA_COMMAND) +#define IsAtapiCommand(AtaFunction) (AtaFunction & ATA_FUNCTION_ATAPI_COMMAND) +#define IsDataTransferNeeded(SrbExtension) (SrbExtension->Flags & (ATA_FLAGS_DATA_IN | ATA_FLAGS_DATA_OUT)) +#define IsAdapterCAPS64(CAP) (CAP & AHCI_Global_HBA_CAP_S64A) // 3.1.1 NCS = CAP[12:08] -> Align #define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) @@ -165,10 +181,31 @@ // --------------------------- // ////////////////////////////////////////////////////////////// +typedef union _AHCI_COMMAND_HEADER_DESCRIPTION +{ + struct + { + ULONG CFL :5; // Command FIS Length + ULONG A :1; // IsATAPI + ULONG W :1; // Write + ULONG P :1; // Prefetchable + + ULONG R :1; // Reset + ULONG B :1; // BIST + ULONG C :1; //Clear Busy upon R_OK + ULONG DW0_Reserved :1; + ULONG PMP :4; //Port Multiplier Port + + ULONG PRDTL :16; //Physical Region Descriptor Table Length + }; + + ULONG Status; +} AHCI_COMMAND_HEADER_DESCRIPTION; + // 4.2.2 Command Header typedef struct _AHCI_COMMAND_HEADER { - ULONG HEADER_DESCRIPTION; // DW 0 + AHCI_COMMAND_HEADER_DESCRIPTION DI; // DW 0 ULONG PRDBC; // DW 1 ULONG CTBA0; // DW 2 ULONG CTBA_U0; // DW 3 @@ -265,6 +302,7 @@ ULONG CAP; ULONG CAP2; ULONG LastInterruptPort; + ULONG CurrentCommandSlot; PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension @@ -280,10 +318,20 @@ AHCI_PORT_EXTENSION PortExtension[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; +typedef struct _ATA_REGISTER +{ + UCHAR CommandReg; + ULONG Reserved; +} ATA_REGISTER; + typedef struct _AHCI_SRB_EXTENSION { + ULONG AtaFunction; + ULONG Flags; + ATA_REGISTER Task; + ULONG SlotIndex; ULONG Reserved[4]; -} AHCI_SRB_EXTENSION; +} AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION; ////////////////////////////////////////////////////////////// // Declarations //

1 0

[hbelusca] 71654: [i8042prt]: Add yet another Dell Latitude D620 hack to make its trackpad work. CORE-11431 #resolve CORE-6901
by hbelusca＠svn.reactos.org 19 Jun '16

19 Jun '16

Author: hbelusca Date: Sun Jun 19 13:13:01 2016 New Revision: 71654 URL: http://svn.reactos.org/svn/reactos?rev=71654&view=rev Log: [i8042prt]: Add yet another Dell Latitude D620 hack to make its trackpad work. CORE-11431 #resolve CORE-6901 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Sun Jun 19 13:13:01 2016 @@ -63,6 +63,7 @@ { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK },

1 0

[ekohl] 71653: [SC] Add EnumDepend command.
by ekohl＠svn.reactos.org 18 Jun '16

18 Jun '16

Author: ekohl Date: Sat Jun 18 11:18:53 2016 New Revision: 71653 URL: http://svn.reactos.org/svn/reactos?rev=71653&view=rev Log: [SC] Add EnumDepend command. Added: trunk/reactos/base/applications/sc/depend.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/print.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -6,6 +6,7 @@ control.c create.c delete.c + depend.c description.c failure.c misc.c Added: trunk/reactos/base/applications/sc/depend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/depen… ============================================================================== --- trunk/reactos/base/applications/sc/depend.c (added) +++ trunk/reactos/base/applications/sc/depend.c [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/depend.c + * PURPOSE: + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL EnumDepend(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD BufferSize = 0; + DWORD EntriesRead = 0; + LPENUM_SERVICE_STATUS pBuffer = NULL; + DWORD i; + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_ENUMERATE_DEPENDENTS); + if (hService == NULL) + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!EnumDependentServices(hService, + SERVICE_STATE_ALL, + NULL, + 0, + &BufferSize, + &EntriesRead)) + { + if (BufferSize == 0) + { + _tprintf(_T("[SC] EnumDependentServices FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (pBuffer == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + _tprintf(_T("[SC] HeapAlloc FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!EnumDependentServices(hService, + SERVICE_STATE_ALL, + pBuffer, + BufferSize, + &BufferSize, + &EntriesRead)) + { + _tprintf(_T("[SC] EnumDependentServices FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + _tprintf(_T("Enum: entriesRead = %lu\n"), EntriesRead); + + for (i = 0; i < EntriesRead; i++) + { + _tprintf(_T("\n")); + _tprintf(_T("SERVICE_NAME: %s\n"), pBuffer[i].lpServiceName); + _tprintf(_T("DISPLAY_NAME: %s\n"), pBuffer[i].lpDisplayName); + PrintServiceStatus(&pBuffer[i].ServiceStatus); + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pBuffer != NULL) + HeapFree(GetProcessHeap(), 0, pBuffer); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/depend.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/print… ============================================================================== --- trunk/reactos/base/applications/sc/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/print.c [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -102,3 +102,85 @@ _tprintf(_T("\n")); } + + +VOID +PrintServiceStatus( + LPSERVICE_STATUS pStatus) +{ + _tprintf(_T("\tTYPE : %x "), + (unsigned int)pStatus->dwServiceType); + switch (pStatus->dwServiceType) + { + case SERVICE_KERNEL_DRIVER: + _tprintf(_T("KERNEL_DRIVER\n")); + break; + + case SERVICE_FILE_SYSTEM_DRIVER: + _tprintf(_T("FILE_SYSTEM_DRIVER\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); + break; + + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\tSTATE : %x "), + (unsigned int)pStatus->dwCurrentState); + + switch (pStatus->dwCurrentState) + { + case 1 : _tprintf(_T("STOPPED\n")); break; + case 2 : _tprintf(_T("START_PENDING\n")); break; + case 3 : _tprintf(_T("STOP_PENDING\n")); break; + case 4 : _tprintf(_T("RUNNING\n")); break; + case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; + case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; + case 7 : _tprintf(_T("PAUSED\n")); break; + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\t\t\t\t(")); + + if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_STOP) + _tprintf(_T("STOPPABLE,")); + else + _tprintf(_T("NOT_STOPPABLE,")); + + if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) + _tprintf(_T("PAUSABLE,")); + else + _tprintf(_T("NOT_PAUSABLE,")); + + if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN) + _tprintf(_T("ACCEPTS_SHUTDOWN")); + else + _tprintf(_T("IGNORES_SHUTDOWN")); + + _tprintf(_T(")\n")); + + _tprintf(_T("\tWIN32_EXIT_CODE : %u (0x%x)\n"), + (unsigned int)pStatus->dwWin32ExitCode, + (unsigned int)pStatus->dwWin32ExitCode); + _tprintf(_T("\tSERVICE_EXIT_CODE : %u (0x%x)\n"), + (unsigned int)pStatus->dwServiceSpecificExitCode, + (unsigned int)pStatus->dwServiceSpecificExitCode); + _tprintf(_T("\tCHECKPOINT : 0x%x\n"), + (unsigned int)pStatus->dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : 0x%x\n"), + (unsigned int)pStatus->dwWaitHint); +} Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -296,6 +296,18 @@ else GetKeyNameUsage(); } + else if (!lstrcmpi(Command, _T("EnumDepend"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + EnumDepend(ServiceName); + } + else + EnumDependUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -47,9 +47,11 @@ BOOL SetFailure(LPCTSTR *ServiceArgs, INT ArgCount); BOOL GetDisplayName(LPCTSTR ServiceName); BOOL GetKeyName(LPCTSTR ServiceName); +BOOL EnumDepend(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); +VOID PrintServiceStatus(LPSERVICE_STATUS pStatus); VOID ReportLastError(VOID); /* misc.c */ @@ -87,5 +89,6 @@ VOID SetFailureUsage(VOID); VOID GetDisplayNameUsage(VOID); VOID GetKeyNameUsage(VOID); +VOID EnumDependUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Jun 18 11:18:53 2016 @@ -45,8 +45,8 @@ _T("\t sdshow : Displays a service's security descriptor.\n") _T("\t sdset : Sets a service's security descriptor.\n") _T("\t GetDisplayName : Gets the DisplayName for a service.\n") - _T("\t GetKeyName : Gets the ServiceKeyName for a service.\n")); -// "\t EnumDepend : Enumerates Service Dependencies.\n") + _T("\t GetKeyName : Gets the ServiceKeyName for a service.\n") + _T("\t EnumDepend : Enumerates Service Dependencies.\n")); // "\n") // "\tService Name Independant Commands:\n") // "\t boot : (ok | bad) Indicates whether the last boot should\n") @@ -279,3 +279,11 @@ _T("USAGE:\n") _T(" sc <server> GetKeyName <service display name> <bufsize>\n")); } + +VOID EnumDependUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Enumerates te Services that are dependent on this one.\n") + _T("USAGE:\n") + _T(" sc <server> EnumDepend <service display name> <bufsize>\n")); +}

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