Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 35559: - Fix fs_isdirty prototype, since there is no need to pass DriveRoot there.
by fireball＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: fireball Date: Sat Aug 23 05:49:57 2008 New Revision: 35559 URL: http://svn.reactos.org/svn/reactos?rev=35559&view=rev Log: - Fix fs_isdirty prototype, since there is no need to pass DriveRoot there. Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/io.h trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Sat Aug 23 05:49:57 2008 @@ -80,14 +80,14 @@ did_change = 0; } -BOOLEAN fs_isdirty(PUNICODE_STRING DriveRoot) +BOOLEAN fs_isdirty() { ULONG DirtyMask = 0; NTSTATUS Status; IO_STATUS_BLOCK IoSb; /* Check if volume is dirty */ - Status = NtFsControlFile(fd/*FileSystem*/, + Status = NtFsControlFile(fd, NULL, NULL, NULL, &IoSb, FSCTL_IS_VOLUME_DIRTY, NULL, 0, &DirtyMask, sizeof(DirtyMask)); Modified: trunk/reactos/lib/fslib/vfatlib/check/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] Sat Aug 23 05:49:57 2008 @@ -21,7 +21,7 @@ /* Opens the file system PATH. If RW is zero, the file system is opened read-only, otherwise, it is opened read-write. */ -BOOLEAN fs_isdirty(PUNICODE_STRING DriveRoot); +BOOLEAN fs_isdirty(); /* Checks if filesystem is dirty */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sat Aug 23 05:49:57 2008 @@ -256,7 +256,7 @@ /* Open filesystem */ fs_open(DriveRoot,FixErrors); - if (CheckOnlyIfDirty && !fs_isdirty(DriveRoot)) + if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ return fs_close(FALSE);

1 0

[fireball] 35558: - Remove a hack around sending FSCTL_ to an opened volume handle, it works good enough without the need to open another handle to the file system.
by fireball＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: fireball Date: Sat Aug 23 05:47:52 2008 New Revision: 35558 URL: http://svn.reactos.org/svn/reactos?rev=35558&view=rev Log: - Remove a hack around sending FSCTL_ to an opened volume handle, it works good enough without the need to open another handle to the file system. Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Sat Aug 23 05:47:52 2008 @@ -72,6 +72,8 @@ return; } + // Query geometry and partition info, to have bytes per sector, etc + CurrentOffset.QuadPart = 0LL; changes = last = NULL; @@ -80,43 +82,12 @@ BOOLEAN fs_isdirty(PUNICODE_STRING DriveRoot) { - OBJECT_ATTRIBUTES ObjectAttributes; ULONG DirtyMask = 0; - WCHAR TempRootBuf[128]; - UNICODE_STRING TempRoot; - HANDLE FileSystem; + NTSTATUS Status; IO_STATUS_BLOCK IoSb; - NTSTATUS Status; - - /* Add backslash to the end, so FS will be opened */ - TempRoot.Length = 0; - TempRoot.MaximumLength = sizeof(TempRootBuf); - TempRoot.Buffer = TempRootBuf; - RtlCopyUnicodeString(&TempRoot, DriveRoot); - if (TempRoot.Length == (TempRoot.MaximumLength-1)) return FALSE; - wcscat(TempRoot.Buffer, L"\\"); - TempRoot.Length += sizeof(WCHAR); - - InitializeObjectAttributes(&ObjectAttributes, - &TempRoot, - 0, - NULL, - NULL); - - Status = NtOpenFile(&FileSystem, - FILE_GENERIC_READ, - &ObjectAttributes, - &IoSb, - 0, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile() failed with status 0x%.08x\n", Status); - return FALSE; - } /* Check if volume is dirty */ - Status = NtFsControlFile(FileSystem, + Status = NtFsControlFile(fd/*FileSystem*/, NULL, NULL, NULL, &IoSb, FSCTL_IS_VOLUME_DIRTY, NULL, 0, &DirtyMask, sizeof(DirtyMask)); @@ -124,17 +95,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtFsControlFile() failed with Status 0x%08x\n", Status); - /* Close FS handle */ - NtClose(FileSystem); return FALSE; } - /* Close FS handle */ - NtClose(FileSystem); - + /* Convert Dirty mask to a boolean value */ return (DirtyMask & 1); } - void fs_read(loff_t pos,int size,void *data) {

1 0

[arty] 35557: Silence debug spew.
by arty＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: arty Date: Sat Aug 23 05:13:14 2008 New Revision: 35557 URL: http://svn.reactos.org/svn/reactos?rev=35557&view=rev Log: Silence debug spew. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 23 05:13:14 2008 @@ -15,8 +15,8 @@ #include <debug.h> #ifdef DBG -DWORD DebugTraceLevel = DEBUG_ULTRA; -//DWORD DebugTraceLevel = 0; +//DWORD DebugTraceLevel = DEBUG_ULTRA; +DWORD DebugTraceLevel = 0; #endif /* DBG */ HANDLE GlobalHeap;

