Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[hpoussin] 43529: [freeldr] FAT driver: check for directory attribute before parsing the next part of filename Implement OpenDirectory mode in FAT driver

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Oct 17 16:05:34 2009 New Revision: 43529 URL: http://svn.reactos.org/svn/reactos?rev=43529&view=rev Log: [freeldr] FAT driver: check for directory attribute before parsing the next part of filename Implement OpenDirectory mode in FAT driver Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Oct 17 16:05:34 2009 @@ -1,6 +1,7 @@ /* * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2009 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -598,6 +599,7 @@ // // We found the entry, now fill in the FAT_FILE_INFO struct // + FatFileInfoPointer->Attributes = DirEntry->Attr; FatFileInfoPointer->FileSize = DirEntry->Size; FatFileInfoPointer->FilePointer = 0; @@ -791,6 +793,14 @@ // if ((i+1) < NumberOfPathParts) { + // + // Check if current entry is a directory + // + if (!FatFileInfo.Attributes & ATTR_DIRECTORY) + { + MmFreeMemory(FatFileInfo.FileFatChain); + return ENOTDIR; + } DirectoryStartCluster = FatFileInfo.FileFatChain[0]; } MmFreeMemory(FatFileInfo.FileFatChain); @@ -1347,9 +1357,10 @@ FAT_FILE_INFO TempFileInfo; PFAT_FILE_INFO FileHandle; ULONG DeviceId; + BOOLEAN IsDirectory; LONG ret; - if (OpenMode != OpenReadOnly) + if (OpenMode != OpenReadOnly && OpenMode != OpenDirectory) return EACCES; DeviceId = FsGetDeviceId(*FileId); @@ -1361,6 +1372,15 @@ ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) return ENOENT; + + // + // Check if caller opened what he expected (dir vs file) + // + IsDirectory = (TempFileInfo.Attributes & ATTR_DIRECTORY) != 0; + if (IsDirectory && OpenMode != OpenDirectory) + return EISDIR; + else if (!IsDirectory && OpenMode != OpenReadOnly) + return ENOTDIR; FileHandle = MmHeapAlloc(sizeof(FAT_FILE_INFO)); if (!FileHandle) Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] Sat Oct 17 16:05:34 2009 @@ -148,6 +148,7 @@ typedef struct { + UCHAR Attributes; /* File attributes */ ULONG FileSize; /* File size */ ULONG FilePointer; /* File pointer */ ULONG* FileFatChain; /* File fat chain array */

14 years, 11 months

