Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jmorlan] 34618: KiMoveApcState: Fix reversal of RepairList arguments. (Bug 1720)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Jul 20 17:48:06 2008 New Revision: 34618 URL: http://svn.reactos.org/svn/reactos?rev=34618&view=rev Log: KiMoveApcState: Fix reversal of RepairList arguments. (Bug 1720) Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3461… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sun Jul 20 17:48:06 2008 @@ -519,8 +519,8 @@ RtlCopyMemory(NewState, OldState, KAPC_STATE_ACTUAL_LENGTH); /* Repair Lists */ - RepairList(NewState->ApcListHead, OldState->ApcListHead, KernelMode); - RepairList(NewState->ApcListHead, OldState->ApcListHead, UserMode); + RepairList(OldState->ApcListHead, NewState->ApcListHead, KernelMode); + RepairList(OldState->ApcListHead, NewState->ApcListHead, UserMode); } /* PUBLIC FUNCTIONS **********************************************************/

16 years, 2 months

[pschweitzer] 34617: Switched two more files to PSEH

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 20 15:33:18 2008 New Revision: 34617 URL: http://svn.reactos.org/svn/reactos?rev=34617&view=rev Log: Switched two more files to PSEH Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c [iso-8859-1] Sun Jul 20 15:33:18 2008 @@ -4,7 +4,8 @@ * FILE: fileinfo.c * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net - * UPDATE HISTORY: + * UPDATE HISTORY: 15 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Replaced SEH support with PSEH support */ /* INCLUDES *****************************************************************/ @@ -16,6 +17,38 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ + +VOID +Ext2QueryFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_FCB Fcb, + IN BOOLEAN FcbResourceAcquired ); + +VOID +Ext2SetFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_VCB Vcb, + IN PFILE_OBJECT FileObject, + IN PEXT2_FCB Fcb, + IN ULONG NotifyFilter, + IN BOOLEAN VcbMainResourceAcquired, + IN BOOLEAN FcbMainResourceAcquired, + IN BOOLEAN FcbPagingIoResourceAcquired, + IN BOOLEAN CacheInitialized ); + +VOID +Ext2DeleteFileFinal ( + IN PEXT2_VCB Vcb, + IN PEXT2_MCB Mcb, + IN PEXT2_FCB Dcb, + IN PEXT2_FCB Fcb, + IN BOOLEAN VcbResourceAcquired, + IN BOOLEAN FcbPagingIoAcquired, + IN BOOLEAN FcbResourceAcquired, + IN BOOLEAN DcbResourceAcquired, + IN BOOLEAN bNewDcb ); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, Ext2QueryFileInformation) @@ -27,6 +60,46 @@ #pragma alloc_text(PAGE, Ext2DeleteFile) #endif + +/* FUNCTIONS ***************************************************************/ + + +_SEH_DEFINE_LOCALS(Ext2QueryFileInformationFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PEXT2_FCB Fcb; + BOOLEAN FcbResourceAcquired; +}; + +_SEH_FINALLYFUNC(Ext2QueryFileInformationFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2QueryFileInformationFinal); + Ext2QueryFileInformationFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), + _SEH_VAR(Fcb), _SEH_VAR(FcbResourceAcquired)); +} + +VOID +Ext2QueryFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_FCB Fcb, + IN BOOLEAN FcbResourceAcquired + ) +{ + if (FcbResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + if (*pStatus == STATUS_PENDING || + *pStatus == STATUS_CANT_WAIT) { + *pStatus = Ext2QueueRequest(IrpContext); + } else { + Ext2CompleteIrpContext(IrpContext, *pStatus); + } + } +} NTSTATUS Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) @@ -42,9 +115,13 @@ FILE_INFORMATION_CLASS FileInformationClass; ULONG Length; PVOID Buffer; - BOOLEAN FcbResourceAcquired = FALSE; - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2QueryFileInformationFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(FcbResourceAcquired) = FALSE; ASSERT(IrpContext != NULL); @@ -58,15 +135,16 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } FileObject = IrpContext->FileObject; Fcb = (PEXT2_FCB) FileObject->FsContext; + _SEH_VAR(Fcb) = Fcb; if (Fcb == NULL) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } // @@ -74,13 +152,13 @@ // if (Fcb->Identifier.Type == EXT2VCB) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } if(!((Fcb->Identifier.Type == EXT2FCB) && (Fcb->Identifier.Size == sizeof(EXT2_FCB)))) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } Vcb = Fcb->Vcb; @@ -92,10 +170,10 @@ )) { Status = STATUS_PENDING; - __leave; + _SEH_LEAVE; } - FcbResourceAcquired = TRUE; + _SEH_VAR(FcbResourceAcquired) = TRUE; } Ccb = (PEXT2_CCB) FileObject->FsContext2; @@ -122,7 +200,7 @@ if (Length < sizeof(FILE_BASIC_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileBasicInformation = (PFILE_BASIC_INFORMATION) Buffer; @@ -148,7 +226,7 @@ if (Length < sizeof(FILE_STANDARD_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FSI = (PFILE_STANDARD_INFORMATION) Buffer; @@ -182,7 +260,7 @@ if (Length < sizeof(FILE_INTERNAL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileInternalInformation = (PFILE_INTERNAL_INFORMATION) Buffer; @@ -202,7 +280,7 @@ if (Length < sizeof(FILE_EA_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileEaInformation = (PFILE_EA_INFORMATION) Buffer; @@ -222,7 +300,7 @@ if (Length < sizeof(FILE_NAME_INFORMATION) + Fcb->Mcb->ShortName.Length - sizeof(WCHAR)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileNameInformation = (PFILE_NAME_INFORMATION) Buffer; @@ -246,7 +324,7 @@ if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; @@ -272,7 +350,7 @@ if (Length < sizeof(FILE_ALL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileAllInformation = (PFILE_ALL_INFORMATION) Buffer; @@ -335,7 +413,7 @@ Fcb->Mcb->ShortName.Length - sizeof(WCHAR)) { Irp->IoStatus.Information = sizeof(FILE_ALL_INFORMATION); Status = STATUS_BUFFER_OVERFLOW; - __leave; + _SEH_LEAVE; } FileNameInformation->FileNameLength = Fcb->Mcb->ShortName.Length; @@ -368,7 +446,7 @@ if (Length < sizeof(FILE_NETWORK_OPEN_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } PFNOI = (PFILE_NETWORK_OPEN_INFORMATION) Buffer; @@ -405,7 +483,7 @@ if (Length < sizeof(FILE_ATTRIBUTE_TAG_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FATI = (PFILE_ATTRIBUTE_TAG_INFORMATION) Buffer; @@ -430,25 +508,88 @@ break; } - } __finally { - - if (FcbResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - if (Status == STATUS_PENDING || - Status == STATUS_CANT_WAIT) { - Status = Ext2QueueRequest(IrpContext); - } else { - Ext2CompleteIrpContext(IrpContext, Status); - } - } - } - + } + _SEH_FINALLY(Ext2QueryFileInformationFinal_PSEH) + _SEH_END; + return Status; } +_SEH_DEFINE_LOCALS(Ext2SetFileInformationFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PEXT2_VCB Vcb; + PFILE_OBJECT FileObject; + PEXT2_FCB Fcb; + ULONG NotifyFilter; + BOOLEAN VcbMainResourceAcquired; + BOOLEAN FcbMainResourceAcquired; + BOOLEAN FcbPagingIoResourceAcquired; + BOOLEAN CacheInitialized; +}; + +_SEH_FINALLYFUNC(Ext2SetFileInformationFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2SetFileInformationFinal); + Ext2SetFileInformationFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), + _SEH_VAR(Vcb), _SEH_VAR(FileObject), _SEH_VAR(Fcb), + _SEH_VAR(NotifyFilter), _SEH_VAR(VcbMainResourceAcquired), + _SEH_VAR(FcbMainResourceAcquired), + _SEH_VAR(FcbPagingIoResourceAcquired), + _SEH_VAR(CacheInitialized)); +} + +VOID +Ext2SetFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_VCB Vcb, + IN PFILE_OBJECT FileObject, + IN PEXT2_FCB Fcb, + IN ULONG NotifyFilter, + IN BOOLEAN VcbMainResourceAcquired, + IN BOOLEAN FcbMainResourceAcquired, + IN BOOLEAN FcbPagingIoResourceAcquired, + IN BOOLEAN CacheInitialized + ) +{ + if (FcbPagingIoResourceAcquired) { + ExReleaseResourceLite(&Fcb->PagingIoResource); + } + + if (NT_SUCCESS(*pStatus) && (NotifyFilter != 0)) { + Ext2NotifyReportChange( + IrpContext, + Vcb, + Fcb->Mcb, + NotifyFilter, + FILE_ACTION_MODIFIED ); + + } + + if (FcbMainResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (CacheInitialized) { + CcUninitializeCacheMap(FileObject, NULL, NULL); + } + + if (VcbMainResourceAcquired) { + ExReleaseResourceLite(&Vcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + if (*pStatus == STATUS_PENDING || + *pStatus == STATUS_CANT_WAIT ) { + DbgBreak(); + *pStatus = Ext2QueueRequest(IrpContext); + } else { + Ext2CompleteIrpContext(IrpContext, *pStatus); + } + } +} NTSTATUS Ext2SetFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) @@ -463,17 +604,19 @@ PIO_STACK_LOCATION IoStackLocation; FILE_INFORMATION_CLASS FileInformationClass; - ULONG NotifyFilter = 0; - ULONG Length; PVOID Buffer; - BOOLEAN VcbMainResourceAcquired = FALSE; - BOOLEAN FcbMainResourceAcquired = FALSE; - BOOLEAN FcbPagingIoResourceAcquired = FALSE; - BOOLEAN CacheInitialized = FALSE; - - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2SetFileInformationFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(NotifyFilter) = 0; + _SEH_VAR(VcbMainResourceAcquired) = FALSE; + _SEH_VAR(FcbMainResourceAcquired) = FALSE; + _SEH_VAR(FcbPagingIoResourceAcquired) = FALSE; + _SEH_VAR(CacheInitialized) = FALSE; ASSERT(IrpContext != NULL); @@ -486,7 +629,7 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } /* check io stack location of irp stack */ @@ -499,12 +642,13 @@ /* check Vcb */ Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; + _SEH_VAR(Vcb) = Vcb; ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == EXT2VCB) && (Vcb->Identifier.Size == sizeof(EXT2_VCB))); if (!IsMounted(Vcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } /* we need grab Vcb in case it's a rename operation */ @@ -513,18 +657,20 @@ &Vcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; - __leave; - } - VcbMainResourceAcquired = TRUE; + _SEH_LEAVE; + } + _SEH_VAR(VcbMainResourceAcquired) = TRUE; } FileObject = IrpContext->FileObject; + _SEH_VAR(FileObject) = FileObject; Fcb = (PEXT2_FCB) FileObject->FsContext; + _SEH_VAR(Fcb) = Fcb; // This request is issued to volumes, just return success if (Fcb == NULL || Fcb->Identifier.Type == EXT2VCB) { Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } ASSERT((Fcb->Identifier.Type == EXT2FCB) && @@ -532,7 +678,7 @@ if (IsFlagOn(Fcb->Flags, FCB_FILE_DELETED)) { Status = STATUS_FILE_DELETED; - __leave; + _SEH_LEAVE; } Ccb = (PEXT2_CCB) FileObject->FsContext2; @@ -551,7 +697,7 @@ NULL ); if (Status != STATUS_SUCCESS) { - __leave; + _SEH_LEAVE; } // @@ -570,17 +716,17 @@ &Fcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; - __leave; + _SEH_LEAVE; } - FcbMainResourceAcquired = TRUE; + _SEH_VAR(FcbMainResourceAcquired) = TRUE; } if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { if (FileInformationClass != FilePositionInformation) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } } @@ -592,10 +738,10 @@ IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; DbgBreak(); - __leave; + _SEH_LEAVE; } - FcbPagingIoResourceAcquired = TRUE; + _SEH_VAR(FcbPagingIoResourceAcquired) = TRUE; } /* @@ -616,19 +762,19 @@ if (FBI->CreationTime.QuadPart != 0 && FBI->CreationTime.QuadPart != -1) { Ext2Inode->i_ctime = Ext2LinuxTime(FBI->CreationTime); Fcb->Mcb->CreationTime = Ext2NtTime(Ext2Inode->i_ctime); - NotifyFilter |= FILE_NOTIFY_CHANGE_CREATION; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_CREATION; } if (FBI->LastAccessTime.QuadPart != 0 && FBI->LastAccessTime.QuadPart != -1) { Ext2Inode->i_atime = Ext2LinuxTime(FBI->LastAccessTime); Fcb->Mcb->LastAccessTime = Ext2NtTime(Ext2Inode->i_atime); - NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_LAST_ACCESS; } if (FBI->LastWriteTime.QuadPart != 0 && FBI->LastWriteTime.QuadPart != -1) { Ext2Inode->i_mtime = Ext2LinuxTime(FBI->LastWriteTime); Fcb->Mcb->LastWriteTime = Ext2NtTime(Ext2Inode->i_mtime); - NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_WRITE; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_LAST_WRITE; SetFlag(Ccb->Flags, CCB_LAST_WRITE_UPDATED); } @@ -639,7 +785,7 @@ if (FBI->FileAttributes != 0) { BOOLEAN bIsDirectory = IsDirectory(Fcb); - NotifyFilter |= FILE_NOTIFY_CHANGE_ATTRIBUTES; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_ATTRIBUTES; if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) { Ext2SetReadOnly(Fcb->Inode->i_mode); @@ -659,14 +805,14 @@ } } - if (NotifyFilter != 0) { + if (_SEH_VAR(NotifyFilter) != 0) { if ( Ext2SaveInode( IrpContext, Vcb, Fcb->Mcb->iNo, Ext2Inode)) { Status = STATUS_SUCCESS; } } - ClearFlag(NotifyFilter, FILE_NOTIFY_CHANGE_LAST_ACCESS); + ClearFlag(_SEH_VAR(NotifyFilter), FILE_NOTIFY_CHANGE_LAST_ACCESS); Status = STATUS_SUCCESS; } @@ -679,7 +825,7 @@ if (IsDirectory(Fcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } else { Status = STATUS_SUCCESS; } @@ -698,7 +844,7 @@ &(Ext2Global->CacheManagerNoOpCallbacks), Fcb ); - CacheInitialized = TRUE; + _SEH_VAR(CacheInitialized) = TRUE; } /* get user specified allocationsize aligned with BLOCK_SIZE */ @@ -721,7 +867,7 @@ Status = Ext2ExpandFile(IrpContext, Vcb, Fcb->Mcb, &AllocationSize); Fcb->Header.AllocationSize = AllocationSize; - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } else if (AllocationSize.QuadPart < Fcb->Header.AllocationSize.QuadPart) { @@ -743,7 +889,7 @@ } } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; Fcb->Header.AllocationSize.QuadPart = AllocationSize.QuadPart; if (Fcb->Header.FileSize.QuadPart > AllocationSize.QuadPart) { Fcb->Header.FileSize.QuadPart = AllocationSize.QuadPart; @@ -764,11 +910,11 @@ Status = STATUS_USER_MAPPED_FILE; DbgBreak(); - __leave; + _SEH_LEAVE; } } - if (NotifyFilter) { + if (_SEH_VAR(NotifyFilter)) { SetFlag(FileObject->Flags, FO_FILE_MODIFIED); SetLongFlag(Fcb->Flags, FCB_FILE_MODIFIED); @@ -795,7 +941,7 @@ if (IsDirectory(Fcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } else { Status = STATUS_SUCCESS; } @@ -814,7 +960,7 @@ &(Ext2Global->CacheManagerNoOpCallbacks), Fcb ); - CacheInitialized = TRUE; + _SEH_VAR(CacheInitialized) = TRUE; } AllocationSize = Fcb->Header.AllocationSize; @@ -826,7 +972,7 @@ if (IoStackLocation->Parameters.SetFile.AdvanceOnly) { if (IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING)) { - __leave; + _SEH_LEAVE; } if (EndOfFile.QuadPart > Fcb->Header.FileSize.QuadPart) { @@ -840,11 +986,11 @@ if (S_ISREG(Fcb->Inode->i_mode)) { Fcb->Inode->i_size_high = (__u32)(EndOfFile.HighPart); } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; goto FileEndChanged; } - __leave; + _SEH_LEAVE; } /* check if file blocks are allocated in Ext2Create */ @@ -862,7 +1008,7 @@ Fcb->Mcb, &(Fcb->Header.AllocationSize) ); - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } else if (FileSize.QuadPart == AllocationSize.QuadPart) { @@ -913,7 +1059,7 @@ } } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } if (NT_SUCCESS(Status)) { @@ -935,7 +1081,7 @@ SetFlag(FileObject->Flags, FO_FILE_MODIFIED); SetLongFlag(Fcb->Flags, FCB_FILE_MODIFIED); - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } FileEndChanged: @@ -981,7 +1127,7 @@ if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; @@ -990,14 +1136,14 @@ (FilePositionInformation->CurrentByteOffset.LowPart & DeviceObject->AlignmentRequirement) ) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } FileObject->CurrentByteOffset = FilePositionInformation->CurrentByteOffset; Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } break; @@ -1013,44 +1159,9 @@ Status = STATUS_INVALID_PARAMETER;/* STATUS_INVALID_INFO_CLASS; */ } - } __finally { - - if (FcbPagingIoResourceAcquired) { - ExReleaseResourceLite(&Fcb->PagingIoResource); - } - - if (NT_SUCCESS(Status) && (NotifyFilter != 0)) { - Ext2NotifyReportChange( - IrpContext, - Vcb, - Fcb->Mcb, - NotifyFilter, - FILE_ACTION_MODIFIED ); - - } - - if (FcbMainResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (CacheInitialized) { - CcUninitializeCacheMap(FileObject, NULL, NULL); - } - - if (VcbMainResourceAcquired) { - ExReleaseResourceLite(&Vcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - if (Status == STATUS_PENDING || - Status == STATUS_CANT_WAIT ) { - DbgBreak(); - Status = Ext2QueueRequest(IrpContext); - } else { - Ext2CompleteIrpContext(IrpContext, Status); - } - } - } + } + _SEH_FINALLY(Ext2SetFileInformationFinal_PSEH) + _SEH_END; return Status; } @@ -1780,6 +1891,69 @@ return EXT2_FT_REG_FILE; } +_SEH_DEFINE_LOCALS(Ext2DeleteFileFinal) +{ + PEXT2_VCB Vcb; + PEXT2_MCB Mcb; + PEXT2_FCB Dcb; + PEXT2_FCB Fcb; + BOOLEAN VcbResourceAcquired; + BOOLEAN FcbPagingIoAcquired; + BOOLEAN FcbResourceAcquired; + BOOLEAN DcbResourceAcquired; + BOOLEAN bNewDcb; +}; + +_SEH_FINALLYFUNC(Ext2DeleteFileFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2DeleteFileFinal); + Ext2DeleteFileFinal(_SEH_VAR(Vcb), _SEH_VAR(Mcb), _SEH_VAR(Dcb), + _SEH_VAR(Fcb), _SEH_VAR(VcbResourceAcquired), + _SEH_VAR(FcbPagingIoAcquired), _SEH_VAR(FcbResourceAcquired), + _SEH_VAR(DcbResourceAcquired), _SEH_VAR(bNewDcb)); +} + +VOID +Ext2DeleteFileFinal ( + IN PEXT2_VCB Vcb, + IN PEXT2_MCB Mcb, + IN PEXT2_FCB Dcb, + IN PEXT2_FCB Fcb, + IN BOOLEAN VcbResourceAcquired, + IN BOOLEAN FcbPagingIoAcquired, + IN BOOLEAN FcbResourceAcquired, + IN BOOLEAN DcbResourceAcquired, + IN BOOLEAN bNewDcb + ) +{ + if (FcbPagingIoAcquired) { + ExReleaseResourceLite(&Fcb->PagingIoResource); + } + + if (FcbResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (DcbResourceAcquired) { + ExReleaseResourceLite(&Dcb->MainResource); + } + + if (Dcb) { + ClearLongFlag(Dcb->Flags, FCB_STATE_BUSY); + if (bNewDcb) { + if (Ext2DerefXcb(&Dcb->ReferenceCount) == 0) { + Ext2FreeFcb(Dcb); + } else { + DEBUG(DL_ERR, ( "Ext2DeleteFile: Dcb %wZ used by other threads.\n", + &Mcb->FullName )); + } + } + } + if (VcbResourceAcquired) { + ExReleaseResourceLite(&Vcb->MainResource); + } +} + NTSTATUS Ext2DeleteFile( PEXT2_IRP_CONTEXT IrpContext, @@ -1793,13 +1967,6 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; - BOOLEAN VcbResourceAcquired = FALSE; - BOOLEAN FcbPagingIoAcquired = FALSE; - BOOLEAN FcbResourceAcquired = FALSE; - BOOLEAN DcbResourceAcquired = FALSE; - - BOOLEAN bNewDcb = FALSE; - LARGE_INTEGER SysTime; DEBUG(DL_INF, ( "Ext2DeleteFile: File %wZ (%xh) will be deleted!\n", @@ -1818,22 +1985,33 @@ } } - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2DeleteFileFinal); + _SEH_VAR(Vcb) = Vcb; + _SEH_VAR(Mcb) = Mcb; + _SEH_VAR(Dcb) = Dcb; + _SEH_VAR(Fcb) = Fcb; + _SEH_VAR(VcbResourceAcquired) = FALSE; + _SEH_VAR(FcbPagingIoAcquired) = FALSE; + _SEH_VAR(FcbResourceAcquired) = FALSE; + _SEH_VAR(DcbResourceAcquired) = FALSE; + _SEH_VAR(bNewDcb) = FALSE; ExAcquireResourceExclusiveLite(&Vcb->MainResource, TRUE); - VcbResourceAcquired = TRUE; + _SEH_VAR(VcbResourceAcquired) = TRUE; if (!(Dcb = Mcb->Parent->Fcb)) { Dcb = Ext2AllocateFcb(Vcb, Mcb->Parent); if (Dcb) { Ext2ReferXcb(&Dcb->ReferenceCount); - bNewDcb = TRUE; + _SEH_VAR(bNewDcb) = TRUE; } } if (Dcb) { SetLongFlag(Dcb->Flags, FCB_STATE_BUSY); - DcbResourceAcquired = + _SEH_VAR(DcbResourceAcquired) = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); /* remove it's entry form it's parent */ @@ -1848,10 +2026,10 @@ if (NT_SUCCESS(Status)) { if (Fcb) { - FcbResourceAcquired = + _SEH_VAR(FcbResourceAcquired) = ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - FcbPagingIoAcquired = + _SEH_VAR(FcbPagingIoAcquired) = ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); } @@ -1873,7 +2051,7 @@ } if (!NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } if (IsMcbSymlink(Mcb)) { @@ -1941,35 +2119,9 @@ Ext2RemoveMcb(Vcb, Mcb); } - } __finally { - - if (FcbPagingIoAcquired) { - ExReleaseResourceLite(&Fcb->PagingIoResource); - } - - if (FcbResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (DcbResourceAcquired) { - ExReleaseResourceLite(&Dcb->MainResource); - } - - if (Dcb) { - ClearLongFlag(Dcb->Flags, FCB_STATE_BUSY); - if (bNewDcb) { - if (Ext2DerefXcb(&Dcb->ReferenceCount) == 0) { - Ext2FreeFcb(Dcb); - } else { - DEBUG(DL_ERR, ( "Ext2DeleteFile: Dcb %wZ used by other threads.\n", - &Mcb->FullName )); - } - } - } - if (VcbResourceAcquired) { - ExReleaseResourceLite(&Vcb->MainResource); - } - } + } + _SEH_FINALLY(Ext2DeleteFileFinal_PSEH) + _SEH_END; DEBUG(DL_INF, ( "Ext2DeleteFile: %wZ Succeed... EXT2SB->S_FREE_BLOCKS = %xh .\n", &Mcb->FullName, Vcb->SuperBlock->s_free_blocks_count)); Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c [iso-8859-1] Sun Jul 20 15:33:18 2008 @@ -4,7 +4,8 @@ * FILE: flush.c * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net - * UPDATE HISTORY: + * UPDATE HISTORY: 15 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Replaced SEH support with PSEH support */ /* INCLUDES *****************************************************************/ @@ -16,6 +17,16 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ + +VOID +Ext2FlushFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_VCB Vcb, + IN PEXT2_FCBVCB FcbOrVcb, + IN BOOLEAN MainResourceAcquired ); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, Ext2FlushFile) @@ -25,6 +36,9 @@ #endif +/* FUNCTIONS ***************************************************************/ + + NTSTATUS Ext2FlushCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, @@ -138,6 +152,71 @@ return IoStatus.Status; } +_SEH_DEFINE_LOCALS(Ext2FlushFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PIRP Irp; + PIO_STACK_LOCATION IrpSp; + PEXT2_VCB Vcb; + PEXT2_FCBVCB FcbOrVcb; + BOOLEAN MainResourceAcquired; +}; + +_SEH_FINALLYFUNC(Ext2FlushFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2FlushFinal); + Ext2FlushFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), _SEH_VAR(Irp), + _SEH_VAR(IrpSp), _SEH_VAR(Vcb), _SEH_VAR(FcbOrVcb), + _SEH_VAR(MainResourceAcquired)); +} + +VOID +Ext2FlushFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_VCB Vcb, + IN PEXT2_FCBVCB FcbOrVcb, + IN BOOLEAN MainResourceAcquired + ) +{ + if (MainResourceAcquired) { + ExReleaseResourceLite(&FcbOrVcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + + if (Vcb && Irp && IrpSp && (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY))) { + + // Call the disk driver to flush the physial media. + NTSTATUS DriverStatus; + PIO_STACK_LOCATION NextIrpSp; + + NextIrpSp = IoGetNextIrpStackLocation(Irp); + + *NextIrpSp = *IrpSp; + + IoSetCompletionRoutine( Irp, + Ext2FlushCompletionRoutine, + NULL, + TRUE, + TRUE, + TRUE ); + + DriverStatus = IoCallDriver(Vcb->TargetDeviceObject, Irp); + + *pStatus = (DriverStatus == STATUS_INVALID_DEVICE_REQUEST) ? + *pStatus : DriverStatus; + + IrpContext->Irp = Irp = NULL; + } + + Ext2CompleteIrpContext(IrpContext, *pStatus); + } +} + NTSTATUS Ext2Flush (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -154,9 +233,16 @@ PDEVICE_OBJECT DeviceObject = NULL; - BOOLEAN MainResourceAcquired = FALSE; - - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2FlushFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(Irp) = NULL; + _SEH_VAR(IrpSp) = NULL; + _SEH_VAR(Vcb) = NULL; + _SEH_VAR(FcbOrVcb) = NULL; + _SEH_VAR(MainResourceAcquired) = FALSE; ASSERT(IrpContext); @@ -170,10 +256,11 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; + _SEH_VAR(Vcb) = Vcb; ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == EXT2VCB) && (Vcb->Identifier.Size == sizeof(EXT2_VCB))); @@ -182,27 +269,30 @@ if ( IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } Irp = IrpContext->Irp; + _SEH_VAR(Irp) = Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); + _SEH_VAR(IrpSp) = IrpSp; FileObject = IrpContext->FileObject; FcbOrVcb = (PEXT2_FCBVCB) FileObject->FsContext; + _SEH_VAR(FcbOrVcb) = FcbOrVcb; ASSERT(FcbOrVcb != NULL); Ccb = (PEXT2_CCB) FileObject->FsContext2; if (Ccb == NULL) { Status = STATUS_SUCCESS; - __leave; - } - - MainResourceAcquired = + _SEH_LEAVE; + } + + _SEH_VAR(MainResourceAcquired) = ExAcquireResourceExclusiveLite(&FcbOrVcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT)); - ASSERT(MainResourceAcquired); + ASSERT(_SEH_VAR(MainResourceAcquired)); DEBUG(DL_USR, ("Ext2Flush-pre: total mcb records=%u\n", FsRtlNumberOfRunsInLargeMcb(&Vcb->Extents))); @@ -211,7 +301,7 @@ Ext2VerifyVcb(IrpContext, Vcb); Status = Ext2FlushFiles(IrpContext, (PEXT2_VCB)(FcbOrVcb), FALSE); if (NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } Status = Ext2FlushVolume(IrpContext, (PEXT2_VCB)(FcbOrVcb), FALSE); @@ -237,42 +327,9 @@ FsRtlNumberOfRunsInLargeMcb(&Vcb->Extents))); - } __finally { - - if (MainResourceAcquired) { - ExReleaseResourceLite(&FcbOrVcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - - if (Vcb && Irp && IrpSp && (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY))) { - - // Call the disk driver to flush the physial media. - NTSTATUS DriverStatus; - PIO_STACK_LOCATION NextIrpSp; - - NextIrpSp = IoGetNextIrpStackLocation(Irp); - - *NextIrpSp = *IrpSp; - - IoSetCompletionRoutine( Irp, - Ext2FlushCompletionRoutine, - NULL, - TRUE, - TRUE, - TRUE ); - - DriverStatus = IoCallDriver(Vcb->TargetDeviceObject, Irp); - - Status = (DriverStatus == STATUS_INVALID_DEVICE_REQUEST) ? - Status : DriverStatus; - - IrpContext->Irp = Irp = NULL; - } - - Ext2CompleteIrpContext(IrpContext, Status); - } - } + } + _SEH_FINALLY(Ext2FlushFinal_PSEH) + _SEH_END; return Status; -} +}

