Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[pschweitzer] 74684: [RXCE] Make RxpTrackDereference()/RxpTrackReference() when they're noop. CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 17:41:58 2017 New Revision: 74684 URL: http://svn.reactos.org/svn/reactos?rev=74684&view=rev Log: [RXCE] Make RxpTrackDereference()/RxpTrackReference() when they're noop. CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 17:41:58 2017 @@ -4611,8 +4611,15 @@ _In_ ULONG Line, _In_ PVOID Instance) { + PAGED_CODE(); + + if (!BooleanFlagOn(RdbssReferenceTracingValue, TraceType)) + { + return TRUE; + } + UNIMPLEMENTED; - return FALSE; + return TRUE; } VOID @@ -4622,6 +4629,11 @@ _In_ ULONG Line, _In_ PVOID Instance) { + if (!BooleanFlagOn(RdbssReferenceTracingValue, TraceType)) + { + return; + } + UNIMPLEMENTED; }

7 years, 7 months

[pschweitzer] 74683: [RDBSS] [RXCE] Try to make use of wrapper more 'properly'. Now, we use wrappers for ASSERT and memory management. This allows us to allocate memory with low priority (which isn...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 17:29:11 2017 New Revision: 74683 URL: http://svn.reactos.org/svn/reactos?rev=74683&view=rev Log: [RDBSS] [RXCE] Try to make use of wrapper more 'properly'. Now, we use wrappers for ASSERT and memory management. This allows us to allocate memory with low priority (which isn't supported by ReactOS yet :-(). Note that we go a bit farther than MS: we also define RxFreePoolWithTag() and make use of it. This should make Thomas happy :-) CORE-11327 Modified: trunk/reactos/sdk/include/ddk/rxovride.h trunk/reactos/sdk/include/ddk/rxpooltg.h trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/include/ddk/rxovride.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxovride.h… ============================================================================== --- trunk/reactos/sdk/include/ddk/rxovride.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/rxovride.h [iso-8859-1] Sat May 27 17:29:11 2017 @@ -1,3 +1,11 @@ #ifndef NO_RXOVRIDE_GLOBAL #include <struchdr.h> #endif + +#ifndef RX_POOL_WRAPPER +#define RX_POOL_WRAPPER 1 +#endif + +#ifndef RDBSS_ASSERTS +#define RDBSS_ASSERTS 1 +#endif Modified: trunk/reactos/sdk/include/ddk/rxpooltg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/rxpooltg.h… ============================================================================== --- trunk/reactos/sdk/include/ddk/rxpooltg.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/rxpooltg.h [iso-8859-1] Sat May 27 17:29:11 2017 @@ -9,5 +9,14 @@ #define RX_WORKQ_POOLTAG ('qWxR') #define RX_MISC_POOLTAG ('sMxR') #define RX_IRPC_POOLTAG ('rIxR') +#ifdef __REACTOS__ +#define RX_TLC_POOLTAG ('??xR') +#endif + +extern ULONG RxExplodePoolTags; + +#define RX_DEFINE_POOLTAG(ExplodedPoolTag, DefaultPoolTag) ((RxExplodePoolTags == 0) ? (DefaultPoolTag) : (ExplodedPoolTag)) + +#define RX_DIRCTL_POOLTAG RX_DEFINE_POOLTAG('cDxR', RX_MISC_POOLTAG) #endif Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sat May 27 17:29:11 2017 @@ -61,6 +61,13 @@ RxAddToTopLevelIrpAllocatedContextsList( PRX_TOPLEVELIRP_CONTEXT TopLevelContext); +VOID +RxAssert( + PVOID Assert, + PVOID File, + ULONG Line, + PVOID Message); + NTSTATUS NTAPI RxCommonCleanup( @@ -449,6 +456,24 @@ NTSTATUS RxXXXControlFileCallthru( PRX_CONTEXT Context); + +PVOID +NTAPI +_RxAllocatePoolWithTag( + _In_ POOL_TYPE PoolType, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG Tag); + +VOID +NTAPI +_RxFreePool( + _In_ PVOID Buffer); + +VOID +NTAPI +_RxFreePoolWithTag( + _In_ PVOID Buffer, + _In_ ULONG Tag); WCHAR RxStarForTemplate = '*'; WCHAR Rx8QMdot3QM[] = L">>>>>>>>.>>>*"; @@ -537,6 +562,29 @@ DECLARE_CONST_UNICODE_STRING(unknownId, L"???"); +#if RDBSS_ASSERTS +#ifdef ASSERT +#undef ASSERT +#endif + +#define ASSERT(exp) \ + if (!(exp)) \ + { \ + RxAssert(#exp, __FILE__, __LINE__, NULL); \ + } +#endif + +#if RX_POOL_WRAPPER +#undef RxAllocatePool +#undef RxAllocatePoolWithTag +#undef RxFreePool + +#define RxAllocatePool(P, S) _RxAllocatePoolWithTag(P, S, 0) +#define RxAllocatePoolWithTag _RxAllocatePoolWithTag +#define RxFreePool _RxFreePool +#define RxFreePoolWithTag _RxFreePoolWithTag +#endif + /* FUNCTIONS ****************************************************************/ VOID @@ -715,7 +763,7 @@ return STATUS_OBJECT_PATH_INVALID; } - CanonicalName->Buffer = ExAllocatePoolWithTag(PagedPool | POOL_COLD_ALLOCATION, CanonicalLength, RX_MISC_POOLTAG); + CanonicalName->Buffer = RxAllocatePoolWithTag(PagedPool | POOL_COLD_ALLOCATION, CanonicalLength, RX_MISC_POOLTAG); if (CanonicalName->Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -3102,7 +3150,7 @@ RxInitializeDispatcher(); - ExInitializeNPagedLookasideList(&RxContextLookasideList, ExAllocatePoolWithTag, ExFreePool, 0, sizeof(RX_CONTEXT), RX_IRPC_POOLTAG, 4); + ExInitializeNPagedLookasideList(&RxContextLookasideList, RxAllocatePoolWithTag, RxFreePool, 0, sizeof(RX_CONTEXT), RX_IRPC_POOLTAG, 4); InitializeListHead(&RxIrpsList); KeInitializeSpinLock(&RxIrpsListSpinLock); @@ -3276,7 +3324,6 @@ VNetRoot = (PV_NET_ROOT)RxContext->Create.pVNetRoot; ASSERT(NetRoot == VNetRoot->NetRoot); - TableAcquired = FALSE; Status = STATUS_SUCCESS; AcquiredExclusive = FALSE; @@ -3553,7 +3600,7 @@ if (Context->Create.CanonicalNameBuffer != NULL) { - ExFreePoolWithTag(Context->Create.CanonicalNameBuffer, RX_MISC_POOLTAG); + RxFreePoolWithTag(Context->Create.CanonicalNameBuffer, RX_MISC_POOLTAG); Context->Create.CanonicalNameBuffer = NULL; Context->AlsoCanonicalNameBuffer = NULL; } @@ -4825,7 +4872,7 @@ RxContext->MajorFunction = IRP_MJ_CREATE; /* Fake canon name */ - RxContext->PrefixClaim.SuppliedPathName.Buffer = ExAllocatePoolWithTag(NonPagedPool, QueryRequest->PathNameLength, RX_MISC_POOLTAG); + RxContext->PrefixClaim.SuppliedPathName.Buffer = RxAllocatePoolWithTag(NonPagedPool, QueryRequest->PathNameLength, RX_MISC_POOLTAG); if (RxContext->PrefixClaim.SuppliedPathName.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -4885,7 +4932,7 @@ { if (RxContext->PrefixClaim.SuppliedPathName.Buffer != NULL) { - ExFreePoolWithTag(RxContext->PrefixClaim.SuppliedPathName.Buffer, RX_MISC_POOLTAG); + RxFreePoolWithTag(RxContext->PrefixClaim.SuppliedPathName.Buffer, RX_MISC_POOLTAG); } RxpPrepareCreateContextForReuse(RxContext); @@ -5151,14 +5198,14 @@ { Fobx->ContainsWildCards = FsRtlDoesNameContainWildCards(FileName); - Fobx->UnicodeQueryTemplate.Buffer = RxAllocatePoolWithTag(PagedPool, FileName->Length, 'cDxR'); + Fobx->UnicodeQueryTemplate.Buffer = RxAllocatePoolWithTag(PagedPool, FileName->Length, RX_DIRCTL_POOLTAG); if (Fobx->UnicodeQueryTemplate.Buffer != NULL) { /* UNICODE_STRING; length has to be even */ if ((FileName->Length & 1) != 0) { Status = STATUS_INVALID_PARAMETER; - RxFreePool(Fobx->UnicodeQueryTemplate.Buffer); + RxFreePoolWithTag(Fobx->UnicodeQueryTemplate.Buffer, RX_DIRCTL_POOLTAG); } else { @@ -6001,7 +6048,7 @@ /* If not TLC provider, allocate one */ if (TopLevelContext == NULL) { - TopLevelContext = RxAllocatePoolWithTag(NonPagedPool, sizeof(RX_TOPLEVELIRP_CONTEXT), '??xR'); + TopLevelContext = RxAllocatePoolWithTag(NonPagedPool, sizeof(RX_TOPLEVELIRP_CONTEXT), RX_TLC_POOLTAG); if (TopLevelContext == NULL) { return FALSE; @@ -6129,7 +6176,7 @@ if (BooleanFlagOn(TopLevelContext->Flags, RX_TOPLEVELCTX_FLAG_FROM_POOL)) { RxRemoveFromTopLevelIrpAllocatedContextsList(TopLevelContext); - ExFreePool(TopLevelContext); + RxFreePoolWithTag(TopLevelContext, RX_TLC_POOLTAG); } } Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 17:29:11 2017 @@ -69,6 +69,24 @@ RxWorkItemDispatcher( PVOID Context); +PVOID +NTAPI +_RxAllocatePoolWithTag( + _In_ POOL_TYPE PoolType, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG Tag); + +VOID +NTAPI +_RxFreePool( + _In_ PVOID Buffer); + +VOID +NTAPI +_RxFreePoolWithTag( + _In_ PVOID Buffer, + _In_ ULONG Tag); + extern ULONG ReadAheadGranularity; volatile LONG RxNumberOfActiveFcbs = 0; @@ -86,12 +104,14 @@ RX_WORK_QUEUE_DISPATCHER RxDispatcherWorkQueues; FAST_MUTEX RxLowIoPagingIoSyncMutex; BOOLEAN RxContinueFromAssert = TRUE; +ULONG RxExplodePoolTags = 1; #if DBG BOOLEAN DumpDispatchRoutine = TRUE; #else BOOLEAN DumpDispatchRoutine = FALSE; #endif +#if RDBSS_ASSERTS #ifdef ASSERT #undef ASSERT #endif @@ -101,6 +121,18 @@ { \ RxAssert(#exp, __FILE__, __LINE__, NULL); \ } +#endif + +#if RX_POOL_WRAPPER +#undef RxAllocatePool +#undef RxAllocatePoolWithTag +#undef RxFreePool + +#define RxAllocatePool(P, S) _RxAllocatePoolWithTag(P, S, 0) +#define RxAllocatePoolWithTag _RxAllocatePoolWithTag +#define RxFreePool _RxFreePool +#define RxFreePoolWithTag _RxFreePoolWithTag +#endif /* FUNCTIONS ****************************************************************/ @@ -225,7 +257,7 @@ /* Otherwise, allocate it */ else { - Buffer = ExAllocatePoolWithTag(PoolType, NameSize + FcbSize + SrvOpenSize + FobxSize + NonPagedSize, RX_FCB_POOLTAG); + Buffer = RxAllocatePoolWithTag(PoolType, NameSize + FcbSize + SrvOpenSize + FobxSize + NonPagedSize, RX_FCB_POOLTAG); if (Buffer == NULL) { return NULL; @@ -260,10 +292,10 @@ /* If we were not allocated from non paged, allocate the NON_PAGED_FCB now */ if (PoolType != NonPagedPool) { - NonPagedFcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NON_PAGED_FCB), RX_NONPAGEDFCB_POOLTAG); + NonPagedFcb = RxAllocatePoolWithTag(NonPagedPool, sizeof(NON_PAGED_FCB), RX_NONPAGEDFCB_POOLTAG); if (NonPagedFcb == NULL) { - ExFreePoolWithTag(Buffer, RX_FCB_POOLTAG); + RxFreePoolWithTag(Buffer, RX_FCB_POOLTAG); return NULL; } @@ -399,7 +431,7 @@ /* Now, allocate the object */ ObjectSize = ExtensionSize + StructSize + NameLength; - Object = ExAllocatePoolWithTag(NonPagedPool, ObjectSize, Tag); + Object = RxAllocatePoolWithTag(NonPagedPool, ObjectSize, Tag); if (Object == NULL) { return NULL; @@ -731,7 +763,7 @@ ASSERT(*LockHoldingState == LHS_ExclusiveLockHeld); /* Allocate the context */ - Context = ExAllocatePoolWithTag(PagedPool, sizeof(MRX_CREATENETROOT_CONTEXT), RX_SRVCALL_POOLTAG); + Context = RxAllocatePoolWithTag(PagedPool, sizeof(MRX_CREATENETROOT_CONTEXT), RX_SRVCALL_POOLTAG); if (Context == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -797,7 +829,7 @@ RxTransitionVNetRoot(VirtualNetRoot, VRootCondition); /* Context is not longer needed */ - ExFreePoolWithTag(Context, RX_SRVCALL_POOLTAG); + RxFreePoolWithTag(Context, RX_SRVCALL_POOLTAG); DPRINT("Status: %x\n", Status); @@ -829,7 +861,7 @@ ASSERT(*LockHoldingState == LHS_ExclusiveLockHeld); /* Allocate the context for mini-rdr */ - Calldown = ExAllocatePoolWithTag(NonPagedPool, sizeof(MRX_SRVCALLDOWN_STRUCTURE), RX_SRVCALL_POOLTAG); + Calldown = RxAllocatePoolWithTag(NonPagedPool, sizeof(MRX_SRVCALLDOWN_STRUCTURE), RX_SRVCALL_POOLTAG); if (Calldown == NULL) { SrvCall->Context = NULL; @@ -1893,7 +1925,7 @@ PRX_WORK_DISPATCH_ITEM DispatchItem; /* Allocate a bit of context */ - DispatchItem = ExAllocatePoolWithTag(PagedPool, sizeof(RX_WORK_DISPATCH_ITEM), RX_WORKQ_POOLTAG); + DispatchItem = RxAllocatePoolWithTag(PagedPool, sizeof(RX_WORK_DISPATCH_ITEM), RX_WORKQ_POOLTAG); if (DispatchItem == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1909,7 +1941,7 @@ Status = RxInsertWorkQueueItem(pMRxDeviceObject, WorkQueueType, DispatchItem); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(DispatchItem, RX_WORKQ_POOLTAG); + RxFreePoolWithTag(DispatchItem, RX_WORKQ_POOLTAG); DPRINT1("RxInsertWorkQueueItem failed! Queue: %ld, Routine: %p, Context: %p, Status: %lx\n", WorkQueueType, Routine, pContext, Status); } @@ -2188,7 +2220,7 @@ Entry = ThisFcb->BufferedLocks.List; ThisFcb->BufferedLocks.List = Entry->Next; - ExFreePool(Entry); + RxFreePool(Entry); } } @@ -2221,7 +2253,7 @@ /* Now, release everything */ if (ThisFcb->pBufferingStateChangeCompletedEvent != NULL) { - ExFreePool(ThisFcb->pBufferingStateChangeCompletedEvent); + RxFreePool(ThisFcb->pBufferingStateChangeCompletedEvent); } if (ThisFcb->MRxDispatch != NULL) @@ -2965,7 +2997,7 @@ RxAcquirePrefixTableLockExclusive(PrefixTable, TRUE); RxTransitionSrvCall(SrvCall, Condition); - ExFreePoolWithTag(Calldown, RX_SRVCALL_POOLTAG); + RxFreePoolWithTag(Calldown, RX_SRVCALL_POOLTAG); /* If async, finish it here, otherwise, caller has already finished the stuff */ if (BooleanFlagOn(Context->Flags, RX_CONTEXT_FLAG_ASYNC_OPERATION)) @@ -2994,7 +3026,7 @@ { if (Context->Info.Buffer != NULL) { - ExFreePool(Context->Info.Buffer); + RxFreePool(Context->Info.Buffer); Context->Info.Buffer = NULL; } } @@ -5397,17 +5429,17 @@ /* Only free what could have been allocated */ if (UserName != NULL) { - ExFreePool(UserName); + RxFreePool(UserName); } if (UserDomainName != NULL) { - ExFreePool(UserDomainName); + RxFreePool(UserDomainName); } if (Password != NULL) { - ExFreePool(Password); + RxFreePool(Password); } /* And remove the possibly set CSC agent flag */ @@ -5639,7 +5671,43 @@ DispatchItem->DispatchRoutine(DispatchItem->DispatchRoutineParameter); - ExFreePoolWithTag(DispatchItem, RX_WORKQ_POOLTAG); + RxFreePoolWithTag(DispatchItem, RX_WORKQ_POOLTAG); +} + +/* + * @implemented + */ +PVOID +NTAPI +_RxAllocatePoolWithTag( + _In_ POOL_TYPE PoolType, + _In_ SIZE_T NumberOfBytes, + _In_ ULONG Tag) +{ + return ExAllocatePoolWithTagPriority(PoolType, NumberOfBytes, Tag, LowPoolPriority); +} + +/* + * @implemented + */ +VOID +NTAPI +_RxFreePool( + _In_ PVOID Buffer) +{ + ExFreePoolWithTag(Buffer, 0); +} + +/* + * @implemented + */ +VOID +NTAPI +_RxFreePoolWithTag( + _In_ PVOID Buffer, + _In_ ULONG Tag) +{ + ExFreePoolWithTag(Buffer, Tag); } NTSTATUS

7 years, 7 months

[pschweitzer] 74682: [RXCE] Implement FCB refcounting CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 16:50:29 2017 New Revision: 74682 URL: http://svn.reactos.org/svn/reactos?rev=74682&view=rev Log: [RXCE] Implement FCB refcounting CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 16:50:29 2017 @@ -4367,12 +4367,25 @@ return Freed; } +/* + * @implemented + */ LONG RxpDereferenceNetFcb( PFCB Fcb) { - UNIMPLEMENTED; - return 0; + LONG NewCount; + + PAGED_CODE(); + + ASSERT(NodeTypeIsFcb(Fcb)); + + NewCount = InterlockedDecrement((volatile long *)&Fcb->NodeReferenceCount); + ASSERT(NewCount >= 0); + + PRINT_REF_COUNT(NETFCB, NewCount); + + return NewCount; } /* @@ -4491,12 +4504,24 @@ return Container; } +/* + * @implemented + */ LONG RxpReferenceNetFcb( PFCB Fcb) { - UNIMPLEMENTED; - return 0; + LONG NewCount; + + PAGED_CODE(); + + ASSERT(NodeTypeIsFcb(Fcb)); + + NewCount = InterlockedIncrement((volatile long *)&Fcb->NodeReferenceCount); + + PRINT_REF_COUNT(NETFCB, Fcb->NodeReferenceCount); + + return NewCount; } /*

7 years, 7 months

[pschweitzer] 74681: [RXCE] Implement operation verification, this is notably based on FatVerifyOperationIsLegal. CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 12:34:38 2017 New Revision: 74681 URL: http://svn.reactos.org/svn/reactos?rev=74681&view=rev Log: [RXCE] Implement operation verification, this is notably based on FatVerifyOperationIsLegal. CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 12:34:38 2017 @@ -5436,11 +5436,112 @@ } } +/* + * @implemented + */ VOID RxVerifyOperationIsLegal( IN PRX_CONTEXT RxContext) { - UNIMPLEMENTED; + PIRP Irp; + PMRX_FOBX Fobx; + BOOLEAN FlagSet; + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION Stack; + + PAGED_CODE(); + + Irp = RxContext->CurrentIrp; + Stack = RxContext->CurrentIrpSp; + FileObject = Stack->FileObject; + + /* We'll only check stuff on opened files, this requires an IRP and a FO */ + if (Irp == NULL || FileObject == NULL) + { + return; + } + + /* Set no exception for breakpoint - remember whether is was already set */ + FlagSet = BooleanFlagOn(RxContext->Flags, RX_CONTEXT_FLAG_NO_EXCEPTION_BREAKPOINT); + SetFlag(RxContext->Flags, RX_CONTEXT_FLAG_NO_EXCEPTION_BREAKPOINT); + + /* If we have a CCB, perform a few checks on opened file */ + Fobx = RxContext->pFobx; + if (Fobx != NULL) + { + PMRX_SRV_OPEN SrvOpen; + + SrvOpen = Fobx->pSrvOpen; + if (SrvOpen != NULL) + { + UCHAR MajorFunction; + + MajorFunction = RxContext->MajorFunction; + /* Only allow closing/cleanup operations on renamed files */ + if (MajorFunction != IRP_MJ_CLEANUP && MajorFunction != IRP_MJ_CLOSE && + BooleanFlagOn(SrvOpen->Flags, SRVOPEN_FLAG_FILE_RENAMED)) + { + RxContext->IoStatusBlock.Status = STATUS_FILE_RENAMED; + ExRaiseStatus(STATUS_FILE_RENAMED); + } + + /* Only allow closing/cleanup operations on deleted files */ + if (MajorFunction != IRP_MJ_CLEANUP && MajorFunction != IRP_MJ_CLOSE && + BooleanFlagOn(SrvOpen->Flags, SRVOPEN_FLAG_FILE_DELETED)) + { + RxContext->IoStatusBlock.Status = STATUS_FILE_DELETED; + ExRaiseStatus(STATUS_FILE_DELETED); + } + } + } + + /* If that's an open operation */ + if (RxContext->MajorFunction == IRP_MJ_CREATE) + { + PFILE_OBJECT RelatedFileObject; + + /* We won't allow an open operation relative to a file to be deleted */ + RelatedFileObject = FileObject->RelatedFileObject; + if (RelatedFileObject != NULL) + { + PMRX_FCB Fcb; + + Fcb = RelatedFileObject->FsContext; + if (BooleanFlagOn(Fcb->FcbState, FCB_STATE_DELETE_ON_CLOSE)) + { + RxContext->IoStatusBlock.Status = STATUS_DELETE_PENDING; + ExRaiseStatus(STATUS_DELETE_PENDING); + } + } + } + + /* If cleanup was completed */ + if (BooleanFlagOn(FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + if (!BooleanFlagOn(Irp->Flags, IRP_PAGING_IO)) + { + UCHAR MajorFunction; + + /* We only allow a subset of operations (see FatVerifyOperationIsLegal for instance) */ + MajorFunction = Stack->MajorFunction; + if (MajorFunction != IRP_MJ_CLOSE && MajorFunction != IRP_MJ_QUERY_INFORMATION && + MajorFunction != IRP_MJ_SET_INFORMATION) + { + if ((MajorFunction != IRP_MJ_READ && MajorFunction != IRP_MJ_WRITE) || + !BooleanFlagOn(Stack->MinorFunction, IRP_MN_COMPLETE)) + { + RxContext->IoStatusBlock.Status = STATUS_FILE_CLOSED; + ExRaiseStatus(STATUS_FILE_CLOSED); + } + } + } + } + + /* If flag was already set, don't clear it */ + if (!FlagSet) + { + ClearFlag(RxContext->Flags, RX_CONTEXT_FLAG_NO_EXCEPTION_BREAKPOINT); + } } /*

7 years, 7 months

[gadamopoulos] 74680: [EXPLORER] -Make the taskbar grip get its size from the theme. This fixes one of the last theme related problems in explorer itself. Also simplify some theme drawing code.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat May 27 10:44:44 2017 New Revision: 74680 URL: http://svn.reactos.org/svn/reactos?rev=74680&view=rev Log: [EXPLORER] -Make the taskbar grip get its size from the theme. This fixes one of the last theme related problems in explorer itself. Also simplify some theme drawing code. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat May 27 10:44:44 2017 @@ -850,22 +850,31 @@ VOID AdjustSizerRect(RECT *rc, DWORD pos) { + int iSizerPart[4] = {TBP_SIZINGBARLEFT, TBP_SIZINGBARTOP, TBP_SIZINGBARRIGHT, TBP_SIZINGBARBOTTOM}; + SIZE size; + + if (pos > ABE_BOTTOM) + pos = ABE_BOTTOM; + + HRESULT hr = GetThemePartSize(m_Theme, NULL, iSizerPart[pos], 0, NULL, TS_TRUE, &size); + if (FAILED_UNEXPECTEDLY(hr)) + return; + switch (pos) { case ABE_TOP: - rc->bottom -= GetSystemMetrics(SM_CXSIZEFRAME); + rc->bottom -= size.cy; break; case ABE_BOTTOM: - rc->top += GetSystemMetrics(SM_CXSIZEFRAME); + rc->top += size.cy; break; case ABE_LEFT: - rc->right -= GetSystemMetrics(SM_CYSIZEFRAME); + rc->right -= size.cx; break; case ABE_RIGHT: - rc->left += GetSystemMetrics(SM_CYSIZEFRAME); + rc->left += size.cx; break; } - } VOID MakeTrayRectWithSize(IN DWORD Position, @@ -1876,41 +1885,31 @@ LRESULT EraseBackgroundWithTheme(HDC hdc) { RECT rect; - int partId; - HRESULT res; - - GetClientRect(&rect); + int iSBkgndPart[4] = {TBP_BACKGROUNDLEFT, TBP_BACKGROUNDTOP, TBP_BACKGROUNDRIGHT, TBP_BACKGROUNDBOTTOM}; + + ASSERT(m_Position <= ABE_BOTTOM); if (m_Theme) { GetClientRect(&rect); - switch (m_Position) - { - case ABE_LEFT: - partId = TBP_BACKGROUNDLEFT; - break; - case ABE_TOP: - partId = TBP_BACKGROUNDTOP; - break; - case ABE_RIGHT: - partId = TBP_BACKGROUNDRIGHT; - break; - case ABE_BOTTOM: - default: - partId = TBP_BACKGROUNDBOTTOM; - break; - } - res = DrawThemeBackground(m_Theme, hdc, partId, 0, &rect, 0); - } - - return res; + DrawThemeBackground(m_Theme, hdc, iSBkgndPart[m_Position], 0, &rect, 0); + } + + return 0; } int DrawSizerWithTheme(IN HRGN hRgn) { HDC hdc; RECT rect; - int backgroundPart; + int iSizerPart[4] = {TBP_SIZINGBARLEFT, TBP_SIZINGBARTOP, TBP_SIZINGBARRIGHT, TBP_SIZINGBARBOTTOM}; + SIZE size; + + ASSERT(m_Position <= ABE_BOTTOM); + + HRESULT hr = GetThemePartSize(m_Theme, NULL, iSizerPart[m_Position], 0, NULL, TS_TRUE, &size); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; GetWindowRect(&rect); OffsetRect(&rect, -rect.left, -rect.top); @@ -1920,28 +1919,21 @@ switch (m_Position) { case ABE_LEFT: - backgroundPart = TBP_SIZINGBARLEFT; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZEFRAME); + rect.left = rect.right - size.cx; break; case ABE_TOP: - backgroundPart = TBP_SIZINGBARTOP; - rect.top = rect.bottom - GetSystemMetrics(SM_CYSIZEFRAME); + rect.top = rect.bottom - size.cy; break; case ABE_RIGHT: - backgroundPart = TBP_SIZINGBARRIGHT; - rect.right = rect.left + GetSystemMetrics(SM_CXSIZEFRAME); + rect.right = rect.left + size.cx; break; case ABE_BOTTOM: default: - backgroundPart = TBP_SIZINGBARBOTTOM; - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZEFRAME); - break; - } - if (IsThemeBackgroundPartiallyTransparent(m_Theme, backgroundPart, 0)) - { - DrawThemeParentBackground(m_hWnd, hdc, &rect); - } - DrawThemeBackground(m_Theme, hdc, backgroundPart, 0, &rect, 0); + rect.bottom = rect.top + size.cy; + break; + } + + DrawThemeBackground(m_Theme, hdc, iSizerPart[m_Position], 0, &rect, 0); ReleaseDC(hdc); return 0;

7 years, 7 months

[mjansen] 74679: [SYSSETUP][UNATTENDED] Allow changing the resolution automatically. CORE-13315

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat May 27 09:37:16 2017 New Revision: 74679 URL: http://svn.reactos.org/svn/reactos?rev=74679&view=rev Log: [SYSSETUP][UNATTENDED] Allow changing the resolution automatically. CORE-13315 Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Sat May 27 09:37:16 2017 @@ -56,3 +56,11 @@ ; [GuiRunOnce] ; %SystemRoot%\system32\cmd.exe + +; enable this section to change resolution / bpp +; setting a value to 0 or skipping it will leave it unchanged +; [Display] +; BitsPerPel = 32 +; XResolution = 1440 +; YResolution = 900 +; VRefresh = 0 Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat May 27 09:37:16 2017 @@ -2211,6 +2211,70 @@ } while (SetupFindNextLine(&InfContext, &InfContext)); + if (SetupFindFirstLineW(pSetupData->hUnattendedInf, + L"Display", + NULL, + &InfContext)) + { + DEVMODEW dm = { { 0 } }; + dm.dmSize = sizeof(dm); + if (EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm)) + { + do + { + int iValue; + if (!SetupGetStringFieldW(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(WCHAR), + &LineLength)) + { + DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); + return; + } + + if (!SetupGetStringFieldW(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(WCHAR), + &LineLength)) + { + DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); + return; + } + iValue = _wtoi(szValue); + DPRINT1("Name %S Value %i\n", szName, iValue); + + if (!iValue) + continue; + + if (!wcscmp(szName, L"BitsPerPel")) + { + dm.dmFields |= DM_BITSPERPEL; + dm.dmBitsPerPel = iValue; + } + else if (!wcscmp(szName, L"XResolution")) + { + dm.dmFields |= DM_PELSWIDTH; + dm.dmPelsWidth = iValue; + } + else if (!wcscmp(szName, L"YResolution")) + { + dm.dmFields |= DM_PELSHEIGHT; + dm.dmPelsHeight = iValue; + } + else if (!wcscmp(szName, L"VRefresh")) + { + dm.dmFields |= DM_DISPLAYFREQUENCY; + dm.dmDisplayFrequency = iValue; + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + + ChangeDisplaySettingsW(&dm, CDS_UPDATEREGISTRY); + } + } + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce", 0,

7 years, 7 months

[pschweitzer] 74678: [RXCE] - Make RxpUndoScavengerFinalizationMarking() more smart: only warn about unimplemented if there's scavenger mark - Implement FCB operations (release/acquire) tracker COR...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 09:36:42 2017 New Revision: 74678 URL: http://svn.reactos.org/svn/reactos?rev=74678&view=rev Log: [RXCE] - Make RxpUndoScavengerFinalizationMarking() more smart: only warn about unimplemented if there's scavenger mark - Implement FCB operations (release/acquire) tracker CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 09:36:42 2017 @@ -4572,6 +4572,17 @@ RxpUndoScavengerFinalizationMarking( PVOID Instance) { + PNODE_TYPE_AND_SIZE Node; + + PAGED_CODE(); + + Node = (PNODE_TYPE_AND_SIZE)Instance; + /* There's no marking - nothing to do */ + if (!BooleanFlagOn(Node->NodeTypeCode, RX_SCAVENGER_MASK)) + { + return; + } + UNIMPLEMENTED; } @@ -5254,6 +5265,9 @@ return NULL; } +/* + * @implemented + */ VOID RxTrackerUpdateHistory( _Inout_opt_ PRX_CONTEXT RxContext, @@ -5263,7 +5277,74 @@ _In_ PCSTR FileName, _In_ ULONG SerialNumber) { - UNIMPLEMENTED; + PFCB Fcb; + RX_FCBTRACKER_CASES Case; + + /* Check for null or special context */ + if (RxContext == NULL) + { + Case = RX_FCBTRACKER_CASE_NULLCONTEXT; + } + else if ((ULONG_PTR)RxContext == -1) + { + Case = RX_FCBTRACKER_CASE_CBS_CONTEXT; + } + else if ((ULONG_PTR)RxContext == -2) + { + Case = RX_FCBTRACKER_CASE_CBS_WAIT_CONTEXT; + } + else + { + ASSERT(NodeType(RxContext) == RDBSS_NTC_RX_CONTEXT); + Case = RX_FCBTRACKER_CASE_NORMAL; + } + + /* If caller provided a FCB, update its history */ + if (MrxFcb != NULL) + { + Fcb = (PFCB)MrxFcb; + ASSERT(NodeTypeIsFcb(Fcb)); + + /* Only one acquire operation, so many release operations... */ + if (Operation == TRACKER_ACQUIRE_FCB) + { + ++Fcb->FcbAcquires[Case]; + } + else + { + ++Fcb->FcbReleases[Case]; + } + } + + /* If we have a normal context, update its history about this function calls */ + if (Case == RX_FCBTRACKER_CASE_NORMAL) + { + ULONG TrackerHistoryPointer; + + /* Only one acquire operation, so many release operations... */ + if (Operation == TRACKER_ACQUIRE_FCB) + { + InterlockedIncrement(&RxContext->AcquireReleaseFcbTrackerX); + } + else + { + InterlockedDecrement(&RxContext->AcquireReleaseFcbTrackerX); + } + + /* We only keep track of the 32 first calls */ + TrackerHistoryPointer = InterlockedExchangeAdd((volatile long *)&RxContext->TrackerHistoryPointer, 1); + if (TrackerHistoryPointer < RDBSS_TRACKER_HISTORY_SIZE) + { + RxContext->TrackerHistory[TrackerHistoryPointer].AcquireRelease = Operation; + RxContext->TrackerHistory[TrackerHistoryPointer].LineNumber = LineNumber; + RxContext->TrackerHistory[TrackerHistoryPointer].FileName = (PSZ)FileName; + RxContext->TrackerHistory[TrackerHistoryPointer].SavedTrackerValue = RxContext->AcquireReleaseFcbTrackerX; + RxContext->TrackerHistory[TrackerHistoryPointer].Flags = RxContext->Flags; + } + + /* If it's negative, then we released once more than we acquired it?! */ + ASSERT(RxContext->AcquireReleaseFcbTrackerX >= 0); + } } VOID