[fireball] 43528: [fastfat_new] - Implement FatiOpenExistingFcb. - Make FatGetFcbUnicodeName supporting DCBs. - Implement FF_OpenW wrapper around FullFAT to support opening files/dirs using a unicode name.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 17 15:18:29 2009 New Revision: 43528 URL: http://svn.reactos.org/svn/reactos?rev=43528&view=rev Log: [fastfat_new] - Implement FatiOpenExistingFcb. - Make FatGetFcbUnicodeName supporting DCBs. - Implement FF_OpenW wrapper around FullFAT to support opening files/dirs using a unicode name. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c trunk/reactos/drivers/filesystems/fastfat_new/lock.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -10,16 +10,6 @@ #define NDEBUG #include "fastfat.h" - -NTSYSAPI -NTSTATUS -NTAPI -RtlUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING DestinationString, - IN PCUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString -); - /* FUNCTIONS *****************************************************************/ 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] Sat Oct 17 15:18:29 2009 @@ -34,6 +34,15 @@ { \ ExReleaseResourceLite(&(FatGlobalData.Resource)); \ } + +NTSYSAPI +NTSTATUS +NTAPI +RtlUpcaseUnicodeStringToCountedOemString( + IN OUT POEM_STRING DestinationString, + IN PCUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); /* ------------------------------------------------------ shutdown.c */ @@ -211,6 +220,14 @@ NTSTATUS NTAPI FatLockControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +VOID NTAPI +FatOplockComplete(IN PVOID Context, + IN PIRP Irp); + +VOID NTAPI +FatPrePostIrp(IN PVOID Context, + IN PIRP Irp); + /* --------------------------------------------------------- fsctl.c */ NTSTATUS NTAPI @@ -220,6 +237,10 @@ NTSTATUS NTAPI FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +/* --------------------------------------------------------- fullfat.c */ + +FF_FILE *FF_OpenW(FF_IOMAN *pIoman, PUNICODE_STRING pathW, FF_T_UINT8 Mode, FF_ERROR *pError); /* --------------------------------------------------------- iface.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -133,9 +133,10 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define VCB_STATE_FLAG_LOCKED 0x01 -#define VCB_STATE_FLAG_DIRTY 0x02 -#define VCB_STATE_MOUNTED_DIRTY 0x04 +#define VCB_STATE_FLAG_LOCKED 0x01 +#define VCB_STATE_FLAG_DIRTY 0x02 +#define VCB_STATE_MOUNTED_DIRTY 0x04 +#define VCB_STATE_CREATE_IN_PROGRESS 0x08 typedef enum _VCB_CONDITION { @@ -249,6 +250,8 @@ #define FCB_STATE_HAS_NAMES 0x01 #define FCB_STATE_HAS_UNICODE_NAME 0x02 +#define FCB_STATE_PAGEFILE 0x04 +#define FCB_STATE_DELAY_CLOSE 0x08 typedef struct _FCB { @@ -264,7 +267,6 @@ ERESOURCE Resource; // nonpaged! ERESOURCE PagingIoResource; // nonpaged! - FILE_LOCK Lock; /* First cluster in the fat allocation chain */ ULONG FirstClusterOfFile; /* A list of all FCBs of that DCB */ @@ -307,6 +309,13 @@ { struct { + /* File and Op locks */ + FILE_LOCK Lock; + OPLOCK Oplock; + } Fcb; + + struct + { /* A list of all FCBs/DCBs opened under this DCB */ LIST_ENTRY ParentDcbList; /* Directory data stream (just handy to have it). */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -191,9 +191,243 @@ OUT PBOOLEAN OplockPostIrp) { IO_STATUS_BLOCK Iosb = {{0}}; - - Iosb.Status = STATUS_NOT_IMPLEMENTED; - UNIMPLEMENTED; + ACCESS_MASK AddedAccess = 0; + BOOLEAN Hidden; + BOOLEAN System; + PCCB Ccb = NULL; + NTSTATUS Status; + + /* Acquire exclusive FCB lock */ + (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); + + *OplockPostIrp = FALSE; + + /* Check if there is a batch oplock */ + if (FsRtlCurrentBatchOplock(&Fcb->Fcb.Oplock)) + { + /* Return with a special information field */ + Iosb.Information = FILE_OPBATCH_BREAK_UNDERWAY; + + /* Check the oplock */ + Iosb.Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + IrpContext->Irp, + IrpContext, + FatOplockComplete, + FatPrePostIrp); + + if (Iosb.Status != STATUS_SUCCESS && + Iosb.Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) + { + /* The Irp needs to be queued */ + *OplockPostIrp = TRUE; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + } + + /* Validate parameters and modify access */ + if (CreateDisposition == FILE_CREATE) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + else if (CreateDisposition == FILE_SUPERSEDE) + { + SetFlag(AddedAccess, DELETE & ~(*DesiredAccess)); + *DesiredAccess |= DELETE; + } + else if ((CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + SetFlag(AddedAccess, + (FILE_WRITE_DATA | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES) + & ~(*DesiredAccess) ); + + *DesiredAccess |= FILE_WRITE_DATA | FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES; + } + + // TODO: Check desired access + + // TODO: Check if this file is readonly and DeleteOnClose is set + + /* Validate disposition information */ + if ((CreateDisposition == FILE_SUPERSEDE) || + (CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + // TODO: Get this attributes from the dirent + Hidden = FALSE; + System = FALSE; + + if ((Hidden && !FlagOn(FileAttributes, FILE_ATTRIBUTE_HIDDEN)) || + (System && !FlagOn(FileAttributes, FILE_ATTRIBUTE_SYSTEM))) + { + DPRINT1("Hidden/system attributes don't match\n"); + + Iosb.Status = STATUS_ACCESS_DENIED; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + // TODO: Check for write protected volume + } + + /* Check share access */ + Iosb.Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Fcb->ShareAccess, + FALSE); + if (!NT_SUCCESS(Iosb.Status)) + { + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + /* Check the oplock status after checking for share access */ + Iosb.Status = FsRtlCheckOplock(&Fcb->Fcb.Oplock, + IrpContext->Irp, + IrpContext, + FatOplockComplete, + FatPrePostIrp ); + + if (Iosb.Status != STATUS_SUCCESS && + Iosb.Status != STATUS_OPLOCK_BREAK_IN_PROGRESS) + { + /* The Irp needs to be queued */ + *OplockPostIrp = TRUE; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + + /* Set Fast I/O flag */ + Fcb->Header.IsFastIoPossible = FALSE; //FatiIsFastIoPossible(Fcb); + + /* Make sure image is not mapped */ + if (DeleteOnClose || FlagOn(*DesiredAccess, FILE_WRITE_DATA)) + { + /* Try to flush the image section */ + if (!MmFlushImageSection(&Fcb->SectionObjectPointers, MmFlushForWrite)) + { + /* Yes, image section exists, set correct status code */ + if (DeleteOnClose) + Iosb.Status = STATUS_CANNOT_DELETE; + else + Iosb.Status = STATUS_SHARING_VIOLATION; + + /* Release the FCB and return */ + FatReleaseFcb(IrpContext, Fcb); + return Iosb; + } + } + + /* Flush the cache if it's non-cached non-pagefile access */ + if (FlagOn(FileObject->Flags, FO_NO_INTERMEDIATE_BUFFERING) && + Fcb->SectionObjectPointers.DataSectionObject && + !FlagOn(Fcb->State, FCB_STATE_PAGEFILE)) + { + /* Set the flag that create is in progress */ + SetFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + + /* Flush the cache */ + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + + /* Acquire and release Paging I/O resource before purging the cache section + to let lazy writer finish */ + ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE); + ExReleaseResourceLite( Fcb->Header.PagingIoResource ); + + /* Delete the cache section */ + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + + /* Clear the flag */ + ClearFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + } + + /* Check create disposition flags and branch accordingly */ + if (CreateDisposition == FILE_OPEN || + CreateDisposition == FILE_OPEN_IF) + { + DPRINT("Opening a file\n"); + + /* Check if we need to bother with EA */ + if (NoEaKnowledge && FALSE /* FatIsFat32(Vcb)*/) + { + UNIMPLEMENTED; + } + + /* Set up file object */ + Ccb = FatCreateCcb(IrpContext); + FatSetFileObject(FileObject, + UserFileOpen, + Fcb, + Ccb); + + FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + /* The file is opened */ + Iosb.Information = FILE_OPENED; + goto SuccComplete; + } + else if ((CreateDisposition == FILE_SUPERSEDE) || + (CreateDisposition == FILE_OVERWRITE) || + (CreateDisposition == FILE_OVERWRITE_IF)) + { + UNIMPLEMENTED; + ASSERT(FALSE); + } + else + { + /* We can't get here */ + KeBugCheckEx(0x23, CreateDisposition, 0, 0, 0); + } + + +SuccComplete: + /* If all is fine */ + if (Iosb.Status != STATUS_PENDING && + NT_SUCCESS(Iosb.Status)) + { + /* Update access if needed */ + if (AddedAccess) + { + /* Remove added access flags from desired access */ + ClearFlag(*DesiredAccess, AddedAccess); + + /* Check share access */ + Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Fcb->ShareAccess, + TRUE); + + /* Make sure it's success */ + ASSERT(Status == STATUS_SUCCESS); + } + else + { + /* Update the share access */ + IoUpdateShareAccess(FileObject, &Fcb->ShareAccess); + } + + /* Clear the delay close */ + ClearFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + + /* Increase global volume counter */ + Vcb->OpenFileCount++; + + // TODO: Handle DeleteOnClose and OpenedAsDos by storing those flags in CCB + } return Iosb; } @@ -213,11 +447,16 @@ OEM_STRING LongNameOem; NTSTATUS Status; - /* We support only files now, not directories */ - if (Fcb->Header.NodeTypeCode != FAT_NTC_FCB) - { - UNIMPLEMENTED; - ASSERT(FALSE); + /* Make sure this FCB has a FullFAT handle associated with it */ + if (Fcb->FatHandle == NULL && + FatNodeType(Fcb) == FAT_NTC_DCB) + { + /* Open the dir with FullFAT */ + Fcb->FatHandle = FF_OpenW(Fcb->Vcb->Ioman, &Fcb->FullFileName, FF_MODE_DIR, NULL); + if (!Fcb->FatHandle) + { + ASSERT(FALSE); + } } /* Get the dir entry */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -77,4 +77,27 @@ return Count; } +FF_FILE *FF_OpenW(FF_IOMAN *pIoman, PUNICODE_STRING pathW, FF_T_UINT8 Mode, FF_ERROR *pError) +{ + OEM_STRING AnsiName; + CHAR AnsiNameBuf[512]; + NTSTATUS Status; + + /* Convert the name to ANSI */ + AnsiName.Buffer = AnsiNameBuf; + AnsiName.Length = 0; + AnsiName.MaximumLength = sizeof(AnsiNameBuf); + RtlZeroMemory(AnsiNameBuf, sizeof(AnsiNameBuf)); + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiName, pathW, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + DPRINT1("Opening '%s'\n", AnsiName.Buffer); + + /* Call FullFAT's handler */ + return FF_Open(pIoman, AnsiName.Buffer, Mode, pError); +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] Sat Oct 17 15:18:29 2009 @@ -21,4 +21,20 @@ return STATUS_NOT_IMPLEMENTED; } +VOID +NTAPI +FatOplockComplete(IN PVOID Context, + IN PIRP Irp) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +FatPrePostIrp(IN PVOID Context, + IN PIRP Irp) +{ + UNIMPLEMENTED; +} + /* EOF */