16 years, 2 months

[ros-arm-bringup] 34616: - Now it compiles. - Add wdk_wnet_to_ros.diff to easily merge changes with any possible future WDK updates.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 20 14:56:09 2008 New Revision: 34616 URL: http://svn.reactos.org/svn/reactos?rev=34616&view=rev Log: - Now it compiles. - Add wdk_wnet_to_ros.diff to easily merge changes with any possible future WDK updates. Added: trunk/reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff Modified: trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c trunk/reactos/drivers/filesystems/cdfs_new/cddata.c trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c trunk/reactos/drivers/filesystems/cdfs_new/close.c trunk/reactos/drivers/filesystems/cdfs_new/create.c trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c trunk/reactos/drivers/filesystems/cdfs_new/namesup.c trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c trunk/reactos/drivers/filesystems/cdfs_new/read.c trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c trunk/reactos/drivers/filesystems/cdfs_new/workque.c Modified: trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -128,7 +128,7 @@ { BOOLEAN FirstPass = TRUE; ULONG McbEntryOffset; - PFCB ParentFcb; + PFCB ParentFcb = NULL; /* ReactOS Change: GCC uninitialized variable bug */ BOOLEAN CleanupParent = FALSE; BOOLEAN UnlockFcb = FALSE; Modified: trunk/reactos/drivers/filesystems/cdfs_new/cddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -417,7 +417,6 @@ return Status; } - #ifdef CD_SANITY VOID @@ -481,7 +480,6 @@ #endif - LONG CdExceptionFilter ( IN PIRP_CONTEXT IrpContext, @@ -1006,6 +1004,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, Modified: trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="cdfs_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs_new.sys"> +<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <include base="cdfs_new">.</include> + <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> <file>allocsup.c</file> @@ -32,6 +32,5 @@ <file>volinfo.c</file> <file>workque.c</file> <file>cdfs.rc</file> - <compilerflag>-fms-extensions</compilerflag> <pch>cdprocs.h</pch> </module> Modified: trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -22,12 +22,14 @@ #define BugCheckFileId (CDFS_BUG_CHECK_CDINIT) NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdUnload( IN PDRIVER_OBJECT DriverObject ); @@ -39,6 +41,7 @@ ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdShutdown ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -57,6 +60,7 @@ // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -169,6 +173,7 @@ } NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdShutdown ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -200,6 +205,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdUnload( IN PDRIVER_OBJECT DriverObject ) @@ -310,10 +316,10 @@ // Initialize the cache manager callback routines // - CdData.CacheManagerCallbacks.AcquireForLazyWrite = &CdAcquireForCache; - CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = &CdReleaseFromCache; - CdData.CacheManagerCallbacks.AcquireForReadAhead = &CdAcquireForCache; - CdData.CacheManagerCallbacks.ReleaseFromReadAhead = &CdReleaseFromCache; + CdData.CacheManagerCallbacks.AcquireForLazyWrite = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + CdData.CacheManagerCallbacks.AcquireForReadAhead = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + CdData.CacheManagerCallbacks.ReleaseFromReadAhead = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ CdData.CacheManagerVolumeCallbacks.AcquireForLazyWrite = &CdNoopAcquire; CdData.CacheManagerVolumeCallbacks.ReleaseFromLazyWrite = &CdNoopRelease; Modified: trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -44,28 +44,30 @@ // Here are the different pool tags. // -#define TAG_CCB 'ccdC' // Ccb -#define TAG_CDROM_TOC 'ctdC' // TOC -#define TAG_DIRENT_NAME 'nddC' // CdName in dirent -#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration -#define TAG_FCB_DATA 'dfdC' // Data Fcb -#define TAG_FCB_INDEX 'ifdC' // Index Fcb -#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb -#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry -#define TAG_FILE_NAME 'nFdC' // Filename buffer -#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name -#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer -#define TAG_IO_CONTEXT 'oidC' // Io context for async reads -#define TAG_IRP_CONTEXT 'cidC' // Irp Context -#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite -#define TAG_MCB_ARRAY 'amdC' // Mcb array -#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry -#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry -#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name -#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table -#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name -#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor -#define TAG_VPB 'pvdC' // Vpb allocated in filesystem +/* ReactOS Change: GCC doesn't understand this, use TAG macro */ +#include <reactos/helper.h> +#define TAG_CCB TAG('c','c','d','C') // Ccb +#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC +#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent +#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration +#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb +#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb +#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb +#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry +#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer +#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name +#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer +#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads +#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context +#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite +#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array +#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry +#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry +#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name +#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table +#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name +#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor +#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem // // Tag all of our allocations if tagging is turned on @@ -902,33 +904,39 @@ } BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopAcquire ( IN PVOID Fcb, IN BOOLEAN Wait ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopRelease ( IN PVOID Fcb ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdAcquireForCache ( IN PFCB Fcb, IN BOOLEAN Wait ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdReleaseFromCache ( IN PFCB Fcb ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdAcquireForCreateSection ( IN PFILE_OBJECT FileObject ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdReleaseForCreateSection ( IN PFILE_OBJECT FileObject ); @@ -1184,8 +1192,8 @@ // Verification support routines. Contained in verfysup.c // - -INLINE +/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */ +static inline BOOLEAN CdOperationIsDasdOpen( IN PIRP_CONTEXT IrpContext @@ -1272,12 +1280,14 @@ ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdPrePostIrp ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdOplockComplete ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -1293,7 +1303,9 @@ // otherwise // -//#ifndef BooleanFlagOn +/* ReactOS Change: GCC doesn't understand the comment style */ +/* + //#ifndef BooleanFlagOn //#define BooleanFlagOn(F,SF) ( \ // (BOOLEAN)(((F) & (SF)) != 0) \ //) @@ -1310,6 +1322,7 @@ // (Flags) &= ~(SingleFlag); \ //} //#endif +*/ // // CAST @@ -1598,6 +1611,7 @@ // BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -1607,6 +1621,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryStdInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -1616,6 +1631,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1629,6 +1645,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1640,6 +1657,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAll ( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, @@ -1648,6 +1666,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAllByKey ( IN PFILE_OBJECT FileObject, PVOID ProcessId, @@ -1657,6 +1676,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1669,6 +1689,7 @@ ); BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryNetworkInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -1862,17 +1883,26 @@ // // #define try_return(S) { S; goto try_exit; } // - -#define try_return(S) { S; goto try_exit; } -#define try_leave(S) { S; leave; } +/* ReactOS Change: Remove SEH */ +#define try +#define leave goto exitLabel; +#define finally if (0) goto exitLabel; exitLabel: +#define except(x) while (0) +#define GetExceptionCode() 0 +#define AbnormalTermination() 0 + +#define try_return(S) { goto try_exit; } +#define try_leave(S) { leave; } + // // Encapsulate safe pool freeing // - -INLINE -VOID -CdFreePool( +/* ReactOS Change: GCC "passing argument 1 of CdFreePool from incompatible pointer type" */ +#define CdFreePool(x) _CdFreePool((PVOID*)(x)) + +/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */ +static inline void _CdFreePool( IN PVOID *Pool ) { Modified: trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -504,8 +504,8 @@ // ULONG VcbCleanup; - ULONG VcbReference; - ULONG VcbUserReference; + LONG VcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ + LONG VcbUserReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ // // Fcb for the Volume Dasd file, root directory and the Path Table. @@ -655,7 +655,7 @@ // executed later. // - ULONG PostedRequestCount; + LONG PostedRequestCount; /* ReactOS Change: GCC "pointer targets in passing argument 1 of 'InterlockedDecrement' differ in signedness" */ // // The following field indicates the number of IRP's waiting @@ -878,7 +878,7 @@ // ULONG FcbCleanup; - ULONG FcbReference; + LONG FcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ ULONG FcbUserReference; // Modified: trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -159,7 +159,7 @@ // Use a try-finally to facilitate cleanup. // - try { + //try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ // // Case on the type of open that we are trying to cleanup. @@ -279,7 +279,7 @@ IoRemoveShareAccess( FileObject, &Fcb->ShareAccess ); - } finally { + //} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ CdReleaseFcb( IrpContext, Fcb ); @@ -287,7 +287,7 @@ FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } - } + //} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ // // If appropriate, try to spark teardown by purging the volume. Should Modified: trunk/reactos/drivers/filesystems/cdfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/close.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -77,6 +77,7 @@ ); VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdCloseWorker ( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context @@ -136,8 +137,8 @@ // // Continue processing until there are no more closes to process. // - - while (IrpContext = CdRemoveClose( Vcb )) { + /* ReactOS Change: "GCC suggest parentheses around assignment used as truth value" */ + while ((IrpContext = CdRemoveClose( Vcb ))) { // // If we don't have an IrpContext then use the one on the stack. @@ -165,7 +166,7 @@ // Free the IrpContextLite. // - CdFreeIrpContextLite( (PIRP_CONTEXT_LITE) IrpContext ); + CdFreeIrpContextLite( IrpContext ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */ // // Remember we have the IrpContext from the stack. @@ -662,6 +663,7 @@ } VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdCloseWorker ( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context Modified: trunk/reactos/drivers/filesystems/cdfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/create.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -2106,7 +2106,7 @@ PFCB NextFcb; PFCB ParentFcb = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC uninitialized variable */ PAGED_CODE(); @@ -2757,8 +2757,8 @@ OplockStatus = FsRtlCheckOplock( &Fcb->Oplock, IrpContext->Irp, IrpContext, - CdOplockComplete, - CdPrePostIrp ); + (PVOID)CdOplockComplete, /* ReactOS Change: GCC "assignment from incompatible pointer type" */ + (PVOID)CdPrePostIrp ); /* ReactOS Change: GCC "assignment from incompatible pointer type" */ if (OplockStatus == STATUS_PENDING) { @@ -2789,8 +2789,8 @@ OplockStatus = FsRtlCheckOplock( &Fcb->Oplock, IrpContext->Irp, IrpContext, - CdOplockComplete, - CdPrePostIrp ); + (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */ if (OplockStatus == STATUS_PENDING) { Modified: trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -64,7 +64,7 @@ PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION NextIrpSp; - PVOID TargetBuffer = NULL; +// PVOID TargetBuffer = NULL; /* ReactOS Change: GCC unused variable */ PAGED_CODE(); Modified: trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -165,6 +165,7 @@ ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdMultiSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -172,6 +173,7 @@ ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdMultiAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -179,6 +181,7 @@ ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdSingleSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -186,6 +189,7 @@ ); NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdSingleAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2943,6 +2947,7 @@ // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdMultiSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3029,6 +3034,7 @@ // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdMultiAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3066,7 +3072,8 @@ { PCD_IO_CONTEXT IoContext = Context; - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); + /* ReactOS Change: GCC Unused Variable */ + //PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); AssertVerifyDeviceIrp( Irp ); @@ -3148,6 +3155,7 @@ // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdSingleSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3207,6 +3215,7 @@ // NTSTATUS +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdSingleAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3267,7 +3276,7 @@ // and finally, free the context record. // - CdFreeIoContext( (PCD_IO_CONTEXT) Context ); + CdFreeIoContext( Context ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */ return STATUS_SUCCESS; UNREFERENCED_PARAMETER( DeviceObject ); Modified: trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -209,7 +209,7 @@ ULONG BaseLength; - PFILE_BOTH_DIR_INFORMATION DirInfo; + PFILE_BOTH_DIR_INFORMATION DirInfo = NULL; /* ReactOS Change: GCC Uninit var */ PFILE_NAMES_INFORMATION NamesInfo; PFILE_ID_FULL_DIR_INFORMATION IdFullDirInfo; PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo; @@ -579,6 +579,9 @@ NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes; break; + + /* ReactOS Change: GCC "enumeration value not handled in switch" */ + default: break; } // Modified: trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -465,7 +465,7 @@ // Save a pointer to the time stamps. // - Dirent->CdTime = RawDirent->RecordTime; + Dirent->CdTime = (PCHAR)RawDirent->RecordTime; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */ // // Copy the dirent flags. @@ -501,7 +501,7 @@ } Dirent->FileNameLen = RawDirent->FileIdLen; - Dirent->FileName = RawDirent->FileId; + Dirent->FileName = (PCHAR)RawDirent->FileId; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */ // // If there are any remaining bytes at the end of the dirent then @@ -1457,7 +1457,7 @@ --*/ { - XA_EXTENT_TYPE ExtentType; + XA_EXTENT_TYPE ExtentType = 0; /* ReactOS Change: GCC Uninit var */ PCOMPOUND_DIRENT CurrentCompoundDirent; PDIRENT CurrentDirent; Modified: trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -460,6 +460,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -577,6 +578,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryStdInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -704,6 +706,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastQueryNetworkInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, Modified: trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -105,7 +105,7 @@ FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; - SetFlag( ((ULONG_PTR) FileObject->FsContext2), TypeOfOpen ); + SetFlag( (*(PULONG_PTR)&FileObject->FsContext2), TypeOfOpen ); /* ReactOS Change: GCC "invalid lvalue in assignment" */ // // Set the Vpb field in the file object. @@ -176,7 +176,7 @@ *Fcb = FileObject->FsContext; *Ccb = FileObject->FsContext2; - ClearFlag( (ULONG_PTR) *Ccb, TYPE_OF_OPEN_MASK ); + ClearFlag( (*(PULONG_PTR)Ccb), TYPE_OF_OPEN_MASK ); /* ReactOS Change: GCC "invalid lvalue in assignment" */ } // Modified: trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -82,7 +82,8 @@ IN PIRP_CONTEXT IrpContext, IN PIRP Irp ); - + +NTSTATUS /* ReactOS Change: Function did not have a type??? */ CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -918,7 +919,7 @@ if (CdIsRemount( IrpContext, Vcb, &OldVcb )) { - KIRQL SavedIrql; + //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */ ASSERT( NULL != OldVcb->SwapVpb ); @@ -1374,7 +1375,7 @@ // Compute the length of the volume name // - AnsiLabel.Buffer = CdRvdVolId( RawIsoVd, Vcb->VcbState ); + AnsiLabel.Buffer = (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ); /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ AnsiLabel.MaximumLength = AnsiLabel.Length = VOLUME_ID_LENGTH; UnicodeLabel.MaximumLength = VOLUME_ID_LENGTH * sizeof( WCHAR ); @@ -1401,7 +1402,7 @@ } else { CdConvertBigToLittleEndian( IrpContext, - CdRvdVolId( RawIsoVd, Vcb->VcbState ), + (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ VOLUME_ID_LENGTH, (PCHAR) VolumeLabel ); @@ -2005,7 +2006,7 @@ // // Local support routine // - +NTSTATUS /* ReactOS Change: Function did not have a type??? */ CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -2294,9 +2295,9 @@ Status = ObReferenceObjectByHandle( Handle, 0, - *IoFileObjectType, + IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibily with exported kernel data */ KernelMode, - &FileToMarkBad, + (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ NULL ); if (!NT_SUCCESS(Status)) { @@ -2642,8 +2643,8 @@ // The track address is BigEndian, we need to flip the bytes. // - Source = (PUCHAR) &CdromToc->TrackData[0].Address[3]; - Dest = (PUCHAR) &BaseSector; + Source = (PCHAR) &CdromToc->TrackData[0].Address[3];/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + Dest = (PCHAR) &BaseSector; /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ do { @@ -3118,7 +3119,7 @@ if (NT_SUCCESS( RtlOemToUnicodeN( &Vcb->Vpb->VolumeLabel[0], MAXIMUM_VOLUME_LABEL_LENGTH, &Length, - CdRvdVolId( RawIsoVd, Vcb->VcbState ), + (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ VOLUME_ID_LENGTH ))) { Vcb->Vpb->VolumeLabelLength = (USHORT) Length; @@ -3131,7 +3132,7 @@ } else { CdConvertBigToLittleEndian( IrpContext, - CdRvdVolId( RawIsoVd, Vcb->VcbState ), + (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ VOLUME_ID_LENGTH, (PCHAR) Vcb->Vpb->VolumeLabel ); Modified: trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -89,7 +89,7 @@ Status = FsRtlCheckOplock( &Fcb->Oplock, Irp, IrpContext, - CdOplockComplete, + (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ NULL ); // @@ -138,6 +138,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -246,8 +247,8 @@ // // Now call the FsRtl routine to perform the lock request. // - - if (Results = FsRtlFastLock( Fcb->FileLock, + /* ReactOS Change: GCC "suggest parentheses around assignment used as truth value" */ + if ((Results = FsRtlFastLock( Fcb->FileLock, FileObject, FileOffset, Length, @@ -257,7 +258,7 @@ ExclusiveLock, IoStatus, NULL, - FALSE )) { + FALSE ))) { // // Set the flag indicating if Fast I/O is questionable. We @@ -284,6 +285,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -424,6 +426,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAll ( IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, @@ -546,6 +549,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAllByKey ( IN PFILE_OBJECT FileObject, PVOID ProcessId, Modified: trunk/reactos/drivers/filesystems/cdfs_new/namesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -206,7 +206,7 @@ { NTSTATUS Status; - PVOID NewBuffer; + //PVOID NewBuffer; /* ReactOS Change: GCC Uninitialized variable */ PAGED_CODE(); Modified: trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -97,6 +97,8 @@ #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) #define CDFS_BUG_CHECK_WORKQUE (0x001c0000) +/* ReactOS Change: Need to add to reactos.mc */ +#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } #endif // _NODETYPE_ Modified: trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -764,7 +764,7 @@ PathEntry->PathEntryLength = WordAlign( PathEntry->PathEntryLength ); - PathEntry->DirName = RawPathEntry->DirId; + PathEntry->DirName = (PCHAR)RawPathEntry->DirId; /* ReactOS Change: GCC "assignment makes pointer from integer without a cast" */ return TRUE; } Modified: trunk/reactos/drivers/filesystems/cdfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/read.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -79,7 +79,7 @@ --*/ { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Uninit var */ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); TYPE_OF_OPEN TypeOfOpen; @@ -225,8 +225,8 @@ Status = FsRtlCheckOplock( &Fcb->Oplock, Irp, IrpContext, - CdOplockComplete, - CdPrePostIrp ); + (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */ // // If the result is not STATUS_SUCCESS then the Irp was completed Modified: trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -123,6 +123,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdAcquireForCache ( IN PFCB Fcb, IN BOOLEAN Wait @@ -159,6 +160,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdReleaseFromCache ( IN PFCB Fcb ) @@ -193,6 +195,7 @@ BOOLEAN +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopAcquire ( IN PVOID Fcb, IN BOOLEAN Wait @@ -224,6 +227,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopRelease ( IN PVOID Fcb ) @@ -251,6 +255,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdAcquireForCreateSection ( IN PFILE_OBJECT FileObject ) @@ -298,6 +303,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdReleaseForCreateSection ( IN PFILE_OBJECT FileObject ) Modified: trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -438,7 +438,7 @@ --*/ { - ULONG Shift; + //ULONG Shift; /* ReactOS Change: GCC Unused variable */ ULONG StartingBlock; ULONG ByteCount; Modified: trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -431,7 +431,7 @@ ULONG MediaChangeCount = 0; BOOLEAN ForceVerify = FALSE; BOOLEAN DevMarkedForVerify; - KIRQL SavedIrql; + //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */ PAGED_CODE(); @@ -581,6 +581,9 @@ CdRaiseStatus( IrpContext, STATUS_FILE_INVALID ); break; + + /* ReactOS Change: GCC "enumeration value not handled in switch" */ + default: break; } } @@ -613,7 +616,7 @@ --*/ { - NTSTATUS Status = STATUS_SUCCESS; + //NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Unused variable */ PVCB Vcb = Fcb->Vcb; PDEVICE_OBJECT RealDevice = Vcb->Vpb->RealDevice; PIRP Irp; Modified: trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -166,8 +166,11 @@ Status = CdQueryFsAttributeInfo( IrpContext, Fcb->Vcb, Irp->AssociatedIrp.SystemBuffer, &Length ); break; + + /* ReactOS Change: GCC "enumeration value not handled in switch" */ + default: break; } - + // // Set the information field to the number of bytes actually filled in // Added: trunk/reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff (added) +++ trunk/reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -1,0 +1,1073 @@ +Index: drivers/filesystems/cdfs_new/deviosup.c +=================================================================== +--- drivers/filesystems/cdfs_new/deviosup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/deviosup.c (working copy) +@@ -165,6 +165,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdMultiSyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -172,6 +173,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdMultiAsyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -179,6 +181,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdSingleSyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -186,6 +189,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdSingleAsyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -2943,6 +2947,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdMultiSyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -3029,6 +3034,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdMultiAsyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -3066,7 +3072,8 @@ + + { + PCD_IO_CONTEXT IoContext = Context; +- PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); ++ /* ReactOS Change: GCC Unused Variable */ ++ //PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + AssertVerifyDeviceIrp( Irp ); + +@@ -3148,6 +3155,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdSingleSyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -3207,6 +3215,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdSingleAsyncCompletionRoutine ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, +@@ -3267,7 +3276,7 @@ + // and finally, free the context record. + // + +- CdFreeIoContext( (PCD_IO_CONTEXT) Context ); ++ CdFreeIoContext( Context ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */ + return STATUS_SUCCESS; + + UNREFERENCED_PARAMETER( DeviceObject ); +Index: drivers/filesystems/cdfs_new/dirctrl.c +=================================================================== +--- drivers/filesystems/cdfs_new/dirctrl.c (revision 34615) ++++ drivers/filesystems/cdfs_new/dirctrl.c (working copy) +@@ -209,7 +209,7 @@ + + ULONG BaseLength; + +- PFILE_BOTH_DIR_INFORMATION DirInfo; ++ PFILE_BOTH_DIR_INFORMATION DirInfo = NULL; /* ReactOS Change: GCC Uninit var */ + PFILE_NAMES_INFORMATION NamesInfo; + PFILE_ID_FULL_DIR_INFORMATION IdFullDirInfo; + PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo; +@@ -579,6 +579,9 @@ + NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes; + + break; ++ ++ /* ReactOS Change: GCC "enumeration value not handled in switch" */ ++ default: break; + } + + // +Index: drivers/filesystems/cdfs_new/create.c +=================================================================== +--- drivers/filesystems/cdfs_new/create.c (revision 34615) ++++ drivers/filesystems/cdfs_new/create.c (working copy) +@@ -2106,7 +2106,7 @@ + PFCB NextFcb; + PFCB ParentFcb = NULL; + +- NTSTATUS Status; ++ NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC uninitialized variable */ + + PAGED_CODE(); + +@@ -2757,8 +2757,8 @@ + OplockStatus = FsRtlCheckOplock( &Fcb->Oplock, + IrpContext->Irp, + IrpContext, +- CdOplockComplete, +- CdPrePostIrp ); ++ (PVOID)CdOplockComplete, /* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ (PVOID)CdPrePostIrp ); /* ReactOS Change: GCC "assignment from incompatible pointer type" */ + + if (OplockStatus == STATUS_PENDING) { + +@@ -2789,8 +2789,8 @@ + OplockStatus = FsRtlCheckOplock( &Fcb->Oplock, + IrpContext->Irp, + IrpContext, +- CdOplockComplete, +- CdPrePostIrp ); ++ (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + + if (OplockStatus == STATUS_PENDING) { + +Index: drivers/filesystems/cdfs_new/devctrl.c +=================================================================== +--- drivers/filesystems/cdfs_new/devctrl.c (revision 34615) ++++ drivers/filesystems/cdfs_new/devctrl.c (working copy) +@@ -64,7 +64,7 @@ + PIO_STACK_LOCATION IrpSp; + PIO_STACK_LOCATION NextIrpSp; + +- PVOID TargetBuffer = NULL; ++// PVOID TargetBuffer = NULL; /* ReactOS Change: GCC unused variable */ + + PAGED_CODE(); + +Index: drivers/filesystems/cdfs_new/close.c +=================================================================== +--- drivers/filesystems/cdfs_new/close.c (revision 34615) ++++ drivers/filesystems/cdfs_new/close.c (working copy) +@@ -77,6 +77,7 @@ + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdCloseWorker ( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context +@@ -136,9 +137,9 @@ + // + // Continue processing until there are no more closes to process. + // ++ /* ReactOS Change: "GCC suggest parentheses around assignment used as truth value" */ ++ while ((IrpContext = CdRemoveClose( Vcb ))) { + +- while (IrpContext = CdRemoveClose( Vcb )) { +- + // + // If we don't have an IrpContext then use the one on the stack. + // Initialize it for this request. +@@ -165,7 +166,7 @@ + // Free the IrpContextLite. + // + +- CdFreeIrpContextLite( (PIRP_CONTEXT_LITE) IrpContext ); ++ CdFreeIrpContextLite( IrpContext ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */ + + // + // Remember we have the IrpContext from the stack. +@@ -662,6 +663,7 @@ + } + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdCloseWorker ( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context +Index: drivers/filesystems/cdfs_new/dirsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/dirsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/dirsup.c (working copy) +@@ -465,7 +465,7 @@ + // Save a pointer to the time stamps. + // + +- Dirent->CdTime = RawDirent->RecordTime; ++ Dirent->CdTime = (PCHAR)RawDirent->RecordTime; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */ + + // + // Copy the dirent flags. +@@ -501,7 +501,7 @@ + } + + Dirent->FileNameLen = RawDirent->FileIdLen; +- Dirent->FileName = RawDirent->FileId; ++ Dirent->FileName = (PCHAR)RawDirent->FileId; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */ + + // + // If there are any remaining bytes at the end of the dirent then +@@ -1457,7 +1457,7 @@ + --*/ + + { +- XA_EXTENT_TYPE ExtentType; ++ XA_EXTENT_TYPE ExtentType = 0; /* ReactOS Change: GCC Uninit var */ + PCOMPOUND_DIRENT CurrentCompoundDirent; + PDIRENT CurrentDirent; + +Index: drivers/filesystems/cdfs_new/read.c +=================================================================== +--- drivers/filesystems/cdfs_new/read.c (revision 34615) ++++ drivers/filesystems/cdfs_new/read.c (working copy) +@@ -79,7 +79,7 @@ + --*/ + + { +- NTSTATUS Status; ++ NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Uninit var */ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + TYPE_OF_OPEN TypeOfOpen; +@@ -225,8 +225,8 @@ + Status = FsRtlCheckOplock( &Fcb->Oplock, + Irp, + IrpContext, +- CdOplockComplete, +- CdPrePostIrp ); ++ (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + + // + // If the result is not STATUS_SUCCESS then the Irp was completed +Index: drivers/filesystems/cdfs_new/volinfo.c +=================================================================== +--- drivers/filesystems/cdfs_new/volinfo.c (revision 34615) ++++ drivers/filesystems/cdfs_new/volinfo.c (working copy) +@@ -166,8 +166,11 @@ + + Status = CdQueryFsAttributeInfo( IrpContext, Fcb->Vcb, Irp->AssociatedIrp.SystemBuffer, &Length ); + break; ++ ++ /* ReactOS Change: GCC "enumeration value not handled in switch" */ ++ default: break; + } +- ++ + // + // Set the information field to the number of bytes actually filled in + // +Index: drivers/filesystems/cdfs_new/cdfs.rbuild +=================================================================== +--- drivers/filesystems/cdfs_new/cdfs.rbuild (revision 34615) ++++ drivers/filesystems/cdfs_new/cdfs.rbuild (working copy) +@@ -1,8 +1,8 @@ + <?xml version="1.0"?> + <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +-<module name="cdfs_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs_new.sys"> ++<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> +- <include base="cdfs_new">.</include> ++ <include base="cdfs">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>allocsup.c</file> +@@ -32,6 +32,5 @@ + <file>volinfo.c</file> + <file>workque.c</file> + <file>cdfs.rc</file> +- <compilerflag>-fms-extensions</compilerflag> + <pch>cdprocs.h</pch> + </module> +Index: drivers/filesystems/cdfs_new/cddata.c +=================================================================== +--- drivers/filesystems/cdfs_new/cddata.c (revision 34615) ++++ drivers/filesystems/cdfs_new/cddata.c (working copy) +@@ -417,7 +417,6 @@ + return Status; + } + +- + #ifdef CD_SANITY + + VOID +@@ -481,7 +480,6 @@ + + #endif + +- + LONG + CdExceptionFilter ( + IN PIRP_CONTEXT IrpContext, +@@ -1006,6 +1004,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastIoCheckIfPossible ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +Index: drivers/filesystems/cdfs_new/allocsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/allocsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/allocsup.c (working copy) +@@ -128,7 +128,7 @@ + { + BOOLEAN FirstPass = TRUE; + ULONG McbEntryOffset; +- PFCB ParentFcb; ++ PFCB ParentFcb = NULL; /* ReactOS Change: GCC uninitialized variable bug */ + BOOLEAN CleanupParent = FALSE; + + BOOLEAN UnlockFcb = FALSE; +Index: drivers/filesystems/cdfs_new/verfysup.c +=================================================================== +--- drivers/filesystems/cdfs_new/verfysup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/verfysup.c (working copy) +@@ -431,7 +431,7 @@ + ULONG MediaChangeCount = 0; + BOOLEAN ForceVerify = FALSE; + BOOLEAN DevMarkedForVerify; +- KIRQL SavedIrql; ++ //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */ + + PAGED_CODE(); + +@@ -581,6 +581,9 @@ + + CdRaiseStatus( IrpContext, STATUS_FILE_INVALID ); + break; ++ ++ /* ReactOS Change: GCC "enumeration value not handled in switch" */ ++ default: break; + } + } + +@@ -613,7 +616,7 @@ + --*/ + + { +- NTSTATUS Status = STATUS_SUCCESS; ++ //NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Unused variable */ + PVCB Vcb = Fcb->Vcb; + PDEVICE_OBJECT RealDevice = Vcb->Vpb->RealDevice; + PIRP Irp; +Index: drivers/filesystems/cdfs_new/filobsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/filobsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/filobsup.c (working copy) +@@ -105,7 +105,7 @@ + FileObject->FsContext = Fcb; + FileObject->FsContext2 = Ccb; + +- SetFlag( ((ULONG_PTR) FileObject->FsContext2), TypeOfOpen ); ++ SetFlag( (*(PULONG_PTR)&FileObject->FsContext2), TypeOfOpen ); /* ReactOS Change: GCC "invalid lvalue in assignment" */ + + // + // Set the Vpb field in the file object. +@@ -176,7 +176,7 @@ + *Fcb = FileObject->FsContext; + *Ccb = FileObject->FsContext2; + +- ClearFlag( (ULONG_PTR) *Ccb, TYPE_OF_OPEN_MASK ); ++ ClearFlag( (*(PULONG_PTR)Ccb), TYPE_OF_OPEN_MASK ); /* ReactOS Change: GCC "invalid lvalue in assignment" */ + } + + // +Index: drivers/filesystems/cdfs_new/pathsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/pathsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/pathsup.c (working copy) +@@ -764,7 +764,7 @@ + + PathEntry->PathEntryLength = WordAlign( PathEntry->PathEntryLength ); + +- PathEntry->DirName = RawPathEntry->DirId; ++ PathEntry->DirName = (PCHAR)RawPathEntry->DirId; /* ReactOS Change: GCC "assignment makes pointer from integer without a cast" */ + + return TRUE; + } +Index: drivers/filesystems/cdfs_new/cdprocs.h +=================================================================== +--- drivers/filesystems/cdfs_new/cdprocs.h (revision 34615) ++++ drivers/filesystems/cdfs_new/cdprocs.h (working copy) +@@ -44,28 +44,30 @@ + // Here are the different pool tags. + // + +-#define TAG_CCB 'ccdC' // Ccb +-#define TAG_CDROM_TOC 'ctdC' // TOC +-#define TAG_DIRENT_NAME 'nddC' // CdName in dirent +-#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration +-#define TAG_FCB_DATA 'dfdC' // Data Fcb +-#define TAG_FCB_INDEX 'ifdC' // Index Fcb +-#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb +-#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry +-#define TAG_FILE_NAME 'nFdC' // Filename buffer +-#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name +-#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer +-#define TAG_IO_CONTEXT 'oidC' // Io context for async reads +-#define TAG_IRP_CONTEXT 'cidC' // Irp Context +-#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite +-#define TAG_MCB_ARRAY 'amdC' // Mcb array +-#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry +-#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry +-#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name +-#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table +-#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name +-#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor +-#define TAG_VPB 'pvdC' // Vpb allocated in filesystem ++/* ReactOS Change: GCC doesn't understand this, use TAG macro */ ++#include <reactos/helper.h> ++#define TAG_CCB TAG('c','c','d','C') // Ccb ++#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC ++#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent ++#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration ++#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb ++#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb ++#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb ++#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry ++#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer ++#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name ++#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer ++#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads ++#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context ++#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite ++#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array ++#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry ++#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry ++#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name ++#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table ++#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name ++#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor ++#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem + + // + // Tag all of our allocations if tagging is turned on +@@ -902,33 +904,39 @@ + } + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdNoopAcquire ( + IN PVOID Fcb, + IN BOOLEAN Wait + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdNoopRelease ( + IN PVOID Fcb + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdAcquireForCache ( + IN PFCB Fcb, + IN BOOLEAN Wait + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdReleaseFromCache ( + IN PFCB Fcb + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdAcquireForCreateSection ( + IN PFILE_OBJECT FileObject + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdReleaseForCreateSection ( + IN PFILE_OBJECT FileObject + ); +@@ -1184,8 +1192,8 @@ + // Verification support routines. Contained in verfysup.c + // + +- +-INLINE ++/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */ ++static inline + BOOLEAN + CdOperationIsDasdOpen( + IN PIRP_CONTEXT IrpContext +@@ -1272,12 +1280,14 @@ + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdPrePostIrp ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdOplockComplete ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp +@@ -1293,7 +1303,9 @@ + // otherwise + // + +-//#ifndef BooleanFlagOn ++/* ReactOS Change: GCC doesn't understand the comment style */ ++/* ++ //#ifndef BooleanFlagOn + //#define BooleanFlagOn(F,SF) ( \ + // (BOOLEAN)(((F) & (SF)) != 0) \ + //) +@@ -1310,6 +1322,7 @@ + // (Flags) &= ~(SingleFlag); \ + //} + //#endif ++*/ + + // + // CAST +@@ -1598,6 +1611,7 @@ + // + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryBasicInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +@@ -1607,6 +1621,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryStdInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +@@ -1616,6 +1631,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastLock ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +@@ -1629,6 +1645,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockSingle ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +@@ -1640,6 +1657,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockAll ( + IN PFILE_OBJECT FileObject, + PEPROCESS ProcessId, +@@ -1648,6 +1666,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockAllByKey ( + IN PFILE_OBJECT FileObject, + PVOID ProcessId, +@@ -1657,6 +1676,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastIoCheckIfPossible ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +@@ -1669,6 +1689,7 @@ + ); + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryNetworkInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +@@ -1862,17 +1883,26 @@ + // + // #define try_return(S) { S; goto try_exit; } + // ++/* ReactOS Change: Remove SEH */ ++#define try ++#define leave goto exitLabel; ++#define finally if (0) goto exitLabel; exitLabel: ++#define except(x) while (0) ++#define GetExceptionCode() 0 ++#define AbnormalTermination() 0 + +-#define try_return(S) { S; goto try_exit; } +-#define try_leave(S) { S; leave; } ++#define try_return(S) { goto try_exit; } ++#define try_leave(S) { leave; } + ++ + // + // Encapsulate safe pool freeing + // ++/* ReactOS Change: GCC "passing argument 1 of CdFreePool from incompatible pointer type" */ ++#define CdFreePool(x) _CdFreePool((PVOID*)(x)) + +-INLINE +-VOID +-CdFreePool( ++/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */ ++static inline void _CdFreePool( + IN PVOID *Pool + ) + { +Index: drivers/filesystems/cdfs_new/resrcsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/resrcsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/resrcsup.c (working copy) +@@ -123,6 +123,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdAcquireForCache ( + IN PFCB Fcb, + IN BOOLEAN Wait +@@ -159,6 +160,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdReleaseFromCache ( + IN PFCB Fcb + ) +@@ -193,6 +195,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdNoopAcquire ( + IN PVOID Fcb, + IN BOOLEAN Wait +@@ -224,6 +227,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdNoopRelease ( + IN PVOID Fcb + ) +@@ -251,6 +255,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdAcquireForCreateSection ( + IN PFILE_OBJECT FileObject + ) +@@ -298,6 +303,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdReleaseForCreateSection ( + IN PFILE_OBJECT FileObject + ) +Index: drivers/filesystems/cdfs_new/namesup.c +=================================================================== +--- drivers/filesystems/cdfs_new/namesup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/namesup.c (working copy) +@@ -206,7 +206,7 @@ + + { + NTSTATUS Status; +- PVOID NewBuffer; ++ //PVOID NewBuffer; /* ReactOS Change: GCC Uninitialized variable */ + + PAGED_CODE(); + +Index: drivers/filesystems/cdfs_new/cdinit.c +=================================================================== +--- drivers/filesystems/cdfs_new/cdinit.c (revision 34615) ++++ drivers/filesystems/cdfs_new/cdinit.c (working copy) +@@ -22,12 +22,14 @@ + #define BugCheckFileId (CDFS_BUG_CHECK_CDINIT) + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath + ); + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdUnload( + IN PDRIVER_OBJECT DriverObject + ); +@@ -39,6 +41,7 @@ + ); + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdShutdown ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +@@ -57,6 +60,7 @@ + // + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath +@@ -169,6 +173,7 @@ + } + + NTSTATUS ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdShutdown ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +@@ -200,6 +205,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdUnload( + IN PDRIVER_OBJECT DriverObject + ) +@@ -310,10 +316,10 @@ + // Initialize the cache manager callback routines + // + +- CdData.CacheManagerCallbacks.AcquireForLazyWrite = &CdAcquireForCache; +- CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = &CdReleaseFromCache; +- CdData.CacheManagerCallbacks.AcquireForReadAhead = &CdAcquireForCache; +- CdData.CacheManagerCallbacks.ReleaseFromReadAhead = &CdReleaseFromCache; ++ CdData.CacheManagerCallbacks.AcquireForLazyWrite = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ CdData.CacheManagerCallbacks.AcquireForReadAhead = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ ++ CdData.CacheManagerCallbacks.ReleaseFromReadAhead = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + + CdData.CacheManagerVolumeCallbacks.AcquireForLazyWrite = &CdNoopAcquire; + CdData.CacheManagerVolumeCallbacks.ReleaseFromLazyWrite = &CdNoopRelease; +Index: drivers/filesystems/cdfs_new/cdstruc.h +=================================================================== +--- drivers/filesystems/cdfs_new/cdstruc.h (revision 34615) ++++ drivers/filesystems/cdfs_new/cdstruc.h (working copy) +@@ -504,8 +504,8 @@ + // + + ULONG VcbCleanup; +- ULONG VcbReference; +- ULONG VcbUserReference; ++ LONG VcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ ++ LONG VcbUserReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ + + // + // Fcb for the Volume Dasd file, root directory and the Path Table. +@@ -655,7 +655,7 @@ + // executed later. + // + +- ULONG PostedRequestCount; ++ LONG PostedRequestCount; /* ReactOS Change: GCC "pointer targets in passing argument 1 of 'InterlockedDecrement' differ in signedness" */ + + // + // The following field indicates the number of IRP's waiting +@@ -878,7 +878,7 @@ + // + + ULONG FcbCleanup; +- ULONG FcbReference; ++ LONG FcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */ + ULONG FcbUserReference; + + // +Index: drivers/filesystems/cdfs_new/lockctrl.c +=================================================================== +--- drivers/filesystems/cdfs_new/lockctrl.c (revision 34615) ++++ drivers/filesystems/cdfs_new/lockctrl.c (working copy) +@@ -89,7 +89,7 @@ + Status = FsRtlCheckOplock( &Fcb->Oplock, + Irp, + IrpContext, +- CdOplockComplete, ++ (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + NULL ); + + // +@@ -138,6 +138,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastLock ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +@@ -246,8 +247,8 @@ + // + // Now call the FsRtl routine to perform the lock request. + // +- +- if (Results = FsRtlFastLock( Fcb->FileLock, ++ /* ReactOS Change: GCC "suggest parentheses around assignment used as truth value" */ ++ if ((Results = FsRtlFastLock( Fcb->FileLock, + FileObject, + FileOffset, + Length, +@@ -257,7 +258,7 @@ + ExclusiveLock, + IoStatus, + NULL, +- FALSE )) { ++ FALSE ))) { + + // + // Set the flag indicating if Fast I/O is questionable. We +@@ -284,6 +285,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockSingle ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, +@@ -424,6 +426,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockAll ( + IN PFILE_OBJECT FileObject, + PEPROCESS ProcessId, +@@ -546,6 +549,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastUnlockAllByKey ( + IN PFILE_OBJECT FileObject, + PVOID ProcessId, +Index: drivers/filesystems/cdfs_new/cleanup.c +=================================================================== +--- drivers/filesystems/cdfs_new/cleanup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/cleanup.c (working copy) +@@ -159,7 +159,7 @@ + // Use a try-finally to facilitate cleanup. + // + +- try { ++ //try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + + // + // Case on the type of open that we are trying to cleanup. +@@ -279,7 +279,7 @@ + + IoRemoveShareAccess( FileObject, &Fcb->ShareAccess ); + +- } finally { ++ //} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + + CdReleaseFcb( IrpContext, Fcb ); + +@@ -287,7 +287,7 @@ + + FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); + } +- } ++ //} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + + // + // If appropriate, try to spark teardown by purging the volume. Should +Index: drivers/filesystems/cdfs_new/strucsup.c +=================================================================== +--- drivers/filesystems/cdfs_new/strucsup.c (revision 34615) ++++ drivers/filesystems/cdfs_new/strucsup.c (working copy) +@@ -438,7 +438,7 @@ + --*/ + + { +- ULONG Shift; ++ //ULONG Shift; /* ReactOS Change: GCC Unused variable */ + ULONG StartingBlock; + ULONG ByteCount; + +Index: drivers/filesystems/cdfs_new/fileinfo.c +=================================================================== +--- drivers/filesystems/cdfs_new/fileinfo.c (revision 34615) ++++ drivers/filesystems/cdfs_new/fileinfo.c (working copy) +@@ -460,6 +460,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryBasicInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +@@ -577,6 +578,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryStdInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +@@ -704,6 +706,7 @@ + + + BOOLEAN ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdFastQueryNetworkInfo ( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, +Index: drivers/filesystems/cdfs_new/nodetype.h +=================================================================== +--- drivers/filesystems/cdfs_new/nodetype.h (revision 34615) ++++ drivers/filesystems/cdfs_new/nodetype.h (working copy) +@@ -97,6 +97,8 @@ + #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) + #define CDFS_BUG_CHECK_WORKQUE (0x001c0000) + ++/* ReactOS Change: Need to add to reactos.mc */ ++#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) + #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } + + #endif // _NODETYPE_ +Index: drivers/filesystems/cdfs_new/fsctrl.c +=================================================================== +--- drivers/filesystems/cdfs_new/fsctrl.c (revision 34615) ++++ drivers/filesystems/cdfs_new/fsctrl.c (working copy) +@@ -82,7 +82,8 @@ + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp + ); +- ++ ++NTSTATUS /* ReactOS Change: Function did not have a type??? */ + CdIsVolumeDirty ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp +@@ -918,7 +919,7 @@ + + if (CdIsRemount( IrpContext, Vcb, &OldVcb )) { + +- KIRQL SavedIrql; ++ //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */ + + ASSERT( NULL != OldVcb->SwapVpb ); + +@@ -1374,7 +1375,7 @@ + // Compute the length of the volume name + // + +- AnsiLabel.Buffer = CdRvdVolId( RawIsoVd, Vcb->VcbState ); ++ AnsiLabel.Buffer = (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ); /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + AnsiLabel.MaximumLength = AnsiLabel.Length = VOLUME_ID_LENGTH; + + UnicodeLabel.MaximumLength = VOLUME_ID_LENGTH * sizeof( WCHAR ); +@@ -1401,7 +1402,7 @@ + } else { + + CdConvertBigToLittleEndian( IrpContext, +- CdRvdVolId( RawIsoVd, Vcb->VcbState ), ++ (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + VOLUME_ID_LENGTH, + (PCHAR) VolumeLabel ); + +@@ -2005,7 +2006,7 @@ + // + // Local support routine + // +- ++NTSTATUS /* ReactOS Change: Function did not have a type??? */ + CdIsVolumeDirty ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp +@@ -2294,9 +2295,9 @@ + + Status = ObReferenceObjectByHandle( Handle, + 0, +- *IoFileObjectType, ++ IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibily with exported kernel data */ + KernelMode, +- &FileToMarkBad, ++ (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ + NULL ); + + if (!NT_SUCCESS(Status)) { +@@ -2642,8 +2643,8 @@ + // The track address is BigEndian, we need to flip the bytes. + // + +- Source = (PUCHAR) &CdromToc->TrackData[0].Address[3]; +- Dest = (PUCHAR) &BaseSector; ++ Source = (PCHAR) &CdromToc->TrackData[0].Address[3];/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ ++ Dest = (PCHAR) &BaseSector; /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + + do { + +@@ -3118,7 +3119,7 @@ + if (NT_SUCCESS( RtlOemToUnicodeN( &Vcb->Vpb->VolumeLabel[0], + MAXIMUM_VOLUME_LABEL_LENGTH, + &Length, +- CdRvdVolId( RawIsoVd, Vcb->VcbState ), ++ (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + VOLUME_ID_LENGTH ))) { + + Vcb->Vpb->VolumeLabelLength = (USHORT) Length; +@@ -3131,7 +3132,7 @@ + } else { + + CdConvertBigToLittleEndian( IrpContext, +- CdRvdVolId( RawIsoVd, Vcb->VcbState ), ++ (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */ + VOLUME_ID_LENGTH, + (PCHAR) Vcb->Vpb->VolumeLabel ); + +Index: drivers/filesystems/cdfs_new/workque.c +=================================================================== +--- drivers/filesystems/cdfs_new/workque.c (revision 34615) ++++ drivers/filesystems/cdfs_new/workque.c (working copy) +@@ -97,6 +97,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdPrePostIrp ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp +@@ -209,6 +210,7 @@ + + + VOID ++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ + CdOplockComplete ( + IN PIRP_CONTEXT IrpContext, + IN PIRP Irp +@@ -386,7 +388,7 @@ + // + + ExInitializeWorkItem( &IrpContext->WorkQueueItem, +- CdFspDispatch, ++ (PVOID)CdFspDispatch,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ + IrpContext ); + + ExQueueWorkItem( &IrpContext->WorkQueueItem, CriticalWorkQueue ); Modified: trunk/reactos/drivers/filesystems/cdfs_new/workque.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] Sun Jul 20 14:56:09 2008 @@ -97,6 +97,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdPrePostIrp ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -209,6 +210,7 @@ VOID +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdOplockComplete ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -386,7 +388,7 @@ // ExInitializeWorkItem( &IrpContext->WorkQueueItem, - CdFspDispatch, + (PVOID)CdFspDispatch,/* ReactOS Change: GCC "assignment from incompatible pointer type" */ IrpContext ); ExQueueWorkItem( &IrpContext->WorkQueueItem, CriticalWorkQueue );

