Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 48498: [FASTFAT_NEW] - Implement opening an existing DCB. - Add a bunch of useful macros and helper functions and use them throughout the code. - Implement in-memory setendoffile set information class. On-disk to be done. - Implement user fs ctrl wrapper with stubs. - Fill up QueryVolumeInfo with classes it should handle. Silence up a warning about classes it should reject.
by fireball＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: fireball Date: Mon Aug 9 21:33:17 2010 New Revision: 48498 URL: http://svn.reactos.org/svn/reactos?rev=48498&view=rev Log: [FASTFAT_NEW] - Implement opening an existing DCB. - Add a bunch of useful macros and helper functions and use them throughout the code. - Implement in-memory setendoffile set information class. On-disk to be done. - Implement user fs ctrl wrapper with stubs. - Fill up QueryVolumeInfo with classes it should handle. Silence up a warning about classes it should reject. Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -188,9 +188,98 @@ IN BOOLEAN DeleteOnClose) { IO_STATUS_BLOCK Iosb = {{0}}; - - Iosb.Status = STATUS_NOT_IMPLEMENTED; - UNIMPLEMENTED; + PCCB Ccb; + + /* Exclusively lock this FCB */ + FatAcquireExclusiveFcb(IrpContext, Dcb); + + /* Check if it's a delete-on-close of a root DCB */ + if (FatNodeType(Dcb) == FAT_NTC_ROOT_DCB && DeleteOnClose) + { + Iosb.Status = STATUS_CANNOT_DELETE; + + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + + /*if (NoEaKnowledge && NodeType(Dcb) != FAT_NTC_ROOT_DCB && + !FatIsFat32(Vcb)) + { + UNIMPLEMENTED; + }*/ + + /* Check the create disposition and desired access */ + if ((CreateDisposition != FILE_OPEN) && + (CreateDisposition != FILE_OPEN_IF)) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + +#if 0 + if (!FatCheckFileAccess(IrpContext, + Dcb->DirentFatFlags, + DesiredAccess)) + { + Iosb.Status = STATUS_ACCESS_DENIED; + try_return( Iosb ); + } +#endif + + /* If it's already opened - check share access */ + if (Dcb->OpenCount > 0) + { + Iosb.Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Dcb->ShareAccess, + TRUE); + + if (!NT_SUCCESS(Iosb.Status)) + { + /* Release the lock and return */ + FatReleaseFcb(IrpContext, Dcb); + return Iosb; + } + } + else + { + IoSetShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Dcb->ShareAccess); + } + + /* Set the file object */ + Ccb = FatCreateCcb(IrpContext); + FatSetFileObject(FileObject, + UserDirectoryOpen, + Dcb, + Ccb); + + /* Increase counters */ + Dcb->UncleanCount++; + Dcb->OpenCount++; + Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; + + /* Set delete on close */ + if (DeleteOnClose) + SetFlag(Ccb->Flags, CCB_DELETE_ON_CLOSE); + + /* Clear delay close flag */ + ClearFlag(Dcb->State, FCB_STATE_DELAY_CLOSE); + + /* That's it */ + Iosb.Status = STATUS_SUCCESS; + Iosb.Information = FILE_OPENED; + + /* Release the lock */ + FatReleaseFcb(IrpContext, Dcb); return Iosb; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -524,4 +524,32 @@ return FALSE; } +VOID +NTAPI +FatNotifyReportChange(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB Fcb, + IN ULONG Filter, + IN ULONG Action) +{ + if (Fcb->FullFileName.Buffer == NULL) + FatSetFullFileNameInFcb(IrpContext, Fcb); + + ASSERT(Fcb->FullFileName.Length != 0 ); + ASSERT(Fcb->FileNameLength != 0 ); + ASSERT(Fcb->FullFileName.Length > Fcb->FileNameLength ); + ASSERT(Fcb->FullFileName.Buffer[(Fcb->FullFileName.Length - Fcb->FileNameLength)/sizeof(WCHAR) - 1] == L'\\' ); + + FsRtlNotifyFullReportChange(Vcb->NotifySync, + &Vcb->NotifyList, + (PSTRING)&Fcb->FullFileName, + (USHORT)(Fcb->FullFileName.Length - + Fcb->FileNameLength), + NULL, + NULL, + Filter, + Action, + NULL); +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -51,6 +51,18 @@ ) #define IsFileObjectReadOnly(FO) (!((FO)->WriteAccess | (FO)->DeleteAccess)) +#define IsFileDeleted(FCB) (FlagOn((FCB)->State, FCB_STATE_DELETE_ON_CLOSE) && ((FCB)->UncleanCount == 0)) + +BOOLEAN +FORCEINLINE +FatIsIoRangeValid(IN LARGE_INTEGER Start, IN ULONG Length) +{ + /* Check if it's more than 32bits, or if the length causes 32bit overflow. + FAT-specific! */ + + return !(Start.HighPart || Start.LowPart + Length < Start.LowPart); +} + NTSYSAPI NTSTATUS @@ -229,6 +241,13 @@ BOOLEAN NTAPI FatIsTopLevelIrp(IN PIRP Irp); + +VOID NTAPI +FatNotifyReportChange(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb, + IN PFCB Fcb, + IN ULONG Filter, + IN ULONG Action); /* --------------------------------------------------------- fullfat.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -263,11 +263,7 @@ FsRtlEnterFileSystem(); /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait); @@ -286,10 +282,392 @@ NTSTATUS NTAPI +FatSetEndOfFileInfo(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb) +{ + PFILE_END_OF_FILE_INFORMATION Buffer; + ULONG NewFileSize; + ULONG InitialFileSize; + ULONG InitialValidDataLength; + //ULONG InitialValidDataToDisk; + BOOLEAN CacheMapInitialized = FALSE; + BOOLEAN ResourceAcquired = FALSE; + NTSTATUS Status; + + Buffer = Irp->AssociatedIrp.SystemBuffer; + + if (FatNodeType(Fcb) != FAT_NTC_FCB) + { + /* Trying to change size of a dir */ + Status = STATUS_INVALID_DEVICE_REQUEST; + return Status; + } + + /* Validate new size */ + if (!FatIsIoRangeValid(Buffer->EndOfFile, 0)) + { + Status = STATUS_DISK_FULL; + return Status; + } + + NewFileSize = Buffer->EndOfFile.LowPart; + + /* Lookup allocation size if needed */ + if (Fcb->Header.AllocationSize.QuadPart == (LONGLONG)-1) + UNIMPLEMENTED;//FatLookupFileAllocationSize(IrpContext, Fcb); + + /* Cache the file if there is a data section */ + if (FileObject->SectionObjectPointer->DataSectionObject && + (FileObject->SectionObjectPointer->SharedCacheMap == NULL) && + !FlagOn(Irp->Flags, IRP_PAGING_IO)) + { + if (FlagOn(FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + /* This is a really weird condition */ + UNIMPLEMENTED; + //Raise(STATUS_FILE_CLOSED); + } + + /* Initialize the cache map */ + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, + &FatGlobalData.CacheMgrCallbacks, + Fcb); + + CacheMapInitialized = TRUE; + } + + /* Lazy write case */ + if (IoGetCurrentIrpStackLocation(Irp)->Parameters.SetFile.AdvanceOnly) + { + if (!IsFileDeleted(Fcb) && + (Fcb->Condition == FcbGood)) + { + /* Clamp the new file size */ + if (NewFileSize >= Fcb->Header.FileSize.LowPart) + NewFileSize = Fcb->Header.FileSize.LowPart; + + ASSERT(NewFileSize <= Fcb->Header.AllocationSize.LowPart); + + /* Never reduce the file size here! */ + + // TODO: Actually change file size + DPRINT1("Actually changing file size is missing\n"); + + /* Notify about file size change */ + FatNotifyReportChange(IrpContext, + Vcb, + Fcb, + FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED); + } + else + { + DPRINT1("Cannot set size on deleted file\n"); + } + + Status = STATUS_SUCCESS; + return Status; + } + + if ( NewFileSize > Fcb->Header.AllocationSize.LowPart ) + { + // TODO: Increase file size + DPRINT1("Actually changing file size is missing\n"); + } + + if (Fcb->Header.FileSize.LowPart != NewFileSize) + { + if (NewFileSize < Fcb->Header.FileSize.LowPart) + { + if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, + &Buffer->EndOfFile)) + { + Status = STATUS_USER_MAPPED_FILE; + + /* Free up resources if necessary */ + if (CacheMapInitialized) + CcUninitializeCacheMap(FileObject, NULL, NULL); + + return Status; + } + + ResourceAcquired = ExAcquireResourceExclusiveLite(Fcb->Header.PagingIoResource, TRUE); + } + + /* Set new file sizes */ + InitialFileSize = Fcb->Header.FileSize.LowPart; + InitialValidDataLength = Fcb->Header.ValidDataLength.LowPart; + //InitialValidDataToDisk = Fcb->ValidDataToDisk; + + Fcb->Header.FileSize.LowPart = NewFileSize; + + /* Adjust valid data length if new size is less than that */ + if (Fcb->Header.ValidDataLength.LowPart > NewFileSize) + Fcb->Header.ValidDataLength.LowPart = NewFileSize; + + //if (Fcb->ValidDataToDisk > NewFileSize) + // Fcb->ValidDataToDisk = NewFileSize; + + DPRINT1("New file size is 0x%08lx\n", NewFileSize); + + /* Update cache mapping */ + CcSetFileSizes(FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + + /* Notify about size change */ + FatNotifyReportChange(IrpContext, + Vcb, + Fcb, + FILE_NOTIFY_CHANGE_SIZE, + FILE_ACTION_MODIFIED); + + /* Set truncate on close flag */ + SetFlag(Fcb->State, FCB_STATE_TRUNCATE_ON_CLOSE); + } + + /* Set modified flag */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Free up resources if necessary */ + if (CacheMapInitialized) + CcUninitializeCacheMap(FileObject, NULL, NULL); + + if (ResourceAcquired) + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FatiSetInformation(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION IrpSp; + FILE_INFORMATION_CLASS InfoClass; + TYPE_OF_OPEN TypeOfOpen; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + LONG Length; + PVOID Buffer; + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN VcbAcquired = FALSE, FcbAcquired = FALSE; + + /* Get IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Get the file object */ + FileObject = IrpSp->FileObject; + + /* Copy variables to something with shorter names */ + InfoClass = IrpSp->Parameters.SetFile.FileInformationClass; + Length = IrpSp->Parameters.SetFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + DPRINT("FatiSetInformation\n", 0); + DPRINT("\tIrp = %08lx\n", Irp); + DPRINT("\tLength = %08lx\n", Length); + DPRINT("\tFileInformationClass = %08lx\n", InfoClass); + DPRINT("\tFileObject = %08lx\n", IrpSp->Parameters.SetFile.FileObject); + DPRINT("\tBuffer = %08lx\n", Buffer); + + TypeOfOpen = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); + + DPRINT("Vcb %p, Fcb %p, Ccb %p, open type %d\n", Vcb, Fcb, Ccb, TypeOfOpen); + + switch (TypeOfOpen) + { + case UserVolumeOpen: + Status = STATUS_INVALID_PARAMETER; + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + case UserFileOpen: + /* Check oplocks */ + if (!FlagOn(Fcb->State, FCB_STATE_PAGEFILE) && + ((InfoClass == FileEndOfFileInformation) || + (InfoClass == FileAllocationInformation))) + { + Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + Irp, + IrpContext, + NULL, + NULL); + + if (Status != STATUS_SUCCESS) + { + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* Update Fast IO flag */ + Fcb->Header.IsFastIoPossible = FatIsFastIoPossible(Fcb); + } + break; + + case UserDirectoryOpen: + break; + + default: + Status = STATUS_INVALID_PARAMETER; + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* If it's a root DCB - fail */ + if (FatNodeType(Fcb) == FAT_NTC_ROOT_DCB) + { + if (InfoClass == FileDispositionInformation) + Status = STATUS_CANNOT_DELETE; + else + Status = STATUS_INVALID_PARAMETER; + + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + + /* Acquire the volume lock if needed */ + if (InfoClass == FileDispositionInformation || + InfoClass == FileRenameInformation) + { + if (!FatAcquireExclusiveVcb(IrpContext, Vcb)) + { + UNIMPLEMENTED; + } + + VcbAcquired = TRUE; + } + + /* Acquire FCB lock */ + if (!FlagOn(Fcb->State, FCB_STATE_PAGEFILE)) + { + if (!FatAcquireExclusiveFcb(IrpContext, Fcb)) + { + UNIMPLEMENTED; + } + + FcbAcquired = TRUE; + } + + // TODO: VerifyFcb + + switch (InfoClass) + { + case FileBasicInformation: + //Status = FatSetBasicInfo(IrpContext, Irp, Fcb, Ccb); + DPRINT1("FileBasicInformation\n"); + break; + + case FileDispositionInformation: + if (FlagOn(Vcb->State, VCB_STATE_FLAG_DEFERRED_FLUSH) && + !FlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)) + { + UNIMPLEMENTED; + } + else + { + //Status = FatSetDispositionInfo(IrpContext, Irp, FileObject, Fcb); + DPRINT1("FileDispositionInformation\n"); + } + + break; + + case FileRenameInformation: + if (!FlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)) + { + UNIMPLEMENTED; + } + else + { + //Status = FatSetRenameInfo(IrpContext, Irp, Vcb, Fcb, Ccb); + DPRINT1("FileRenameInformation\n"); + + /* NOTE: Request must not be completed here! + That's why Irp/IrpContext are set to NULL */ + if (Status == STATUS_PENDING) + { + Irp = NULL; + IrpContext = NULL; + } + } + break; + + case FilePositionInformation: + //Status = FatSetPositionInfo(IrpContext, Irp, FileObject); + DPRINT1("FilePositionInformation\n"); + break; + + case FileLinkInformation: + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case FileAllocationInformation: + //Status = FatSetAllocationInfo(IrpContext, Irp, Fcb, FileObject); + DPRINT1("FileAllocationInformation\n"); + break; + + case FileEndOfFileInformation: + Status = FatSetEndOfFileInfo(IrpContext, Irp, FileObject, Vcb, Fcb); + break; + + default: + Status = STATUS_INVALID_PARAMETER; + } + + /* Release locks */ + if (FcbAcquired) FatReleaseFcb(IrpContext, Fcb); + if (VcbAcquired) FatReleaseVcb(IrpContext, Vcb); + + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; +} + +NTSTATUS +NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatSetInformation()\n"); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN TopLevel, CanWait; + PFAT_IRP_CONTEXT IrpContext; + + CanWait = TRUE; + TopLevel = FALSE; + Status = STATUS_INVALID_DEVICE_REQUEST; + + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL) + CanWait = IoIsOperationSynchronous(Irp); + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Set Top Level IRP if not set */ + TopLevel = FatIsTopLevelIrp(Irp); + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Perform the actual read */ + Status = FatiSetInformation(IrpContext, Irp); + + /* Restore top level Irp */ + if (TopLevel) IoSetTopLevelIrp(NULL); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -15,11 +15,179 @@ NTSTATUS NTAPI +FatOplockRequest(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + NTSTATUS Status; + DPRINT1("Oplock request!\n"); + + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; +} + +NTSTATUS +NTAPI +FatMarkVolumeDirty(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + NTSTATUS Status; + DPRINT1("Marking volume as dirty\n"); + + Status = STATUS_SUCCESS; + FatCompleteRequest(IrpContext, Irp, Status); + + return Status; +} + +NTSTATUS +NTAPI FatUserFsCtrl(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) { - DPRINT1("FatUserFsCtrl()\n"); - FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); - return STATUS_INVALID_DEVICE_REQUEST; + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + ULONG Code; + + /* Get current IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + Code = IrpSp->Parameters.FileSystemControl.FsControlCode; + + /* Set the wait flag */ + if (Irp->RequestorMode != KernelMode && + (Code & 3) == METHOD_NEITHER) + { + SetFlag(IrpContext->Flags, IRPCONTEXT_CANWAIT); + } + + /* Branch according to the code */ + switch (Code) + { + case FSCTL_REQUEST_OPLOCK_LEVEL_1: + case FSCTL_REQUEST_OPLOCK_LEVEL_2: + case FSCTL_REQUEST_BATCH_OPLOCK: + case FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: + case FSCTL_OPBATCH_ACK_CLOSE_PENDING: + case FSCTL_OPLOCK_BREAK_NOTIFY: + case FSCTL_OPLOCK_BREAK_ACK_NO_2: + case FSCTL_REQUEST_FILTER_OPLOCK : + Status = FatOplockRequest(IrpContext, Irp); + break; + + case FSCTL_LOCK_VOLUME: + //Status = FatLockVolume( IrpContext, Irp ); + DPRINT1("FSCTL_LOCK_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_UNLOCK_VOLUME: + //Status = FatUnlockVolume( IrpContext, Irp ); + DPRINT1("FSCTL_UNLOCK_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_DISMOUNT_VOLUME: + //Status = FatDismountVolume( IrpContext, Irp ); + DPRINT1("FSCTL_DISMOUNT_VOLUME\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_MARK_VOLUME_DIRTY: + Status = FatMarkVolumeDirty(IrpContext, Irp); + break; + + case FSCTL_IS_VOLUME_DIRTY: + //Status = FatIsVolumeDirty( IrpContext, Irp ); + DPRINT1("FSCTL_IS_VOLUME_DIRTY\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_IS_VOLUME_MOUNTED: + //Status = FatIsVolumeMounted( IrpContext, Irp ); + DPRINT1("FSCTL_IS_VOLUME_MOUNTED\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_IS_PATHNAME_VALID: + //Status = FatIsPathnameValid( IrpContext, Irp ); + DPRINT1("FSCTL_IS_PATHNAME_VALID\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_QUERY_RETRIEVAL_POINTERS: + //Status = FatQueryRetrievalPointers( IrpContext, Irp ); + DPRINT1("FSCTL_QUERY_RETRIEVAL_POINTERS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_QUERY_FAT_BPB: + //Status = FatQueryBpb( IrpContext, Irp ); + DPRINT1("FSCTL_QUERY_FAT_BPB\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_FILESYSTEM_GET_STATISTICS: + //Status = FatGetStatistics( IrpContext, Irp ); + DPRINT1("FSCTL_FILESYSTEM_GET_STATISTICS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_GET_VOLUME_BITMAP: + //Status = FatGetVolumeBitmap( IrpContext, Irp ); + DPRINT1("FSCTL_GET_VOLUME_BITMAP\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_GET_RETRIEVAL_POINTERS: + //Status = FatGetRetrievalPointers( IrpContext, Irp ); + DPRINT1("FSCTL_GET_RETRIEVAL_POINTERS\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_MOVE_FILE: + //Status = FatMoveFile( IrpContext, Irp ); + DPRINT1("FSCTL_MOVE_FILE\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + case FSCTL_ALLOW_EXTENDED_DASD_IO: + //Status = FatAllowExtendedDasdIo( IrpContext, Irp ); + DPRINT1("FSCTL_ALLOW_EXTENDED_DASD_IO\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + break; + + default: + DPRINT1("FatUserFsCtrl(), unhandled fs control code 0x%x\n", Code); + Status = STATUS_INVALID_DEVICE_REQUEST; + FatCompleteRequest(IrpContext, Irp, Status); + } + + //(((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) + + // 9c040 + // 1 1 0 0 0 + // 6 4 8 4 0 + // 10011100000001000000 + // DT = 1001 = 9 + // Access = 11 = 3 + // Function = 10000 = 16 + // Method = 0 + + return Status; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -91,11 +91,7 @@ if (DeviceObject != FatGlobalData.DiskDeviceObject) { /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait); Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Mon Aug 9 21:33:17 2010 @@ -135,13 +135,29 @@ /* Call FsVolumeInfo handler */ Status = FatiQueryFsVolumeInfo(Vcb, Buffer, &Length); break; + case FileFsSizeInformation: /* Call FsVolumeInfo handler */ Status = FatiQueryFsSizeInfo(Vcb, Buffer, &Length); break; + + case FileFsDeviceInformation: + UNIMPLEMENTED + //Status = FatiQueryFsDeviceInfo(IrpContext, Vcb, Buffer, &Length); + break; + + case FileFsAttributeInformation: + UNIMPLEMENTED; + //Status = FatiQueryFsAttributeInfo(IrpContext, Vcb, Buffer, &Length); + break; + + case FileFsFullSizeInformation: + UNIMPLEMENTED; + //Status = FatiQueryFsFullSizeInfo(IrpContext, Vcb, Buffer, &Length); + break; + default: - DPRINT1("Volume information class %d is not supported!\n", InfoClass); - UNIMPLEMENTED; + Status = STATUS_INVALID_PARAMETER; } /* Set IoStatus.Information to amount of filled bytes */ @@ -175,11 +191,7 @@ FsRtlEnterFileSystem(); /* Set Top Level IRP if not set */ - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - TopLevel = TRUE; - } + TopLevel = FatIsTopLevelIrp(Irp); /* Build an irp context */ IrpContext = FatBuildIrpContext(Irp, CanWait);

