Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52498: [OSKITTCP] - Set SO_REUSEPORT on new sockets to allow binding to ports shared by sockets which are closed according to upper layers of tcpip but still pending a close in oskittcp (...
by cgutman＠svn.reactos.org 01 Jul '11

01 Jul '11

Author: cgutman Date: Fri Jul 1 15:08:59 2011 New Revision: 52498 URL: http://svn.reactos.org/svn/reactos?rev=52498&view=rev Log: [OSKITTCP] - Set SO_REUSEPORT on new sockets to allow binding to ports shared by sockets which are closed according to upper layers of tcpip but still pending a close in oskittcp (see the BSD try-10-times hack) - Fill all members of the sockaddr_in struct when fulfilling a query accept request Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri Jul 1 15:08:59 2011 @@ -117,7 +117,7 @@ void InitializeSocketFlags(struct socket *so) { so->so_state |= SS_NBIO; - so->so_options |= SO_DONTROUTE; + so->so_options |= SO_DONTROUTE | SO_REUSEPORT; so->so_snd.sb_flags |= SB_SEL; so->so_rcv.sb_flags |= SB_SEL; } @@ -382,8 +382,9 @@ inp = so ? (struct inpcb *)so->so_pcb : NULL; if( inp && name ) { - ((struct sockaddr_in *)AddrOut)->sin_addr.s_addr = - inp->inp_faddr.s_addr; + ((struct sockaddr_in *)AddrOut)->sin_len = sizeof(struct sockaddr_in); + ((struct sockaddr_in *)AddrOut)->sin_family = AF_INET; + ((struct sockaddr_in *)AddrOut)->sin_addr = inp->inp_faddr; ((struct sockaddr_in *)AddrOut)->sin_port = inp->inp_fport; }

1 0

[cgutman] 52497: [AFD] - Rewrite disconnect to work asynchronously
by cgutman＠svn.reactos.org 01 Jul '11

01 Jul '11

Author: cgutman Date: Fri Jul 1 14:31:37 2011 New Revision: 52497 URL: http://svn.reactos.org/svn/reactos?rev=52497&view=rev Log: [AFD] - Rewrite disconnect to work asynchronously Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdi_proto.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -332,19 +332,19 @@ return Status; } - FCB->FilledConnectData = MIN(FCB->ConnectInfo->UserDataLength, FCB->ConnectDataSize); + FCB->FilledConnectData = MIN(FCB->ConnectReturnInfo->UserDataLength, FCB->ConnectDataSize); if (FCB->FilledConnectData) { RtlCopyMemory(FCB->ConnectData, - FCB->ConnectInfo->UserData, + FCB->ConnectReturnInfo->UserData, FCB->FilledConnectData); } - FCB->FilledConnectOptions = MIN(FCB->ConnectInfo->OptionsLength, FCB->ConnectOptionsSize); + FCB->FilledConnectOptions = MIN(FCB->ConnectReturnInfo->OptionsLength, FCB->ConnectOptionsSize); if (FCB->FilledConnectOptions) { RtlCopyMemory(FCB->ConnectOptions, - FCB->ConnectInfo->Options, + FCB->ConnectReturnInfo->Options, FCB->FilledConnectOptions); } @@ -380,7 +380,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_CONNECT_INFO ConnectReq; - PTDI_CONNECTION_INFORMATION TargetAddress; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); @@ -450,21 +449,25 @@ if( !NT_SUCCESS(Status) ) break; + if (FCB->ConnectReturnInfo) ExFreePool(FCB->ConnectReturnInfo); Status = TdiBuildConnectionInfo - ( &FCB->ConnectInfo, + ( &FCB->ConnectReturnInfo, &ConnectReq->RemoteAddress ); if( NT_SUCCESS(Status) ) - Status = TdiBuildConnectionInfo(&TargetAddress, + { + if (FCB->ConnectCallInfo) ExFreePool(FCB->ConnectCallInfo); + Status = TdiBuildConnectionInfo(&FCB->ConnectCallInfo, &ConnectReq->RemoteAddress); + } else break; if( NT_SUCCESS(Status) ) { - TargetAddress->UserData = FCB->ConnectData; - TargetAddress->UserDataLength = FCB->ConnectDataSize; - TargetAddress->Options = FCB->ConnectOptions; - TargetAddress->OptionsLength = FCB->ConnectOptionsSize; + FCB->ConnectCallInfo->UserData = FCB->ConnectData; + FCB->ConnectCallInfo->UserDataLength = FCB->ConnectDataSize; + FCB->ConnectCallInfo->Options = FCB->ConnectOptions; + FCB->ConnectCallInfo->OptionsLength = FCB->ConnectOptionsSize; FCB->State = SOCKET_STATE_CONNECTING; @@ -474,8 +477,8 @@ { Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, FCB->Connection.Object, - TargetAddress, - FCB->ConnectInfo, + FCB->ConnectCallInfo, + FCB->ConnectReturnInfo, &FCB->ConnectIrp.Iosb, StreamSocketConnectComplete, FCB ); @@ -483,8 +486,6 @@ if (Status != STATUS_PENDING) FCB->State = SOCKET_STATE_BOUND; - - ExFreePool(TargetAddress); SocketStateUnlock(FCB); Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -37,7 +37,10 @@ Status = MakeSocketIntoConnection( FCB ); if (NT_SUCCESS(Status)) - Status = TdiBuildConnectionInfo(&FCB->ConnectInfo, FCB->RemoteAddress); + Status = TdiBuildConnectionInfo(&FCB->ConnectCallInfo, FCB->RemoteAddress); + + if (NT_SUCCESS(Status)) + Status = TdiBuildConnectionInfo(&FCB->ConnectReturnInfo, FCB->RemoteAddress); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -472,8 +472,11 @@ if( FCB->AddressFrom ) ExFreePool( FCB->AddressFrom ); - if( FCB->ConnectInfo ) - ExFreePool( FCB->ConnectInfo ); + if( FCB->ConnectCallInfo ) + ExFreePool( FCB->ConnectCallInfo ); + + if( FCB->ConnectReturnInfo ) + ExFreePool( FCB->ConnectReturnInfo ); if( FCB->ConnectData ) ExFreePool( FCB->ConnectData ); @@ -534,76 +537,101 @@ static NTSTATUS -DoDisconnect(PAFD_FCB FCB, PIRP CurrentIrp) +NTAPI +DisconnectComplete(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + PAFD_FCB FCB = Context; + PIRP CurrentIrp; + PLIST_ENTRY CurrentEntry; + + if( !SocketAcquireStateLock( FCB ) ) + return STATUS_FILE_CLOSED; + + ASSERT(FCB->DisconnectIrp.InFlightRequest == Irp); + FCB->DisconnectIrp.InFlightRequest = NULL; + + ASSERT(FCB->DisconnectPending); + //ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); + + if (NT_SUCCESS(Irp->IoStatus.Status) && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + { + FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, FCB->ConnectReturnInfo->UserDataLength); + if (FCB->FilledDisconnectData) + { + RtlCopyMemory(FCB->DisconnectData, + FCB->ConnectReturnInfo->UserData, + FCB->FilledDisconnectData); + } + + FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, FCB->ConnectReturnInfo->OptionsLength); + if (FCB->FilledDisconnectOptions) + { + RtlCopyMemory(FCB->DisconnectOptions, + FCB->ConnectReturnInfo->Options, + FCB->FilledDisconnectOptions); + } + } + + FCB->DisconnectPending = FALSE; + + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + CurrentIrp->IoStatus.Status = Irp->IoStatus.Status; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, IoGetCurrentIrpStackLocation(CurrentIrp)); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT ); + } + + if (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE) + FCB->PollState |= AFD_EVENT_DISCONNECT; + else + FCB->PollState |= AFD_EVENT_ABORT; + FCB->PollStatus[FD_CLOSE_BIT] = Irp->IoStatus.Status; + PollReeval(FCB->DeviceExt, FCB->FileObject); + + SocketStateUnlock(FCB); + + return Irp->IoStatus.Status; +} + +static +NTSTATUS +DoDisconnect(PAFD_FCB FCB) { PAFD_DISCONNECT_INFO DisReq; IO_STATUS_BLOCK Iosb; - PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; - PIO_STACK_LOCATION CurrentIrpSp; - USHORT Flags = 0; NTSTATUS Status; - CurrentIrpSp = IoGetCurrentIrpStackLocation(CurrentIrp); - DisReq = GetLockedData(CurrentIrp, CurrentIrpSp); - - if( DisReq->DisconnectType & AFD_DISCONNECT_SEND ) - Flags |= TDI_DISCONNECT_RELEASE; - if( DisReq->DisconnectType & AFD_DISCONNECT_RECV || - DisReq->DisconnectType & AFD_DISCONNECT_ABORT ) - Flags |= TDI_DISCONNECT_ABORT; - - Status = TdiBuildNullConnectionInfo(&ConnectionReturnInfo, - FCB->RemoteAddress->Address[0].AddressType); - if (NT_SUCCESS(Status)) - { - FCB->ConnectInfo->UserData = FCB->DisconnectData; - FCB->ConnectInfo->UserDataLength = FCB->DisconnectDataSize; - FCB->ConnectInfo->Options = FCB->DisconnectOptions; - FCB->ConnectInfo->OptionsLength = FCB->DisconnectOptionsSize; - - Status = TdiDisconnect(FCB->Connection.Object, - &DisReq->Timeout, - Flags, - &Iosb, - NULL, - NULL, - FCB->ConnectInfo, - ConnectionReturnInfo); - - if (NT_SUCCESS(Status)) { - FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, ConnectionReturnInfo->UserDataLength); - if (FCB->FilledDisconnectData) - { - RtlCopyMemory(FCB->DisconnectData, - ConnectionReturnInfo->UserData, - FCB->FilledDisconnectData); - } - - FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, ConnectionReturnInfo->OptionsLength); - if (FCB->FilledDisconnectOptions) - { - RtlCopyMemory(FCB->DisconnectOptions, - ConnectionReturnInfo->Options, - FCB->FilledDisconnectOptions); - } - } - - ExFreePool( ConnectionReturnInfo ); - - if (Flags & TDI_DISCONNECT_RELEASE) - FCB->PollState |= AFD_EVENT_DISCONNECT; - else - FCB->PollState |= AFD_EVENT_ABORT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - - CurrentIrp->IoStatus.Status = Status; - CurrentIrp->IoStatus.Information = 0; - UnlockRequest(CurrentIrp, CurrentIrpSp); - (void)IoSetCancelRoutine(CurrentIrp, NULL); - - IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT); + ASSERT(FCB->DisconnectPending); + + if (FCB->DisconnectIrp.InFlightRequest) + { + return STATUS_PENDING; + } + + FCB->ConnectCallInfo->UserData = FCB->DisconnectData; + FCB->ConnectCallInfo->UserDataLength = FCB->DisconnectDataSize; + FCB->ConnectCallInfo->Options = FCB->DisconnectOptions; + FCB->ConnectCallInfo->OptionsLength = FCB->DisconnectOptionsSize; + + Status = TdiDisconnect(&FCB->DisconnectIrp.InFlightRequest, + FCB->Connection.Object, + &DisReq->Timeout, + FCB->DisconnectFlags, + &Iosb, + DisconnectComplete, + FCB, + FCB->ConnectCallInfo, + FCB->ConnectReturnInfo); + if (Status != STATUS_PENDING) + { + FCB->DisconnectPending = FALSE; + } return Status; } @@ -611,20 +639,12 @@ VOID RetryDisconnectCompletion(PAFD_FCB FCB) { - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) - { - PIRP CurrentIrp; - PLIST_ENTRY CurrentEntry; - - ASSERT(FCB->RemoteAddress); - - while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) - { - CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); - CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); - - DoDisconnect(FCB, CurrentIrp); - } + ASSERT(FCB->RemoteAddress); + + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && FCB->DisconnectPending) + { + /* Sends are done; fire off a TDI_DISCONNECT request */ + DoDisconnect(FCB); } } @@ -636,6 +656,8 @@ PAFD_DISCONNECT_INFO DisReq; NTSTATUS Status = STATUS_SUCCESS; USHORT Flags = 0; + PLIST_ENTRY CurrentEntry; + PIRP CurrentIrp; if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); @@ -651,26 +673,54 @@ if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) { - if( !FCB->ConnectInfo ) + if( !FCB->ConnectCallInfo ) return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0 ); + + if (FCB->DisconnectPending) + { + if (FCB->DisconnectIrp.InFlightRequest) + { + IoCancelIrp(FCB->DisconnectIrp.InFlightRequest); + ASSERT(!FCB->DisconnectIrp.InFlightRequest); + } + else + { + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + CurrentIrp->IoStatus.Status = STATUS_CANCELLED; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, IoGetCurrentIrpStackLocation(CurrentIrp)); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT ); + } + } + } - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (Flags & TDI_DISCONNECT_ABORT)) + FCB->DisconnectFlags = Flags; + FCB->DisconnectPending = TRUE; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); + if (Status == STATUS_PENDING) { - /* Go ahead an execute the disconnect because we're ready for it */ - Status = DoDisconnect(FCB, Irp); + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) + { + /* Go ahead an execute the disconnect because we're ready for it */ + Status = DoDisconnect(FCB); + } - /* DoDisconnect takes care of the IRP */ + if (Status != STATUS_PENDING) + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } + + if (Status == STATUS_PENDING) + { SocketStateUnlock(FCB); - + return Status; } - else - { - /* We have a graceful disconnect waiting on pending sends to complete */ - return LeaveIrpUntilLater(FCB, Irp, FUNCTION_DISCONNECT); - } - } else { Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -1228,6 +1228,7 @@ } NTSTATUS TdiDisconnect( + PIRP *Irp, PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, @@ -1237,10 +1238,6 @@ PTDI_CONNECTION_INFORMATION RequestConnectionInfo, PTDI_CONNECTION_INFORMATION ReturnConnectionInfo) { PDEVICE_OBJECT DeviceObject; - KEVENT Event; - PIRP Irp; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); if (!TransportObject) { AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); @@ -1255,20 +1252,20 @@ return STATUS_INVALID_PARAMETER; } - Irp = TdiBuildInternalDeviceControlIrp + *Irp = TdiBuildInternalDeviceControlIrp ( TDI_DISCONNECT, /* Sub function */ DeviceObject, /* Device object */ TransportObject, /* File object */ - &Event, /* Event */ + NULL, /* Event */ Iosb ); /* Status */ - if (!Irp) { + if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return STATUS_INSUFFICIENT_RESOURCES; } TdiBuildDisconnect - (Irp, /* I/O Request Packet */ + (*Irp, /* I/O Request Packet */ DeviceObject, /* Device object */ TransportObject, /* File object */ CompletionRoutine, /* Completion routine */ @@ -1278,7 +1275,9 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - return TdiCall(Irp, DeviceObject, &Event, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); + + return STATUS_PENDING; } /* EOF */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -182,10 +182,12 @@ PAFD_DEVICE_EXTENSION DeviceExt; BOOLEAN DelayedAccept; UINT ConnSeq; + USHORT DisconnectFlags; + BOOLEAN DisconnectPending; PTRANSPORT_ADDRESS LocalAddress, RemoteAddress; - PTDI_CONNECTION_INFORMATION AddressFrom, ConnectInfo; + PTDI_CONNECTION_INFORMATION AddressFrom, ConnectCallInfo, ConnectReturnInfo; AFD_TDI_OBJECT AddressFile, Connection; - AFD_IN_FLIGHT_REQUEST ConnectIrp, ListenIrp, ReceiveIrp, SendIrp; + AFD_IN_FLIGHT_REQUEST ConnectIrp, ListenIrp, ReceiveIrp, SendIrp, DisconnectIrp; AFD_DATA_WINDOW Send, Recv; KMUTEX Mutex; PKEVENT EventSelect; Modified: trunk/reactos/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] Fri Jul 1 14:31:37 2011 @@ -16,7 +16,8 @@ PFILE_OBJECT FileObject); NTSTATUS TdiDisconnect -( PFILE_OBJECT TransportObject, +( PIRP *Irp, + PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, PIO_STATUS_BLOCK Iosb,

1 0

[tkreuzer] 52496: [FAT32] Add some code that does ... nothing, but fixes 2nd stage boot with msvc. To figure out why this is needed, is left as an excercise to the reader :)
by tkreuzer＠svn.reactos.org 01 Jul '11