1 0

[cfinck] 35556: Update my Release Engineering documentation to conform with current ReactOS releases. Should be idiotproof now ; -)
by cfinck＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: cfinck Date: Sat Aug 23 05:07:48 2008 New Revision: 35556 URL: http://svn.reactos.org/svn/reactos?rev=35556&view=rev Log: Update my Release Engineering documentation to conform with current ReactOS releases. Should be idiotproof now ;-) Modified: trunk/tools/Release Engineering/Packaging ReactOS Releases.odt Modified: trunk/tools/Release Engineering/Packaging ReactOS Releases.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/Release%20Engineering/Packag… ============================================================================== Binary files - no diff available.

1 0

[arty] 35555: Restore cancellation for proper socket shutdown.
by arty＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: arty Date: Sat Aug 23 04:49:57 2008 New Revision: 35555 URL: http://svn.reactos.org/svn/reactos?rev=35555&view=rev Log: Restore cancellation for proper socket shutdown. Modified: trunk/reactos/drivers/network/afd/afd/main.c 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] Sat Aug 23 04:49:57 2008 @@ -155,6 +155,7 @@ VOID DestroySocket( PAFD_FCB FCB ) { UINT i; BOOLEAN ReturnEarly = FALSE; + KIRQL Irql = KeGetCurrentIrql(); PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -190,7 +191,9 @@ if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); + IoCancelIrp(InFlightRequest[i]->InFlightRequest); InFlightRequest[i]->InFlightRequest = NULL; + IoReleaseCancelSpinLock(Irql); } }

1 0

[hpoussin] 35554: Add new devices at start of list, not end. Order is now like in pre-r35543
by hpoussin＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: hpoussin Date: Sat Aug 23 04:43:56 2008 New Revision: 35554 URL: http://svn.reactos.org/svn/reactos?rev=35554&view=rev Log: Add new devices at start of list, not end. Order is now like in pre-r35543 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 23 04:43:56 2008 @@ -388,11 +388,10 @@ { KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); Node->Parent = ParentNode; - if (ParentNode->LastChild != NULL) - ParentNode->LastChild->Sibling = Node; - else - ParentNode->Child = Node; - ParentNode->LastChild = Node; + Node->Sibling = ParentNode->Child; + ParentNode->Child = Node; + if (ParentNode->LastChild == NULL) + ParentNode->LastChild = Node; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); Node->Level = ParentNode->Level + 1; }

1 0

[arty] 35553: Should've done this a long time ago. Just noticed that we're potentially sending a bunch of 0 handles into AfdSelect.
by arty＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: arty Date: Sat Aug 23 04:01:29 2008 New Revision: 35553 URL: http://svn.reactos.org/svn/reactos?rev=35553&view=rev Log: Should've done this a long time ago. Just noticed that we're potentially sending a bunch of 0 handles into AfdSelect. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 23 04:01:29 2008 @@ -15,8 +15,8 @@ #include <debug.h> #ifdef DBG -//DWORD DebugTraceLevel = DEBUG_ULTRA; -DWORD DebugTraceLevel = 0; +DWORD DebugTraceLevel = DEBUG_ULTRA; +//DWORD DebugTraceLevel = 0; #endif /* DBG */ HANDLE GlobalHeap; @@ -598,7 +598,7 @@ IO_STATUS_BLOCK IOSB; PAFD_POLL_INFO PollInfo; NTSTATUS Status; - ULONG HandleCount, OutCount = 0; + LONG HandleCount, OutCount = 0; ULONG PollBufferSize; PVOID PollBuffer; ULONG i, j = 0, x; @@ -661,7 +661,6 @@ RtlZeroMemory( PollInfo, PollBufferSize ); /* Number of handles for AFD to Check */ - PollInfo->HandleCount = HandleCount; PollInfo->Exclusive = FALSE; PollInfo->Timeout = Timeout; @@ -689,6 +688,9 @@ } } + PollInfo->HandleCount = j; + PollBufferSize = ((PCHAR)&PollInfo->Handles[j+1]) - ((PCHAR)PollInfo); + /* Send IOCTL */ Status = NtDeviceIoControlFile( (HANDLE)PollInfo->Handles[0].Handle, SockEvent,

1 0

[fireball] 35552: - Silence "Font loaded" debug print, which was mistakingly promoted to DPRINT in r35184.
by fireball＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: fireball Date: Sat Aug 23 03:10:15 2008 New Revision: 35552 URL: http://svn.reactos.org/svn/reactos?rev=35552&view=rev Log: - Silence "Font loaded" debug print, which was mistakingly promoted to DPRINT in r35184. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sat Aug 23 03:10:15 2008 @@ -385,7 +385,7 @@ - DPRINT1("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); + DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Num glyphs: %u\n", Face->num_glyphs); /* Add this font resource to the font table */

1 0