1 0

[akhaldi] 48497: [DDK] - Move several headers to PSDK where they belong. - Add _ANONYMOUS_UNION. - De-duplicate __GNU_EXTENSION definition from several headers. - Remove semicolons after the closing bracket of extern "C" - Add a missing one in ioaccess.h - Apply a consistent formatting. [PSDK] - De-duplicate __GNU_EXTENSION definition from several headers. - Add missing extern "C" opening bracket in ddkernel.h and remove the semicolon from the closing one. - Add __GNU_EXTENSION definition to ddr
by akhaldi＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: akhaldi Date: Mon Aug 9 20:58:47 2010 New Revision: 48497 URL: http://svn.reactos.org/svn/reactos?rev=48497&view=rev Log: [DDK] - Move several headers to PSDK where they belong. - Add _ANONYMOUS_UNION. - De-duplicate __GNU_EXTENSION definition from several headers. - Remove semicolons after the closing bracket of extern "C" - Add a missing one in ioaccess.h - Apply a consistent formatting. [PSDK] - De-duplicate __GNU_EXTENSION definition from several headers. - Add missing extern "C" opening bracket in ddkernel.h and remove the semicolon from the closing one. - Add __GNU_EXTENSION definition to ddraw.h and remove the semicolon after the closing bracket of extern "C" - Add missing extern "C" closing bracket in ddrawi.h - Remove semicolons after the closing brackets of extern "C" in dinput.h, dmemmgr.h and sti.h - Apply a consistent formatting. [DXSDK] - Move ddraw.h to PSDK. Added: trunk/reactos/include/psdk/d3dnthal.h - copied, changed from r48479, trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/psdk/ddkernel.h - copied, changed from r48479, trunk/reactos/include/ddk/ddkernel.h trunk/reactos/include/psdk/ddkmapi.h - copied, changed from r48479, trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/psdk/ddraw.h - copied, changed from r48479, trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/psdk/ddrawi.h - copied, changed from r48479, trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/psdk/ddrawint.h - copied, changed from r48479, trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/psdk/diskguid.h - copied unchanged from r48489, trunk/reactos/include/ddk/diskguid.h trunk/reactos/include/psdk/dmemmgr.h - copied, changed from r48489, trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/psdk/ntddtape.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddtape.h trunk/reactos/include/psdk/ntddtdi.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddtdi.h trunk/reactos/include/psdk/ntddvdeo.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/psdk/ntddvol.h - copied unchanged from r48489, trunk/reactos/include/ddk/ntddvol.h trunk/reactos/include/psdk/objerror.h - copied unchanged from r48489, trunk/reactos/include/ddk/objerror.h trunk/reactos/include/psdk/polarity.h - copied unchanged from r48489, trunk/reactos/include/ddk/polarity.h trunk/reactos/include/psdk/prntfont.h - copied unchanged from r48489, trunk/reactos/include/ddk/prntfont.h trunk/reactos/include/psdk/stierr.h - copied unchanged from r48489, trunk/reactos/include/ddk/stierr.h trunk/reactos/include/psdk/stireg.h - copied unchanged from r48489, trunk/reactos/include/ddk/stireg.h trunk/reactos/include/psdk/tdi.h - copied unchanged from r48489, trunk/reactos/include/ddk/tdi.h trunk/reactos/include/psdk/tdiinfo.h - copied unchanged from r48489, trunk/reactos/include/ddk/tdiinfo.h trunk/reactos/include/psdk/unknown.h - copied unchanged from r48489, trunk/reactos/include/ddk/unknown.h Removed: trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddkernel.h trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/diskguid.h trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/ddk/ntddtape.h trunk/reactos/include/ddk/ntddtdi.h trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/ddk/ntddvol.h trunk/reactos/include/ddk/objerror.h trunk/reactos/include/ddk/polarity.h trunk/reactos/include/ddk/prntfont.h trunk/reactos/include/ddk/stierr.h trunk/reactos/include/ddk/stireg.h trunk/reactos/include/ddk/tdi.h trunk/reactos/include/ddk/tdiinfo.h trunk/reactos/include/ddk/unknown.h trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/ddk/acpiioct.h trunk/reactos/include/ddk/bdasup.h trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/d3dhalex.h trunk/reactos/include/ddk/dvp.h trunk/reactos/include/ddk/ioaccess.h trunk/reactos/include/psdk/dinput.h trunk/reactos/include/psdk/sti.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/acpiioct.h?rev… Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=4… Modified: trunk/reactos/include/ddk/d3dhalex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhalex.h?rev… Removed: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… Removed: trunk/reactos/include/ddk/ddkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkernel.h?rev… Removed: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… Removed: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=4… Removed: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… Removed: trunk/reactos/include/ddk/diskguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/diskguid.h?rev… Removed: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… Modified: trunk/reactos/include/ddk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dvp.h?rev=4849… Modified: trunk/reactos/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ioaccess.h?rev… Removed: trunk/reactos/include/ddk/ntddtape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtape.h?rev… Removed: trunk/reactos/include/ddk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtdi.h?rev=… Removed: trunk/reactos/include/ddk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvdeo.h?rev… Removed: trunk/reactos/include/ddk/ntddvol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvol.h?rev=… Removed: trunk/reactos/include/ddk/objerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/objerror.h?rev… Removed: trunk/reactos/include/ddk/polarity.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/polarity.h?rev… Removed: trunk/reactos/include/ddk/prntfont.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/prntfont.h?rev… Removed: trunk/reactos/include/ddk/stierr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stierr.h?rev=4… Removed: trunk/reactos/include/ddk/stireg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stireg.h?rev=4… Removed: trunk/reactos/include/ddk/tdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdi.h?rev=4849… Removed: trunk/reactos/include/ddk/tdiinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdiinfo.h?rev=… Removed: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… Removed: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… Copied: trunk/reactos/include/psdk/d3dnthal.h (from r48479, trunk/reactos/include/ddk/d3dnthal.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dnthal.h?p2… Copied: trunk/reactos/include/psdk/ddkernel.h (from r48479, trunk/reactos/include/ddk/ddkernel.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkernel.h?p2… Copied: trunk/reactos/include/psdk/ddkmapi.h (from r48479, trunk/reactos/include/ddk/ddkmapi.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkmapi.h?p2=… Copied: trunk/reactos/include/psdk/ddraw.h (from r48479, trunk/reactos/include/dxsdk/ddraw.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?p2=tr… Copied: trunk/reactos/include/psdk/ddrawi.h (from r48479, trunk/reactos/include/ddk/ddrawi.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawi.h?p2=t… Copied: trunk/reactos/include/psdk/ddrawint.h (from r48479, trunk/reactos/include/ddk/ddrawint.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawint.h?p2… Modified: trunk/reactos/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinput.h?rev=… Copied: trunk/reactos/include/psdk/dmemmgr.h (from r48489, trunk/reactos/include/ddk/dmemmgr.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmemmgr.h?p2=… Modified: trunk/reactos/include/psdk/sti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sti.h?rev=484…