14 years, 11 months

[fireball] 43527: [fastfat_new] - Search FCBs with unicode name too, besides of OEM. - Create an infrastructure for opening existing FCB/DCBs.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 17 12:57:48 2009 New Revision: 43527 URL: http://svn.reactos.org/svn/reactos?rev=43527&view=rev Log: [fastfat_new] - Search FCBs with unicode name too, besides of OEM. - Create an infrastructure for opening existing FCB/DCBs. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -353,10 +353,11 @@ IO_STATUS_BLOCK Iosb; PIO_STACK_LOCATION IrpSp; BOOLEAN EndBackslash = FALSE, OpenedAsDos; - UNICODE_STRING RemainingPart, FirstName, NextName; + UNICODE_STRING RemainingPart, FirstName, NextName, FileNameUpcased; OEM_STRING AnsiFirstName; FF_ERROR FfError; TYPE_OF_OPEN TypeOfOpen; + BOOLEAN OplockPostIrp = FALSE; Iosb.Status = STATUS_SUCCESS; @@ -684,10 +685,22 @@ &OpenedAsDos); } - /* Check if we found anything */ + /* If nothing found - try with unicode */ if (!NextFcb && Fcb->Dcb.SplayLinksUnicode) { - ASSERT(FALSE); + FileNameUpcased.Buffer = FsRtlAllocatePool(PagedPool, FirstName.Length); + FileNameUpcased.Length = 0; + FileNameUpcased.MaximumLength = FirstName.Length; + + /* Downcase and then upcase to normalize it */ + Status = RtlDowncaseUnicodeString(&FileNameUpcased, &FirstName, FALSE); + Status = RtlUpcaseUnicodeString(&FileNameUpcased, &FileNameUpcased, FALSE); + + /* Try to find FCB again using unicode name */ + NextFcb = FatFindFcb(IrpContext, + &Fcb->Dcb.SplayLinksUnicode, + (PSTRING)&FileNameUpcased, + &OpenedAsDos); } /* Move to the next FCB */ @@ -729,8 +742,116 @@ /* We have a valid FCB now */ if (!RemainingPart.Length) { - DPRINT1("It's possible to open an existing FCB\n"); - ASSERT(FALSE); + /* Check for target dir open */ + if (OpenTargetDirectory) + { + DPRINT1("Opening target dir is missing\n"); + ASSERT(FALSE); + } + + /* Check this FCB's type */ + if (FatNodeType(Fcb) == FAT_NTC_ROOT_DCB || + FatNodeType(Fcb) == FAT_NTC_DCB) + { + /* Open a directory */ + if (NonDirectoryFile) + { + /* Forbidden */ + Iosb.Status = STATUS_FILE_IS_A_DIRECTORY; + ASSERT(FALSE); + return Iosb.Status; + } + + /* Open existing DCB */ + Iosb = FatiOpenExistingDcb(IrpContext, + FileObject, + Vcb, + Fcb, + DesiredAccess, + ShareAccess, + CreateDisposition, + NoEaKnowledge, + DeleteOnClose); + + /* Save information */ + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } + else if (FatNodeType(Fcb) == FAT_NTC_FCB) + { + /* Open a file */ + if (OpenDirectory) + { + /* Forbidden */ + Iosb.Status = STATUS_NOT_A_DIRECTORY; + ASSERT(FALSE); + return Iosb.Status; + } + + /* Check for trailing backslash */ + if (EndBackslash) + { + /* Forbidden */ + Iosb.Status = STATUS_OBJECT_NAME_INVALID; + ASSERT(FALSE); + return Iosb.Status; + } + + Iosb = FatiOpenExistingFcb(IrpContext, + FileObject, + Vcb, + Fcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + NoEaKnowledge, + DeleteOnClose, + OpenedAsDos, + &OplockPostIrp); + + /* Check if it's pending */ + if (Iosb.Status != STATUS_PENDING) + { + /* In case of success set cache supported flag */ + if (NT_SUCCESS(Iosb.Status) && !NoIntermediateBuffering) + { + SetFlag(FileObject->Flags, FO_CACHE_SUPPORTED); + } + + /* Save information */ + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } + else + { + /* Queue this IRP */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + } + else + { + /* Unexpected FCB type */ + KeBugCheckEx(/*FAT_FILE_SYSTEM*/0x23, __LINE__, (ULONG_PTR)Fcb, 0, 0); + } } /* During parsing we encountered a part which has no attached FCB/DCB. 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] Sat Oct 17 12:57:48 2009 @@ -173,4 +173,24 @@ return Fcb; } +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Dcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + + Iosb.Status = STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + + return Iosb; +} + /* 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] Sat Oct 17 12:57:48 2009 @@ -86,6 +86,17 @@ IN PVCB Vcb, IN PFCB ParentDcb, IN FF_FILE *FileHandle); + +IO_STATUS_BLOCK NTAPI +FatiOpenExistingDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Dcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose); /* -------------------------------------------------------- create.c */ @@ -296,6 +307,23 @@ IN PFCB ParentDcb, IN FF_FILE *FileHandle); +IO_STATUS_BLOCK NTAPI +FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose, + IN BOOLEAN OpenedAsDos, + OUT PBOOLEAN OplockPostIrp); + PFCB NTAPI FatFindFcb(PFAT_IRP_CONTEXT IrpContext, PRTL_SPLAY_LINKS *RootNode, Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sat Oct 17 12:57:48 2009 @@ -170,6 +170,32 @@ Ccb->NodeByteSize = sizeof(CCB); return Ccb; +} + +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB Fcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN NoEaKnowledge, + IN BOOLEAN DeleteOnClose, + IN BOOLEAN OpenedAsDos, + OUT PBOOLEAN OplockPostIrp) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + + Iosb.Status = STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + + return Iosb; } VOID