16 years, 2 months

[ros-arm-bringup] 34615: - Add new CDFS driver. - Does not compile.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 20 14:52:30 2008 New Revision: 34615 URL: http://svn.reactos.org/svn/reactos?rev=34615&view=rev Log: - Add new CDFS driver. - Does not compile. Added: trunk/reactos/drivers/filesystems/cdfs_new/ trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/cachesup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/cd.h (with props) trunk/reactos/drivers/filesystems/cdfs_new/cddata.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/cddata.h (with props) trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild (with props) trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rc (with props) trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h (with props) trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h (with props) trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/close.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/create.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/fieldoff.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/fspdisp.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/namesup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h (with props) trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/pnp.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/prefxsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/read.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c (with props) trunk/reactos/drivers/filesystems/cdfs_new/workque.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/drivers/filesystems/cdfs_new/allocsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cachesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cddata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cdprocs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cdstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/dirsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/fieldoff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/filobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/fspdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/lockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/namesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/nodetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/pathsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/resrcsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/verfysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… Added: trunk/reactos/drivers/filesystems/cdfs_new/workque.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n…

16 years, 2 months

[ros-arm-bringup] 34614: - Our resident GCC expert just informed me of an undocumented "enable Microsoft Compiler Extensions" flag that makes things like unnnamed members work. - Apply the switch and remove our workaround hack.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 20 14:39:55 2008 New Revision: 34614 URL: http://svn.reactos.org/svn/reactos?rev=34614&view=rev Log: - Our resident GCC expert just informed me of an undocumented "enable Microsoft Compiler Extensions" flag that makes things like unnnamed members work. - Apply the switch and remove our workaround hack. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild 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] Sun Jul 20 14:39:55 2008 @@ -52,20 +52,19 @@ 0x410F, 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); -// -// GCC does not seem to support anonymous structures -// -#define RAMDISK_EXTENSION \ - RAMDISK_DEVICE_TYPE Type; \ - RAMDISK_DEVICE_STATE State; \ - PDEVICE_OBJECT DeviceObject; \ - PDEVICE_OBJECT PhysicalDeviceObject; \ - PDEVICE_OBJECT AttachedDevice; \ - IO_REMOVE_LOCK RemoveLock; \ - UNICODE_STRING DriveDeviceName; \ - UNICODE_STRING BusDeviceName; \ - FAST_MUTEX DiskListLock; \ +typedef struct _RAMDISK_EXTENSION +{ + RAMDISK_DEVICE_TYPE Type; + RAMDISK_DEVICE_STATE State; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT AttachedDevice; + IO_REMOVE_LOCK RemoveLock; + UNICODE_STRING DriveDeviceName; + UNICODE_STRING BusDeviceName; + FAST_MUTEX DiskListLock; LIST_ENTRY DiskList; +} RAMDISK_EXTENSION, *PRAMDISK_EXTENSION; typedef struct _RAMDISK_BUS_EXTENSION { Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Sun Jul 20 14:39:55 2008 @@ -6,4 +6,5 @@ <library>hal</library> <file>ramdisk.c</file> <file>ramdisk.rc</file> + <compilerflag>-fms-extensions</compilerflag> </module>