1 0

[cgutman] 48496: [MSWSOCK] - Implement WSPSetSockOpt (copied and modified from WSPGetSockOpt) - DHCP works now
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 20:47:14 2010 New Revision: 48496 URL: http://svn.reactos.org/svn/reactos?rev=48496&view=rev Log: [MSWSOCK] - Implement WSPSetSockOpt (copied and modified from WSPGetSockOpt) - DHCP works now Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c [iso-8859-1] Mon Aug 9 20:47:14 2010 @@ -517,7 +517,7 @@ PSOCKET_INFORMATION Socket; INT ErrorCode; PWINSOCK_TEB_DATA ThreadData; - + /* Enter prolog */ ErrorCode = SockEnterApiFast(&ThreadData); if (ErrorCode != NO_ERROR) @@ -526,7 +526,7 @@ *lpErrno = ErrorCode; return SOCKET_ERROR; } - + /* Get the socket structure */ Socket = SockFindAndReferenceSocket(Handle, TRUE); if (!Socket) @@ -535,10 +535,10 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } - + /* Lock the socket */ EnterCriticalSection(&Socket->Lock); - + /* Make sure we're not closed */ if (Socket->SharedData.State == SocketClosed) { @@ -546,7 +546,7 @@ ErrorCode = WSAENOTSOCK; goto error; } - + /* Validate the pointer */ if (!OptionValue) { @@ -554,7 +554,7 @@ ErrorCode = WSAEFAULT; goto error; } - + /* Validate option */ if (!IsValidOptionForSocket(Socket, Level, OptionName)) { @@ -562,28 +562,143 @@ ErrorCode = WSAENOPROTOOPT; goto error; } - - /* FIXME: Write code */ - + + /* Check the Level first */ + switch (Level) + { + /* Handle SOL_SOCKET */ + case SOL_SOCKET: + + /* Now check the Option */ + switch (OptionName) + { + case SO_RCVBUF: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.SizeOfRecvBuffer = *(PINT)OptionValue; + + /* FIXME: Tell AFD */ + break; + + case SO_SNDBUF: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.SizeOfSendBuffer = *(PINT)OptionValue; + + /* FIXME: Tell AFD */ + break; + + case SO_BROADCAST: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.Broadcast = *(PINT)OptionValue; + break; + + case SO_DEBUG: + + /* Validate the size */ + if (OptionLength < sizeof(INT)) + { + /* Size is too small, fail */ + ErrorCode = WSAEFAULT; + goto error; + } + + /* Set the data */ + Socket->SharedData.Debug = *(PINT)OptionValue; + break; + + case SO_CONDITIONAL_ACCEPT: + case SO_DONTLINGER: + case SO_DONTROUTE: + case SO_ERROR: + case SO_GROUP_PRIORITY: + case SO_KEEPALIVE: + case SO_LINGER: + case SO_OOBINLINE: + case SO_REUSEADDR: + + /* Unsupported */ + + default: + + /* Unsupported by us, give it to the helper */ + ErrorCode = SockGetTdiHandles(Socket); + if (ErrorCode != NO_ERROR) goto error; + + /* Call the helper */ + ErrorCode = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + (PCHAR)OptionValue, + OptionLength); + if (ErrorCode != NO_ERROR) goto error; + break; + } + break; + + default: + + /* Unsupported by us, give it to the helper */ + ErrorCode = SockGetTdiHandles(Socket); + if (ErrorCode != NO_ERROR) goto error; + + /* Call the helper */ + ErrorCode = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + (PCHAR)OptionValue, + OptionLength); + if (ErrorCode != NO_ERROR) goto error; + break; + } + error: - + /* Dereference and unlock the socket */ + LeaveCriticalSection(&Socket->Lock); + SockDereferenceSocket(Socket); + /* Check if this is the failure path */ if (ErrorCode != NO_ERROR) { - /* Dereference and unlock the socket */ - LeaveCriticalSection(&Socket->Lock); - SockDereferenceSocket(Socket); - /* Return error */ *lpErrno = ErrorCode; return SOCKET_ERROR; } - + /* Update the socket's state in AFD */ ErrorCode = SockSetHandleContext(Socket); - if (ErrorCode != NO_ERROR) goto error; - + /* Return success */ - return NO_ERROR; + return ErrorCode; } -