14 years, 11 months

[cfinck] 43526: Add a newline after KDBG is hit for the second time, so that the following SysregPrintf message can be properly detected by Testman's BuildBot Aggregator script.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Oct 17 12:13:48 2009 New Revision: 43526 URL: http://svn.reactos.org/svn/reactos?rev=43526&view=rev Log: Add a newline after KDBG is hit for the second time, so that the following SysregPrintf message can be properly detected by Testman's BuildBot Aggregator script. Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=43526&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Oct 17 12:13:48 2009 @@ -179,6 +179,7 @@ else { /* We hit it yet another time, give up here */ + printf("\n"); Ret = EXIT_CONTINUE; goto cleanup; }

14 years, 11 months

[dreimer] 43525: Added 11 new Backs for my bavarian cards dll. Way better than 12 times the same ; -)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 17 02:09:51 2009 New Revision: 43525 URL: http://svn.reactos.org/svn/reactos?rev=43525&view=rev Log: Added 11 new Backs for my bavarian cards dll. Way better than 12 times the same ;-) Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp (with props) trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp (with props) Removed: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp Modified: trunk/reactos/dll/win32/cards/cards.rc Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] Sat Oct 17 02:09:51 2009 @@ -152,18 +152,18 @@ 51 BITMAP "res/bavarian/GrasOber.bmp" 52 BITMAP "res/bavarian/GrasKoenig.bmp" 53 BITMAP "res/bavarian/FreeCard.bmp" - 54 BITMAP "res/bavarian/Ruecken.bmp" - 55 BITMAP "res/bavarian/Ruecken.bmp" - 56 BITMAP "res/bavarian/Ruecken.bmp" - 57 BITMAP "res/bavarian/Ruecken.bmp" - 58 BITMAP "res/bavarian/Ruecken.bmp" - 59 BITMAP "res/bavarian/Ruecken.bmp" - 60 BITMAP "res/bavarian/Ruecken.bmp" - 61 BITMAP "res/bavarian/Ruecken.bmp" - 62 BITMAP "res/bavarian/Ruecken.bmp" - 63 BITMAP "res/bavarian/Ruecken.bmp" - 64 BITMAP "res/bavarian/Ruecken.bmp" - 65 BITMAP "res/bavarian/Ruecken.bmp" + 54 BITMAP "res/bavarian/Ruecken1.bmp" + 55 BITMAP "res/bavarian/Ruecken2.bmp" + 56 BITMAP "res/bavarian/Ruecken3.bmp" + 57 BITMAP "res/bavarian/Ruecken4.bmp" + 58 BITMAP "res/bavarian/Ruecken5.bmp" + 59 BITMAP "res/bavarian/Ruecken6.bmp" + 60 BITMAP "res/bavarian/Ruecken7.bmp" + 61 BITMAP "res/bavarian/Ruecken8.bmp" + 62 BITMAP "res/bavarian/Ruecken9.bmp" + 63 BITMAP "res/bavarian/Ruecken10.bmp" + 64 BITMAP "res/bavarian/Ruecken11.bmp" + 65 BITMAP "res/bavarian/Ruecken12.bmp" 66 BITMAP "res/bavarian/Joker.bmp" 67 BITMAP "res/bavarian/XSign.bmp" 68 BITMAP "res/bavarian/OSign.bmp" Removed: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken11.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken12.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/bavari… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/bavarian/Ruecken9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 11 months

