Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[janderwald] 37271: - Show Drive Tools Page only local harddisks
by janderwald＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: janderwald Date: Mon Nov 10 01:43:37 2008 New Revision: 37271 URL: http://svn.reactos.org/svn/reactos?rev=37271&view=rev Log: - Show Drive Tools Page only local harddisks Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Mon Nov 10 01:43:37 2008 @@ -655,11 +655,12 @@ { LPSTR resname; DLGPROC dlgproc; + UINT DriveType; } PropPages[] = { - { "DRIVE_GENERAL_DLG", DriveGeneralDlg }, - { "DRIVE_EXTRA_DLG", DriveExtraDlg }, - { "DRIVE_HARDWARE_DLG", DriveHardwareDlg }, + { "DRIVE_GENERAL_DLG", DriveGeneralDlg, -1}, + { "DRIVE_EXTRA_DLG", DriveExtraDlg, DRIVE_FIXED}, + { "DRIVE_HARDWARE_DLG", DriveHardwareDlg, -1}, }; HRESULT @@ -686,6 +687,7 @@ WCHAR szName[MAX_PATH+6]; DWORD dwMaxComponent, dwFileSysFlags; IDataObject * pDataObj = NULL; + UINT DriveType; ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); @@ -693,7 +695,6 @@ psh.hwndParent = NULL; psh.nStartPage = 0; psh.phpage = hpsp; - if (GetVolumeInformationW(drive, szName, sizeof(szName)/sizeof(WCHAR), NULL, &dwMaxComponent, &dwFileSysFlags, NULL, 0)) @@ -717,15 +718,20 @@ } } + DriveType = GetDriveTypeW(drive); for (i = 0; i < DRIVE_PROPERTY_PAGES; i++) { - HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); - if (hprop) + if (PropPages[i].DriveType == (UINT)-1 || (PropPages[i].DriveType != (UINT)-1 && PropPages[i].DriveType == DriveType)) { - hpsp[psh.nPages] = hprop; - psh.nPages++; + HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL); + if (hprop) + { + hpsp[psh.nPages] = hprop; + psh.nPages++; + } } } + if (SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (void**)&pDataObj) == S_OK) { hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Drive", MAX_PROPERTY_SHEET_PAGE-DRIVE_PROPERTY_PAGES, pDataObj);

1 0

[gschneider] 37269: - Create the XLateObj between background and brush color - Allows hatched brush colors to show - Edit a FIXME: a bitmap is not a brush information
by gschneider＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: gschneider Date: Sun Nov 9 16:02:46 2008 New Revision: 37269 URL: http://svn.reactos.org/svn/reactos?rev=37269&view=rev Log: - Create the XLateObj between background and brush color - Allows hatched brush colors to show - Edit a FIXME: a bitmap is not a brush information Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Nov 9 16:02:46 2008 @@ -62,12 +62,12 @@ if (Count == 0) return 0; /* Set colour */ - Buffer->lbColor = BrushObject->BrushAttr.lbColor; + Buffer->lbColor = BrushObject->BrushAttr.lbColor; /* set Hatch */ if ((BrushObject->flAttrs & GDIBRUSH_IS_HATCH)!=0) { - /* FIXME : is this right value */ + /* FIXME : this is not the right value */ Buffer->lbHatch = (LONG)BrushObject->hbmPattern; } else @@ -153,7 +153,7 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) {

1 0

[gschneider] 37268: Fix BitBlt MERGEPAINT operation command.
by gschneider＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: gschneider Date: Sun Nov 9 12:38:02 2008 New Revision: 37268 URL: http://svn.reactos.org/svn/reactos?rev=37268&view=rev Log: Fix BitBlt MERGEPAINT operation command. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -173,7 +173,7 @@ case ROP3_TO_ROP4(PATINVERT): return(Dest ^ Pattern); case ROP3_TO_ROP4(SRCINVERT): return(Dest ^ Source); case ROP3_TO_ROP4(SRCAND): return(Dest & Source); - case ROP3_TO_ROP4(MERGEPAINT): return(Dest & (~Source)); + case ROP3_TO_ROP4(MERGEPAINT): return(Dest | (~Source)); case ROP3_TO_ROP4(SRCPAINT): return(Dest | Source); case ROP3_TO_ROP4(MERGECOPY): return(Source & Pattern); case ROP3_TO_ROP4(SRCCOPY): return(Source); Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -147,7 +147,7 @@ { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, - { ROPCODE_MERGEPAINT, "MERGEPAINT", "D & (~S)", 1, 1, 0 }, + { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 },

1 0