1 0

[fireball] 48495: Carlo Bramix - Prevent possible out-of-bounds access. See issue #5505 for more details.
by fireball＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: fireball Date: Mon Aug 9 20:41:41 2010 New Revision: 48495 URL: http://svn.reactos.org/svn/reactos?rev=48495&view=rev Log: Carlo Bramix - Prevent possible out-of-bounds access. See issue #5505 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Mon Aug 9 20:41:41 2010 @@ -73,7 +73,7 @@ /* Extract the volume label */ pc = Pvd->VolumeId; pw = CdInfo->VolumeLabel; - for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR); i++) + for (i = 0; i < (MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)) - 1; i++) { *pw++ = (WCHAR)*pc++; }

1 0

[fireball] 48494: Pierre Schweitzer - A better fix for CdfsIsNameLegalDOS8Dot3. See issue #2404 for more details.
by fireball＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: fireball Date: Mon Aug 9 20:38:12 2010 New Revision: 48494 URL: http://svn.reactos.org/svn/reactos?rev=48494&view=rev Log: Pierre Schweitzer - A better fix for CdfsIsNameLegalDOS8Dot3. See issue #2404 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Aug 9 20:38:12 2010 @@ -96,31 +96,37 @@ } BOOLEAN -CdfsIsNameLegalDOS8Dot3(IN PUNICODE_STRING FileName +CdfsIsNameLegalDOS8Dot3(IN UNICODE_STRING FileName ) { ULONG i; STRING DbcsName; CHAR DbcsNameBuffer[12]; - for (i = 0; i < FileName->Length / sizeof(WCHAR) ; i++) + /* 8dot3 filename is max 12 length */ + if (FileName.Length / sizeof(WCHAR) > 12) + { + return FALSE; + } + + for (i = 0; i < FileName.Length / sizeof(WCHAR) ; i++) { /* Don't allow spaces in FileName */ - if (FileName->Buffer[i] == L' ') + if (FileName.Buffer[i] == L' ') return FALSE; } -#if 0 + /* If FileName is finishing with a dot, remove it */ - if (FileName->Buffer[FileName->Length / sizeof(WCHAR) - 1] == '.') - { - FileName->Length -= sizeof(WCHAR); - } -#endif + if (FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == '.') + { + FileName.Length -= sizeof(WCHAR); + } + /* Finally, convert the string to call the FsRtl function */ DbcsName.MaximumLength = 12; DbcsName.Buffer = DbcsNameBuffer; if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName, - FileName, + &FileName, FALSE ))) { @@ -165,7 +171,7 @@ } /* Cache miss */ - if (!CdfsIsNameLegalDOS8Dot3(LongName)) + if (!CdfsIsNameLegalDOS8Dot3(*LongName)) { RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); }