[tkreuzer] 43524: ULONG -> ULONG_PTR when casting handles

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 17 01:11:28 2009 New Revision: 43524 URL: http://svn.reactos.org/svn/reactos?rev=43524&view=rev Log: ULONG -> ULONG_PTR when casting handles Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sat Oct 17 01:11:28 2009 @@ -1815,7 +1815,7 @@ if (DeviceInfo->Flags == MIXER_GETLINEINFOF_DESTINATION) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); @@ -1826,7 +1826,7 @@ /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DESTINATION_LINE); ASSERT(MixerLineSrc); /* copy cached data */ @@ -1835,13 +1835,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_SOURCE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DESTINATION_LINE); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DESTINATION_LINE); ASSERT(MixerLineSrc); if (DeviceInfo->u.MixLine.dwSource >= MixerLineSrc->Line.cConnections) @@ -1851,7 +1851,7 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLine(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwSource); + MixerLineSrc = GetSourceMixerLine(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwSource); if (MixerLineSrc) { DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); @@ -1861,13 +1861,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_LINEID) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); if (!MixerLineSrc) { DPRINT1("Failed to find Line with id %u\n", DeviceInfo->u.MixLine.dwLineID); @@ -1880,13 +1880,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); + MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); ASSERT(MixerLineSrc); /* copy cached data */ @@ -1923,13 +1923,13 @@ if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ALL) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); ASSERT(MixerLineSrc); if (MixerLineSrc) { @@ -1939,13 +1939,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); + MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwLineID); ASSERT(MixerLineSrc); Index = 0; @@ -1963,13 +1963,13 @@ } else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYID) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG_PTR)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - DPRINT1("MixerId %u ControlId %u\n",(ULONG)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); + DPRINT1("MixerId %u ControlId %u\n",(ULONG_PTR)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); if (NT_SUCCESS(Status)) { RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); @@ -2173,7 +2173,7 @@ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get mixer control */ - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); if (!NT_SUCCESS(Status)) { @@ -2225,7 +2225,7 @@ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get mixer control */ - Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); if (!NT_SUCCESS(Status)) {