[cgutman] 37267: - Merge aicom-network-fixes up to r37266
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 12:17:00 2008 New Revision: 37267 URL: http://svn.reactos.org/svn/reactos?rev=37267&view=rev Log: - Merge aicom-network-fixes up to r37266 Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/ip.rbuild trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -83,11 +83,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Mdl = IoAllocateMdl ( Irp->UserBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, @@ -105,11 +100,21 @@ if( NT_SUCCESS(Status) ) { if( Local ) { + if( FCB->AddressFile.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + Status = TdiQueryInformation ( FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + if( FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -25,7 +25,7 @@ NULL ); if( Irp->MdlAddress ) { _SEH_TRY { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH_HANDLE { LockFailed = TRUE; } _SEH_END; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -425,7 +425,7 @@ *TotalBytesCopied = BytesToCopy; - if (!RecvReq->TdiFlags & TDI_RECEIVE_PEEK) { + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { FCB->Recv.BytesUsed = 0; } } 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] Sun Nov 9 12:17:00 2008 @@ -74,7 +74,7 @@ KeWaitForSingleObject( Event, Executive, - UserMode, + KernelMode, FALSE, NULL); Status = Iosb->Status; @@ -853,7 +853,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -862,7 +862,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -934,7 +934,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -944,7 +944,7 @@ _SEH_TRY { AFD_DbgPrint(MIN_TRACE, ("probe and lock\n")); - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); @@ -1034,7 +1034,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -1043,7 +1043,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1132,7 +1132,7 @@ BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1142,7 +1142,7 @@ } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -220,7 +220,7 @@ RemoveEntryList(&Connection->ListEntry); TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - ExFreePool(Connection); + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -387,8 +387,10 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); + if( AddrFile->Listener ) { + TCPClose( AddrFile->Listener ); + ExFreePool( AddrFile->Listener ); + } break; case IPPROTO_UDP: @@ -488,20 +490,18 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; - NTSTATUS Status = STATUS_SUCCESS; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TCPClose(Connection); DeleteConnectionEndpoint(Connection); TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/ip.rbuild?r… ============================================================================== --- trunk/reactos/lib/drivers/ip/ip.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/ip.rbuild [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ip" type="staticlibrary" allowwarnings="true"> +<module name="ip" type="staticlibrary"> <define name="__NTDRIVER__"/> <include base="tcpip">include</include> <include base="oskittcp">include</include> Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -181,6 +181,7 @@ */ { PNEIGHBOR_CACHE_ENTRY NCE; + NTSTATUS Status; TI_DbgPrint(DEBUG_ICMP, ("Called.\n")); @@ -191,7 +192,11 @@ /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - IPSendDatagram(IPPacket, NCE, Complete, Context); + Status = IPSendDatagram(IPPacket, NCE, Complete, Context); + if (!NT_SUCCESS(Status)) + { + Complete(Context, IPPacket->NdisPacket, Status); + } } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -150,12 +150,17 @@ Protocol = 0; } - /* Call the appropriate protocol handler */ - (*ProtocolTable[Protocol])(Interface, IPPacket); - /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also - * must be handled here. */ - if( Protocol == IPPROTO_ICMP ) - ICMPReceive( Interface, IPPacket ); + if (Protocol < IP_PROTOCOL_TABLE_SIZE && + Protocol >= 0) + { + /* Call the appropriate protocol handler */ + (*ProtocolTable[Protocol])(Interface, IPPacket); + + /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also + * must be handled here. */ + if( Protocol == IPPROTO_ICMP ) + ICMPReceive( Interface, IPPacket ); + } } Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -196,6 +196,7 @@ AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); + AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback); Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -28,13 +28,20 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + UINT HashValue; if(!(NCE->State & NUD_CONNECTED)) return; + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); + &NeighborCache[HashValue].Lock); if( PacketEntry != NULL ) { Packet = CONTAINING_RECORD( PacketEntry, NEIGHBOR_PACKET, Next ); @@ -333,15 +340,22 @@ */ { KIRQL OldIrql; + UINT HashValue; TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X) LinkAddress (0x%X) State (0x%X).\n", NCE, LinkAddress, State)); - TcpipAcquireSpinLock(&NCE->Table->Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); RtlCopyMemory(NCE->LinkAddress, LinkAddress, NCE->LinkAddressLength); NCE->State = State; - TcpipReleaseSpinLock(&NCE->Table->Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); @@ -444,9 +458,9 @@ * TRUE if the packet was successfully queued, FALSE if not */ { - PKSPIN_LOCK Lock; KIRQL OldIrql; PNEIGHBOR_PACKET Packet; + UINT HashValue; TI_DbgPrint (DEBUG_NCACHE, @@ -457,16 +471,20 @@ /* FIXME: Should we limit the number of queued packets? */ - Lock = &NCE->Table->Lock; - - TcpipAcquireSpinLock(Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); Packet->Complete = PacketComplete; Packet->Context = PacketContext; Packet->Packet = NdisPacket; InsertTailList( &NCE->PacketQueue, &Packet->Next ); - TcpipReleaseSpinLock(Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -112,13 +112,14 @@ ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - ListEntry = ListEntry->Flink; if( Bucket->AssociatedEndpoint == Connection ) { - RemoveEntryList( ListEntry->Blink ); + RemoveEntryList( &Bucket->Entry ); ExFreePool( Bucket ); break; } + + ListEntry = ListEntry->Flink; } TcpipRecursiveMutexLeave( &TCPLock ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Nov 9 12:17:00 2008 @@ -36,7 +36,6 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { while( !IsListEmpty( &Connection->ConnectRequest ) ) { - Connection->State |= NewState; Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -283,8 +282,7 @@ } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TI_DbgPrint(MAX_TRACE,("FIXME: Cancel all pending requests\n")); - /* XXX Cancel all pending requests */ + TCPClose( Connection ); ExFreePool( Connection ); } @@ -839,7 +837,7 @@ TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; i < sizeof( ListHead ) / sizeof( ListHead[0] ); i++ ) { + for( i = 0; i < 4; i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; Entry = Entry->Flink ) {