1 0

[cgutman] 48493: [DHCPCSVC] - Set the SO_BROADCAST option to 1 before we send data to the broadcast address so we don't get stonewalled by mswsock - DHCP is now compatible with mswsock_new
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 20:37:32 2010 New Revision: 48493 URL: http://svn.reactos.org/svn/reactos?rev=48493&view=rev Log: [DHCPCSVC] - Set the SO_BROADCAST option to 1 before we send data to the broadcast address so we don't get stonewalled by mswsock - DHCP is now compatible with mswsock_new Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Mon Aug 9 20:37:32 2010 @@ -209,7 +209,7 @@ PDHCP_ADAPTER Adapter = NULL; HANDLE AdapterStateChangedEvent = (HANDLE)Context; struct interface_info *ifi = NULL; - int i, AdapterCount = 0; + int i, AdapterCount = 0, Broadcast; /* FIXME: Kill this thread when the service is stopped */ @@ -285,6 +285,15 @@ socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if (DhcpSocket != INVALID_SOCKET) { + + /* Allow broadcast on this socket */ + Broadcast = 1; + setsockopt(DhcpSocket, + SOL_SOCKET, + SO_BROADCAST, + (const char *)&Broadcast, + sizeof(Broadcast)); + Adapter->ListenAddr.sin_family = AF_INET; Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); Adapter->BindStatus =