14 years, 11 months

[sginsberg] 43523: Downgrade various debug prints from DPRINT1 to DPRINT, ranging from "useless" to "pretty useless".

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 17 00:03:38 2009 New Revision: 43523 URL: http://svn.reactos.org/svn/reactos?rev=43523&view=rev Log: Downgrade various debug prints from DPRINT1 to DPRINT, ranging from "useless" to "pretty useless". Modified: trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/mtrr.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/vdm/vdmmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -81,7 +81,7 @@ RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); wcscat(FullImagePath, ImagePath); - DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); + DPRINT("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); /* Create service key */ RtlInitUnicodeString(&StringU, Driver); @@ -368,7 +368,7 @@ DPRINT("Received PnP Event\n"); if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) { - DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds); } else Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -474,7 +474,6 @@ KdDebuggerInitialize0( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -486,7 +485,6 @@ KdDebuggerInitialize1( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -2308,7 +2308,7 @@ PCHAR BootDeviceName, CommandLine; PDEVICE_OBJECT PhysicalDeviceObject = NULL; NTSTATUS Status; - DPRINT1("RAM Disk Driver Initialized\n"); + DPRINT("RAM Disk Driver Initialized\n"); // // Query ramdisk parameters Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -888,7 +888,7 @@ SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; /* Create symbolic link */ - DPRINT1("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); + DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); if (!NT_SUCCESS(Status) && ReferenceString == NULL) { @@ -977,7 +977,7 @@ if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; - DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ @@ -993,7 +993,7 @@ SymLink.Buffer = SymbolicLinkName->Buffer; SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer); - DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( &SymLink, @@ -1015,7 +1015,7 @@ (PVOID)SymbolicLinkName); ObDereferenceObject(FileObject); -DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -40,7 +40,7 @@ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT1("Large Page support detected but not yet taken advantage of!\n"); + DPRINT("Large Page support detected but not yet taken advantage of!\n"); } /* Check for global page support */ Modified: trunk/reactos/ntoskrnl/ke/i386/mtrr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/mtrr.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -21,7 +21,7 @@ KiInitializeMTRR(IN BOOLEAN FinalCpu) { /* FIXME: Support this */ - DPRINT1("Your machine supports MTRR but ReactOS doesn't yet.\n"); + DPRINT("Your machine supports MTRR but ReactOS doesn't yet.\n"); } VOID @@ -29,5 +29,5 @@ KiAmdK6InitializeMTRR(VOID) { /* FIXME: Support this */ - DPRINT1("Your machine supports AMD MTRR but ReactOS doesn't yet.\n"); + DPRINT("Your machine supports AMD MTRR but ReactOS doesn't yet.\n"); } Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -59,5 +59,5 @@ KiInitializePAT(VOID) { /* FIXME: Support this */ - DPRINT1("Advanced Memory features detected but not yet taken advantage of.\n"); + DPRINT("Advanced Memory features detected but not yet taken advantage of.\n"); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -4810,7 +4810,7 @@ /* Something must gone wrong * how can we have a Section but no * reference? */ - DPRINT1("ERROR: DataSectionObject without reference!\n"); + DPRINT("ERROR: DataSectionObject without reference!\n"); } } Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -22,7 +22,7 @@ NTAPI Ki386VdmEnablePentiumExtentions(VOID) { - DPRINT1("VME detected but not yet supported\n"); + DPRINT("VME detected but not yet supported\n"); } VOID Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -881,7 +881,7 @@ } ptiRawInput = PsGetCurrentThreadWin32Thread(); - DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); + DPRINT("\nRaw Input Thread 0x%x \n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -136,8 +136,8 @@ { NTSTATUS Status; - DPRINT1("Enter NtUserInitialize(%lx, %p, %p)\n", - dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); + DPRINT("Enter NtUserInitialize(%lx, %p, %p)\n", + dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); /* Check the Windows version */ if (dwWinVersion != 0)