16 years, 2 months

[jmorlan] 34613: In ConioConsoleCtrlEvent, don't wait for the thread to terminate; a misbehaving handler could hang CSRSS indefinitely that way. Testing on Windows shows that no waiting is done when Ctrl-C is pressed; however, there is a wait of up to 5 seconds when attempting to close the window, so add a comment in GuiConsoleHandleClose mentioning this.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Jul 20 14:34:18 2008 New Revision: 34613 URL: http://svn.reactos.org/svn/reactos?rev=34613&view=rev Log: In ConioConsoleCtrlEvent, don't wait for the thread to terminate; a misbehaving handler could hang CSRSS indefinitely that way. Testing on Windows shows that no waiting is done when Ctrl-C is pressed; however, there is a wait of up to 5 seconds when attempting to close the window, so add a comment in GuiConsoleHandleClose mentioning this. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sun Jul 20 14:34:18 2008 @@ -79,7 +79,7 @@ VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData) { - ConioConsoleCtrlEventTimeout(Event, ProcessData, INFINITE); + ConioConsoleCtrlEventTimeout(Event, ProcessData, 0); } DWORD FASTCALL Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Sun Jul 20 14:34:18 2008 @@ -1241,6 +1241,9 @@ current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); current_entry = current_entry->Flink; + /* FIXME: Windows will wait up to 5 seconds for the thread to exit. + * We shouldn't wait here, though, since the console lock is entered. + * A copy of the thread list probably needs to be made. */ ConioConsoleCtrlEvent(CTRL_CLOSE_EVENT, current); }