1 0

[evb] 48492: Support PCI device resource dicsovery for limit and current now, so bridge + device BAR functionning PciScanBus second pass enabled: PciProcessBus, most stubs now until VGA/ISA system tested PciClassifyDeviceType implement as helper function PCI Enumeration 100% complete!
by evb＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: evb Date: Mon Aug 9 19:07:52 2010 New Revision: 48492 URL: http://svn.reactos.org/svn/reactos?rev=48492&view=rev Log: Support PCI device resource dicsovery for limit and current now, so bridge + device BAR functionning PciScanBus second pass enabled: PciProcessBus, most stubs now until VGA/ISA system tested PciClassifyDeviceType implement as helper function PCI Enumeration 100% complete! Modified: trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -20,32 +20,238 @@ NTAPI Device_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER PciData; + PIO_RESOURCE_DESCRIPTOR IoDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor; + PPCI_FUNCTION_RESOURCES Resources; + PULONG BarArray; + ULONG Bar, BarMask, i; + + /* Get variables from context */ + PciData = Context->Current; + Resources = Context->PdoExtension->Resources; + + /* Loop all the PCI BARs */ + BarArray = PciData->u.type0.BaseAddresses; + for (i = 0; i <= PCI_TYPE0_ADDRESSES; i++) + { + /* Get the resource descriptor and limit descriptor for this BAR */ + CmDescriptor = &Resources->Current[i]; + IoDescriptor = &Resources->Limit[i]; + + /* Build the resource descriptor based on the limit descriptor */ + CmDescriptor->Type = IoDescriptor->Type; + if (CmDescriptor->Type == CmResourceTypeNull) continue; + CmDescriptor->Flags = IoDescriptor->Flags; + CmDescriptor->ShareDisposition = IoDescriptor->ShareDisposition; + CmDescriptor->u.Generic.Start.HighPart = 0; + CmDescriptor->u.Generic.Length = IoDescriptor->u.Generic.Length; + + /* Read the actual BAR value */ + Bar = BarArray[i]; + + /* Check which BAR is being processed now */ + if (i != PCI_TYPE0_ADDRESSES) + { + /* Check if this is an I/O BAR */ + if (Bar & PCI_ADDRESS_IO_SPACE) + { + /* Use the right mask to get the I/O port base address */ + ASSERT(CmDescriptor->Type == CmResourceTypePort); + BarMask = PCI_ADDRESS_IO_ADDRESS_MASK; + } + else + { + /* It's a RAM BAR, use the right mask to get the base address */ + ASSERT(CmDescriptor->Type == CmResourceTypeMemory); + BarMask = PCI_ADDRESS_MEMORY_ADDRESS_MASK; + + /* Check if it's a 64-bit BAR */ + if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + /* The next BAR value is actually the high 32-bits */ + CmDescriptor->u.Memory.Start.HighPart = BarArray[i + 1]; + } + else if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) + { + /* Legacy BAR, don't read more than 20 bits of the address */ + BarMask = 0xFFFF0; + } + } + } + else + { + /* Actually a ROM BAR, so read the correct register */ + Bar = PciData->u.type0.ROMBaseAddress; + + /* Apply the correct mask for ROM BARs */ + BarMask = PCI_ADDRESS_ROM_ADDRESS_MASK; + + /* Make sure it's enabled */ + if (!(Bar & PCI_ROMADDRESS_ENABLED)) + { + /* If it isn't, then a descriptor won't be built for it */ + CmDescriptor->Type = CmResourceTypeNull; + continue; + } + } + + /* Now we have the right mask, read the actual address from the BAR */ + Bar &= BarMask; + CmDescriptor->u.Memory.Start.LowPart = Bar; + + /* And check for invalid BAR addresses */ + if (!(CmDescriptor->u.Memory.Start.HighPart | Bar)) + { + /* Skip these descriptors */ + CmDescriptor->Type = CmResourceTypeNull; + DPRINT1("Invalid BAR\n"); + } + } + + /* Also save the sub-IDs that came directly from the PCI header */ + Context->PdoExtension->SubsystemVendorId = PciData->u.type0.SubVendorID; + Context->PdoExtension->SubsystemId = PciData->u.type0.SubSystemID; } VOID NTAPI Device_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER Current, PciData; + PPCI_PDO_EXTENSION PdoExtension; + PULONG BarArray; + PIO_RESOURCE_DESCRIPTOR Limit; + ULONG i; + + /* Get pointers from the context */ + PdoExtension = Context->PdoExtension; + Current = Context->Current; + PciData = Context->PciData; + + /* And get the array of bARs */ + BarArray = PciData->u.type0.BaseAddresses; + + /* First, check for IDE controllers that are not in native mode */ + if ((PdoExtension->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PdoExtension->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR) && + (PdoExtension->ProgIf & 5) != 5) + { + /* They should not be using any non-legacy resources */ + BarArray[0] = 0; + BarArray[1] = 0; + BarArray[2] = 0; + BarArray[3] = 0; + } + else if ((PdoExtension->VendorId == 0x5333) && + ((PdoExtension->DeviceId == 0x88F0) || + (PdoExtension->DeviceId == 0x8880))) + { + /* + * The problem is caused by the S3 Vision 968/868 video controller which + * is used on the Diamond Stealth 64 Video 3000 series, Number Nine 9FX + * motion 771, and other popular video cards, all containing a memory bug. + * The 968/868 claims to require 32 MB of memory, but it actually decodes + * 64 MB of memory. + */ + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + { + /* Find its 32MB RAM BAR */ + if (BarArray[i] == 0xFE000000) + { + /* Increase it to 64MB to make sure nobody touches the buffer */ + BarArray[i] = 0xFC000000; + DPRINT1("PCI - Adjusted broken S3 requirement from 32MB to 64MB\n"); + } + } + } + + /* Check for Cirrus Logic GD5430/5440 cards */ + if ((PdoExtension->VendorId == 0x1013) && (PdoExtension->DeviceId == 0xA0)) + { + /* Check for the I/O port requirement */ + if (BarArray[1] == 0xFC01) + { + /* Check for completely bogus BAR */ + if (Current->u.type0.BaseAddresses[1] == 1) + { + /* Ignore it */ + BarArray[1] = 0; + DPRINT1("PCI - Ignored Cirrus GD54xx broken IO requirement (400 ports)\n"); + } + else + { + /* Otherwise, this BAR seems okay */ + DPRINT1("PCI - Cirrus GD54xx 400 port IO requirement has a valid setting (%08x)\n", + Current->u.type0.BaseAddresses[1]); + } + } + else if (BarArray[1]) + { + /* Strange, the I/O BAR was not found as expected (or at all) */ + DPRINT1("PCI - Warning Cirrus Adapter 101300a0 has unexpected resource requirement (%08x)\n", + BarArray[1]); + } + } + + /* Finally, process all the limit descriptors */ + Limit = PdoExtension->Resources->Limit; + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) + { + /* And build them based on the BARs */ + if (PciCreateIoDescriptorFromBarLimit(&Limit[i], &BarArray[i], FALSE)) + { + /* This function returns TRUE if the BAR was 64-bit, handle this */ + ASSERT((i + 1) < PCI_TYPE0_ADDRESSES); + i++; + (&Limit[i])->Type == CmResourceTypeNull; + } + } + + /* Create the last descriptor based on the ROM address */ + PciCreateIoDescriptorFromBarLimit(&Limit[i], + &PciData->u.type0.ROMBaseAddress, + TRUE); } VOID NTAPI Device_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER PciData; + PPCI_PDO_EXTENSION PdoExtension; + PULONG BarArray; + ULONG i = 0; + + /* Get pointers from context data */ + PdoExtension = Context->PdoExtension; + PciData = Context->PciData; + + /* Get the array of BARs */ + BarArray = PciData->u.type0.BaseAddresses; + + /* Check for IDE controllers that are not in native mode */ + if ((PdoExtension->BaseClass == PCI_CLASS_MASS_STORAGE_CTLR) && + (PdoExtension->SubClass == PCI_SUBCLASS_MSC_IDE_CTLR) && + (PdoExtension->ProgIf & 5) != 5) + { + /* These controllers only use legacy resources */ + i = 4; + } + + /* Set all the bits on, which will allow us to recover the limit data */ + for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) BarArray[i] = 0xFFFFFFFF; + + /* Do the same for the PCI ROM BAR */ + PciData->u.type0.ROMBaseAddress = PCI_ADDRESS_ROM_ADDRESS_MASK; } VOID NTAPI Device_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + /* Nothing to do for devices */ + return; } VOID @@ -54,6 +260,7 @@ IN PPCI_COMMON_HEADER PciData, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } @@ -62,6 +269,7 @@ NTAPI Device_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } @@ -70,6 +278,7 @@ NTAPI Device_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { + /* Not yet implemented */ UNIMPLEMENTED; while (TRUE); } Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -32,7 +32,7 @@ PPBridge_SaveCurrentSettings, PPBridge_ChangeResourceSettings, PPBridge_GetAdditionalResourceDescriptors, - PPBridge_ResetDevice + PPBridge_ResetDevice }, { Cardbus_MassageHeaderForLimitsDetermination, @@ -44,7 +44,7 @@ Cardbus_ResetDevice } }; - + /* FUNCTIONS ******************************************************************/ /* @@ -715,10 +715,10 @@ /* Write the limit discovery header */ PciWriteDeviceConfig(PdoExtension, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Now read what the device indicated the limits are */ PciReadDeviceConfig(PdoExtension, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Then write back the original configuration header */ PciWriteDeviceConfig(PdoExtension, Current, 0, PCI_COMMON_HDR_LENGTH); @@ -735,7 +735,7 @@ /* Copy back the original status that was saved as well */ Current->Status = Context->Status; - + /* Call the configurator to restore any other data that might've changed */ Context->Configurator->RestoreCurrent(Context); } @@ -915,6 +915,62 @@ /* Enumeration is completed, free the PCI headers and return the status */ ExFreePoolWithTag(PciData, 0); return Status; +} + +VOID +NTAPI +PciProcessBus(IN PPCI_FDO_EXTENSION DeviceExtension) +{ + PPCI_PDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PhysicalDeviceObject; + PAGED_CODE(); + + /* Get the PDO Extension */ + PhysicalDeviceObject = DeviceExtension->PhysicalDeviceObject; + PdoExtension = (PPCI_PDO_EXTENSION)PhysicalDeviceObject->DeviceExtension; + + /* Cheeck if this is the root bus */ + if (!PCI_IS_ROOT_FDO(DeviceExtension)) + { + /* Not really handling this year */ + UNIMPLEMENTED; + while (TRUE); + + /* Check for PCI bridges with the ISA bit set, or required */ + if ((PdoExtension) && + (PciClassifyDeviceType(PdoExtension) == PciTypePciBridge) && + ((PdoExtension->Dependent.type1.IsaBitRequired) || + (PdoExtension->Dependent.type1.IsaBitSet))) + { + /* We'll need to do some legacy support */ + UNIMPLEMENTED; + while (TRUE); + } + } + else + { + /* Scan all of the root bus' children bridges */ + for (PdoExtension = DeviceExtension->ChildBridgePdoList; + PdoExtension; + PdoExtension = PdoExtension->NextBridge) + { + /* Find any that have the VGA decode bit on */ + if (PdoExtension->Dependent.type1.VgaBitSet) + { + /* Again, some more legacy support we'll have to do */ + UNIMPLEMENTED; + while (TRUE); + } + } + } + + /* Check for ACPI systems where the OS assigns bus numbers */ + if (PciAssignBusNumbers) + { + /* Not yet supported */ + UNIMPLEMENTED; + while (TRUE); + } } NTSTATUS @@ -1363,7 +1419,8 @@ } } - /* Enumeration is completed */ + /* Enumeration completed, do a final pass now that all devices are found */ + if (ProcessFlag) PciProcessBus(DeviceExtension); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -101,6 +101,18 @@ PciInterface_AgpTarget = 'icP>', PciInterface_Location = 'icP?' } PCI_SIGNATURE, *PPCI_SIGNATURE; + +// +// Driver-handled PCI Device Types +// +typedef enum _PCI_DEVICE_TYPES +{ + PciTypeInvalid, + PciTypeHostBridge, + PciTypePciBridge, + PciTypeCardbusBridge, + PciTypeDevice +} PCI_DEVICE_TYPES; // // Device Extension Logic States @@ -1064,6 +1076,12 @@ IN BOOLEAN ForPowerDown ); +PCI_DEVICE_TYPES +NTAPI +PciClassifyDeviceType( + IN PPCI_PDO_EXTENSION PdoExtension +); + ULONG_PTR NTAPI PciExecuteCriticalSystemRoutine( @@ -1607,6 +1625,7 @@ extern PDRIVER_OBJECT PciDriverObject; extern PWATCHDOG_TABLE WdTable; extern PPCI_HACK_ENTRY PciHackTable; +extern BOOLEAN PciAssignBusNumbers; extern BOOLEAN PciEnableNativeModeATA; /* Exported by NTOS, should this go in the NDK? */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Mon Aug 9 19:07:52 2010 @@ -1041,6 +1041,24 @@ return !(HackFlags & PCI_HACK_NO_PM_CAPS); } +PCI_DEVICE_TYPES +NTAPI +PciClassifyDeviceType(IN PPCI_PDO_EXTENSION PdoExtension) +{ + ASSERT(PdoExtension->ExtensionType == PciPdoExtensionType); + + /* Differenriate between devices and bridges */ + if (PdoExtension->BaseClass != PCI_CLASS_BRIDGE_DEV) return PciTypeDevice; + + /* The PCI Bus driver handles only CardBus and PCI bridges (plus host) */ + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST) return PciTypeHostBridge; + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI) return PciTypePciBridge; + if (PdoExtension->SubClass == PCI_SUBCLASS_BR_CARDBUS) return PciTypeCardbusBridge; + + /* Any other kind of bridge is treated like a device */ + return PciTypeDevice; +} + ULONG_PTR NTAPI PciExecuteCriticalSystemRoutine(IN ULONG_PTR IpiContext)