[arty] 35551: Hand merge a lost change from aicom-network-fixes.
by arty＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: arty Date: Sat Aug 23 02:39:02 2008 New Revision: 35551 URL: http://svn.reactos.org/svn/reactos?rev=35551&view=rev Log: Hand merge a lost change from aicom-network-fixes. Modified: trunk/reactos/drivers/network/afd/afd/listen.c 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] Sat Aug 23 02:39:02 2008 @@ -216,7 +216,6 @@ NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -239,7 +238,7 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); - return Status; + return Irp->IoStatus.Status; } else { AFD_DbgPrint(MID_TRACE,("Holding\n")); @@ -328,10 +327,9 @@ FCB->PollState &= ~AFD_EVENT_ACCEPT; SocketStateUnlock( FCB ); - return Status; + return Irp->IoStatus.Status; } } - SocketStateUnlock( FCB ); - return STATUS_UNSUCCESSFUL; -} + return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL ); +}

1 0

[arty] 35550: Merge aicom-network-fixes up to 35538
by arty＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: arty Date: Sat Aug 23 02:20:22 2008 New Revision: 35550 URL: http://svn.reactos.org/svn/reactos?rev=35550&view=rev Log: Merge aicom-network-fixes up to 35538 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/bind.c 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/write.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 23 02:20:22 2008 @@ -291,6 +291,7 @@ case STATUS_INVALID_CONNECTION: AFD_DbgPrint(MID_TRACE,("MSAFD: STATUS_INVALID_CONNECTION\n")); *Errno = WSAEAFNOSUPPORT; break; case STATUS_REMOTE_NOT_LISTENING: AFD_DbgPrint(MID_TRACE, ("MSAFD: STATUS_REMOTE_NOT_LISTENING\n")); *Errno = WSAECONNRESET; break; case STATUS_FILE_CLOSED: AFD_DbgPrint(MID_TRACE, ("MSAFD: STATUS_FILE_CLOSED\n")); *Errno = WSAENOTSOCK; break; + case STATUS_INVALID_PARAMETER: DbgPrint("MSAFD: STATUS_INVALID_PARAMETER\n"); *Errno = WSAEINVAL; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break; Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Aug 23 02:20:22 2008 @@ -25,7 +25,7 @@ } if( !FCB->LocalAddress ) { AFD_DbgPrint(MID_TRACE,("No local address\n")); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER; } Status = TdiOpenAddressFile(&FCB->TdiDeviceName, 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] Sat Aug 23 02:20:22 2008 @@ -84,7 +84,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0, + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); } 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] Sat Aug 23 02:20:22 2008 @@ -37,7 +37,7 @@ } IrpSp->Parameters.DeviceIoControl.Type3InputBuffer = - MmMapLockedPages( Irp->MdlAddress, KernelMode ); + MmGetSystemAddressForMdlSafe( Irp->MdlAddress, NormalPagePriority ); if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer ) { IoFreeMdl( Irp->MdlAddress ); @@ -50,12 +50,13 @@ } VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer || !Irp->MdlAddress ) return; - - MmUnmapLockedPages( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, - Irp->MdlAddress ); - MmUnlockPages( Irp->MdlAddress ); - IoFreeMdl( Irp->MdlAddress ); + PVOID Buffer = MmGetSystemAddressForMdlSafe( Irp->MdlAddress, NormalPagePriority ); + if( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer == Buffer || Buffer == NULL ) { + MmUnmapLockedPages( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, Irp->MdlAddress ); + MmUnlockPages( Irp->MdlAddress ); + IoFreeMdl( Irp->MdlAddress ); + } + Irp->MdlAddress = NULL; } @@ -72,6 +73,7 @@ UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); PMDL NewMdl; + BOOLEAN LockFailed = FALSE; AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf)); @@ -117,9 +119,19 @@ if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); - MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, - Write ? IoModifyAccess : IoReadAccess ); + _SEH_TRY { + MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, + Write ? IoModifyAccess : IoReadAccess ); + } _SEH_HANDLE { + LockFailed = TRUE; + } _SEH_END; AFD_DbgPrint(MID_TRACE,("MmProbeAndLock finished\n")); + + if( LockFailed ) { + IoFreeMdl( MapBuf[i].Mdl ); + MapBuf[i].Mdl = NULL; + LockFailed = FALSE; + } } } } 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] Sat Aug 23 02:20:22 2008 @@ -252,7 +252,7 @@ } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); SocketStateUnlock( FCB ); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER; } HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); @@ -285,7 +285,7 @@ FCB->State != SOCKET_STATE_CONNECTING ) { AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); - return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); } @@ -576,7 +576,7 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete - ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL ); + ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); 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] Sat Aug 23 02:20:22 2008 @@ -223,7 +223,7 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) - return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); if( !(SendReq = LockRequest( Irp, IrpSp )) ) @@ -398,7 +398,7 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete - ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL ); + ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL );

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