16 years, 2 months

[silverblade] 34612: Reimplemented sound device capabilities retrieval. "Multimedia" control panel applet on Windows NT4 calls our sndblst.dll which in turn retrieves capabilities about the appropriate sound device and fills in the device name, which the applet displays.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 20 14:24:21 2008 New Revision: 34612 URL: http://svn.reactos.org/svn/reactos?rev=34612&view=rev Log: Reimplemented sound device capabilities retrieval. "Multimedia" control panel applet on Windows NT4 calls our sndblst.dll which in turn retrieves capabilities about the appropriate sound device and fills in the device name, which the applet displays. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -10,6 +10,8 @@ History: 6 July 2008 - Created + + TODO: Adhere to maximum device name length! */ #include <windows.h> @@ -18,9 +20,55 @@ #include <mmebuddy.h> //#include <debug.h> -PWSTR SBWaveOutDeviceName = L"ROS Sound Blaster Playback"; -PWSTR SBWaveInDeviceName = L"ROS Sound Blaster Recording"; +PWSTR SBWaveOutDeviceName = L"ROS Sound Blaster Out"; +PWSTR SBWaveInDeviceName = L"ROS Sound Blaster In"; /* TODO: Mixer etc */ + +MMRESULT +GetSoundBlasterDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + + SND_ASSERT( SoundDevice ); + SND_ASSERT( Capabilities ); + + SND_TRACE(L"Sndblst - GetSoundBlasterDeviceCapabilities\n"); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Use the default method of obtaining device capabilities */ + Result = DefaultGetSoundDeviceCapabilities(SoundDevice, + Capabilities, + CapabilitiesSize); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + + /* Inject the appropriate device name */ + switch ( DeviceType ) + { + case WAVE_OUT_DEVICE_TYPE : + { + LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; + CopyWideString(WaveOutCaps->szPname, SBWaveOutDeviceName); + break; + } + case WAVE_IN_DEVICE_TYPE : + { + LPWAVEINCAPS WaveInCaps = (LPWAVEINCAPS) Capabilities; + CopyWideString(WaveInCaps->szPname, SBWaveInDeviceName); + break; + } + } + + return MMSYSERR_NOERROR; +} + BOOLEAN FoundDevice( UCHAR DeviceType, @@ -28,11 +76,13 @@ { MMRESULT Result; PSOUND_DEVICE SoundDevice = NULL; + MMFUNCTION_TABLE FuncTable; SND_TRACE(L"Callback received: %wS\n", DevicePath); + FuncTable.GetCapabilities = GetSoundBlasterDeviceCapabilities; + /* - MMFUNCTION_TABLE FuncTable; ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); @@ -47,6 +97,7 @@ } /* TODO: Set up function table */ + SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); return TRUE; } @@ -85,6 +136,16 @@ return 0L; } +/* + PSOUND_DEVICE snd; + GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 0, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 1, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 2, &snd); +*/ + + SND_TRACE(L"Initialisation complete\n"); + return 1L; } @@ -102,6 +163,20 @@ return 1L; } + case DRV_ENABLE : + case DRV_DISABLE : + { + SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n"); + return 1L; + } + + case DRV_OPEN : + case DRV_CLOSE : + { + SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n"); + return 1L; + } + case DRV_QUERYCONFIGURE : { SND_TRACE(L"DRV_QUERYCONFIGURE"); @@ -111,6 +186,7 @@ return DRVCNF_OK; default : + SND_TRACE(L"Unhandled message %d\n", Message); return DefDriverProc(DriverId, DriverHandle, Message, Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -126,12 +126,58 @@ */ typedef UCHAR MMDEVICE_TYPE, *PMMDEVICE_TYPE; +struct _SOUND_DEVICE; + + +#define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \ + typedef MMRESULT (*func_typename)( \ + IN struct _SOUND_DEVICE* SoundDevice, \ + OUT caps_type Capabilities, \ + IN DWORD CapabilitiesSize); + +/* This one is for those of us who don't care */ +DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, PVOID); + +/* These are for those of us that do */ +DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEOUTCAPS_FUNC, LPWAVEOUTCAPS); +DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEINCAPS_FUNC, LPWAVEINCAPS ); +DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIOUTCAPS_FUNC, LPMIDIOUTCAPS); +DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIINCAPS_FUNC, LPMIDIINCAPS ); + +typedef struct _MMFUNCTION_TABLE +{ + union + { + MMGETCAPS_FUNC GetCapabilities; + MMGETWAVEOUTCAPS_FUNC GetWaveOutCapabilities; + MMGETWAVEINCAPS_FUNC GetWaveInCapabilities; + MMGETMIDIOUTCAPS_FUNC GetMidiOutCapabilities; + MMGETMIDIINCAPS_FUNC GetMidiInCapabilities; + }; + +/* + MMCREATEINSTANCE_FUNC Constructor; + MMDESTROYINSTANCE_FUNC Destructor; + MMGETCAPS_FUNC GetCapabilities; + + MMWAVEQUERYFORMAT_FUNC QueryWaveFormat; + MMWAVESETFORMAT_FUNC SetWaveFormat; + MMWAVEQUEUEBUFFER_FUNC QueueWaveBuffer; + + MMGETWAVESTATE_FUNC GetWaveDeviceState; + MMSETWAVESTATE_FUNC PauseWaveDevice; + MMSETWAVESTATE_FUNC RestartWaveDevice; + MMSETWAVESTATE_FUNC ResetWaveDevice; + MMSETWAVESTATE_FUNC BreakWaveDeviceLoop; +*/ +} MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; typedef struct _SOUND_DEVICE { struct _SOUND_DEVICE* Next; MMDEVICE_TYPE Type; PWSTR Path; + MMFUNCTION_TABLE FunctionTable; } SOUND_DEVICE, *PSOUND_DEVICE; typedef struct _SOUND_DEVICE_INSTANCE @@ -157,6 +203,30 @@ VOID ReleaseEntrypointMutex( IN MMDEVICE_TYPE DeviceType); + + +/* + capabilities.c +*/ + +MMRESULT +MmeGetSoundDeviceCapabilities( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN PVOID Capabilities, + IN DWORD CapabilitiesSize); + +MMRESULT +GetSoundDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize); + +MMRESULT +DefaultGetSoundDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize); /* @@ -194,6 +264,31 @@ IN MMDEVICE_TYPE DeviceType, IN DWORD DeviceIndex, OUT PSOUND_DEVICE* Device); + +MMRESULT +GetSoundDevicePath( + IN PSOUND_DEVICE SoundDevice, + OUT LPWSTR* DevicePath); + +MMRESULT +GetSoundDeviceType( + IN PSOUND_DEVICE SoundDevice, + OUT PMMDEVICE_TYPE DeviceType); + + +/* + functiontable.c +*/ + +MMRESULT +SetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + IN PMMFUNCTION_TABLE FunctionTable OPTIONAL); + +MMRESULT +GetSoundDeviceFunctionTable( + IN PSOUND_DEVICE SoundDevice, + OUT PMMFUNCTION_TABLE* FunctionTable); /* @@ -289,7 +384,7 @@ MMRESULT OpenKernelSoundDeviceByName( - IN PWSTR DeviceName, + IN PWSTR DevicePath, IN BOOLEAN ReadOnly, OUT PHANDLE Handle); @@ -492,432 +587,6 @@ } Streaming; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; - -/* - Thread requests -*/ - -#define THREADREQUEST_EXIT 0 -#define WAVEREQUEST_QUEUE_BUFFER 1 - - -/* - entry.c -*/ - -LONG -DefaultDriverProc( - DWORD driver_id, - HANDLE driver_handle, - UINT message, - LONG parameter1, - LONG parameter2); - - -/* - devices.c -*/ - -ULONG -GetSoundDeviceCount( - IN UCHAR DeviceType); - -MMRESULT -GetSoundDevice( - IN UCHAR DeviceType, - IN ULONG DeviceIndex, - OUT PSOUND_DEVICE* Device); - -MMRESULT -GetSoundDevicePath( - IN PSOUND_DEVICE SoundDevice, - OUT LPWSTR* DevicePath); - -BOOLEAN -AddSoundDevice( - IN UCHAR DeviceType, - IN PWSTR DevicePath, - IN PMMFUNCTION_TABLE FunctionTable); - -MMRESULT -RemoveSoundDevice( - IN PSOUND_DEVICE SoundDevice); - -MMRESULT -RemoveSoundDevices( - IN UCHAR DeviceType); - -VOID -RemoveAllSoundDevices(); - -BOOLEAN -IsValidSoundDevice( - IN PSOUND_DEVICE SoundDevice); - -MMRESULT -GetSoundDeviceType( - IN PSOUND_DEVICE Device, - OUT PUCHAR DeviceType); - -MMRESULT -GetSoundDeviceFunctionTable( - IN PSOUND_DEVICE SoundDevice, - OUT PMMFUNCTION_TABLE* FunctionTable); - -MMRESULT -DefaultInstanceConstructor( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); - -VOID -DefaultInstanceDestructor( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); - - -/* - nt4.c -*/ - -typedef BOOLEAN (*SOUND_DEVICE_DETECTED_PROC)( - UCHAR DeviceType, - PWSTR DevicePath, - HANDLE Handle); - -MMRESULT -OpenSoundDriverParametersRegKey( - IN LPWSTR ServiceName, - OUT PHKEY KeyHandle); - -MMRESULT -OpenSoundDeviceRegKey( - IN LPWSTR ServiceName, - IN DWORD DeviceIndex, - OUT PHKEY KeyHandle); - -MMRESULT -EnumerateNt4ServiceSoundDevices( - IN LPWSTR ServiceName, - IN UCHAR DeviceType, - IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); - -MMRESULT -DetectNt4SoundDevices( - IN UCHAR DeviceType, - IN PWSTR BaseDevicePath, - IN SOUND_DEVICE_DETECTED_PROC SoundDeviceDetectedProc); - - -/* - kernel.c -*/ - -MMRESULT -OpenKernelSoundDeviceByName( - IN PWSTR DeviceName, - IN DWORD AccessRights, - IN PHANDLE Handle); - -MMRESULT -OpenKernelSoundDevice( - PSOUND_DEVICE SoundDevice, - DWORD AccessRights, - PHANDLE Handle); - -MMRESULT -CloseKernelSoundDevice( - IN HANDLE Handle); - -MMRESULT -PerformDeviceIo( - IN HANDLE Handle, - IN DWORD IoControlCode, - IN LPVOID InBuffer, - IN DWORD InBufferSize, - OUT LPVOID OutBuffer, - IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -RetrieveFromDeviceHandle( - IN HANDLE Handle, - IN DWORD IoControlCode, - OUT LPVOID OutBuffer, - IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -SendToDeviceHandle( - IN HANDLE Handle, - IN DWORD IoControlCode, - IN LPVOID InBuffer, - IN DWORD InBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -PerformSoundDeviceIo( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD IoControlCode, - IN LPVOID InBuffer, - IN DWORD InBufferSize, - OUT LPVOID OutBuffer, - IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned); - -MMRESULT -RetrieveFromSoundDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD IoControlCode, - OUT LPVOID OutBuffer, - IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned); - -MMRESULT -SendToSoundDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD IoControlCode, - IN LPVOID InBuffer, - IN DWORD InBufferSize, - OUT LPDWORD BytesReturned); - -MMRESULT -WriteSoundDeviceBuffer( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN LPVOID Buffer, - IN DWORD BufferSize, - IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, - LPOVERLAPPED Overlapped); - - -/* - utility.c -*/ - -PVOID -AllocateTaggedMemory( - IN DWORD Tag, - IN DWORD Size); - -VOID -FreeTaggedMemory( - IN DWORD Tag, - IN PVOID Pointer); - -DWORD -GetMemoryAllocations(); - -ULONG -GetDigitCount( - IN ULONG Number); - -MMRESULT -Win32ErrorToMmResult(IN UINT error_code); - -MMRESULT -TranslateInternalMmResult(MMRESULT Result); - -MMRESULT -InitEntrypointMutexes(); - -VOID -CleanupEntrypointMutexes(); - -VOID -AcquireEntrypointMutex( - IN MMDEVICE_TYPE DeviceType); - -VOID -ReleaseEntrypointMutex( - IN MMDEVICE_TYPE DeviceType); - - -BOOLEAN -InitMmeBuddyLib(); - -VOID -CleanupMmeBuddyLib(); - - -/* - instances.c -*/ - -MMRESULT -CreateSoundDeviceInstance( - IN PSOUND_DEVICE SoundDevice, - OUT PSOUND_DEVICE_INSTANCE* Instance); - -MMRESULT -DestroySoundDeviceInstance( - IN PSOUND_DEVICE_INSTANCE Instance); - -MMRESULT -DestroyAllInstancesOfSoundDevice( - IN PSOUND_DEVICE SoundDevice); - -MMRESULT -GetSoundDeviceFromInstance( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PSOUND_DEVICE* SoundDevice); - -BOOLEAN -IsValidSoundDeviceInstance( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -GetSoundDeviceTypeFromInstance( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR DeviceType); - - -/* - capabilities.c -*/ - -MMRESULT -GetSoundDeviceCapabilities( - IN PSOUND_DEVICE SoundDevice, - OUT PUNIVERSAL_CAPS Capabilities); - -MMRESULT -DefaultGetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, - OUT PUNIVERSAL_CAPS Capabilities); - - -/* - wave/format.c -*/ - -MMRESULT -QueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE SoundDevice, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - -MMRESULT -DefaultQueryWaveDeviceFormatSupport( - IN PSOUND_DEVICE SoundDevice, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - -MMRESULT -SetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - -MMRESULT -DefaultSetWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - - -/* - thread.c -*/ - -MMRESULT -OverlappedSoundDeviceIo( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Buffer, - IN DWORD BufferSize, - IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, - IN PVOID CompletionParameter OPTIONAL); - -MMRESULT -StartSoundThread(); - -MMRESULT -StopSoundThread(); - -MMRESULT -CallUsingSoundThread( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN PVOID Parameter); - - -/* - wave/streamcontrol.c -*/ - -MMRESULT -InitWaveStreamData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -QueueWaveDeviceBuffer( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PWAVEHDR BufferHeader); - -MMRESULT -GetWaveDeviceState( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PULONG State); - -MMRESULT -DefaultGetWaveDeviceState( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PULONG State); - -MMRESULT -PauseWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -DefaultPauseWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -RestartWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -DefaultRestartWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -ResetWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -DefaultResetWaveDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -BreakWaveDeviceLoop( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - -MMRESULT -DefaultBreakWaveDeviceLoop( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); - - -/* - wave/wodMessage.c -*/ - -APIENTRY DWORD -wodMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2); - - -/* - mme/callback.c -*/ - -VOID -NotifySoundClient( - PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - DWORD Message, - DWORD Parameter); #endif #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,9 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to auxiliary devices. +*/ APIENTRY DWORD auxMessage( DWORD DeviceId, @@ -25,9 +28,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(AUX_DEVICE_TYPE); + + SND_TRACE(L"auxMessage - Message type %d\n", Message); switch ( Message ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -54,8 +54,6 @@ CopyWideString(NewDevice->Path, DevicePath); } - /* TODO: Initialise function table */ - /* Return the new structure to the caller and report success */ *SoundDevice = NewDevice; @@ -78,6 +76,8 @@ FreeMemory(SoundDevice->Path); } + /* For safety the whole struct gets zeroed */ + ZeroMemory(SoundDevice, sizeof(SOUND_DEVICE)); FreeMemory(SoundDevice); } @@ -97,6 +97,7 @@ return 0; } + SND_TRACE(L"Returning a count of %d devices\n", SoundDeviceCounts[Index]); return SoundDeviceCounts[Index]; } @@ -109,11 +110,31 @@ IsValidSoundDevice( IN PSOUND_DEVICE SoundDevice) { + UCHAR TypeIndex; + PSOUND_DEVICE CurrentDevice; + if ( ! SoundDevice ) return FALSE; - /* TODO */ - return TRUE; + /* Go through all the device lists */ + for ( TypeIndex = 0; TypeIndex < SOUND_DEVICE_TYPES; ++ TypeIndex ) + { + CurrentDevice = SoundDeviceListHeads[TypeIndex]; + + while ( CurrentDevice ) + { + if ( CurrentDevice == SoundDevice ) + { + /* Found the device */ + return TRUE; + } + + CurrentDevice = CurrentDevice->Next; + } + } + + /* If we get here, nothing was found */ + return FALSE; } /* @@ -164,6 +185,9 @@ /* Add to the count */ ++ SoundDeviceCounts[TypeIndex]; + + /* Set up the default function table */ + SetSoundDeviceFunctionTable(NewDevice, NULL); /* Fill in the caller's PSOUND_DEVICE */ if ( SoundDevice ) @@ -232,6 +256,9 @@ return MMSYSERR_NOERROR; } +/* + Removes all devices from one of the device lists. +*/ MMRESULT UnlistSoundDevices( IN MMDEVICE_TYPE DeviceType) @@ -254,6 +281,9 @@ return MMSYSERR_NOERROR; } +/* + Removes all devices from all lists. +*/ VOID UnlistAllSoundDevices() { @@ -269,11 +299,76 @@ } } +/* + Provides the caller with a pointer to its desired sound device, based on + the device type and index. +*/ MMRESULT GetSoundDevice( IN MMDEVICE_TYPE DeviceType, IN DWORD DeviceIndex, - OUT PSOUND_DEVICE* Device OPTIONAL) -{ - return MMSYSERR_NOTSUPPORTED; -} + OUT PSOUND_DEVICE* SoundDevice) +{ + UCHAR TypeIndex = SOUND_DEVICE_TYPE_TO_INDEX(DeviceType); + DWORD CurrentIndex = 0; + PSOUND_DEVICE CurrentDevice; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceType(DeviceType) ); + + if ( DeviceIndex >= SoundDeviceCounts[TypeIndex] ) + { + SND_ERR(L"Invalid device ID %d for type %d\n", DeviceIndex, DeviceType); + return MMSYSERR_BADDEVICEID; + } + + CurrentDevice = SoundDeviceListHeads[TypeIndex]; + + /* Following the earlier checks, the index should be valid here. */ + for ( CurrentIndex = 0; CurrentIndex != DeviceIndex; ++ CurrentIndex ) + { + SND_ASSERT( CurrentDevice ); + CurrentDevice = CurrentDevice->Next; + } + + SND_TRACE(L"Returning sound device %x\n", CurrentDevice); + + *SoundDevice = CurrentDevice; + + return MMSYSERR_NOERROR; +} + +/* + Provides the caller with the device path of the specified sound device. + This will normally be the path to a device provided by a kernel-mode + driver. +*/ +MMRESULT +GetSoundDevicePath( + IN PSOUND_DEVICE SoundDevice, + OUT LPWSTR* DevicePath) +{ + VALIDATE_MMSYS_PARAMETER( SoundDevice ); + VALIDATE_MMSYS_PARAMETER( DevicePath ); + + /* The caller should not modify this! */ + *DevicePath = SoundDevice->Path; + + return MMSYSERR_NOERROR; +} + +/* + Provides the caller with the device type of the specified sound device. + This will be, for example, WAVE_OUT_DEVICE_TYPE, WAVE_IN_DEVICE_TYPE ... +*/ +MMRESULT +GetSoundDeviceType( + IN PSOUND_DEVICE SoundDevice, + OUT PMMDEVICE_TYPE DeviceType) +{ + VALIDATE_MMSYS_PARAMETER( SoundDevice ); + VALIDATE_MMSYS_PARAMETER( DeviceType ); + + *DeviceType = SoundDevice->Type; + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -14,20 +14,28 @@ #include <ntddsnd.h> #include <mmebuddy.h> +/* + Wraps around CreateFile in order to provide a simpler interface tailored + towards sound driver support code. This simply takes a device path and + opens the device in either read-only mode, or read/write mode (depending on + the ReadOnly parameter). + + If the device is opened in read/write mode, it is opened for overlapped I/O. +*/ MMRESULT OpenKernelSoundDeviceByName( - IN PWSTR DeviceName, + IN PWSTR DevicePath, IN BOOLEAN ReadOnly, OUT PHANDLE Handle) { DWORD AccessRights; - VALIDATE_MMSYS_PARAMETER( DeviceName ); + VALIDATE_MMSYS_PARAMETER( DevicePath ); VALIDATE_MMSYS_PARAMETER( Handle ); AccessRights = ReadOnly ? GENERIC_READ : GENERIC_WRITE; - *Handle = CreateFile(DeviceName, + *Handle = CreateFile(DevicePath, AccessRights, FILE_SHARE_WRITE, /* FIXME? Should be read also? */ NULL, @@ -43,6 +51,9 @@ return MMSYSERR_NOERROR; } +/* + Just a wrapped around CloseHandle. +*/ MMRESULT CloseKernelSoundDevice( IN HANDLE Handle) @@ -54,6 +65,12 @@ return MMSYSERR_NOERROR; } +/* + This is a wrapper around DeviceIoControl which provides control over + instantiated sound devices. It takes a sound device instance rather than + a handle, and waits for I/O to complete (since an instantiated sound + device is opened in overlapped mode, this is necessary). +*/ MMRESULT SoundDeviceIoControl( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,9 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to MIDI input. +*/ APIENTRY DWORD midMessage( DWORD DeviceId, @@ -25,9 +28,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(MIDI_IN_DEVICE_TYPE); + + SND_TRACE(L"midMessage - Message type %d\n", Message); switch ( Message ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,9 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to MIDI output. +*/ APIENTRY DWORD modMessage( DWORD DeviceId, @@ -25,9 +28,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(MIDI_OUT_DEVICE_TYPE); + + SND_TRACE(L"modMessage - Message type %d\n", Message); switch ( Message ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,9 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to mixers. +*/ APIENTRY DWORD mxdMessage( DWORD DeviceId, @@ -25,9 +28,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(MIXER_DEVICE_TYPE); + + SND_TRACE(L"mxdMessage - Message type %d\n", Message); switch ( Message ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -3,8 +3,10 @@ <module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> <include base="ReactOS">include/reactos/libs/sound</include> <define name="DEBUG_NT4">1</define> + <file>capabilities.c</file> <file>devicelist.c</file> <file>deviceinstance.c</file> + <file>functiontable.c</file> <file>reentrancy.c</file> <file>utility.c</file> <file>nt4.c</file> Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/reentrancy.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -15,6 +15,11 @@ HANDLE EntrypointMutexes[SOUND_DEVICE_TYPES]; +/* + Creates a set of mutexes which are used for the purpose of guarding the + device-type specific module entry-points. If any of these fail creation, + all of them will be destroyed and the failure reported. +*/ MMRESULT InitEntrypointMutexes() { @@ -45,6 +50,11 @@ return Result; } +/* + Cleans up any of the entry-point guard mutexes. This will only close the + handles of mutexes which have been created, making it safe for use as a + cleanup routine even within the InitEntrypointMutexes routine above. +*/ VOID CleanupEntrypointMutexes() { @@ -61,6 +71,9 @@ } } +/* + Grabs an entry-point mutex. +*/ VOID AcquireEntrypointMutex( IN MMDEVICE_TYPE DeviceType) @@ -75,6 +88,9 @@ WaitForSingleObject(EntrypointMutexes[i], INFINITE); } +/* + Releases an entry-point mutex. +*/ VOID ReleaseEntrypointMutex( IN MMDEVICE_TYPE DeviceType) Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,7 +17,7 @@ static UINT CurrentAllocations = 0; /* - Memory allocation helper + Allocates memory, zeroes it, and increases the allocation count. */ PVOID AllocateMemory( @@ -38,6 +38,9 @@ return Pointer; } +/* + Frees memory and reduces the allocation count. +*/ VOID FreeMemory( IN PVOID Pointer) @@ -50,6 +53,10 @@ -- CurrentAllocations; } +/* + Returns the current number of memory allocations outstanding. Useful for + detecting/tracing memory leaks. +*/ UINT GetMemoryAllocationCount() { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,10 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to wave audio + input. +*/ APIENTRY DWORD widMessage( DWORD DeviceId, @@ -25,9 +29,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(WAVE_IN_DEVICE_TYPE); + + SND_TRACE(L"widMessage - Message type %d\n", Message); switch ( Message ) { @@ -36,6 +42,15 @@ Result = GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); break; } + + case WIDM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } ReleaseEntrypointMutex(WAVE_IN_DEVICE_TYPE); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 20 14:24:21 2008 @@ -17,6 +17,10 @@ #include <mmebuddy.h> +/* + Standard MME driver entry-point for messages relating to wave audio + output. +*/ APIENTRY DWORD wodMessage( DWORD DeviceId, @@ -25,9 +29,11 @@ DWORD Parameter1, DWORD Parameter2) { - MMRESULT Result = MMSYSERR_NOERROR; + MMRESULT Result = MMSYSERR_NOTSUPPORTED; AcquireEntrypointMutex(WAVE_OUT_DEVICE_TYPE); + + SND_TRACE(L"wodMessage - Message type %d\n", Message); switch ( Message ) { @@ -36,6 +42,15 @@ Result = GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); break; } + + case WODM_GETDEVCAPS : + { + Result = MmeGetSoundDeviceCapabilities(WAVE_OUT_DEVICE_TYPE, + DeviceId, + (PVOID) Parameter1, + Parameter2); + break; + } } ReleaseEntrypointMutex(WAVE_OUT_DEVICE_TYPE);