14 years, 11 months

[cwittich] 43522: fix all msvcrt file winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 16 23:43:28 2009 New Revision: 43522 URL: http://svn.reactos.org/svn/reactos?rev=43522&view=rev Log: fix all msvcrt file winetests Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Oct 16 23:43:28 2009 @@ -902,10 +902,18 @@ { /* Flush output if needed */ if(file->_flag & _IOWRT) - flush_buffer(file); + flush_buffer(file); if(whence == SEEK_CUR && file->_flag & _IOREAD ) { - offset -= file->_cnt; + offset -= file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + offset--; + } + } } /* Discard buffered input */ file->_cnt = 0; @@ -1557,27 +1565,6 @@ } /********************************************************************* - * (internal) remove_cr - * - * Translate all \r\n to \n inplace. - * return the number of \r removed - * Corner cases required by some apps: - * \r\r\n -> \r\n - * BUG: should save state across calls somehow, so CR LF that - * straddles buffer boundary gets recognized properly? - */ -static unsigned int remove_cr(char *buf, unsigned int count) -{ - unsigned int i, j; - - for (i=0, j=0; j < count; j++) - if ((buf[j] != '\r') || ((j+1) < count && buf[j+1] != '\n')) - buf[i++] = buf[j]; - - return count - i; -} - -/********************************************************************* * (internal) read_i */ static int read_i(int fd, void *buf, unsigned int count) @@ -1604,18 +1591,25 @@ { if (fdesc[fd].wxflag & WX_TEXT) { - int i; - /* in text mode, a ctrl-z signals EOF */ - for (i=0; i<num_read; i++) + DWORD i, j; + for (i=0, j=0; i<num_read; i++) { + /* in text mode, a ctrl-z signals EOF */ if (bufstart[i] == 0x1a) { - num_read = i; fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); break; } + /* in text mode, strip \r if followed by \n. + * BUG: should save state across calls somehow, so CR LF that + * straddles buffer boundary gets recognized properly? + */ + if ((bufstart[i] != '\r') + || ((i+1) < num_read && bufstart[i+1] != '\n')) + bufstart[j++] = bufstart[i]; } + num_read = j; } if (count != 0 && num_read == 0) { @@ -1650,10 +1644,6 @@ { int num_read; num_read = read_i(fd, buf, count); - if (num_read>0 && fdesc[fd].wxflag & WX_TEXT) - { - num_read -= remove_cr(buf,num_read); - } return num_read; } @@ -1955,17 +1945,13 @@ { unsigned char *i; unsigned int j; - do { - if (file->_cnt>0) { - file->_cnt--; - i = (unsigned char *)file->_ptr++; - j = *i; - } else - j = _filbuf(file); - if (!(fdesc[file->_file].wxflag & WX_TEXT) - || ((j != '\r') || (file->_cnt && file->_ptr[0] != '\n'))) - return j; - } while(1); + if (file->_cnt>0) { + file->_cnt--; + i = (unsigned char *)file->_ptr++; + j = *i; + } else + j = _filbuf(file); + return j; } /********************************************************************* @@ -2300,11 +2286,13 @@ } if(file->_bufsiz) { int res=flush_buffer(file); - return res?res : fputc(c, file); + return res?res : fputc(c, file); } else { - unsigned char cc=c; + unsigned char cc=c; int len; - len = _write(file->_file, &cc, 1); + /* set _cnt to 0 for unbuffered FILEs */ + file->_cnt = 0; + len = _write(file->_file, &cc, 1); if (len == 1) return c & 0xff; file->_flag |= _IOERR; return EOF; @@ -2336,8 +2324,6 @@ memcpy(ptr, file->_ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; - if (fdesc[file->_file].wxflag & WX_TEXT) - pcnt -= remove_cr(ptr,pcnt); read += pcnt ; rcnt -= pcnt ; ptr = (char*)ptr + pcnt; @@ -2493,17 +2479,26 @@ */ LONG CDECL ftell(FILE* file) { + /* TODO: just call fgetpos and return lower half of result */ int off=0; long pos; + pos = _tell(file->_file); + if(pos == -1) return -1; if(file->_bufsiz) { - if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - } - } - pos = _tell(file->_file); - if(pos == -1) return pos; + if( file->_flag & _IOWRT ) { + off = file->_ptr - file->_base; + } else { + off = -file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } + } + } return off + pos; } @@ -2512,22 +2507,25 @@ */ int CDECL fgetpos(FILE* file, fpos_t *pos) { - /* This code has been lifted form the ftell function */ int off=0; - *pos = _lseeki64(file->_file,0,SEEK_CUR); - - if (*pos == -1) return -1; - + if(*pos == -1) return -1; if(file->_bufsiz) { - if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - } + if( file->_flag & _IOWRT ) { + off = file->_ptr - file->_base; + } else { + off = -file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } + } } *pos += off; - return 0; }