7 years, 7 months

[gadamopoulos] 74677: [EXPLORER] -Reload the theme data only when the orientation changes (we ended up reloading it every few seconds).

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat May 27 09:09:01 2017 New Revision: 74677 URL: http://svn.reactos.org/svn/reactos?rev=74677&view=rev Log: [EXPLORER] -Reload the theme data only when the orientation changes (we ended up reloading it every few seconds). Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Sat May 27 09:09:01 2017 @@ -1334,25 +1334,17 @@ m_pager = new CSysPagerWnd(); m_pager->_Init(m_hWnd, !HideClock); - OnThemeChanged(); - - return TRUE; - } - - BOOL GetMinimumSize(IN BOOL Horizontal, IN OUT PSIZE pSize) + return TRUE; + } + + BOOL GetMinimumSize(IN OUT PSIZE pSize) { SIZE szClock = { 0, 0 }; SIZE szTray = { 0, 0 }; - IsHorizontal = Horizontal; - if (IsHorizontal) - SetWindowTheme(m_hWnd, L"TrayNotifyHoriz", NULL); - else - SetWindowTheme(m_hWnd, L"TrayNotifyVert", NULL); - if (!HideClock) { - if (Horizontal) + if (IsHorizontal) { szClock.cy = pSize->cy - 2 * TRAY_NOTIFY_WND_SPACING_Y; if (szClock.cy <= 0) @@ -1365,7 +1357,7 @@ goto NoClock; } - m_clock->SendMessage(TCWM_GETMINIMUMSIZE, (WPARAM) Horizontal, (LPARAM) &szClock); + m_clock->SendMessage(TCWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &szClock); szTrayClockMin = szClock; } @@ -1373,7 +1365,7 @@ NoClock: szTrayClockMin = szClock; - if (Horizontal) + if (IsHorizontal) { szTray.cy = pSize->cy - 2 * TRAY_NOTIFY_WND_SPACING_Y; } @@ -1382,11 +1374,11 @@ szTray.cx = pSize->cx - 2 * TRAY_NOTIFY_WND_SPACING_X; } - m_pager->GetSize(Horizontal, &szTray); + m_pager->GetSize(IsHorizontal, &szTray); szTrayNotify = szTray; - if (Horizontal) + if (IsHorizontal) { pSize->cx = 2 * TRAY_NOTIFY_WND_SPACING_X; @@ -1513,7 +1505,18 @@ LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return (LRESULT) GetMinimumSize((BOOL) wParam, (PSIZE) lParam); + BOOL Horizontal = (BOOL) wParam; + + if (Horizontal != IsHorizontal) + { + IsHorizontal = Horizontal; + if (IsHorizontal) + SetWindowTheme(m_hWnd, L"TrayNotifyHoriz", NULL); + else + SetWindowTheme(m_hWnd, L"TrayNotifyVert", NULL); + } + + return (LRESULT) GetMinimumSize((PSIZE) lParam); } LRESULT OnUpdateTime(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