16 years, 2 months

[ros-arm-bringup] 34611: - Fix the way NlsOemLeadByteInfo is exported. - Fix definition of PFAST_IO_UNLOCK_ALL_BY_KEY. - Add IO_REPARSE and IO_REMOUNT definitions. - Add IOCTL_CDROM_DISK_TYPE definition. - Add FlagOn, BooleanFlagOn, SetFlag and ClearFlag definitions. - Add FILE_READ_ONLY_VOLUME, FILE_SEQUENTIAL_WRITE_ONCE, FILE_SUPPORTS_TRANSACTIONS definitions. - Add FSRTL_FLAG_ADVANCED_HEADER definition. - Add FSRTL_FLAG2_PURGE_WHEN_MAPPED and FSRTL_FLAG2_IS_PAGING_FILE definitions. - Add FILE

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 20 14:19:02 2008 New Revision: 34611 URL: http://svn.reactos.org/svn/reactos?rev=34611&view=rev Log: - Fix the way NlsOemLeadByteInfo is exported. - Fix definition of PFAST_IO_UNLOCK_ALL_BY_KEY. - Add IO_REPARSE and IO_REMOUNT definitions. - Add IOCTL_CDROM_DISK_TYPE definition. - Add FlagOn, BooleanFlagOn, SetFlag and ClearFlag definitions. - Add FILE_READ_ONLY_VOLUME, FILE_SEQUENTIAL_WRITE_ONCE, FILE_SUPPORTS_TRANSACTIONS definitions. - Add FSRTL_FLAG_ADVANCED_HEADER definition. - Add FSRTL_FLAG2_PURGE_WHEN_MAPPED and FSRTL_FLAG2_IS_PAGING_FILE definitions. - Add FILE_ID_FULL_DIR_INFORMATION and FILE_ID_BOTH_DIR_INFORMATION structures. - Add FSRTL_FCB_HEADER_V0 and FSRTL_FCB_HEADER_V1 definitions. - Add FSRTL_COMPARISION_RESULT enumeration. - Add backwards compatibility support for non-AVL tree routines. - Add RtlInsertElementGenericTableAvl, RtlDeleteElementGenericTableAvl, RtlLookupElementGenericTableAvl, RtlEnumerateGenericTableWithoutSplayingAvl prototypes. - Add FsRtlSetupAdvancedHeader macro. - Add FsRtlIsFatDbcsLegal prototype. - Add FsRtlTeardownPerStreamContexts prototype. - Add RtlFreeOemString, RtlOemStringToCountedUnicodeString, RtlUnicodeStringToCountedOemString, RtlOemToUnicodeN prototypes. - Fix GenericTable prototypes in rtlfuncs.h - It seems the ntoskrnl_i386.def exports file is totally incorrect with respect to mingw -- most FsRtl functions are not properly exported. We fixed the ones we need, someone needs to go fix this entire file. - Add memcmp to the NTOS exports -- we're not entirely sure how you were even expecting 3rd party drivers to load in React? - Fix FastFat's "VfatFastIoUnlockAllByKey" prototype to match the fixed up PFAST_IO_UNLOCK_ALL_BY_KEY definition. - Clean-build-tested on i386. Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/include/ddk/ntddcdrm.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/nls.c trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -114,7 +114,7 @@ static BOOLEAN NTAPI VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) Modified: trunk/reactos/include/ddk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddcdrm.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddcdrm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddcdrm.h [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -61,6 +61,9 @@ #define IOCTL_CDROM_RAW_READ \ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS) + +#define IOCTL_CDROM_DISK_TYPE \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_CDROM_READ_Q_CHANNEL \ CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=34… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -55,6 +55,23 @@ #define EX_PUSH_LOCK ULONG_PTR #define PEX_PUSH_LOCK PULONG_PTR + +#ifndef FlagOn +#define FlagOn(_F,_SF) ((_F) & (_SF)) +#endif + +#ifndef BooleanFlagOn +#define BooleanFlagOn(F,SF) ((BOOLEAN)(((F) & (SF)) != 0)) +#endif + +#ifndef SetFlag +#define SetFlag(_F,_SF) ((_F) |= (_SF)) +#endif + +#ifndef ClearFlag +#define ClearFlag(_F,_SF) ((_F) &= ~(_SF)) +#endif + #include "csq.h" typedef struct _SE_EXPORTS *PSE_EXPORTS; @@ -204,7 +221,10 @@ #define FILE_SUPPORTS_OBJECT_IDS 0x00010000 #define FILE_SUPPORTS_ENCRYPTION 0x00020000 #define FILE_NAMED_STREAMS 0x00040000 - +#define FILE_READ_ONLY_VOLUME 0x00080000 +#define FILE_SEQUENTIAL_WRITE_ONCE 0x00100000 +#define FILE_SUPPORTS_TRANSACTIONS 0x00200000 + #define FILE_PIPE_BYTE_STREAM_TYPE 0x00000000 #define FILE_PIPE_MESSAGE_TYPE 0x00000001 @@ -268,9 +288,13 @@ #define FSRTL_FLAG_ACQUIRE_MAIN_RSRC_EX (0x08) #define FSRTL_FLAG_ACQUIRE_MAIN_RSRC_SH (0x10) #define FSRTL_FLAG_USER_MAPPED_FILE (0x20) +#define FSRTL_FLAG_ADVANCED_HEADER (0x40) #define FSRTL_FLAG_EOF_ADVANCE_ACTIVE (0x80) #define FSRTL_FLAG2_DO_MODIFIED_WRITE (0x01) +#define FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS (0x02) +#define FSRTL_FLAG2_PURGE_WHEN_MAPPED (0x04) +#define FSRTL_FLAG2_IS_PAGING_FILE (0x08) #define FSRTL_FSP_TOP_LEVEL_IRP (0x01) #define FSRTL_CACHE_TOP_LEVEL_IRP (0x02) @@ -880,6 +904,22 @@ ULONG EaSize; WCHAR FileName[0]; } FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION; + +typedef struct _FILE_ID_FULL_DIR_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_FULL_DIR_INFORMATION, *PFILE_ID_FULL_DIR_INFORMATION; typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { ULONG NextEntryOffset; @@ -897,6 +937,24 @@ WCHAR ShortName[12]; WCHAR FileName[0]; } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION; + +typedef struct _FILE_ID_BOTH_DIR_INFORMATION { + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION; typedef struct _FILE_EA_INFORMATION { ULONG EaSize; @@ -1284,6 +1342,10 @@ } FILE_ALLOCATED_RANGE_BUFFER, *PFILE_ALLOCATED_RANGE_BUFFER; #endif /* (VER_PRODUCTBUILD >= 2195) */ +#define FSRTL_FCB_HEADER_V0 (0x00) +#define FSRTL_FCB_HEADER_V1 (0x01) + + typedef struct _FSRTL_COMMON_FCB_HEADER { CSHORT NodeTypeCode; CSHORT NodeByteSize; @@ -1300,6 +1362,13 @@ LARGE_INTEGER ValidDataLength; } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; +typedef enum _FSRTL_COMPARISON_RESULT +{ + LessThan = -1, + EqualTo = 0, + GreaterThan = 1 +} FSRTL_COMPARISON_RESULT; + #if (VER_PRODUCTBUILD >= 2600) typedef struct _FSRTL_ADVANCED_FCB_HEADER { @@ -1570,6 +1639,30 @@ PVOID TableContext; } RTL_GENERIC_TABLE, *PRTL_GENERIC_TABLE; +#undef PRTL_GENERIC_COMPARE_ROUTINE +#undef PRTL_GENERIC_ALLOCATE_ROUTINE +#undef PRTL_GENERIC_FREE_ROUTINE +#undef RTL_GENERIC_TABLE +#undef PRTL_GENERIC_TABLE + +#define PRTL_GENERIC_COMPARE_ROUTINE PRTL_AVL_COMPARE_ROUTINE +#define PRTL_GENERIC_ALLOCATE_ROUTINE PRTL_AVL_ALLOCATE_ROUTINE +#define PRTL_GENERIC_FREE_ROUTINE PRTL_AVL_FREE_ROUTINE +#define RTL_GENERIC_TABLE RTL_AVL_TABLE +#define PRTL_GENERIC_TABLE PRTL_AVL_TABLE + +#define RtlInitializeGenericTable RtlInitializeGenericTableAvl +#define RtlInsertElementGenericTable RtlInsertElementGenericTableAvl +#define RtlInsertElementGenericTableFull RtlInsertElementGenericTableFullAvl +#define RtlDeleteElementGenericTable RtlDeleteElementGenericTableAvl +#define RtlLookupElementGenericTable RtlLookupElementGenericTableAvl +#define RtlLookupElementGenericTableFull RtlLookupElementGenericTableFullAvl +#define RtlEnumerateGenericTable RtlEnumerateGenericTableAvl +#define RtlEnumerateGenericTableWithoutSplaying RtlEnumerateGenericTableWithoutSplayingAvl +#define RtlGetElementGenericTable RtlGetElementGenericTableAvl +#define RtlNumberGenericTableElements RtlNumberGenericTableElementsAvl +#define RtlIsGenericTableEmpty RtlIsGenericTableEmptyAvl + typedef struct _RTL_AVL_TABLE { RTL_BALANCED_LINKS BalancedRoot; @@ -1595,6 +1688,40 @@ PRTL_AVL_FREE_ROUTINE FreeRoutine, PVOID TableContext ); + +NTSYSAPI +PVOID +NTAPI +RtlInsertElementGenericTableAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer, + CLONG BufferSize, + PBOOLEAN NewElement OPTIONAL + ); + +NTSYSAPI +BOOLEAN +NTAPI +RtlDeleteElementGenericTableAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer + ); + +NTSYSAPI +PVOID +NTAPI +RtlLookupElementGenericTableAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer + ); + +NTSYSAPI +PVOID +NTAPI +RtlEnumerateGenericTableWithoutSplayingAvl ( + PRTL_AVL_TABLE Table, + PVOID *RestartKey + ); #if defined(USE_LPC6432) #define LPC_CLIENT_ID CLIENT_ID64 @@ -2443,6 +2570,21 @@ #endif #endif /* (VER_PRODUCTBUILD >= 2600) */ + +#define FsRtlSetupAdvancedHeader( _advhdr, _fmutx ) \ +{ \ + SetFlag( (_advhdr)->Flags, FSRTL_FLAG_ADVANCED_HEADER ); \ + SetFlag( (_advhdr)->Flags2, FSRTL_FLAG2_SUPPORTS_FILTER_CONTEXTS ); \ + (_advhdr)->Version = FSRTL_FCB_HEADER_V1; \ + InitializeListHead( &(_advhdr)->FilterContexts ); \ + if ((_fmutx) != NULL) { \ + (_advhdr)->FastMutex = (_fmutx); \ + } \ + *((PULONG_PTR)(&(_advhdr)->PushLock)) = 0; \ + /*ExInitializePushLock( &(_advhdr)->PushLock ); API Not avaliable downlevel*/\ + (_advhdr)->FileContextSupportPointer = NULL; \ +} + #define FlagOn(x, f) ((x) & (f)) NTKERNELAPI @@ -2679,6 +2821,17 @@ FsRtlDoesNameContainWildCards ( IN PUNICODE_STRING Name ); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlIsFatDbcsLegal ( + IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible + ); + #define FsRtlCompleteRequest(IRP,STATUS) { \ (IRP)->IoStatus.Status = (STATUS); \ @@ -3142,6 +3295,13 @@ NTKERNELAPI VOID NTAPI +FsRtlTeardownPerStreamContexts ( + IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader +); + +NTKERNELAPI +VOID +NTAPI FsRtlUninitializeFileLock ( IN PFILE_LOCK FileLock ); @@ -4072,6 +4232,13 @@ NTSYSAPI VOID NTAPI +RtlFreeOemString( + IN OUT POEM_STRING OemString + ); + +NTSYSAPI +VOID +NTAPI RtlGenerate8dot3Name ( IN PUNICODE_STRING Name, IN BOOLEAN AllowExtendedCharacters, @@ -4173,6 +4340,24 @@ IN BOOLEAN AllocateDestinationString ); +NTSYSAPI +NTSTATUS +NTAPI +RtlOemStringToCountedUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PCOEM_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlUnicodeStringToCountedOemString( + IN OUT POEM_STRING DestinationString, + IN PCUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); + NTSYSAPI NTSTATUS NTAPI @@ -4244,6 +4429,17 @@ OUT PULONG BytesInMultiByteString OPTIONAL, IN PWCH UnicodeString, IN ULONG BytesInUnicodeString +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlOemToUnicodeN( + OUT PWSTR UnicodeString, + IN ULONG MaxBytesInUnicodeString, + OUT PULONG BytesInUnicodeString OPTIONAL, + IN PCH OemString, + IN ULONG BytesInOemString ); /* RTL Splay Tree Functions */ Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -3401,7 +3401,7 @@ typedef BOOLEAN (DDKAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)( IN struct _FILE_OBJECT *FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN struct _DEVICE_OBJECT *DeviceObject); @@ -4769,6 +4769,9 @@ #define IO_FORCE_ACCESS_CHECK 0x001 #define IO_NO_PARAMETER_CHECKING 0x100 +#define IO_REPARSE 0x0 +#define IO_REMOUNT 0x1 + typedef NTSTATUS (DDKAPI *PIO_QUERY_DEVICE_ROUTINE)( IN PVOID Context, @@ -7384,6 +7387,7 @@ ExRaiseDatatypeMisalignment( VOID); +DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -2602,6 +2602,7 @@ // Generic Table Functions // #if defined(NTOS_MODE_USER) || defined(_NTIFS_) +NTSYSAPI PVOID NTAPI RtlInsertElementGenericTable( @@ -2611,6 +2612,7 @@ OUT PBOOLEAN NewElement OPTIONAL ); +NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableFull( @@ -2622,12 +2624,14 @@ IN TABLE_SEARCH_RESULT SearchResult ); +NTSYSAPI BOOLEAN NTAPI RtlIsGenericTableEmpty( IN PRTL_GENERIC_TABLE Table ); +NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableFull( Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=34611&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -31,8 +31,9 @@ PWCHAR NlsOemToUnicodeTable = NULL; PCHAR NlsUnicodeToOemTable =NULL; PWCHAR NlsDbcsUnicodeToOemTable = NULL; -PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ - +PUSHORT _NlsOemLeadByteInfo = NULL; /* exported */ + +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo #define INIT_FUNCTION /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -84,13 +84,15 @@ #define ExSemaphoreObjectType _ExSemaphoreObjectType #define KdDebuggerEnabled _KdDebuggerEnabled #define KdDebuggerNotPresent _KdDebuggerNotPresent +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo +extern PUSHORT _NlsOemLeadByteInfo; #define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray #undef LEGAL_ANSI_CHARACTER_ARRAY #undef NLS_MB_CODE_PAGE_TAG #undef NLS_OEM_LEAD_BYTE_INFO #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray #define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag -#define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo +#define NLS_OEM_LEAD_BYTE_INFO _NlsOemLeadByteInfo #undef KD_DEBUGGER_ENABLED #undef KD_DEBUGGER_NOT_PRESENT #define KD_DEBUGGER_ENABLED KdDebuggerEnabled Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun Jul 20 14:19:02 2008 @@ -186,21 +186,21 @@ FsRtlAddLargeMcbEntry FsRtlAddMcbEntry FsRtlAddToTunnelCache -FsRtlAllocateFileLock +FsRtlAllocateFileLock@8 FsRtlAllocatePool FsRtlAllocatePoolWithQuota FsRtlAllocatePoolWithQuotaTag -FsRtlAllocatePoolWithTag +FsRtlAllocatePoolWithTag@12 FsRtlAllocateResource FsRtlAreNamesEqual@16 FsRtlBalanceReads FsRtlCheckLockForReadAccess@8 FsRtlCheckLockForWriteAccess@8 -FsRtlCheckOplock -FsRtlCopyRead +FsRtlCheckOplock@20 +FsRtlCopyRead@32 FsRtlCopyWrite FsRtlCreateSectionForDataScan@40 -FsRtlCurrentBatchOplock +FsRtlCurrentBatchOplock@4 FsRtlDeleteKeyFromTunnelCache FsRtlDeleteTunnelCache FsRtlDeregisterUncProvider @@ -208,13 +208,13 @@ FsRtlDissectName@16 FsRtlDoesDbcsContainWildCards FsRtlDoesNameContainWildCards@4 -FsRtlFastCheckLockForRead +FsRtlFastCheckLockForRead@24 FsRtlFastCheckLockForWrite FsRtlFastUnlockAll@16 -FsRtlFastUnlockAllByKey -FsRtlFastUnlockSingle +FsRtlFastUnlockAllByKey@20 +FsRtlFastUnlockSingle@32 FsRtlFindInTunnelCache -FsRtlFreeFileLock +FsRtlFreeFileLock@4 FsRtlGetFileSize ;FsRtlGetNextBaseMcbEntry FsRtlGetNextFileLock @@ -233,7 +233,7 @@ FsRtlInsertPerFileObjectContext FsRtlInsertPerStreamContext FsRtlIsDbcsInExpression -FsRtlIsFatDbcsLegal +FsRtlIsFatDbcsLegal@20 FsRtlIsHpfsDbcsLegal FsRtlIsNameInExpression@16 FsRtlIsNtstatusExpected@4 @@ -252,31 +252,31 @@ FsRtlLookupPerStreamContextInternal FsRtlMdlRead FsRtlMdlReadComplete -FsRtlMdlReadCompleteDev -FsRtlMdlReadDev +FsRtlMdlReadCompleteDev@12 +FsRtlMdlReadDev@28 FsRtlMdlWriteComplete -FsRtlMdlWriteCompleteDev -FsRtlNormalizeNtstatus +FsRtlMdlWriteCompleteDev@16 +FsRtlNormalizeNtstatus@8 FsRtlNotifyChangeDirectory -FsRtlNotifyCleanup +FsRtlNotifyCleanup@12 FsRtlNotifyFilterChangeDirectory FsRtlNotifyFilterReportChange FsRtlNotifyFullChangeDirectory@40 FsRtlNotifyFullReportChange -FsRtlNotifyInitializeSync +FsRtlNotifyInitializeSync@4 FsRtlNotifyReportChange -FsRtlNotifyUninitializeSync -FsRtlNotifyVolumeEvent +FsRtlNotifyUninitializeSync@4 +FsRtlNotifyVolumeEvent@8 ;FsRtlNumberOfRunsInBaseMcb FsRtlNumberOfRunsInLargeMcb FsRtlNumberOfRunsInMcb -FsRtlOplockFsctrl -FsRtlOplockIsFastIoPossible +FsRtlOplockFsctrl@12 +FsRtlOplockIsFastIoPossible@4 FsRtlPostPagingFileStackOverflow FsRtlPostStackOverflow FsRtlPrepareMdlWrite -FsRtlPrepareMdlWriteDev -FsRtlPrivateLock +FsRtlPrepareMdlWriteDev@28 +FsRtlPrivateLock@48 FsRtlProcessFileLock@12 FsRtlRegisterFileSystemFilterCallbacks FsRtlRegisterUncProvider @@ -291,7 +291,7 @@ ;FsRtlSplitBaseMcb FsRtlSplitLargeMcb FsRtlSyncVolumes -FsRtlTeardownPerStreamContexts +FsRtlTeardownPerStreamContexts@4 ;FsRtlTruncateBaseMcb FsRtlTruncateLargeMcb FsRtlTruncateMcb @@ -299,7 +299,7 @@ FsRtlUninitializeFileLock@4 FsRtlUninitializeLargeMcb FsRtlUninitializeMcb -FsRtlUninitializeOplock +FsRtlUninitializeOplock@4 HalDispatchTable=_HalDispatchTable @HalExamineMBR@16 HalPrivateDispatchTable DATA @@ -802,7 +802,7 @@ NlsMbCodePageTag DATA NlsMbOemCodePageTag DATA NlsOemCodePage DATA -NlsOemLeadByteInfo DATA +NlsOemLeadByteInfo=_NlsOemLeadByteInfo NtAddAtom@12 NtAdjustPrivilegesToken@24 NtAlertThread@4 @@ -1549,6 +1549,7 @@ mbtowc memchr memcpy +memcmp memmove memset qsort