01 Jul '11

Author: tkreuzer Date: Fri Jul 1 01:06:19 2011 New Revision: 52496 URL: http://svn.reactos.org/svn/reactos?rev=52496&view=rev Log: [FAT32] Add some code that does ... nothing, but fixes 2nd stage boot with msvc. To figure out why this is needed, is left as an excercise to the reader :) Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Fri Jul 1 01:06:19 2011 @@ -194,6 +194,13 @@ mov dl, byte ptr BP_REL(BootDrive) // Drive number mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read int HEX(13) // Call BIOS + + /* This code "fixes" loading the MSVC built kernel */ + pushad + mov si, offset msgNull + call PutChars + popad + jc PrintDiskError // If the read failed then abort add sp, 16 // Remove disk address packet from stack @@ -302,6 +309,8 @@ .ascii "File system error", CR, LF, NUL msgAnyKey: .ascii "Press any key to restart", CR, LF, NUL +msgNull: + .ascii NUL .org 509 // Pad to 509 bytes @@ -527,7 +536,7 @@ filename: .ascii "FREELDR SYS" msgLoading: - .ascii "Loading FreeLoader...\r\n", CR, LF, NUL + .ascii "Loading FreeLoader...", CR, LF, NUL .org 1022 // Pad to 1022 bytes