1 0

[cgutman] 37266: - Fix the parameter check - Now AfdGetSockOrPeerName should work with Local == FALSE - "MSAFD: STATUS_INVALID_PARAMETER" shouldn't fill the debug log anymore when AfdGetSockOrPeerName gets called with Local == FALSE
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 11:39:55 2008 New Revision: 37266 URL: http://svn.reactos.org/svn/reactos?rev=37266&view=rev Log: - Fix the parameter check - Now AfdGetSockOrPeerName should work with Local == FALSE - "MSAFD: STATUS_INVALID_PARAMETER" shouldn't fill the debug log anymore when AfdGetSockOrPeerName gets called with Local == FALSE Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Sun Nov 9 11:39:55 2008 @@ -83,11 +83,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Mdl = IoAllocateMdl ( Irp->UserBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, @@ -105,11 +100,21 @@ if( NT_SUCCESS(Status) ) { if( Local ) { + if( FCB->AddressFile.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + Status = TdiQueryInformation ( FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + if( FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo,

1 0

[cgutman] 37265: - Don't complete unimplemented IOCTL_DISK_FORMAT_TRACKS/IOCTL_DISK_FORMAT_TRACKS_EX with STATUS_SUCCESS - Floppy drivers don't need to support IOCTL_DISK_GET_PARTITION_INFO so complete the irp with STATUS_INVALID_DEVICE_REQUEST
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 10:15:50 2008 New Revision: 37265 URL: http://svn.reactos.org/svn/reactos?rev=37265&view=rev Log: - Don't complete unimplemented IOCTL_DISK_FORMAT_TRACKS/IOCTL_DISK_FORMAT_TRACKS_EX with STATUS_SUCCESS - Floppy drivers don't need to support IOCTL_DISK_GET_PARTITION_INFO so complete the irp with STATUS_INVALID_DEVICE_REQUEST Modified: trunk/reactos/drivers/storage/floppy/ioctl.c Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Sun Nov 9 10:15:50 2008 @@ -250,11 +250,13 @@ case IOCTL_DISK_FORMAT_TRACKS: case IOCTL_DISK_FORMAT_TRACKS_EX: ERR_(FLOPPY, "Format called; not supported yet\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; break; case IOCTL_DISK_GET_PARTITION_INFO: - INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported\n"); - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported by a floppy driver\n"); + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; Irp->IoStatus.Information = 0; break;

1 0

[cgutman] 37264: - Remove the work item from the work queue in ChewRemove
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:55:55 2008 New Revision: 37264 URL: http://svn.reactos.org/svn/reactos?rev=37264&view=rev Log: - Remove the work item from the work queue in ChewRemove Modified: trunk/reactos/lib/drivers/chew/workqueue.c Modified: trunk/reactos/lib/drivers/chew/workqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/workqueue… ============================================================================== --- trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] Sun Nov 9 09:55:55 2008 @@ -101,6 +101,7 @@ VOID ChewRemove( PVOID Item ) { PWORK_ITEM WorkItem = Item; + RemoveEntryList( &WorkItem->Entry ); IoFreeWorkItem( WorkItem->WorkItem ); ExFreePool( WorkItem ); }

1 0