1 0

[cgutman] 48491: [WS2_32] - Check the return value of WSPSelect instead of the error number because the error number doesn't have to be initialized if the function doesn't return SOCKET_ERROR
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 15:42:51 2010 New Revision: 48491 URL: http://svn.reactos.org/svn/reactos?rev=48491&view=rev Log: [WS2_32] - Check the return value of WSPSelect instead of the error number because the error number doesn't have to be initialized if the function doesn't return SOCKET_ERROR Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Mon Aug 9 15:42:51 2010 @@ -459,7 +459,7 @@ DereferenceProviderByPointer(Provider); - if (Errno != NO_ERROR) + if (Count == SOCKET_ERROR) { WSASetLastError(Errno); return SOCKET_ERROR;

1 0

[cgutman] 48490: [MSWSOCK] - Fix a crash in WSPSelect
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 15:37:12 2010 New Revision: 48490 URL: http://svn.reactos.org/svn/reactos?rev=48490&view=rev Log: [MSWSOCK] - Fix a crash in WSPSelect Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] Mon Aug 9 15:37:12 2010 @@ -13,7 +13,7 @@ (s->SharedData.AsyncEvents & e)) #define HANDLES_IN_SET(s) \ - s == NULL ? 0 : (s->fd_count & 0xFFFF) +(((s) == NULL) ? 0 : ((s)->fd_count & 0xFFFF)) /* DATA **********************************************************************/

1 0

[cgutman] 48489: [MSWSOCK] - Add a hack to set the connectionless flag for datagram and raw sockets (the previous msafd has the same hack) - The DHCP service can send and receive packets now
by cgutman＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: cgutman Date: Sun Aug 8 16:36:48 2010 New Revision: 48489 URL: http://svn.reactos.org/svn/reactos?rev=48489&view=rev Log: [MSWSOCK] - Add a hack to set the connectionless flag for datagram and raw sockets (the previous msafd has the same hack) - The DHCP service can send and receive packets now Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c [iso-8859-1] Sun Aug 8 16:36:48 2010 @@ -693,6 +693,12 @@ ServiceFlags = lpProtocolInfo->dwServiceFlags1; ProviderFlags = lpProtocolInfo->dwProviderFlags; ProviderId = lpProtocolInfo->ProviderId; + + /* HACK: We don't set this flag properly ATM */ + if(SocketType == SOCK_DGRAM || SocketType == SOCK_RAW) + { + ServiceFlags |= XP1_CONNECTIONLESS; + } /* Create the actual socket */ ErrorCode = SockSocket(AddressFamily,

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