1 0

[rharabien] 52495: [DDK] - Fix ScsiPortWriteRegisterUchar prototype
by rharabien＠svn.reactos.org 30 Jun '11

30 Jun '11

Author: rharabien Date: Thu Jun 30 22:54:20 2011 New Revision: 52495 URL: http://svn.reactos.org/svn/reactos?rev=52495&view=rev Log: [DDK] - Fix ScsiPortWriteRegisterUchar prototype Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/drivers/storage/scsiport/stubs.c trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Thu Jun 30 22:54:20 2011 @@ -1540,7 +1540,7 @@ NTAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, - IN ULONG Value) + IN UCHAR Value) { WRITE_REGISTER_UCHAR(Register, Value); } Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] Thu Jun 30 22:54:20 2011 @@ -249,7 +249,7 @@ NTAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, - IN ULONG Value) + IN UCHAR Value) { WRITE_REGISTER_UCHAR(Register, Value); } Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=5249… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Thu Jun 30 22:54:20 2011 @@ -883,7 +883,7 @@ NTAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, - IN ULONG Value); + IN UCHAR Value); SCSIPORTAPI VOID

1 0

[rharabien] 52494: [FREELDR] - Allocate enough memory for unicode strings
by rharabien＠svn.reactos.org 30 Jun '11

30 Jun '11