[pschweitzer] 37263: Fix pierre-fsd branch (and cdfs.sys): FsRtlIsNameInExpression needs Expression to be uppercase if IgnoreCase is set to TRUE
by pschweitzer＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: pschweitzer Date: Sun Nov 9 09:55:13 2008 New Revision: 37263 URL: http://svn.reactos.org/svn/reactos?rev=37263&view=rev Log: Fix pierre-fsd branch (and cdfs.sys): FsRtlIsNameInExpression needs Expression to be uppercase if IgnoreCase is set to TRUE Modified: branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c Modified: branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sun Nov 9 09:55:13 2008 @@ -166,6 +166,7 @@ UNICODE_STRING TempString; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; PVOID Block; NTSTATUS Status; ULONG len; @@ -264,6 +265,14 @@ Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); } + /* FsRtlIsNameInExpression need the searched string to be upcase, + * even if IgnoreCase is specified */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", @@ -309,8 +318,8 @@ _SEH_TRY { - Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL); } _SEH_HANDLE { @@ -319,6 +328,7 @@ _SEH_END; if (!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status; } @@ -361,6 +371,7 @@ DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", Fcb->PathName, Fcb->ObjectName, DirIndex); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_SUCCESS; @@ -371,6 +382,7 @@ DirIndex++; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); if (pDirIndex) Modified: branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sun Nov 9 09:55:13 2008 @@ -463,6 +463,7 @@ WCHAR ShortNameBuffer[13]; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; GENERATE_NAME_CONTEXT NameContext; @@ -500,6 +501,15 @@ Offset = 0; BlockOffset = 0; Record = (PDIR_RECORD)Block; + + /* FsRtlIsNameInExpression need the searched string to be upcase, + * even if IgnoreCase is specified */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { if (Record->RecordLength == 0) @@ -542,8 +552,8 @@ _SEH_TRY { - Found = FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL); + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL); } _SEH_HANDLE { @@ -552,6 +562,7 @@ _SEH_END; if (!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status; } @@ -567,6 +578,7 @@ Offset, FoundFCB); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(Status); @@ -589,6 +601,7 @@ &Context, &Block)) { DPRINT("CcMapData() failed\n"); + RtlFreeUnicodeString(&FileToFindUpcase); return(STATUS_UNSUCCESSFUL); } Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); @@ -598,6 +611,7 @@ break; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return Status;

1 0

[cgutman] 37262: - Revert part of r37261
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:35:18 2008 New Revision: 37262 URL: http://svn.reactos.org/svn/reactos?rev=37262&view=rev Log: - Revert part of r37261 Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Sun Nov 9 09:35:18 2008 @@ -175,6 +175,5 @@ TRACE_(FLOPPY, "CSQ: Inserting IRP 0x%p\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); - IoMarkIrpPending(Irp); }

1 0

[cgutman] 37261: - Mark the irp pending before adding it to the queue - Fix a few comments - Return a better status when a drive isn't present - Complete the read/write irp with IO_DISK_INCREMENT instead of IO_NO_INCREMENT
by cgutman＠svn.reactos.org 09 Nov '08

09 Nov '08

Author: cgutman Date: Sun Nov 9 09:21:59 2008 New Revision: 37261 URL: http://svn.reactos.org/svn/reactos?rev=37261&view=rev Log: - Mark the irp pending before adding it to the queue - Fix a few comments - Return a better status when a drive isn't present - Complete the read/write irp with IO_DISK_INCREMENT instead of IO_NO_INCREMENT Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/readwrite.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -175,5 +175,6 @@ TRACE_(FLOPPY, "CSQ: Inserting IRP 0x%p\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); + IoMarkIrpPending(Irp); } Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -686,16 +686,16 @@ return STATUS_IO_DEVICE_ERROR; } -/* Check if floppy drive exists */ + /* Check if floppy drive exists */ if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) - { - WARN_(FLOPPY, "Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); - return STATUS_IO_DEVICE_ERROR; - } + { + WARN_(FLOPPY, "Floppy drive not detected!\n"); + return STATUS_NO_SUCH_DEVICE; + } INFO_(FLOPPY, "InitController: resetting the controller after floppy detection\n"); - /* Reset the controller */ + /* Reset the controller again after drive detection */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { WARN_(FLOPPY, "InitController: unable to reset controller\n"); @@ -984,6 +984,9 @@ /* 3i: Now that we're done, set the Initialized flag so we know to free this in Unload */ gControllerInfo[i].DriveInfo[j].Initialized = TRUE; + + /* 3j: Clear the DO_DEVICE_INITIALIZING flag */ + gControllerInfo[i].DriveInfo[j].DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } } Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Sun Nov 9 09:21:59 2008 @@ -758,7 +758,7 @@ INFO_(FLOPPY, "ReadWritePassive(): success; Completing with STATUS_SUCCESS\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); StopMotor(DriveInfo->ControllerInfo); }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008