7 years, 7 months

[pschweitzer] 74676: [RXCE] Implement reference tracing CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat May 27 08:39:42 2017 New Revision: 74676 URL: http://svn.reactos.org/svn/reactos?rev=74676&view=rev Log: [RXCE] Implement reference tracing CORE-11327 Modified: trunk/reactos/sdk/include/ddk/fcb.h trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/include/ddk/fcb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fcb.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/fcb.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fcb.h [iso-8859-1] Sat May 27 08:39:42 2017 @@ -324,6 +324,7 @@ #define RDBSS_REF_TRACK_NETFOBX 0x00000008 #define RDBSS_REF_TRACK_NETFCB 0x00000010 #define RDBSS_REF_TRACK_SRVOPEN 0x00000020 +#define RX_PRINT_REF_TRACKING 0x40000000 extern ULONG RdbssReferenceTracingValue; @@ -340,6 +341,14 @@ _In_ PCSTR FileName, _In_ ULONG Line, _In_ PVOID Instance); + +#define REF_TRACING_ON(TraceMask) (TraceMask & RdbssReferenceTracingValue) +#define PRINT_REF_COUNT(TYPE, Count) \ + if (REF_TRACING_ON( RDBSS_REF_TRACK_ ## TYPE) && \ + (RdbssReferenceTracingValue & RX_PRINT_REF_TRACKING)) \ + { \ + DbgPrint("%ld\n", Count); \ + } #define RxReferenceSrvCall(SrvCall) \ RxpTrackReference(RDBSS_REF_TRACK_SRVCALL, __FILE__, __LINE__, SrvCall); \ Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sat May 27 08:39:42 2017 @@ -1718,16 +1718,29 @@ RefCount = InterlockedDecrement((volatile long *)&Node->NodeReferenceCount); ASSERT(RefCount >= 0); - /* TODO: trace */ + /* Trace refcount */ switch (NodeType) { case RDBSS_NTC_SRVCALL: + PRINT_REF_COUNT(SRVCALL, Node->NodeReferenceCount); + break; + case RDBSS_NTC_NETROOT: + PRINT_REF_COUNT(NETROOT, Node->NodeReferenceCount); + break; + case RDBSS_NTC_V_NETROOT: + PRINT_REF_COUNT(VNETROOT, Node->NodeReferenceCount); + break; + case RDBSS_NTC_SRVOPEN: + PRINT_REF_COUNT(SRVOPEN, Node->NodeReferenceCount); + break; + case RDBSS_NTC_FOBX: - UNIMPLEMENTED; + PRINT_REF_COUNT(NETFOBX, Node->NodeReferenceCount); break; + default: ASSERT(FALSE); break; @@ -4752,16 +4765,29 @@ Node = (PNODE_TYPE_AND_SIZE)Instance; InterlockedIncrement((volatile long *)&Node->NodeReferenceCount); - /* And that's not implemented! (yay, we leak :-D) */ + /* Trace refcount if asked */ switch (NodeType) { case RDBSS_NTC_SRVCALL: + PRINT_REF_COUNT(SRVCALL, Node->NodeReferenceCount); + break; + case RDBSS_NTC_NETROOT: + PRINT_REF_COUNT(NETROOT, Node->NodeReferenceCount); + break; + case RDBSS_NTC_V_NETROOT: + PRINT_REF_COUNT(VNETROOT, Node->NodeReferenceCount); + break; + case RDBSS_NTC_SRVOPEN: + PRINT_REF_COUNT(SRVOPEN, Node->NodeReferenceCount); + break; + case RDBSS_NTC_FOBX: - UNIMPLEMENTED; + PRINT_REF_COUNT(NETFOBX, Node->NodeReferenceCount); break; + default: ASSERT(FALSE); break;