Author: rharabien Date: Thu Jun 30 18:55:44 2011 New Revision: 52494 URL: http://svn.reactos.org/svn/reactos?rev=52494&view=rev Log: [FREELDR] - Allocate enough memory for unicode strings Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Thu Jun 30 18:55:44 2011 @@ -711,7 +711,7 @@ { PBOOT_DRIVER_LIST_ENTRY BootDriverEntry; NTSTATUS Status; - ULONG PathLength; + USHORT PathLength; BootDriverEntry = MmHeapAlloc(sizeof(BOOT_DRIVER_LIST_ENTRY)); @@ -726,10 +726,10 @@ if (ImagePath && (wcslen(ImagePath) > 0)) { // Just copy ImagePath to the corresponding field in the structure - PathLength = wcslen(ImagePath) * sizeof(WCHAR); + PathLength = wcslen(ImagePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); BootDriverEntry->FilePath.Length = 0; - BootDriverEntry->FilePath.MaximumLength = PathLength + sizeof(WCHAR); + BootDriverEntry->FilePath.MaximumLength = PathLength; BootDriverEntry->FilePath.Buffer = MmHeapAlloc(PathLength); if (!BootDriverEntry->FilePath.Buffer) @@ -751,7 +751,7 @@ // we have to construct ImagePath ourselves PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys"); BootDriverEntry->FilePath.Length = 0; - BootDriverEntry->FilePath.MaximumLength = PathLength+sizeof(WCHAR); + BootDriverEntry->FilePath.MaximumLength = PathLength; BootDriverEntry->FilePath.Buffer = MmHeapAlloc(PathLength); if (!BootDriverEntry->FilePath.Buffer) @@ -786,9 +786,9 @@ } // Add registry path - PathLength = (wcslen(RegistryPath)+wcslen(ServiceName))*sizeof(WCHAR); + PathLength = (wcslen(RegistryPath) + wcslen(ServiceName))*sizeof(WCHAR) + sizeof(UNICODE_NULL); BootDriverEntry->RegistryPath.Length = 0; - BootDriverEntry->RegistryPath.MaximumLength = PathLength;//+sizeof(WCHAR); + BootDriverEntry->RegistryPath.MaximumLength = PathLength; BootDriverEntry->RegistryPath.Buffer = MmHeapAlloc(PathLength); if (!BootDriverEntry->RegistryPath.Buffer) return FALSE;