14 years, 11 months

[cwittich] 43521: don't set errno for libcnt

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 16 23:29:27 2009 New Revision: 43521 URL: http://svn.reactos.org/svn/reactos?rev=43521&view=rev Log: don't set errno for libcnt Modified: trunk/reactos/lib/sdk/crt/string/strtol.c trunk/reactos/lib/sdk/crt/string/strtoul.c Modified: trunk/reactos/lib/sdk/crt/string/strtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] Fri Oct 16 23:29:27 2009 @@ -79,7 +79,9 @@ if (any < 0) { acc = neg ? LONG_MIN : LONG_MAX; +#ifndef _LIBCNT_ __set_errno(ERANGE); +#endif } else if (neg) acc = -acc; Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] Fri Oct 16 23:29:27 2009 @@ -63,7 +63,9 @@ if (any < 0) { acc = ULONG_MAX; +#ifndef _LIBCNT_ __set_errno(ERANGE); +#endif } else if (neg) acc = -acc;

14 years, 11 months

[cwittich] 43520: -sync msvcrt_init_io to wine 1.1.31 fixes 12 msvcrt file winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 16 22:57:00 2009 New Revision: 43520 URL: http://svn.reactos.org/svn/reactos?rev=43520&view=rev Log: -sync msvcrt_init_io to wine 1.1.31 fixes 12 msvcrt file winetests Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Oct 16 22:57:00 2009 @@ -306,18 +306,19 @@ InitializeCriticalSection(&FILE_cs); FILE_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FILE_cs"); GetStartupInfoA(&si); - if (si.cbReserved2 != 0 && si.lpReserved2 != NULL) - { - char* wxflag_ptr; + if (si.cbReserved2 >= sizeof(unsigned int) && si.lpReserved2 != NULL) + { + BYTE* wxflag_ptr; HANDLE* handle_ptr; - - fdend = *(unsigned*)si.lpReserved2; - - wxflag_ptr = (char*)(si.lpReserved2 + sizeof(unsigned)); - handle_ptr = (HANDLE*)(wxflag_ptr + fdend * sizeof(char)); - - fdend = min(fdend, sizeof(fdesc) / sizeof(fdesc[0])); - for (i = 0; i < fdend; i++) + unsigned int count; + + count = *(unsigned*)si.lpReserved2; + wxflag_ptr = si.lpReserved2 + sizeof(unsigned); + handle_ptr = (HANDLE*)(wxflag_ptr + count); + + count = min(count, (si.cbReserved2 - sizeof(unsigned)) / (sizeof(HANDLE) + 1)); + count = min(count, sizeof(fdesc) / sizeof(fdesc[0])); + for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) { @@ -331,6 +332,7 @@ } wxflag_ptr++; handle_ptr++; } + fdend = max( 3, count ); for (fdstart = 3; fdstart < fdend; fdstart++) if (fdesc[fdstart].handle == INVALID_HANDLE_VALUE) break; }

14 years, 11 months

← Newer
1
...
34
35
36
37
38
39
40
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009