7 years, 7 months

[tthompson] 74675: [NTFS] - Add support for changing a file's size via SetEndOfFile(): -Handle IRP_MJ_SET_INFORMATION IRP requests. +NtfsSetEndOfFile() - Sets the end of file (file size) for a give...

by tthompson＠svn.reactos.org

Author: tthompson Date: Sat May 27 03:20:31 2017 New Revision: 74675 URL: http://svn.reactos.org/svn/reactos?rev=74675&view=rev Log: [NTFS] - Add support for changing a file's size via SetEndOfFile(): -Handle IRP_MJ_SET_INFORMATION IRP requests. +NtfsSetEndOfFile() - Sets the end of file (file size) for a given file. +NtfsSetInformation() - Sets the specified file information. At this point, only FileEndOfFileInformation is fully implemented. FileAllocationInformation is handled the same way and not truly implemented, but this works well enough for SetEndOfFile(). Overwriting a file in NTFS should now work in the majority of use cases. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sat May 27 03:20:31 2017 @@ -79,6 +79,10 @@ case IRP_MJ_QUERY_INFORMATION: Status = NtfsQueryInformation(IrpContext); + break; + + case IRP_MJ_SET_INFORMATION: + Status = NtfsSetInformation(IrpContext); break; case IRP_MJ_DIRECTORY_CONTROL: Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sat May 27 03:20:31 2017 @@ -396,4 +396,248 @@ return Status; } +/** +* @name NtfsSetEndOfFile +* @implemented +* +* Sets the end of file (file size) for a given file. +* +* @param Fcb +* Pointer to an NTFS_FCB which describes the target file. Fcb->MainResource should have been +* acquired with ExAcquireResourceSharedLite(). +* +* @param FileObject +* Pointer to a FILE_OBJECT describing the target file. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION +* +* @param IrpFlags +* ULONG describing the flags of the original IRP request (Irp->Flags). +* +* @param NewFileSize +* Pointer to a LARGE_INTEGER which indicates the new end of file (file size). +* +* @return +* STATUS_SUCCESS if successful, +* STATUS_USER_MAPPED_FILE if trying to truncate a file but MmCanFileBeTruncated() returned false, +* STATUS_OBJECT_NAME_NOT_FOUND if there was no $DATA attribute associated with the target file, +* STATUS_INVALID_PARAMETER if there was no $FILENAME attribute associated with the target file, +* STATUS_INSUFFICIENT_RESOURCES if an allocation failed, +* STATUS_ACCESS_DENIED if target file is a volume or if paging is involved. +* +* @remarks As this function sets the size of a file at the file-level +* (and not at the attribute level) it's not recommended to use this +* function alongside functions that operate on the data attribute directly. +* +*/ +NTSTATUS +NtfsSetEndOfFile(PNTFS_FCB Fcb, + PFILE_OBJECT FileObject, + PDEVICE_EXTENSION DeviceExt, + ULONG IrpFlags, + PLARGE_INTEGER NewFileSize) +{ + LARGE_INTEGER CurrentFileSize; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONG AttributeOffset; + NTSTATUS Status = STATUS_SUCCESS; + ULONGLONG AllocationSize; + PFILENAME_ATTRIBUTE fileNameAttribute; + ULONGLONG ParentMFTId; + UNICODE_STRING filename; + + + // Allocate non-paged memory for the file record + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (FileRecord == NULL) + { + DPRINT1("Couldn't allocate memory for file record!"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read the file record + DPRINT("Reading file record...\n"); + Status = ReadFileRecord(DeviceExt, Fcb->MFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + // We couldn't get the file's record. Free the memory and return the error + DPRINT1("Can't find record for %wS!\n", Fcb->ObjectName); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + DPRINT("Found record for %wS\n", Fcb->ObjectName); + + CurrentFileSize.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&CurrentFileSize); + + // Are we trying to decrease the file size? + if (NewFileSize->QuadPart < CurrentFileSize.QuadPart) + { + // Is the file mapped? + if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, + NewFileSize)) + { + DPRINT1("Couldn't decrease file size!\n"); + return STATUS_USER_MAPPED_FILE; + } + } + + // Find the attribute with the data stream for our file + DPRINT("Finding Data Attribute...\n"); + Status = FindAttribute(DeviceExt, + FileRecord, + AttributeData, + Fcb->Stream, + wcslen(Fcb->Stream), + &DataContext, + &AttributeOffset); + + // Did we fail to find the attribute? + if (!NT_SUCCESS(Status)) + { + DPRINT1("No '%S' data stream associated with file!\n", Fcb->Stream); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + // Get the size of the data attribute + CurrentFileSize.QuadPart = AttributeDataLength(&DataContext->Record); + + // Are we enlarging the attribute? + if (NewFileSize->QuadPart > CurrentFileSize.QuadPart) + { + // is increasing the stream size not allowed? + if ((Fcb->Flags & FCB_IS_VOLUME) || + (IrpFlags & IRP_PAGING_IO)) + { + // TODO - just fail for now + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_ACCESS_DENIED; + } + } + + // set the attribute data length + Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, NewFileSize); + if (!NT_SUCCESS(Status)) + { + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + // now we need to update this file's size in every directory index entry that references it + // TODO: expand to work with every filename / hardlink stored in the file record. + fileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); + if (fileNameAttribute == NULL) + { + DPRINT1("Unable to find FileName attribute associated with file!\n"); + return STATUS_INVALID_PARAMETER; + } + + ParentMFTId = fileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + + filename.Buffer = fileNameAttribute->Name; + filename.Length = fileNameAttribute->NameLength * sizeof(WCHAR); + filename.MaximumLength = filename.Length; + + AllocationSize = ROUND_UP(NewFileSize->QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); + + Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, &filename, FALSE, NewFileSize->QuadPart, AllocationSize); + + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; +} + +/** +* @name NtfsSetInformation +* @implemented +* +* Sets the specified file information. +* +* @param IrpContext +* Points to an NTFS_IRP_CONTEXT which describes the set operation +* +* @return +* STATUS_SUCCESS if successful, +* STATUS_NOT_IMPLEMENTED if trying to set an unimplemented information class, +* STATUS_USER_MAPPED_FILE if trying to truncate a file but MmCanFileBeTruncated() returned false, +* STATUS_OBJECT_NAME_NOT_FOUND if there was no $DATA attribute associated with the target file, +* STATUS_INVALID_PARAMETER if there was no $FILENAME attribute associated with the target file, +* STATUS_INSUFFICIENT_RESOURCES if an allocation failed, +* STATUS_ACCESS_DENIED if target file is a volume or if paging is involved. +* +* @remarks Called by NtfsDispatch() in response to an IRP_MJ_SET_INFORMATION request. +* Only the FileEndOfFileInformation InformationClass is fully implemented. FileAllocationInformation +* is a hack and not a true implementation, but it's enough to make SetEndOfFile() work. +* All other information classes are TODO. +* +*/ +NTSTATUS +NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) +{ + FILE_INFORMATION_CLASS FileInformationClass; + PIO_STACK_LOCATION Stack; + PDEVICE_EXTENSION DeviceExt; + PFILE_OBJECT FileObject; + PNTFS_FCB Fcb; + PVOID SystemBuffer; + ULONG BufferLength; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT1("NtfsSetInformation(%p)\n", IrpContext); + + Irp = IrpContext->Irp; + Stack = IrpContext->Stack; + DeviceObject = IrpContext->DeviceObject; + DeviceExt = DeviceObject->DeviceExtension; + FileInformationClass = Stack->Parameters.QueryFile.FileInformationClass; + FileObject = IrpContext->FileObject; + Fcb = FileObject->FsContext; + + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; + BufferLength = Stack->Parameters.QueryFile.Length; + + if (!ExAcquireResourceSharedLite(&Fcb->MainResource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + + switch (FileInformationClass) + { + PFILE_END_OF_FILE_INFORMATION EndOfFileInfo; + + /* TODO: Allocation size is not actually the same as file end for NTFS, + however, few applications are likely to make the distinction. */ + case FileAllocationInformation: + DPRINT1("FIXME: Using hacky method of setting FileAllocationInformation.\n"); + case FileEndOfFileInformation: + EndOfFileInfo = (PFILE_END_OF_FILE_INFORMATION)SystemBuffer; + Status = NtfsSetEndOfFile(Fcb, FileObject, DeviceExt, Irp->Flags, &EndOfFileInfo->EndOfFile); + break; + + // TODO: all other information classes + + default: + DPRINT1("FIXME: Unimplemented information class %u\n", FileInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + } + + ExReleaseResourceLite(&Fcb->MainResource); + + if (NT_SUCCESS(Status)) + Irp->IoStatus.Information = + Stack->Parameters.QueryFile.Length - BufferLength; + else + Irp->IoStatus.Information = 0; + + return Status; +} /* EOF */ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sat May 27 03:20:31 2017 @@ -139,6 +139,7 @@ DriverObject->MajorFunction[IRP_MJ_READ] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NtfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NtfsFsdDispatch; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat May 27 03:20:31 2017 @@ -796,6 +796,15 @@ NTSTATUS NtfsQueryInformation(PNTFS_IRP_CONTEXT IrpContext); +NTSTATUS +NtfsSetEndOfFile(PNTFS_FCB Fcb, + PFILE_OBJECT FileObject, + PDEVICE_EXTENSION DeviceExt, + ULONG IrpFlags, + PLARGE_INTEGER NewFileSize); + +NTSTATUS +NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext); /* fsctl.c */

7 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
29
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 May 2017