1 0

[tkreuzer] 52493: [CMAKE] Add hlink and msi importlib to MSVC build
by tkreuzer＠svn.reactos.org 30 Jun '11

30 Jun '11

Author: tkreuzer Date: Thu Jun 30 16:03:41 2011 New Revision: 52493 URL: http://svn.reactos.org/svn/reactos?rev=52493&view=rev Log: [CMAKE] Add hlink and msi importlib to MSVC build Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Jun 30 16:03:41 2011 @@ -43,9 +43,7 @@ add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) -if(NOT MSVC) - add_subdirectory(hlink) # FIXME: msvc build. -endif() +add_subdirectory(hlink) # FIXME: msvc build. add_subdirectory(hnetcfg) add_subdirectory(httpapi) add_subdirectory(iccvid) @@ -96,8 +94,8 @@ if(NOT MSVC) #FIXME: msvc build. add_subdirectory(mshtml) - add_subdirectory(msi) -endif() +endif() +add_subdirectory(msi) add_subdirectory(mshtml.tlb) add_subdirectory(msimg32) add_subdirectory(msimtf) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Thu Jun 30 16:03:41 2011 @@ -1,3 +1,5 @@ + +if(NOT MSVC) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) @@ -92,4 +94,7 @@ ntdll) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) + +endif(NOT MSVC) + add_importlib_target(msi.spec)

1 0

[cgutman] 52492: [AFD] - Fix several bugs related to the FD_WRITE event - We would not set the sendable poll state if the socket had data waiting to be sent even if there was buffer space - We did ...
by cgutman＠svn.reactos.org 30 Jun '11

30 Jun '11

Author: cgutman Date: Thu Jun 30 06:04:09 2011 New Revision: 52492 URL: http://svn.reactos.org/svn/reactos?rev=52492&view=rev Log: [AFD] - Fix several bugs related to the FD_WRITE event - We would not set the sendable poll state if the socket had data waiting to be sent even if there was buffer space - We did not set the poll state after performing a send - We did not clear the sendable poll state if we ran out of buffer space Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Thu Jun 30 06:04:09 2011 @@ -156,11 +156,21 @@ else break; } + + if (FCB->Send.Size - FCB->Send.BytesUsed != 0) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; + } /* Some data is still waiting */ - if( FCB->Send.BytesUsed ) { - FCB->PollState &= ~AFD_EVENT_SEND; - + if( FCB->Send.BytesUsed ) + { Status = TdiSend( &FCB->SendIrp.InFlightRequest, FCB->Connection.Object, 0, @@ -171,10 +181,6 @@ FCB ); RetryDisconnectCompletion(FCB); - } else { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); } SocketStateUnlock( FCB ); @@ -388,6 +394,7 @@ } else { + FCB->PollState &= ~AFD_EVENT_SEND; if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); @@ -415,6 +422,17 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", Status, TotalBytesCopied)); + } + + if (SpaceAvail) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; } RetryDisconnectCompletion(FCB);