16 years, 2 months

[mkupfer] 34610: mark the current keyboard layout as checked (in popup menu)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jul 20 14:08:35 2008 New Revision: 34610 URL: http://svn.reactos.org/svn/reactos?rev=34610&view=rev Log: mark the current keyboard layout as checked (in popup menu) Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Jul 20 14:08:35 2008 @@ -323,6 +323,8 @@ AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName); } + (void)CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED); + RegCloseKey(hKey); }

16 years, 2 months

[jmorlan] 34609: Fix memory leak in vfwprintf: Don't change 'mem' pointer before freeing it.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Jul 20 11:48:24 2008 New Revision: 34609 URL: http://svn.reactos.org/svn/reactos?rev=34609&view=rev Log: Fix memory leak in vfwprintf: Don't change 'mem' pointer before freeing it. 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] Sun Jul 20 11:48:24 2008 @@ -3144,18 +3144,18 @@ /* Convert each character and stop at the first invalid character. Behavior verified by tests under WinXP SP2 */ char chMultiByte[MB_LEN_MAX]; int nReturn; + wchar_t *p; retval = 0; - while(*mem) + for (p = mem; *p; p++) { - nReturn = wctomb(chMultiByte, *mem); + nReturn = wctomb(chMultiByte, *p); if(nReturn == -1) break; retval += fwrite(chMultiByte, 1, nReturn, file); - mem++; } } else

16 years, 2 months

← Newer
1
...
35
36
37
38
39
40
41
...
77
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 July 2008