1 0

[tkreuzer] 52491: [FREELDR] Remove the old boot method. Its not needed anymore, since booting with more than 4GB works fine with the new method now. It didn't work anyway since the neccessary code ...
by tkreuzer＠svn.reactos.org 29 Jun '11

29 Jun '11

Author: tkreuzer Date: Wed Jun 29 20:27:07 2011 New Revision: 52491 URL: http://svn.reactos.org/svn/reactos?rev=52491&view=rev Log: [FREELDR] Remove the old boot method. Its not needed anymore, since booting with more than 4GB works fine with the new method now. It didn't work anyway since the neccessary code in the kernel has been #if'ed out in r49445 Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/_alloca.S trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/bootcd.ini trunk/reactos/boot/bootdata/livecd.ini trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/_alloca.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Removed: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Removed: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Removed: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Removed: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…

1 0

[spetreolle] 52490: [ASM] Use CR, LF and NUL in .ascii macro.
by spetreolle＠svn.reactos.org 29 Jun '11

29 Jun '11

Author: spetreolle Date: Wed Jun 29 16:40:14 2011 New Revision: 52490 URL: http://svn.reactos.org/svn/reactos?rev=52490&view=rev Log: [ASM] Use CR, LF and NUL in .ascii macro. Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Wed Jun 29 16:40:14 2011 @@ -412,7 +412,7 @@ .ascii "ldr not found", CR, LF, NUL // Sorry, need the space... //msgAnyKey: -// .asciz "Press any key to restart\r\n" +// .ascii "Press any key to restart", CR, LF, NUL filename: .ascii "FREELDR SYS" Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Wed Jun 29 16:40:14 2011 @@ -297,11 +297,11 @@ .long 0 msgDiskError: - .asciz "Disk error\r\n" + .ascii "Disk error", CR, LF, NUL msgFileSystemError: - .asciz "File system error\r\n" + .ascii "File system error", CR, LF, NUL msgAnyKey: - .asciz "Press any key to restart\r\n" + .ascii "Press any key to restart", CR, LF, NUL .org 509 // Pad to 509 bytes

1 0

[tfaber] 52489: [KMTESTS] - add skip() functionality (with more useful syntax than Wine's) - add format attributes for GCC - do not show the full path of the source file for failed tests - general ...
by tfaber＠svn.reactos.org 29 Jun '11

29 Jun '11

Author: tfaber Date: Wed Jun 29 08:51:00 2011 New Revision: 52489 URL: http://svn.reactos.org/svn/reactos?rev=52489&view=rev Log: [KMTESTS] - add skip() functionality (with more useful syntax than Wine's) - add format attributes for GCC - do not show the full path of the source file for failed tests - general cleanup Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Wed Jun 29 08:51:00 2011 @@ -25,10 +25,20 @@ ok_eq_ulong(3LU, 4LU); ok_eq_pointer((PVOID)8, (PVOID)9); ok_eq_hex(0x1234LU, 0x5678LU); + ok_eq_bool(TRUE, TRUE); + ok_eq_bool(TRUE, FALSE); + ok_eq_bool(FALSE, TRUE); ok_bool_true(FALSE, "foo"); ok_bool_false(TRUE, "bar"); ok_eq_print(1, 2, "%i"); ok_eq_str("Hello", "world"); ok_eq_wstr(L"ABC", L"DEF"); + + if (!skip(KeGetCurrentIrql() == HIGH_LEVEL, "This should only work on HIGH_LEVEL\n")) + { + /* do tests depending on HIGH_LEVEL here */ + ok(1, "This is fine\n"); + } + KeLowerIrql(Irql); } Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_public.h [iso-8859-1] Wed Jun 29 08:51:00 2011 @@ -18,6 +18,7 @@ CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) #define KMTEST_DEVICE_NAME L"Kmtest" -#define KMTEST_DEVICE_PATH (L"\\\\.\\Global\\GLOBALROOT\\Device\\" KMTEST_DEVICE_NAME) +#define KMTEST_DEVICE_DRIVER_PATH L"\\Device\\" KMTEST_DEVICE_NAME +#define KMTEST_DEVICE_PATH L"\\\\.\\Global\\GLOBALROOT" KMTEST_DEVICE_DRIVER_PATH #endif /* !defined _KMTEST_PUBLIC_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Jun 29 08:51:00 2011 @@ -27,9 +27,11 @@ extern const KMT_TEST TestList[]; -typedef struct { +typedef struct +{ volatile LONG Successes; volatile LONG Failures; + volatile LONG Skipped; volatile LONG LogBufferLength; LONG LogBufferMaxLength; CHAR LogBuffer[ANYSIZE_ARRAY]; @@ -37,32 +39,43 @@ extern PKMT_RESULTBUFFER ResultBuffer; +#ifdef __GNUC__ +#define KMT_FORMAT(type, fmt, first) __attribute__((__format__(type, fmt, first))) +#elif !defined __GNUC__ +#define KMT_FORMAT(type, fmt, first) +#endif /* !defined __GNUC__ */ + #define START_TEST(name) VOID Test_##name(VOID) #define KMT_STRINGIZE(x) #x -#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) - -#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) -#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) - -VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments); -VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...); -VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments); -VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...); +#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) +#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) +#define skip(test, ...) skip_(test, __FILE__, __LINE__, __VA_ARGS__) + +#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define skip_(test, file, line, ...) KmtSkip(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) + +VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); +VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); +VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 2, 0); +VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 2, 3); +BOOLEAN KmtVSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); +BOOLEAN KmtSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); #ifdef KMT_KERNEL_MODE #define ok_irql(irql) ok(KeGetCurrentIrql() == irql, "IRQL is %d, expected %d\n", KeGetCurrentIrql(), irql) #endif /* defined KMT_KERNEL_MODE */ -#define ok_eq_print(value, expected, spec) ok(value == expected, #value " = " spec ", expected " spec "\n", value, expected) +#define ok_eq_print(value, expected, spec) ok((value) == (expected), #value " = " spec ", expected " spec "\n", value, expected) #define ok_eq_pointer(value, expected) ok_eq_print(value, expected, "%p") #define ok_eq_int(value, expected) ok_eq_print(value, expected, "%d") #define ok_eq_uint(value, expected) ok_eq_print(value, expected, "%u") #define ok_eq_long(value, expected) ok_eq_print(value, expected, "%ld") #define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") #define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") -#define ok_bool_true(value, desc) ok(value == TRUE, desc " FALSE, expected TRUE\n") -#define ok_bool_false(value, desc) ok(value == FALSE, desc " TRUE, expected FALSE\n") +#define ok_bool_true(value, desc) ok((value) == TRUE, desc " FALSE, expected TRUE\n") +#define ok_bool_false(value, desc) ok((value) == FALSE, desc " TRUE, expected FALSE\n") +#define ok_eq_bool(value, expected) ok((value) == (expected), #value " = %s, expected %s\n", (value) ? "TRUE" : "FALSE", (expected) ? "TRUE" : "FALSE") #define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) @@ -76,6 +89,7 @@ Buffer->Successes = 0; Buffer->Failures = 0; + Buffer->Skipped = 0; Buffer->LogBufferLength = 0; Buffer->LogBufferMaxLength = LogBufferMaxLength; @@ -109,44 +123,57 @@ } #ifdef KMT_KERNEL_MODE -INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments); +INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); #elif defined KMT_USER_MODE #define KmtVSNPrintF vsnprintf #endif /* defined KMT_USER_MODE */ -static SIZE_T KmtXVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, va_list Arguments) +KMT_FORMAT(ms_printf, 5, 0) +static SIZE_T KmtXVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR FileAndLine, PCSTR Prepend, PCSTR Format, va_list Arguments) { SIZE_T BufferLength = 0; SIZE_T Length; - if (Prepend1) - { - SIZE_T Length = min(BufferMaxLength, strlen(Prepend1)); - memcpy(Buffer, Prepend1, Length); + if (FileAndLine) + { + PCSTR Slash; + Slash = strrchr(FileAndLine, '\\'); + if (Slash) + FileAndLine = Slash + 1; + Slash = strrchr(FileAndLine, '/'); + if (Slash) + FileAndLine = Slash + 1; + + Length = min(BufferMaxLength, strlen(FileAndLine)); + memcpy(Buffer, FileAndLine, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length; } - if (Prepend2) - { - SIZE_T Length = min(BufferMaxLength, strlen(Prepend2)); - memcpy(Buffer, Prepend2, Length); + if (Prepend) + { + Length = min(BufferMaxLength, strlen(Prepend)); + memcpy(Buffer, Prepend, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length; } - Length = KmtVSNPrintF(Buffer, BufferMaxLength, Format, Arguments); - /* vsnprintf can return more than maxLength, we don't want to do that */ - BufferLength += min(Length, BufferMaxLength); + if (Format) + { + Length = KmtVSNPrintF(Buffer, BufferMaxLength, Format, Arguments); + /* vsnprintf can return more than maxLength, we don't want to do that */ + BufferLength += min(Length, BufferMaxLength); + } return BufferLength; } -static SIZE_T KmtXSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, ...) +KMT_FORMAT(ms_printf, 5, 6) +static SIZE_T KmtXSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR FileAndLine, PCSTR Prepend, PCSTR Format, ...) { SIZE_T BufferLength; va_list Arguments; va_start(Arguments, Format); - BufferLength = KmtXVSNPrintF(Buffer, BufferMaxLength, Prepend1, Prepend2, Format, Arguments); + BufferLength = KmtXVSNPrintF(Buffer, BufferMaxLength, FileAndLine, Prepend, Format, Arguments); va_end(Arguments); return BufferLength; } @@ -157,10 +184,11 @@ SIZE_T MessageLength; MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, NULL, NULL, - "%s: %d tests executed (0 marked as todo, %d failures), 0 skipped.\n", + "%s: %ld tests executed (0 marked as todo, %ld failures), %ld skipped.\n", TestName, ResultBuffer->Successes + ResultBuffer->Failures, - ResultBuffer->Failures); + ResultBuffer->Failures, + ResultBuffer->Skipped); KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } @@ -175,7 +203,7 @@ if (0/*KmtReportSuccess*/) { - MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test succeeded\n", ""); + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test succeeded\n", NULL); KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } } @@ -212,6 +240,31 @@ va_end(Arguments); } +BOOLEAN KmtVSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + if (!Condition) + { + InterlockedIncrement(&ResultBuffer->Skipped); + MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Tests skipped: ", Format, Arguments); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); + } + + return !Condition; +} + +BOOLEAN KmtSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) +{ + BOOLEAN Ret; + va_list Arguments; + va_start(Arguments, Format); + Ret = KmtVSkip(Condition, FileAndLine, Format, Arguments); + va_end(Arguments); + return Ret; +} + #endif /* defined KMT_DEFINE_TEST_FUNCTIONS */ #endif /* !defined _KMTEST_TEST_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Wed Jun 29 08:51:00 2011 @@ -158,11 +158,8 @@ size_t len; printf("Usage: %s test_name\n", programName); + printf(" %s <Create|Start|Stop|Delete>\n", programName); puts("\nValid test names:"); - puts(" Create"); - puts(" Start"); - puts(" Stop"); - puts(" Delete"); error = ListTests(&testNames); testName = testNames; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Wed Jun 29 08:51:00 2011 @@ -29,7 +29,7 @@ { PKMT_RESULTBUFFER ResultBuffer; PMDL Mdl; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; +} KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; /* Globals */ static PDEVICE_OBJECT MainDeviceObject; @@ -47,11 +47,15 @@ * * @return Status */ -NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING DeviceName; - PDEVICE_EXTENSION DeviceExtension; + PKMT_DEVICE_EXTENSION DeviceExtension; PAGED_CODE(); @@ -59,8 +63,9 @@ DPRINT("DriverEntry\n"); - RtlInitUnicodeString(&DeviceName, L"\\Device\\Kmtest"); - Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), &DeviceName, + RtlInitUnicodeString(&DeviceName, KMTEST_DEVICE_DRIVER_PATH); + Status = IoCreateDevice(DriverObject, sizeof(KMT_DEVICE_EXTENSION), + &DeviceName, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, TRUE, &MainDeviceObject); @@ -98,7 +103,11 @@ * @param DriverObject * Driver Object */ -static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) +static +VOID +NTAPI +DriverUnload( + IN PDRIVER_OBJECT DriverObject) { PAGED_CODE(); @@ -108,7 +117,7 @@ if (MainDeviceObject) { - PDEVICE_EXTENSION DeviceExtension = MainDeviceObject->DeviceExtension; + PKMT_DEVICE_EXTENSION DeviceExtension = MainDeviceObject->DeviceExtension; ASSERT(!DeviceExtension->Mdl); ASSERT(!DeviceExtension->ResultBuffer); ASSERT(!ResultBuffer); @@ -128,11 +137,16 @@ * * @return Status */ -static NTSTATUS NTAPI DriverCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +static +NTSTATUS +NTAPI +DriverCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStackLocation; - PDEVICE_EXTENSION DeviceExtension; + PKMT_DEVICE_EXTENSION DeviceExtension; PAGED_CODE(); @@ -166,11 +180,16 @@ * * @return Status */ -static NTSTATUS NTAPI DriverClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +static +NTSTATUS +NTAPI +DriverClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStackLocation; - PDEVICE_EXTENSION DeviceExtension; + PKMT_DEVICE_EXTENSION DeviceExtension; PAGED_CODE(); @@ -208,7 +227,12 @@ * * @return Status */ -static NTSTATUS NTAPI DriverIoControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +static +NTSTATUS +NTAPI +DriverIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStackLocation; @@ -283,7 +307,7 @@ } case IOCTL_KMTEST_SET_RESULTBUFFER: { - PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PKMT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; DPRINT("DriverIoControl. IOCTL_KMTEST_SET_RESULTBUFFER, inlen=%lu, outlen=%lu\n", IoStackLocation->Parameters.DeviceIoControl.InputBufferLength,

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