Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOSKRNL] Fix MSVC build: don't attempt to return in a void function
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2284a457a36a9ce7e2b28… commit 2284a457a36a9ce7e2b28bf38b6456ff0a6de471 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:38:36 2017 +0100 [NTOSKRNL] Fix MSVC build: don't attempt to return in a void function --- ntoskrnl/fsrtl/oplock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/fsrtl/oplock.c b/ntoskrnl/fsrtl/oplock.c index 250f0fce3f..7ab457d399 100644 --- a/ntoskrnl/fsrtl/oplock.c +++ b/ntoskrnl/fsrtl/oplock.c @@ -63,7 +63,7 @@ FsRtlNotifyCompletion(IN PVOID Context, DPRINT("FsRtlNotifyCompletion(%p, %p)\n", Context, Irp); /* Just complete the IRP */ - return IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); } VOID

1 0

[reactos] 01/01: [CDFS] Attempt to a switch to the MS CDFS driver. To be reverted if it brings in too many regressions, even though I tried to do my best to address them.
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec6b3ecbe48ad51c36656… commit ec6b3ecbe48ad51c366563196cc93a6ae74e8b69 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:32:36 2017 +0100 [CDFS] Attempt to a switch to the MS CDFS driver. To be reverted if it brings in too many regressions, even though I tried to do my best to address them. Leaving the old driver in place, for now; if no regressions are reported regarding CDFS in 0.4.8, then old driver could be dropped for 0.4.9. --- drivers/filesystems/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt index 7485d433b5..24937d7f13 100644 --- a/drivers/filesystems/CMakeLists.txt +++ b/drivers/filesystems/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(btrfs) -add_subdirectory(cdfs) +add_subdirectory(cdfs_new) add_subdirectory(ext2) add_subdirectory(fastfat) add_subdirectory(ffs)

1 0

[reactos] 01/01: [NTOSKRNL] Implement FsRtlCheckOplock(), FsRtlCurrentBatchOplock(), FsRtlInitializeOplock(), FsRtlOplockFsctrl(), FsRtlOplockIsFastIoPossible(), FsRtlUninitializeOplock(). But also, implement FsRtlNotifyCompletion(), FsRtlCompletionRoutinePriv(), FsRtlRemoveAndCompleteWaitIrp(), FsRtlCancelWaitIrp(), FsRtlWaitOnIrp(), FsRtlOplockBreakNotify(), FsRtlRemoveAndCompleteIrp(), FsRtlCancelOplockIIIrp(), FsRtlAcknowledgeOplockBreak(), FsRtlOpBatchBreakClosePending(), FsRtlAllocateOploc
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3d585395684b96df9782… commit d3d585395684b96df9782fe0af253f2c3e9cffc4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:23:57 2017 +0100 [NTOSKRNL] Implement FsRtlCheckOplock(), FsRtlCurrentBatchOplock(), FsRtlInitializeOplock(), FsRtlOplockFsctrl(), FsRtlOplockIsFastIoPossible(), FsRtlUninitializeOplock(). But also, implement FsRtlNotifyCompletion(), FsRtlCompletionRoutinePriv(), FsRtlRemoveAndCompleteWaitIrp(), FsRtlCancelWaitIrp(), FsRtlWaitOnIrp(), FsRtlOplockBreakNotify(), FsRtlRemoveAndCompleteIrp(), FsRtlCancelOplockIIIrp(), FsRtlAcknowledgeOplockBreak(), FsRtlOpBatchBreakClosePending(), FsRtlAllocateOplock(), FsRtlCancelExclusiveIrp(), FsRtlRequestExclusiveOplock(), FsRtlRequestOplockII(), FsRtlOplockCleanup(), FsRtlOplockBreakToNone(), FsRtlOplockBreakToII(). In short... Implement oplocks support in ReactOS. --- ntoskrnl/fsrtl/oplock.c | 1556 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1543 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/fsrtl/oplock.c b/ntoskrnl/fsrtl/oplock.c index ce31dfbab7..250f0fce3f 100644 --- a/ntoskrnl/fsrtl/oplock.c +++ b/ntoskrnl/fsrtl/oplock.c @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/oplock.c * PURPOSE: Provides an Opportunistic Lock for file system drivers. - * PROGRAMMERS: None. + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,6 +12,1133 @@ #define NDEBUG #include <debug.h> +#define NO_OPLOCK 0x1 +#define LEVEL_1_OPLOCK 0x2 +#define BATCH_OPLOCK 0x4 +#define FILTER_OPLOCK 0x8 +#define LEVEL_2_OPLOCK 0x10 + +#define EXCLUSIVE_LOCK 0x40 +#define PENDING_LOCK 0x80 + +#define BROKEN_TO_LEVEL_2 0x100 +#define BROKEN_TO_NONE 0x200 +#define BROKEN_TO_NONE_FROM_LEVEL_2 0x400 +#define BROKEN_TO_CLOSE_PENDING 0x800 +#define BROKEN_ANY (BROKEN_TO_LEVEL_2 | BROKEN_TO_NONE | BROKEN_TO_NONE_FROM_LEVEL_2 | BROKEN_TO_CLOSE_PENDING) + +#define TAG_OPLOCK 'orSF' + +typedef struct _INTERNAL_OPLOCK +{ + /* Level I IRP */ + PIRP ExclusiveIrp; + /* Level I FILE_OBJECT */ + PFILE_OBJECT FileObject; + /* Level II IRPs */ + LIST_ENTRY SharedListHead; + /* IRPs waiting on level I */ + LIST_ENTRY WaitListHead; + ULONG Flags; + PFAST_MUTEX IntLock; +} INTERNAL_OPLOCK, *PINTERNAL_OPLOCK; + +typedef struct _WAIT_CONTEXT +{ + LIST_ENTRY WaitListEntry; + PIRP Irp; + POPLOCK_WAIT_COMPLETE_ROUTINE CompletionRoutine; + PVOID CompletionContext; + ULONG Reserved; + ULONG_PTR SavedInformation; +} WAIT_CONTEXT, *PWAIT_CONTEXT; + +VOID +NTAPI +FsRtlNotifyCompletion(IN PVOID Context, + IN PIRP Irp) +{ + PAGED_CODE(); + + DPRINT("FsRtlNotifyCompletion(%p, %p)\n", Context, Irp); + + /* Just complete the IRP */ + return IoCompleteRequest(Irp, IO_DISK_INCREMENT); +} + +VOID +NTAPI +FsRtlCompletionRoutinePriv(IN PVOID Context, + IN PIRP Irp) +{ + PKEVENT WaitEvent; + + PAGED_CODE(); + + DPRINT("FsRtlCompletionRoutinePriv(%p, %p)\n", Context, Irp); + + /* Set the event */ + WaitEvent = (PKEVENT)Context; + KeSetEvent(WaitEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +FsRtlRemoveAndCompleteWaitIrp(IN PWAIT_CONTEXT WaitCtx) +{ + PIRP Irp; + + PAGED_CODE(); + + DPRINT("FsRtlRemoveAndCompleteWaitIrp(%p)\n", WaitCtx); + + RemoveEntryList(&WaitCtx->WaitListEntry); + Irp = WaitCtx->Irp; + + /* No cancel routine anymore */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Set the information */ + Irp->IoStatus.Information = WaitCtx->SavedInformation; + /* Set the status according to the fact it got cancel or not */ + Irp->IoStatus.Status = (Irp->Cancel ? STATUS_CANCELLED : STATUS_SUCCESS); + + /* Call the completion routine */ + WaitCtx->CompletionRoutine(WaitCtx->CompletionContext, Irp); + + /* And get rid of the now useless wait context */ + ExFreePoolWithTag(WaitCtx, TAG_OPLOCK); +} + +VOID +NTAPI +FsRtlCancelWaitIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PINTERNAL_OPLOCK Oplock; + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + + DPRINT("FsRtlCancelWaitIrp(%p, %p)\n", DeviceObject, Irp); + + /* Get the associated oplock */ + Oplock = (PINTERNAL_OPLOCK)Irp->IoStatus.Information; + + /* Remove the cancel routine (we're being called!) */ + IoSetCancelRoutine(Irp, NULL); + /* And release the cancel spin lock (always locked when cancel routine is called) */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Now, remove and complete any associated waiter */ + ExAcquireFastMutex(Oplock->IntLock); + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + + if (WaitCtx->Irp->Cancel) + { + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + } + ExReleaseFastMutex(Oplock->IntLock); +} + +VOID +FsRtlWaitOnIrp(IN PINTERNAL_OPLOCK Oplock, + IN PIRP Irp, + IN PVOID CompletionContext, + IN POPLOCK_WAIT_COMPLETE_ROUTINE CompletionRoutine, + IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine, + IN PKEVENT WaitEvent) +{ + BOOLEAN Locked; + PWAIT_CONTEXT WaitCtx; + + DPRINT("FsRtlWaitOnIrp(%p, %p, %p, %p, %p, %p)\n", Oplock, Irp, CompletionContext, CompletionRoutine, PostIrpRoutine, WaitEvent); + + /* We must always be called with IntLock locked! */ + Locked = TRUE; + /* Dirty check for above statement */ + ASSERT(Oplock->IntLock->Owner == KeGetCurrentThread()); + + /* Allocate a wait context for the IRP */ + WaitCtx = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(WAIT_CONTEXT), TAG_OPLOCK); + WaitCtx->Irp = Irp; + WaitCtx->SavedInformation = Irp->IoStatus.Information; + /* If caller provided everything required, us it */ + if (CompletionRoutine != NULL) + { + WaitCtx->CompletionRoutine = CompletionRoutine; + WaitCtx->CompletionContext = CompletionContext; + } + /* Otherwise, put ourselves */ + else + { + WaitCtx->CompletionRoutine = FsRtlCompletionRoutinePriv; + WaitCtx->CompletionContext = WaitEvent; + KeInitializeEvent(WaitEvent, NotificationEvent, FALSE); + } + + /* If we got a prepost routine, call it now! */ + if (PostIrpRoutine != NULL) + { + PostIrpRoutine(CompletionContext, Irp); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* Queue the IRP - it's OK, we're locked */ + InsertHeadList(&Oplock->WaitListHead, &WaitCtx->WaitListEntry); + + /* Set the oplock as information of the IRP (for the cancel routine) + * And lock the cancel routine lock for setting it + */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + Irp->IoStatus.Information = (ULONG_PTR)Oplock; + + /* If there's already a cancel routine + * Cancel the IRP + */ + if (Irp->Cancel) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + Locked = FALSE; + + if (CompletionRoutine != NULL) + { + IoMarkIrpPending(Irp); + } + FsRtlCancelWaitIrp(NULL, Irp); + } + /* Otherwise, put ourselves as the cancel routine and start waiting */ + else + { + IoSetCancelRoutine(Irp, FsRtlCancelWaitIrp); + IoReleaseCancelSpinLock(Irp->CancelIrql); + if (CompletionRoutine != NULL) + { + IoMarkIrpPending(Irp); + } + else + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + Locked = FALSE; + KeWaitForSingleObject(WaitEvent, Executive, KernelMode, FALSE, NULL); + } + } + + /* If we didn't unlock yet, do it now */ + if (Locked) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + } +} + +NTSTATUS +FsRtlOplockBreakNotify(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp) +{ + PAGED_CODE(); + + DPRINT("FsRtlOplockBreakNotify(%p, %p, %p)\n", Oplock, Stack, Irp); + + /* No oplock, no break to notify */ + if (Oplock == NULL) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; + } + + /* Notify by completing the IRP, unless we have broken to shared */ + ExAcquireFastMutexUnsafe(Oplock->IntLock); + if (!BooleanFlagOn(Oplock->Flags, BROKEN_TO_LEVEL_2)) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* If it's pending, just complete the IRP and get rid of the oplock */ + if (BooleanFlagOn(Oplock->Flags, PENDING_LOCK)) + { + Oplock->FileObject = NULL; + Oplock->Flags = NO_OPLOCK; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* Otherwise, wait on the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + FsRtlWaitOnIrp(Oplock, Irp, NULL, FsRtlNotifyCompletion, NULL, NULL); + return STATUS_SUCCESS; +} + +VOID +FsRtlRemoveAndCompleteIrp(IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + + DPRINT("FsRtlRemoveAndCompleteIrp(%p)\n", Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + /* Remove our extra ref */ + ObDereferenceObject(Stack->FileObject); + + /* Remove our cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Remove the IRP from the list it may be in (wait or shared) */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + /* And complete! */ + Irp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Irp->IoStatus.Status = (Irp->Cancel ? STATUS_CANCELLED : STATUS_SUCCESS); + + IoCompleteRequest(Irp, IO_DISK_INCREMENT); +} + +VOID +NTAPI +FsRtlCancelOplockIIIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PINTERNAL_OPLOCK Oplock; + PLIST_ENTRY NextEntry; + PIRP ListIrp; + BOOLEAN Removed; + + DPRINT("FsRtlCancelOplockIIIrp(%p, %p)\n", DeviceObject, Irp); + + /* Get the associated oplock */ + Oplock = (PINTERNAL_OPLOCK)Irp->IoStatus.Information; + + /* Remove the cancel routine (it's OK, we're the cancel routine! )*/ + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Nothing removed yet */ + Removed = FALSE; + ExAcquireFastMutex(Oplock->IntLock); + /* Browse all the IRPs associated to the shared lock */ + for (NextEntry = Oplock->SharedListHead.Flink; + NextEntry != &Oplock->SharedListHead; + NextEntry = NextEntry->Flink) + { + ListIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + /* If canceled, remove it */ + if (ListIrp->Cancel) + { + FsRtlRemoveAndCompleteIrp(ListIrp); + Removed = TRUE; + } + } + + /* If no IRP left, the oplock is gone */ + if (Removed && IsListEmpty(&Oplock->SharedListHead)) + { + Oplock->Flags = NO_OPLOCK; + } + /* Don't forget to release the mutex */ + ExReleaseFastMutex(Oplock->IntLock); +} + +NTSTATUS +FsRtlAcknowledgeOplockBreak(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp, + IN BOOLEAN SwitchToLevel2) +{ + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + BOOLEAN Deref; + BOOLEAN Locked; + + DPRINT("FsRtlAcknowledgeOplockBreak(%p, %p, %p, %u)\n", Oplock, Stack, Irp, Unknown); + + /* No oplock, nothing to acknowledge */ + if (Oplock == NULL) + { + Irp->IoStatus.Status = STATUS_INVALID_OPLOCK_PROTOCOL; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_INVALID_OPLOCK_PROTOCOL; + } + + /* Acquire oplock internal lock */ + ExAcquireFastMutexUnsafe(Oplock->IntLock); + Locked = TRUE; + /* Does it match the file? */ + if (Oplock->FileObject != Stack->FileObject) + { + Irp->IoStatus.Status = STATUS_INVALID_OPLOCK_PROTOCOL; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_INVALID_OPLOCK_PROTOCOL; + } + + /* Assume we'll have to deref our extra ref (level I) */ + Deref = TRUE; + + /* If we got broken to level 2 and asked for a shared lock + * switch the oplock to shared + */ + if (SwitchToLevel2 && BooleanFlagOn(Oplock->Flags, BROKEN_TO_LEVEL_2)) + { + /* The IRP cannot be synchronous, we'll move it to the LEVEL_2 IRPs */ + ASSERT(!IoIsOperationSynchronous(Irp)); + + /* Mark the IRP pending, and queue it for the shared IRPs */ + IoMarkIrpPending(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(&Oplock->SharedListHead, &Irp->Tail.Overlay.ListEntry); + + /* Don't deref, we're not done yet */ + Deref = FALSE; + /* And mark we've got a shared lock */ + Oplock->Flags = LEVEL_2_OPLOCK; + /* To find the lock back on cancel */ + Irp->IoStatus.Information = (ULONG_PTR)Oplock; + + /* Acquire the spinlock to set the cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + /* If IRP got canceled, call it immediately */ + if (Irp->Cancel) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + Locked = FALSE; + FsRtlCancelOplockIIIrp(NULL, Irp); + } + /* Otherwise, just set our cancel routine */ + else + { + IoSetCancelRoutine(Irp, FsRtlCancelOplockIIIrp); + IoReleaseCancelSpinLock(Irp->CancelIrql); + } + } + /* If oplock got broken, remove it */ + else if (BooleanFlagOn(Oplock->Flags, (BROKEN_TO_NONE | BROKEN_TO_LEVEL_2))) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IofCompleteRequest(Irp, IO_DISK_INCREMENT); + Oplock->Flags = NO_OPLOCK; + } + /* Same, but precise we got broken from none to shared */ + else if (BooleanFlagOn(Oplock->Flags, BROKEN_TO_NONE_FROM_LEVEL_2)) + { + Irp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Irp->IoStatus.Status = STATUS_SUCCESS; + IofCompleteRequest(Irp, IO_DISK_INCREMENT); + Oplock->Flags = NO_OPLOCK; + } + + /* Now, complete any IRP waiting */ + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + + /* If we dropped oplock, remove our extra ref */ + if (Deref) + { + ObfDereferenceObject(Oplock->FileObject); + } + /* And unset FO: no oplock left or shared */ + Oplock->FileObject = NULL; + + /* Don't leak the mutex! */ + if (Locked) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +FsRtlOpBatchBreakClosePending(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp) +{ + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + + PAGED_CODE(); + + DPRINT("FsRtlOpBatchBreakClosePending(%p, %p, %p)\n", Oplock, Stack, Irp); + + /* No oplock, that's not legit! */ + if (Oplock == NULL) + { + Irp->IoStatus.Status = STATUS_INVALID_OPLOCK_PROTOCOL; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_INVALID_OPLOCK_PROTOCOL; + } + + Status = STATUS_SUCCESS; + ExAcquireFastMutexUnsafe(Oplock->IntLock); + + /* First of all, check if all conditions are met: + * Correct FO + broken oplock + */ + if (Oplock->FileObject == Stack->FileObject && (BooleanFlagOn(Oplock->Flags, (BROKEN_TO_LEVEL_2 | BROKEN_TO_NONE | BROKEN_TO_NONE_FROM_LEVEL_2)))) + { + /* If we have a pending or level 1 oplock... */ + if (BooleanFlagOn(Oplock->Flags, (PENDING_LOCK | LEVEL_1_OPLOCK))) + { + /* Remove our extra ref from the FO */ + if (Oplock->Flags & LEVEL_1_OPLOCK) + { + ObDereferenceObject(Oplock->FileObject); + } + + /* And remove the oplock */ + Oplock->Flags = NO_OPLOCK; + Oplock->FileObject = NULL; + + /* Complete any waiting IRP */ + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + } + /* Otherwise, mark the oplock as close pending */ + else + { + ClearFlag(Oplock->Flags, BROKEN_ANY); + SetFlag(Oplock->Flags, BROKEN_TO_CLOSE_PENDING); + } + } + /* Oplock is in invalid state */ + else + { + Status = STATUS_INVALID_OPLOCK_PROTOCOL; + } + + /* And complete */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ExReleaseFastMutexUnsafe(Oplock->IntLock); + + return Status; +} + +PINTERNAL_OPLOCK +FsRtlAllocateOplock(VOID) +{ + PINTERNAL_OPLOCK Oplock = NULL; + + PAGED_CODE(); + + DPRINT("FsRtlAllocateOplock()\n"); + + _SEH2_TRY + { + /* Allocate and initialize the oplock */ + Oplock = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE | POOL_COLD_ALLOCATION, sizeof(INTERNAL_OPLOCK), TAG_OPLOCK); + RtlZeroMemory(Oplock, sizeof(INTERNAL_OPLOCK)); + /* We allocate the fast mutex separately to have it non paged (while the rest of the oplock can be paged) */ + Oplock->IntLock = ExAllocatePoolWithTag(NonPagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(FAST_MUTEX), TAG_OPLOCK); + ExInitializeFastMutex(Oplock->IntLock); + /* Initialize the IRP list for level 2 oplock */ + InitializeListHead(&Oplock->SharedListHead); + /* And for the wait IRPs */ + InitializeListHead(&Oplock->WaitListHead); + Oplock->Flags = NO_OPLOCK; + } + _SEH2_FINALLY + { + /* In case of abnormal termination, it means either OPLOCK or FAST_MUTEX allocation failed */ + if (_abnormal_termination()) + { + /* That FAST_MUTEX, free OPLOCK */ + if (Oplock != NULL) + { + ExFreePoolWithTag(Oplock, TAG_OPLOCK); + Oplock = NULL; + } + } + } + _SEH2_END; + + return Oplock; +} + +VOID +NTAPI +FsRtlCancelExclusiveIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PINTERNAL_OPLOCK IntOplock; + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + + DPRINT("FsRtlCancelExclusiveIrp(%p, %p)\n", DeviceObject, Irp); + + /* Get the associated oplock */ + IntOplock = (PINTERNAL_OPLOCK)Irp->IoStatus.Information; + + /* Remove the cancel routine (us!) and release the cancel spinlock */ + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Acquire our internal FAST_MUTEX */ + ExAcquireFastMutex(IntOplock->IntLock); + /* If we had an exclusive IRP */ + if (IntOplock->ExclusiveIrp != NULL && IntOplock->ExclusiveIrp->Cancel) + { + /* Cancel it, and remove it from the oplock */ + IntOplock->ExclusiveIrp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(IntOplock->ExclusiveIrp, IO_DISK_INCREMENT); + IntOplock->ExclusiveIrp = NULL; + + /* Dereference the fileobject and remove the oplock */ + ObDereferenceObject(IntOplock->FileObject); + IntOplock->FileObject = NULL; + IntOplock->Flags = NO_OPLOCK; + + /* And complete any waiting IRP */ + for (NextEntry = IntOplock->WaitListHead.Flink; + NextEntry != &IntOplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + } + + /* Done! */ + ExReleaseFastMutexUnsafe(IntOplock->IntLock); +} + +NTSTATUS +FsRtlRequestExclusiveOplock(IN POPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp, + IN ULONG Flags) +{ + PINTERNAL_OPLOCK IntOplock; + PIRP ListIrp; + BOOLEAN Locked; + NTSTATUS Status; + + DPRINT("FsRtlRequestExclusiveOplock(%p, %p, %p, %lu)\n", Oplock, Stack, Irp, Flags); + + IntOplock = *Oplock; + Locked = FALSE; + Status = STATUS_SUCCESS; + + /* Time to work! */ + _SEH2_TRY + { + /* Was the oplock already allocated? If not, do it now! */ + if (IntOplock == NULL) + { + *Oplock = FsRtlAllocateOplock(); + IntOplock = *Oplock; + } + + /* Acquire our internal lock */ + ExAcquireFastMutexUnsafe(IntOplock->IntLock); + Locked = TRUE; + + /* If we request exclusiveness, a filter or a pending oplock, grant it */ + if (Flags == (EXCLUSIVE_LOCK | PENDING_LOCK | FILTER_OPLOCK)) + { + /* Either no oplock, or pending */ + ASSERT(BooleanFlagOn(IntOplock->Flags, (NO_OPLOCK | PENDING_LOCK))); + IntOplock->ExclusiveIrp = Irp; + IntOplock->FileObject = Stack->FileObject; + IntOplock->Flags = (EXCLUSIVE_LOCK | PENDING_LOCK | FILTER_OPLOCK); + } + else + { + /* Otherwise, shared or no effective oplock */ + if (BooleanFlagOn(IntOplock->Flags, (LEVEL_2_OPLOCK | PENDING_LOCK | NO_OPLOCK))) + { + /* The shared IRPs list should contain a single entry! */ + if (IntOplock->Flags == LEVEL_2_OPLOCK) + { + ListIrp = CONTAINING_RECORD(IntOplock->SharedListHead.Flink, IRP, Tail.Overlay.ListEntry); + ASSERT(IntOplock->SharedListHead.Flink == IntOplock->SharedListHead.Blink); + FsRtlRemoveAndCompleteIrp(ListIrp); + } + + /* Set the exclusiveness */ + IntOplock->ExclusiveIrp = Irp; + IntOplock->FileObject = Stack->FileObject; + IntOplock->Flags = Flags; + + /* Mark the IRP pending and reference our file object */ + IoMarkIrpPending(Irp); + ObReferenceObject(Stack->FileObject); + Irp->IoStatus.Information = (ULONG_PTR)IntOplock; + + /* Now, set ourselves as cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + /* Unless IRP got canceled, then, just give up */ + if (Irp->Cancel) + { + ExReleaseFastMutexUnsafe(IntOplock->IntLock); + Locked = FALSE; + FsRtlCancelExclusiveIrp(NULL, Irp); + Status = STATUS_CANCELLED; + } + else + { + IoSetCancelRoutine(Irp, FsRtlCancelExclusiveIrp); + IoReleaseCancelSpinLock(Irp->CancelIrql); + } + } + /* Cannot set exclusiveness, fail */ + else + { + if (Irp != NULL) + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + Status = STATUS_OPLOCK_NOT_GRANTED; + } + } + } + } + /* If locked, release */ + _SEH2_FINALLY + { + if (Locked) + { + ExReleaseFastMutexUnsafe(IntOplock->IntLock); + } + } + _SEH2_END; + + return Status; +} + +NTSTATUS +FsRtlRequestOplockII(IN POPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp) +{ + BOOLEAN Locked; + NTSTATUS Status; + PINTERNAL_OPLOCK IntOplock; + + DPRINT("FsRtlRequestOplockII(%p, %p, %p)\n", Oplock, Stack, Irp); + + IntOplock = *Oplock; + Locked = FALSE; + Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* No oplock yet? Allocate it */ + if (IntOplock == NULL) + { + *Oplock = FsRtlAllocateOplock(); + IntOplock = *Oplock; + } + + /* Acquire the oplock */ + ExAcquireFastMutexUnsafe(IntOplock->IntLock); + Locked = TRUE; + + /* If already shared, or no oplock that's fine! */ + if (BooleanFlagOn(IntOplock->Flags, (LEVEL_2_OPLOCK | NO_OPLOCK))) + { + IoMarkIrpPending(Irp); + /* Granted! */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* Insert in the shared list */ + InsertTailList(&IntOplock->SharedListHead, &Irp->Tail.Overlay.ListEntry); + + /* Save the associated oplock */ + Irp->IoStatus.Information = (ULONG_PTR)IntOplock; + + /* The oplock is shared */ + IntOplock->Flags = LEVEL_2_OPLOCK; + + /* Reference the fileobject */ + ObReferenceObject(Stack->FileObject); + + /* Set our cancel routine, unless the IRP got canceled in-between */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + if (Irp->Cancel) + { + ExReleaseFastMutexUnsafe(IntOplock->IntLock); + Locked = FALSE; + FsRtlCancelOplockIIIrp(NULL, Irp); + Status = STATUS_CANCELLED; + } + else + { + IoSetCancelRoutine(Irp, FsRtlCancelOplockIIIrp); + IoReleaseCancelSpinLock(Irp->CancelIrql); + } + } + /* Otherwise, just fail */ + else + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + Status = STATUS_OPLOCK_NOT_GRANTED; + } + } + _SEH2_FINALLY + { + if (Locked) + { + ExReleaseFastMutexUnsafe(IntOplock->IntLock); + } + } + _SEH2_END; + + return Status; +} + +VOID +FsRtlOplockCleanup(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack) +{ + PIO_STACK_LOCATION ListStack; + PLIST_ENTRY NextEntry; + PIRP ListIrp; + PWAIT_CONTEXT WaitCtx; + + DPRINT("FsRtlOplockCleanup(%p, %p)\n", Oplock, Stack); + + ExAcquireFastMutexUnsafe(Oplock->IntLock); + /* oplock cleaning only makes sense if there's an oplock */ + if (Oplock->Flags != NO_OPLOCK) + { + /* Shared lock */ + if (Oplock->Flags == LEVEL_2_OPLOCK) + { + /* Complete any associated IRP */ + for (NextEntry = Oplock->SharedListHead.Flink; + NextEntry != &Oplock->SharedListHead; + NextEntry = NextEntry->Flink) + { + ListIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + ListStack = IoGetCurrentIrpStackLocation(ListIrp); + + if (Stack->FileObject == ListStack->FileObject) + { + FsRtlRemoveAndCompleteIrp(ListIrp); + } + } + + /* If, in the end, no IRP is left, then the lock is gone */ + if (IsListEmpty(&Oplock->SharedListHead)) + { + Oplock->Flags = NO_OPLOCK; + } + } + else + { + /* If we have matching file */ + if (Oplock->FileObject == Stack->FileObject) + { + /* Oplock wasn't broken (still exclusive), easy case */ + if (!BooleanFlagOn(Oplock->Flags, (BROKEN_ANY | PENDING_LOCK))) + { + /* Remove the cancel routine we set previously */ + IoAcquireCancelSpinLock(&Oplock->ExclusiveIrp->CancelIrql); + IoSetCancelRoutine(Oplock->ExclusiveIrp, NULL); + IoReleaseCancelSpinLock(Oplock->ExclusiveIrp->CancelIrql); + + /* And return the fact we broke the oplock to no oplock */ + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Oplock->ExclusiveIrp->IoStatus.Status = STATUS_SUCCESS; + + /* And complete! */ + IoCompleteRequest(Oplock->ExclusiveIrp, IO_DISK_INCREMENT); + Oplock->ExclusiveIrp = NULL; + } + + /* If no pending, we can safely dereference the file object */ + if (!BooleanFlagOn(Oplock->Flags, PENDING_LOCK)) + { + ObDereferenceObject(Oplock->FileObject); + } + + /* Now, remove the oplock */ + Oplock->FileObject = NULL; + Oplock->Flags = NO_OPLOCK; + + /* And complete any waiting IRP */ + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + } + } + } + ExReleaseFastMutexUnsafe(Oplock->IntLock); +} + +NTSTATUS +NTAPI +FsRtlOplockBreakToNone(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp, + IN PVOID Context, + IN POPLOCK_WAIT_COMPLETE_ROUTINE CompletionRoutine OPTIONAL, + IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine OPTIONAL) +{ + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + PIRP ListIrp; + KEVENT WaitEvent; + + DPRINT("FsRtlOplockBreakToNone(%p, %p, %p, %p, %p, %p)\n", Oplock, Stack, Irp, Context, CompletionRoutine, PostIrpRoutine); + + ExAcquireFastMutexUnsafe(Oplock->IntLock); + + /* No oplock to break! */ + if (Oplock->Flags == NO_OPLOCK) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* Not broken yet, but set... Let's do it! + * Also, we won't break a shared oplock + */ + if (!BooleanFlagOn(Oplock->Flags, (BROKEN_ANY | PENDING_LOCK | LEVEL_2_OPLOCK))) + { + /* Remove our cancel routine, no longer needed */ + IoAcquireCancelSpinLock(&Oplock->ExclusiveIrp->CancelIrql); + IoSetCancelRoutine(Oplock->ExclusiveIrp, NULL); + IoReleaseCancelSpinLock(Oplock->ExclusiveIrp->CancelIrql); + + /* If the IRP got canceled, we need to cleanup a bit */ + if (Oplock->ExclusiveIrp->Cancel) + { + /* Return cancelation */ + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Oplock->ExclusiveIrp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Oplock->ExclusiveIrp, IO_DISK_INCREMENT); + + /* No oplock left */ + Oplock->Flags = NO_OPLOCK; + Oplock->ExclusiveIrp = NULL; + + /* No need for the FO anymore */ + ObDereferenceObject(Oplock->FileObject); + Oplock->FileObject = NULL; + + /* And complete any waiting IRP */ + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + + /* Done! */ + ExReleaseFastMutexUnsafe(Oplock->IntLock); + + return STATUS_SUCCESS; + } + + /* Easier break, just complete :-) */ + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Oplock->ExclusiveIrp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Oplock->ExclusiveIrp, IO_DISK_INCREMENT); + + /* And remove our exclusive IRP */ + Oplock->ExclusiveIrp = NULL; + SetFlag(Oplock->Flags, BROKEN_TO_NONE); + } + /* Shared lock */ + else if (Oplock->Flags == LEVEL_2_OPLOCK) + { + /* Complete any IRP in the shared lock */ + for (NextEntry = Oplock->SharedListHead.Flink; + NextEntry != &Oplock->SharedListHead; + NextEntry = NextEntry->Flink) + { + ListIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + FsRtlRemoveAndCompleteIrp(ListIrp); + } + + /* No lock left */ + Oplock->Flags = NO_OPLOCK; + + /* Done */ + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + /* If it was broken to level 2, break it to none from level 2 */ + else if (Oplock->Flags & BROKEN_TO_LEVEL_2) + { + ClearFlag(Oplock->Flags, BROKEN_TO_LEVEL_2); + SetFlag(Oplock->Flags, BROKEN_TO_NONE_FROM_LEVEL_2); + } + /* If it was pending, just drop the lock */ + else if (BooleanFlagOn(Oplock->Flags, PENDING_LOCK)) + { + Oplock->Flags = NO_OPLOCK; + Oplock->FileObject = NULL; + + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* If that's ours, job done */ + if (Oplock->FileObject == Stack->FileObject) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* Otherwise, wait on the IRP */ + if (Stack->MajorFunction != IRP_MJ_CREATE || !BooleanFlagOn(Stack->Parameters.Create.Options, FILE_COMPLETE_IF_OPLOCKED)) + { + FsRtlWaitOnIrp(Oplock, Irp, Context, CompletionRoutine, PostIrpRoutine, &WaitEvent); + + ExReleaseFastMutexUnsafe(Oplock->IntLock); + + return STATUS_SUCCESS; + } + /* Done */ + else + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_OPLOCK_BREAK_IN_PROGRESS; + } +} + +NTSTATUS +NTAPI +FsRtlOplockBreakToII(IN PINTERNAL_OPLOCK Oplock, + IN PIO_STACK_LOCATION Stack, + IN PIRP Irp, + IN PVOID Context, + IN POPLOCK_WAIT_COMPLETE_ROUTINE CompletionRoutine OPTIONAL, + IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine OPTIONAL) +{ + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + KEVENT WaitEvent; + + DPRINT("FsRtlOplockBreakToII(%p, %p, %p, %p, %p, %p)\n", Oplock, Stack, Irp, Context, CompletionRoutine, PostIrpRoutine); + + ExAcquireFastMutexUnsafe(Oplock->IntLock); + + /* If our lock, or if not exclusively locked, nothing to break! */ + if (!BooleanFlagOn(Oplock->Flags, EXCLUSIVE_LOCK) || Oplock->FileObject == Stack->FileObject) + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + /* If already broken or not set yet */ + if (BooleanFlagOn(Oplock->Flags, (BROKEN_ANY | PENDING_LOCK))) + { + /* Drop oplock if pending */ + if (BooleanFlagOn(Oplock->Flags, PENDING_LOCK)) + { + Oplock->Flags = NO_OPLOCK; + Oplock->FileObject = NULL; + + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_SUCCESS; + } + + } + /* To break! */ + else + { + /* Drop the cancel routine of the exclusive IRP */ + IoAcquireCancelSpinLock(&Oplock->ExclusiveIrp->CancelIrql); + IoSetCancelRoutine(Oplock->ExclusiveIrp, NULL); + IoReleaseCancelSpinLock(Oplock->ExclusiveIrp->CancelIrql); + + /* If it was canceled in between, break to no oplock */ + if (Oplock->ExclusiveIrp->Cancel) + { + /* Complete the IRP with cancellation */ + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Oplock->ExclusiveIrp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Oplock->ExclusiveIrp, IO_DISK_INCREMENT); + + /* And mark we have no longer lock */ + Oplock->Flags = NO_OPLOCK; + Oplock->ExclusiveIrp = NULL; + ObDereferenceObject(Oplock->FileObject); + Oplock->FileObject = NULL; + + /* Finally, complete any waiter */ + for (NextEntry = Oplock->WaitListHead.Flink; + NextEntry != &Oplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + FsRtlRemoveAndCompleteWaitIrp(WaitCtx); + } + + ExReleaseFastMutexUnsafe(Oplock->IntLock); + + return STATUS_SUCCESS; + } + + /* It wasn't canceled, so break to shared unless we were alone, in that case we break to no lock! */ + Oplock->ExclusiveIrp->IoStatus.Status = STATUS_SUCCESS; + if (BooleanFlagOn(Oplock->Flags, (BATCH_OPLOCK | LEVEL_1_OPLOCK))) + { + SetFlag(Oplock->Flags, BROKEN_TO_LEVEL_2); + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_LEVEL_2; + } + else + { + SetFlag(Oplock->Flags, BROKEN_TO_NONE); + Oplock->ExclusiveIrp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + } + /* And complete */ + IoCompleteRequest(Oplock->ExclusiveIrp, IO_DISK_INCREMENT); + Oplock->ExclusiveIrp = NULL; + } + + /* Wait if required */ + if (Stack->MajorFunction != IRP_MJ_CREATE || !BooleanFlagOn(Stack->Parameters.Create.Options, FILE_COMPLETE_IF_OPLOCKED)) + { + FsRtlWaitOnIrp(Oplock, Irp, Context, CompletionRoutine, PostIrpRoutine, &WaitEvent); + + ExReleaseFastMutexUnsafe(Oplock->IntLock); + + return STATUS_SUCCESS; + } + else + { + ExReleaseFastMutexUnsafe(Oplock->IntLock); + return STATUS_OPLOCK_BREAK_IN_PROGRESS; + } +} + /* PUBLIC FUNCTIONS **********************************************************/ /*++ @@ -48,14 +1175,181 @@ FsRtlCheckOplock(IN POPLOCK Oplock, IN POPLOCK_WAIT_COMPLETE_ROUTINE CompletionRoutine OPTIONAL, IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine OPTIONAL) { - /* Unimplemented */ - UNIMPLEMENTED; + PINTERNAL_OPLOCK IntOplock; + PIO_STACK_LOCATION Stack; + ACCESS_MASK DesiredAccess; + FILE_INFORMATION_CLASS FileInfo; + ULONG CreateDisposition; + +#define BreakToIIIfRequired \ + if (IntOplock->Flags != LEVEL_2_OPLOCK || IntOplock->FileObject != Stack->FileObject) \ + return FsRtlOplockBreakToII(IntOplock, Stack, Irp, Context, CompletionRoutine, PostIrpRoutine) + +#define BreakToNoneIfRequired \ + if (IntOplock->Flags == LEVEL_2_OPLOCK || IntOplock->FileObject != Stack->FileObject) \ + return FsRtlOplockBreakToNone(IntOplock, Stack, Irp, Context, CompletionRoutine, PostIrpRoutine) + + DPRINT("FsRtlCheckOplock(%p, %p, %p, %p, %p)\n", Oplock, Irp, Context, CompletionRoutine, PostIrpRoutine); + + IntOplock = *Oplock; + + /* No oplock, easy! */ + if (IntOplock == NULL) + { + return STATUS_SUCCESS; + } + + /* No sense on paging */ + if (Irp->Flags & IRP_PAGING_IO) + { + return STATUS_SUCCESS; + } + + /* No oplock, easy (bis!) */ + if (IntOplock->Flags == NO_OPLOCK) + { + return STATUS_SUCCESS; + } + + Stack = IoGetCurrentIrpStackLocation(Irp); + + /* If cleanup, cleanup the associated oplock & return */ + if (Stack->MajorFunction == IRP_MJ_CLEANUP) + { + FsRtlOplockCleanup(IntOplock, Stack); + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_LOCK_CONTROL) + { + /* OK for filter */ + if (BooleanFlagOn(IntOplock->Flags, FILTER_OPLOCK)) + { + return STATUS_SUCCESS; + } + + /* Lock operation, we will have to break to no lock if shared or not us */ + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) + { + /* FSCTL should be safe, unless user wants a write FSCTL */ + if (Stack->Parameters.FileSystemControl.FsControlCode != FSCTL_SET_ZERO_DATA) + { + return STATUS_SUCCESS; + } + + /* We will have to break for write if shared or not us! */ + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_WRITE) + { + /* Write operation, we will have to break if shared or not us */ + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_READ) + { + /* If that's filter oplock, it's alright */ + if (BooleanFlagOn(IntOplock->Flags, FILTER_OPLOCK)) + { + return STATUS_SUCCESS; + } + + /* Otherwise, we need to break to shared oplock */ + BreakToIIIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_CREATE) + { + DesiredAccess = Stack->Parameters.Create.SecurityContext->DesiredAccess; + + /* If that's just for reading, the oplock is fine */ + if ((!(DesiredAccess & ~(SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | FILE_READ_DATA)) && !(Stack->Parameters.Create.Options & FILE_RESERVE_OPFILTER)) + || (BooleanFlagOn(IntOplock->Flags, FILTER_OPLOCK) && !(DesiredAccess & ~(SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | FILE_EXECUTE | FILE_READ_EA | FILE_WRITE_DATA)) && BooleanFlagOn(Stack->Parameters.Create.ShareAccess, FILE_SHARE_READ))) + { + return STATUS_SUCCESS; + } + + /* Otherwise, check the disposition */ + CreateDisposition = (Stack->Parameters.Create.Options >> 24) & 0x000000FF; + if (!CreateDisposition || CreateDisposition == FILE_OVERWRITE || + CreateDisposition == FILE_OVERWRITE_IF || + BooleanFlagOn(Stack->Parameters.Create.Options, FILE_RESERVE_OPFILTER)) + { + /* Not us, we have to break the oplock! */ + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + + /* It's fine, we can have the oplock shared */ + BreakToIIIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_FLUSH_BUFFERS) + { + /* We need to share the lock, if not done yet! */ + BreakToIIIfRequired; + + return STATUS_SUCCESS; + } + else if (Stack->MajorFunction == IRP_MJ_SET_INFORMATION) + { + /* Only deal with really specific classes */ + FileInfo = Stack->Parameters.SetFile.FileInformationClass; + if (FileInfo == FileRenameInformation || FileInfo == FileLinkInformation || + FileInfo == FileShortNameInformation) + { + /* No need to break */ + if (!BooleanFlagOn(IntOplock->Flags, (FILTER_OPLOCK | BATCH_OPLOCK))) + { + return STATUS_SUCCESS; + } + /* Otherwise break to none */ + else + { + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + } + else if (FileInfo == FileAllocationInformation) + { + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + else if (FileInfo == FileEndOfFileInformation) + { + /* Advance only, nothing to do */ + if (Stack->Parameters.SetFile.AdvanceOnly) + { + return STATUS_SUCCESS; + } + + /* Otherwise, attempt to break to none */ + BreakToNoneIfRequired; + + return STATUS_SUCCESS; + } + } + +#undef BreakToIIIfRequired +#undef BreakToNoneIfRequired + return STATUS_SUCCESS; } /*++ * @name FsRtlCurrentBatchOplock - * @unimplemented + * @implemented * * FILLME * @@ -71,8 +1365,21 @@ BOOLEAN NTAPI FsRtlCurrentBatchOplock(IN POPLOCK Oplock) { - /* Unimplemented */ - UNIMPLEMENTED; + PINTERNAL_OPLOCK IntOplock; + + PAGED_CODE(); + + DPRINT("FsRtlCurrentBatchOplock(%p)\n", Oplock); + + IntOplock = *Oplock; + + /* Only return true if batch or filter oplock */ + if (IntOplock != NULL && + BooleanFlagOn(IntOplock->Flags, (FILTER_OPLOCK | BATCH_OPLOCK))) + { + return TRUE; + } + return FALSE; } @@ -95,6 +1402,9 @@ NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { PAGED_CODE(); + + /* Nothing to do */ + DPRINT("FsRtlInitializeOplock(%p)\n", Oplock); } /*++ @@ -123,14 +1433,123 @@ FsRtlOplockFsctrl(IN POPLOCK Oplock, IN PIRP Irp, IN ULONG OpenCount) { - /* Unimplemented */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION Stack; + PINTERNAL_OPLOCK IntOplock; + + PAGED_CODE(); + + DPRINT("FsRtlOplockFsctrl(%p, %p, %lu)\n", Oplock, Irp, OpenCount); + + IntOplock = *Oplock; + Stack = IoGetCurrentIrpStackLocation(Irp); + /* Make sure it's not called on create */ + if (Stack->MajorFunction != IRP_MJ_CREATE) + { + switch (Stack->Parameters.FileSystemControl.FsControlCode) + { + case FSCTL_OPLOCK_BREAK_NOTIFY: + return FsRtlOplockBreakNotify(IntOplock, Stack, Irp); + + case FSCTL_OPLOCK_BREAK_ACK_NO_2: + return FsRtlAcknowledgeOplockBreak(IntOplock, Stack, Irp, FALSE); + + case FSCTL_OPBATCH_ACK_CLOSE_PENDING: + return FsRtlOpBatchBreakClosePending(IntOplock, Stack, Irp); + + case FSCTL_REQUEST_OPLOCK_LEVEL_1: + /* We can only grant level 1 if synchronous, and only a single handle to it + * (plus, not a paging IO - obvious, and not cleanup done...) + */ + if (OpenCount == 1 && !IoIsOperationSynchronous(Irp) && + !BooleanFlagOn(Irp->Flags, IRP_SYNCHRONOUS_PAGING_IO) && !BooleanFlagOn(Stack->FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + return FsRtlRequestExclusiveOplock(Oplock, Stack, Irp, EXCLUSIVE_LOCK | LEVEL_1_OPLOCK); + } + /* Not matching, fail */ + else + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_OPLOCK_NOT_GRANTED; + } + + case FSCTL_REQUEST_OPLOCK_LEVEL_2: + /* Shared can only be granted if no byte-range lock, and async operation + * (plus, not a paging IO - obvious, and not cleanup done...) + */ + if (OpenCount == 0 && !IoIsOperationSynchronous(Irp) && + !BooleanFlagOn(Irp->Flags, IRP_SYNCHRONOUS_PAGING_IO) && !BooleanFlagOn(Stack->FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + return FsRtlRequestOplockII(Oplock, Stack, Irp); + } + /* Not matching, fail */ + else + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_OPLOCK_NOT_GRANTED; + } + + case FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: + return FsRtlAcknowledgeOplockBreak(IntOplock, Stack, Irp, TRUE); + + case FSCTL_REQUEST_BATCH_OPLOCK: + /* Batch oplock can only be granted if there's a byte-range lock and async operation + * (plus, not a paging IO - obvious, and not cleanup done...) + */ + if (OpenCount == 1 && !IoIsOperationSynchronous(Irp) && + !BooleanFlagOn(Irp->Flags, IRP_SYNCHRONOUS_PAGING_IO) && !BooleanFlagOn(Stack->FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + return FsRtlRequestExclusiveOplock(Oplock, Stack, Irp, EXCLUSIVE_LOCK | BATCH_OPLOCK); + } + /* Not matching, fail */ + else + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_OPLOCK_NOT_GRANTED; + } + + case FSCTL_REQUEST_FILTER_OPLOCK: + /* Filter oplock can only be granted if there's a byte-range lock and async operation + * (plus, not a paging IO - obvious, and not cleanup done...) + */ + if (OpenCount == 1 && !IoIsOperationSynchronous(Irp) && + !BooleanFlagOn(Irp->Flags, IRP_SYNCHRONOUS_PAGING_IO) && !BooleanFlagOn(Stack->FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + return FsRtlRequestExclusiveOplock(Oplock, Stack, Irp, EXCLUSIVE_LOCK | FILTER_OPLOCK); + } + /* Not matching, fail */ + else + { + Irp->IoStatus.Status = STATUS_OPLOCK_NOT_GRANTED; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_OPLOCK_NOT_GRANTED; + } + + default: + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + } + + /* That's a create operation! Only grant exclusive if there's a single user handle opened + * and we're only performing reading operations. + */ + if (OpenCount == 1 && + !(Stack->Parameters.Create.SecurityContext->DesiredAccess & ~(FILE_READ_ATTRIBUTES | FILE_READ_DATA)) && + (Stack->Parameters.Create.ShareAccess & FILE_SHARE_VALID_FLAGS) == FILE_SHARE_VALID_FLAGS) + { + return FsRtlRequestExclusiveOplock(Oplock, Stack, NULL, EXCLUSIVE_LOCK | PENDING_LOCK | FILTER_OPLOCK); + } + + return STATUS_OPLOCK_NOT_GRANTED; } /*++ * @name FsRtlOplockIsFastIoPossible - * @unimplemented + * @implemented * * FILLME * @@ -146,13 +1565,27 @@ BOOLEAN NTAPI FsRtlOplockIsFastIoPossible(IN POPLOCK Oplock) { - UNIMPLEMENTED; + PINTERNAL_OPLOCK IntOplock; + + PAGED_CODE(); + + DPRINT("FsRtlOplockIsFastIoPossible(%p)\n", Oplock); + + IntOplock = *Oplock; + + /* If there's a shared oplock or if it was used for write operation, deny FastIO */ + if (IntOplock != NULL && + BooleanFlagOn(IntOplock->Flags, (BROKEN_ANY | LEVEL_2_OPLOCK))) + { + return FALSE; + } + return TRUE; } /*++ * @name FsRtlUninitializeOplock - * @unimplemented + * @implemented * * FILLME * @@ -168,6 +1601,103 @@ VOID NTAPI FsRtlUninitializeOplock(IN POPLOCK Oplock) { - UNIMPLEMENTED; + PINTERNAL_OPLOCK IntOplock; + PLIST_ENTRY NextEntry; + PWAIT_CONTEXT WaitCtx; + PIRP Irp; + PIO_STACK_LOCATION Stack; + + DPRINT("FsRtlUninitializeOplock(%p)\n", Oplock); + + IntOplock = *Oplock; + + /* No oplock, nothing to do */ + if (IntOplock == NULL) + { + return; + } + + /* Caller won't have the oplock anymore */ + *Oplock = NULL; + + _SEH2_TRY + { + ExAcquireFastMutexUnsafe(IntOplock->IntLock); + + /* If we had IRPs waiting for the lock, complete them */ + for (NextEntry = IntOplock->WaitListHead.Flink; + NextEntry != &IntOplock->WaitListHead; + NextEntry = NextEntry->Flink) + { + WaitCtx = CONTAINING_RECORD(NextEntry, WAIT_CONTEXT, WaitListEntry); + Irp = WaitCtx->Irp; + + RemoveEntryList(&WaitCtx->WaitListEntry); + /* Remove the cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* And complete */ + Irp->IoStatus.Information = 0; + WaitCtx->CompletionRoutine(WaitCtx->CompletionContext, WaitCtx->Irp); + + ExFreePoolWithTag(WaitCtx, TAG_OPLOCK); + } + + /* If we had shared IRPs (LEVEL_2), complete them */ + for (NextEntry = IntOplock->SharedListHead.Flink; + NextEntry != &IntOplock->SharedListHead; + NextEntry = NextEntry->Flink) + { + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + /* Remvoe the cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Dereference the file object */ + Stack = IoGetCurrentIrpStackLocation(Irp); + ObDereferenceObject(Stack->FileObject); + + /* And complete */ + Irp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + /* If we have an exclusive IRP, complete it */ + Irp = IntOplock->ExclusiveIrp; + if (Irp != NULL) + { + /* Remvoe the cancel routine */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* And complete */ + Irp->IoStatus.Information = FILE_OPLOCK_BROKEN_TO_NONE; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IntOplock->ExclusiveIrp = NULL; + + /* If still referenced, dereference */ + if (IntOplock->FileObject != NULL) + { + ObDereferenceObject(IntOplock->FileObject); + } + } + } + _SEH2_FINALLY + { + ExReleaseFastMutexUnsafe(IntOplock->IntLock); + } + _SEH2_END; + + ExFreePoolWithTag(IntOplock->IntLock, TAG_OPLOCK); + ExFreePoolWithTag(IntOplock, TAG_OPLOCK); }

1 0

[reactos] 02/02: [CRT] Add __m128i, _mm_setzero_si128, and _mm_stream_si128.
by Thomas Faber 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89e83b2cf48c9bab7eec3… commit 89e83b2cf48c9bab7eec3670b69b72db675b0279 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 4 11:47:12 2017 +0100 [CRT] Add __m128i, _mm_setzero_si128, and _mm_stream_si128. --- sdk/include/crt/emmintrin.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/crt/emmintrin.h index 91cf4a6477..5f8ceb1933 100644 --- a/sdk/include/crt/emmintrin.h +++ b/sdk/include/crt/emmintrin.h @@ -11,6 +11,19 @@ #include <crtdefs.h> #include <xmmintrin.h> +typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128i +{ + __int8 m128i_i8[16]; + __int16 m128i_i16[8]; + __int32 m128i_i32[4]; + __int64 m128i_i64[2]; + unsigned __int8 m128i_u8[16]; + unsigned __int16 m128i_u16[8]; + unsigned __int32 m128i_u32[4]; + unsigned __int64 m128i_u64[2]; +} __m128i; +C_ASSERT(sizeof(__m128i) == 16); + typedef struct _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128d { double m128d_f64[2]; @@ -20,5 +33,9 @@ extern __m128d _mm_load_sd(double const*); extern int _mm_cvtsd_si32(__m128d); +extern __m128i _mm_setzero_si128(void); + +extern void _mm_stream_si128(__m128i *, __m128i); + #endif /* _INCLUDED_EMM */

1 0

[reactos] 01/02: [RTL] Make RtlFillMemoryUlonglong public
by Thomas Faber 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=631d1e071c4def6cb318e… commit 631d1e071c4def6cb318ee7e917e568283f5bb9d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Nov 4 11:46:29 2017 +0100 [RTL] Make RtlFillMemoryUlonglong public --- sdk/lib/rtl/i386/rtlmem.s | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/rtl/i386/rtlmem.s b/sdk/lib/rtl/i386/rtlmem.s index eb93f89d23..2843480f89 100644 --- a/sdk/lib/rtl/i386/rtlmem.s +++ b/sdk/lib/rtl/i386/rtlmem.s @@ -14,6 +14,7 @@ PUBLIC _RtlCompareMemory@12 PUBLIC _RtlCompareMemoryUlong@12 PUBLIC _RtlFillMemory@12 PUBLIC _RtlFillMemoryUlong@12 +PUBLIC _RtlFillMemoryUlonglong@16 PUBLIC _RtlMoveMemory@12 PUBLIC _RtlZeroMemory@8

1 0

[reactos] 01/01: [NTOSKRNL] Don't make CcSetReadAheadGranularity() whine for every single file opened by FSDs making use of it.
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b217e4ecf942126c4672… commit 2b217e4ecf942126c4672f8d1c0a2fb55530d731 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 18:00:48 2017 +0100 [NTOSKRNL] Don't make CcSetReadAheadGranularity() whine for every single file opened by FSDs making use of it. --- ntoskrnl/cc/cacheman.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 2369cad546..4d62314ccd 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -158,8 +158,10 @@ CcSetReadAheadGranularity ( IN ULONG Granularity ) { + static ULONG Warn; + CCTRACE(CC_API_DEBUG, "FileObject=%p Granularity=%lu\n", FileObject, Granularity); - UNIMPLEMENTED; + if (!Warn++) UNIMPLEMENTED; }

1 0

[reactos] 02/02: [NTOSKRNL] In CcPurgeCacheSection(), don't assume the file being purged isn't used. Handle that case properly instead of asserting. This fixes a triggerable ASSERT from umode where you open a file on a CDFS (with MS CDFS) and attempt to lock the volume.
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64cb138a673fa02d76922… commit 64cb138a673fa02d76922963c680bfeb05f1d715 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 17:53:07 2017 +0100 [NTOSKRNL] In CcPurgeCacheSection(), don't assume the file being purged isn't used. Handle that case properly instead of asserting. This fixes a triggerable ASSERT from umode where you open a file on a CDFS (with MS CDFS) and attempt to lock the volume. --- ntoskrnl/cc/fs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 6f6b5568fe..fb5f99aab2 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -143,6 +143,7 @@ CcPurgeCacheSection ( PLIST_ENTRY ListEntry; PROS_VACB Vacb; LONGLONG ViewEnd; + BOOLEAN Success; CCTRACE(CC_API_DEBUG, "SectionObjectPointer=%p\n FileOffset=%p Length=%lu UninitializeCacheMaps=%d", SectionObjectPointer, FileOffset, Length, UninitializeCacheMaps); @@ -169,6 +170,9 @@ CcPurgeCacheSection ( InitializeListHead(&FreeList); + /* Assume success */ + Success = TRUE; + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); ListEntry = SharedCacheMap->CacheMapVacbListHead.Flink; @@ -189,8 +193,12 @@ CcPurgeCacheSection ( break; } - ASSERT((Vacb->ReferenceCount == 0) || - (Vacb->ReferenceCount == 1 && Vacb->Dirty)); + /* Still in use, it cannot be purged, fail */ + if (Vacb->ReferenceCount != 0 && !Vacb->Dirty) + { + Success = FALSE; + break; + } /* This VACB is in range, so unlink it and mark for free */ RemoveEntryList(&Vacb->VacbLruListEntry); @@ -213,7 +221,7 @@ CcPurgeCacheSection ( CcRosInternalFreeVacb(Vacb); } - return TRUE; + return Success; }

1 0

[reactos] 01/02: [NTOSKRNL] When CcPurgeCacheSection() succeed, make it return TRUE so that callers don't believe it always fail
by Pierre Schweitzer 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4768a371f4f8cb4387a90… commit 4768a371f4f8cb4387a902037e42d387086f334a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 18 17:51:08 2017 +0100 [NTOSKRNL] When CcPurgeCacheSection() succeed, make it return TRUE so that callers don't believe it always fail --- ntoskrnl/cc/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 4ecd55352a..6f6b5568fe 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -213,7 +213,7 @@ CcPurgeCacheSection ( CcRosInternalFreeVacb(Vacb); } - return FALSE; + return TRUE; }

1 0

[reactos] 01/01: [FONTS] Add more font substitutes. CORE-12419
by Katayama Hirofumi MZ 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d2e34d1d4f0b04df3e6e… commit 5d2e34d1d4f0b04df3e6e87ca143c5a20d0b0cd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 00:11:16 2017 +0900 [FONTS] Add more font substitutes. CORE-12419 Substitute Comic Sans MS with Ubuntu, Georgia with FreeSerif and Palatino Linotype with DejaVu Serif. --- base/setup/usetup/muifonts.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/base/setup/usetup/muifonts.h b/base/setup/usetup/muifonts.h index e60088075d..4b0e0c26e8 100644 --- a/base/setup/usetup/muifonts.h +++ b/base/setup/usetup/muifonts.h @@ -19,6 +19,9 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -40,6 +43,9 @@ MUI_SUBFONT CyrillicFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -61,6 +67,9 @@ MUI_SUBFONT GreekFonts[] = { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -82,6 +91,9 @@ MUI_SUBFONT HebrewFonts[] = { L"Times New Roman", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -112,6 +124,9 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"NSimSun", L"Droid Sans Fallback" }, { L"MS Song", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, { CSF_LocalName1, L"Droid Sans Fallback" }, @@ -147,6 +162,9 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, { CTF_LocalName1, L"Droid Sans Fallback" }, @@ -181,6 +199,9 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, { JF_LocalName1, L"Droid Sans Fallback" }, @@ -219,6 +240,9 @@ MUI_SUBFONT KoreanFonts[] = { L"Gulim", L"Droid Sans Fallback" }, { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, { KF_LocalName1, L"Droid Sans Fallback" }, @@ -247,5 +271,8 @@ MUI_SUBFONT UnicodeFonts[] = { L"Times New Roman", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } };

1 0

[reactos] 01/01: [SHELL32] CDrivesFolder: Implement the eject and disconnect menu items. CORE-13841
by Katayama Hirofumi MZ 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64657051c3cb60f1997ff… commit 64657051c3cb60f1997ffa6c6dfda57adffc7547 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 23:55:08 2017 +0900 [SHELL32] CDrivesFolder: Implement the eject and disconnect menu items. CORE-13841 - The items are shown only for the drives where they are applicable. - May not work fully yet due to bugs in the drivers. --- dll/win32/shell32/folders/CDrivesFolder.cpp | 185 ++++++++++++++++++++++++++-- dll/win32/shell32/lang/bg-BG.rc | 8 ++ dll/win32/shell32/lang/ca-ES.rc | 8 ++ dll/win32/shell32/lang/cs-CZ.rc | 8 ++ dll/win32/shell32/lang/da-DK.rc | 8 ++ dll/win32/shell32/lang/de-DE.rc | 8 ++ dll/win32/shell32/lang/el-GR.rc | 8 ++ dll/win32/shell32/lang/en-GB.rc | 8 ++ dll/win32/shell32/lang/en-US.rc | 8 ++ dll/win32/shell32/lang/es-ES.rc | 8 ++ dll/win32/shell32/lang/fi-FI.rc | 8 ++ dll/win32/shell32/lang/fr-FR.rc | 8 ++ dll/win32/shell32/lang/he-IL.rc | 8 ++ dll/win32/shell32/lang/hu-HU.rc | 8 ++ dll/win32/shell32/lang/it-IT.rc | 8 ++ dll/win32/shell32/lang/ja-JP.rc | 8 ++ dll/win32/shell32/lang/ko-KR.rc | 8 ++ dll/win32/shell32/lang/nl-NL.rc | 8 ++ dll/win32/shell32/lang/no-NO.rc | 8 ++ dll/win32/shell32/lang/pl-PL.rc | 8 ++ dll/win32/shell32/lang/pt-BR.rc | 8 ++ dll/win32/shell32/lang/pt-PT.rc | 8 ++ dll/win32/shell32/lang/ro-RO.rc | 8 ++ dll/win32/shell32/lang/ru-RU.rc | 8 ++ dll/win32/shell32/lang/sk-SK.rc | 8 ++ dll/win32/shell32/lang/sl-SI.rc | 8 ++ dll/win32/shell32/lang/sq-AL.rc | 8 ++ dll/win32/shell32/lang/sv-SE.rc | 8 ++ dll/win32/shell32/lang/tr-TR.rc | 8 ++ dll/win32/shell32/lang/uk-UA.rc | 8 ++ dll/win32/shell32/lang/zh-CN.rc | 8 ++ dll/win32/shell32/lang/zh-TW.rc | 8 ++ dll/win32/shell32/shresdef.h | 8 ++ 33 files changed, 429 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 7a088248c9..a708dc4d49 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -4,6 +4,7 @@ * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied * Copyright 2009 Andrew Hill + * Copyright 2017 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,6 +58,89 @@ static int iDriveTypeIds[7] = { IDS_DRIVE_FIXED, /* DRIVE_UNKNOWN */ * IShellFolder implementation */ +#define RETRY_COUNT 3 +#define RETRY_SLEEP 250 +static BOOL TryToLockOrUnlockDrive(HANDLE hDrive, BOOL bLock) +{ + DWORD dwError, dwBytesReturned; + DWORD dwCode = (bLock ? FSCTL_LOCK_VOLUME : FSCTL_UNLOCK_VOLUME); + for (DWORD i = 0; i < RETRY_COUNT; ++i) + { + if (DeviceIoControl(hDrive, dwCode, NULL, 0, NULL, 0, &dwBytesReturned, NULL)) + return TRUE; + + dwError = GetLastError(); + if (dwError == ERROR_INVALID_FUNCTION) + break; /* don't sleep if function is not implemented */ + + Sleep(RETRY_SLEEP); + } + SetLastError(dwError); + return FALSE; +} + +// NOTE: See also https://support.microsoft.com/en-us/help/165721/how-to-ejecting-removable-m… +static BOOL DoEjectDrive(const WCHAR *physical, UINT nDriveType, INT *pnStringID) +{ + /* GENERIC_WRITE isn't needed for umount */ + DWORD dwAccessMode = GENERIC_READ; + DWORD dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + + HANDLE hDrive = CreateFile(physical, dwAccessMode, dwShareMode, 0, OPEN_EXISTING, 0, NULL); + if (hDrive == INVALID_HANDLE_VALUE) + return FALSE; + + BOOL bResult, bNeedUnlock = FALSE; + DWORD dwBytesReturned, dwError = NO_ERROR; + PREVENT_MEDIA_REMOVAL removal; + do + { + bResult = TryToLockOrUnlockDrive(hDrive, TRUE); + if (!bResult) + { + dwError = GetLastError(); + *pnStringID = IDS_CANTLOCKVOLUME; /* Unable to lock volume */ + break; + } + bResult = DeviceIoControl(hDrive, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &dwBytesReturned, NULL); + if (!bResult) + { + dwError = GetLastError(); + *pnStringID = IDS_CANTDISMOUNTVOLUME; /* Unable to dismount volume */ + bNeedUnlock = TRUE; + break; + } + removal.PreventMediaRemoval = FALSE; + bResult = DeviceIoControl(hDrive, IOCTL_STORAGE_MEDIA_REMOVAL, &removal, sizeof(removal), NULL, + 0, &dwBytesReturned, NULL); + if (!bResult) + { + *pnStringID = IDS_CANTEJECTMEDIA; /* Unable to eject media */ + dwError = GetLastError(); + bNeedUnlock = TRUE; + break; + } + bResult = DeviceIoControl(hDrive, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &dwBytesReturned, NULL); + if (!bResult) + { + *pnStringID = IDS_CANTEJECTMEDIA; /* Unable to eject media */ + dwError = GetLastError(); + bNeedUnlock = TRUE; + break; + } + } while (0); + + if (bNeedUnlock) + { + TryToLockOrUnlockDrive(hDrive, FALSE); + } + + CloseHandle(hDrive); + + SetLastError(dwError); + return bResult; +} + HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, HWND hwnd, IDataObject *pdtobj, @@ -70,6 +154,8 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, PIDLIST_ABSOLUTE pidlFolder; PUITEMID_CHILD *apidl; UINT cidl; + UINT nDriveType; + DWORD dwFlags; HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -82,35 +168,110 @@ HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, _ILFreeaPidl(apidl, cidl); return E_FAIL; } + nDriveType = GetDriveTypeA(szDrive); + GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0); + +// custom command IDs +#define CMDID_FORMAT 1 +#define CMDID_EJECT 2 +#define CMDID_DISCONNECT 3 if (uMsg == DFM_MERGECONTEXTMENU) { QCMINFO *pqcminfo = (QCMINFO *)lParam; - DWORD dwFlags; - if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) + UINT idCmdFirst = pqcminfo->idCmdFirst; + if (!(dwFlags & FILE_READ_ONLY_VOLUME) && nDriveType != DRIVE_REMOTE) { - /* Disable format if read only */ - if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) - { - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, pqcminfo->idCmdFirst++, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); - } + /* add separator and Format */ + UINT idCmd = idCmdFirst + CMDID_FORMAT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + } + if (nDriveType == DRIVE_REMOVABLE || nDriveType == DRIVE_CDROM) + { + /* add separator and Eject */ + UINT idCmd = idCmdFirst + CMDID_EJECT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_EJECT), MFS_ENABLED); + } + if (nDriveType == DRIVE_REMOTE) + { + /* add separator and Disconnect */ + UINT idCmd = idCmdFirst + CMDID_DISCONNECT; + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, idCmd, MFT_STRING, MAKEINTRESOURCEW(IDS_DISCONNECT), MFS_ENABLED); } + + pqcminfo->idCmdFirst += 3; } else if (uMsg == DFM_INVOKECOMMAND) { + WCHAR wszBuf[4] = L"A:\\"; + wszBuf[0] = (WCHAR)szDrive[0]; + + INT nStringID = 0; + DWORD dwError = NO_ERROR; + if (wParam == DFM_CMD_PROPERTIES) { - WCHAR wszBuf[4]; - wcscpy(wszBuf, L"A:\\"); - wszBuf[0] = (WCHAR)szDrive[0]; if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) + { hr = E_FAIL; + dwError = ERROR_CAN_NOT_COMPLETE; + nStringID = IDS_CANTSHOWPROPERTIES; + } } else { - SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + if (wParam == CMDID_FORMAT) + { + /* do format */ + DWORD dwRet = SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + switch (dwRet) + { + case SHFMT_ERROR: case SHFMT_CANCEL: case SHFMT_NOFORMAT: + hr = E_FAIL; + break; + } + } + else if (wParam == CMDID_EJECT) + { + /* do eject */ + WCHAR physical[10]; + wsprintfW(physical, _T("\\\\.\\%c:"), szDrive[0]); + + if (DoEjectDrive(physical, nDriveType, &nStringID)) + { + SHChangeNotify(SHCNE_MEDIAREMOVED, SHCNF_PATHW | SHCNF_FLUSHNOWAIT, wszBuf, NULL); + } + else + { + dwError = GetLastError(); + } + } + else if (wParam == CMDID_DISCONNECT) + { + /* do disconnect */ + dwError = WNetCancelConnection2W(wszBuf, 0, FALSE); + if (dwError == NO_ERROR) + { + SHChangeNotify(SHCNE_DRIVEREMOVED, SHCNF_PATHW | SHCNF_FLUSHNOWAIT, wszBuf, NULL); + } + else + { + nStringID = IDS_CANTDISCONNECT; + } + } + } + + if (nStringID != 0) + { + /* show error message */ + WCHAR szFormat[128], szMessage[128]; + LoadStringW(shell32_hInstance, nStringID, szFormat, _countof(szFormat)); + wsprintfW(szMessage, szFormat, dwError); + MessageBoxW(hwnd, szMessage, NULL, MB_ICONERROR); } } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 642206abbb..cf7d217fd6 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Оразмеряване..." IDS_RENAME "Преименуване" IDS_PASTE "Вмъкване" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файлове със значета (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Изпълними файлове (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетен файл на РеактОС" IDS_CMD_FILE "Писание за управление на РеактОС" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 02bf0bcae6..a6c579e191 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 4e37b93e44..0b7eb71c90 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -689,6 +689,8 @@ BEGIN IDS_FORMATDRIVE "Formátovat..." IDS_RENAME "Přejmenovat" IDS_PASTE "Vložit" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" @@ -782,6 +784,12 @@ BEGIN IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Spustitelné soubory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Složka" IDS_BAT_FILE "ReactOS dávkový soubor" IDS_CMD_FILE "ReactOS příkazový skript" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 34566694be..c72a856a9d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -689,6 +689,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -782,6 +784,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 574e48e01a..bd80efef09 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -684,6 +684,8 @@ BEGIN IDS_FORMATDRIVE "Formatieren..." IDS_RENAME "Umbenennen" IDS_PASTE "Einfügen" + IDS_EJECT "Auswerfen" + IDS_DISCONNECT "Trennen" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." @@ -777,6 +779,12 @@ BEGIN IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alle Dateien (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Sperren des Volumes nicht möglich (Fehlercode: %lu)." + IDS_CANTDISMOUNTVOLUME "Ausbinden des Volumes nicht möglich (Fehlercode: %lu)." + IDS_CANTEJECTMEDIA "Auswerfen des Mediums nicht möglich (Fehlercode: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Fehlercode: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dateiordner" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" IDS_CMD_FILE "ReactOS-Befehlsskript" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index f49f1c2333..2980b1d270 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 9ea6c41dc0..44fcc213ff 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 4bbc8ac521..adc28545c3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -684,6 +684,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -777,6 +779,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 9ef9bc00ff..7d69400e43 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Formatear..." IDS_RENAME "Renombrar" IDS_PASTE "Insertar" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Archivos de icono (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Todos los archivos (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Directorio" IDS_BAT_FILE "Archivo por lotes de ReactOS" IDS_CMD_FILE "Script de comandos ReactOS" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 3e97c26eaa..bf35e972eb 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 16126e1686..16aaf76420 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formater..." IDS_RENAME "Renommer" IDS_PASTE "Insérer" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Fichiers exécutables (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dossier" IDS_BAT_FILE "Fichier Batch ReactOS" IDS_CMD_FILE "Script de commandes ReactOS" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 73cef872b0..39d3d6c48e 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "אתחול..." IDS_RENAME "שנה שם" IDS_PASTE "הכנס" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 423519e25e..8ef8d4ec9d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index e7feca35ea..bc88f8b998 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatta..." IDS_RENAME "Rinomina" IDS_PASTE "Inserisci" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tutti i file (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0Tutti i file (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Cartella" IDS_BAT_FILE "File Batch ReactOS" IDS_CMD_FILE "Script di comandi ReactOS" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index e0b9518f33..b375c2a3df 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -680,6 +680,8 @@ BEGIN IDS_FORMATDRIVE "フォーマット..." IDS_RENAME "名前の変更" IDS_PASTE "挿入" + IDS_EJECT "取り出し" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" @@ -773,6 +775,12 @@ BEGIN IDS_PICK_ICON_FILTER "アイコンファイル (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "実行可能ファイル (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "フォルダ" IDS_BAT_FILE "ReactOS バッチファイル" IDS_CMD_FILE "ReactOS コマンドスクリプト" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf9d287530..204655eddd 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 78a25cbb69..3777c458c3 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index fedc83209f..656dd8683e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatering..." IDS_RENAME "Endre navn" IDS_PASTE "Sett inn" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikon Fil (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Kjørbare filer (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Mappe" IDS_BAT_FILE "ReactOS Batch fil" IDS_CMD_FILE "ReactOS Kommando skript" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 7327fbae2e..192b706f7f 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -687,6 +687,8 @@ BEGIN IDS_FORMATDRIVE "Formatuj..." IDS_RENAME "Zmień nazwę" IDS_PASTE "Włóż" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Nie mogę utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie mogę utworzyć folderu" @@ -780,6 +782,12 @@ BEGIN IDS_PICK_ICON_FILTER "Pliki ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Wszystkie pliki (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Katalog" IDS_BAT_FILE "Plik wsadowy ReactOS" IDS_CMD_FILE "Skrypt konsoli ReactOS" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 363c7859c9..c7a47b1877 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatar..." IDS_RENAME "Renomear" IDS_PASTE "Inserir" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Arquivos de Ícone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Arquivos Executáveis (*.exe)\0*.exe\0Todos os arquivos (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index e3524050fb..8fc7335f23 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatar..." IDS_RENAME "Renaomear" IDS_PASTE "Inserir" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Impossivel de Criar Pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel de Criar Pasta" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ficheiros de Ícones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Ficheiros Executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index aa794089a9..05813a94dc 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "F&ormatare…" IDS_RENAME "Rede&numește" IDS_PASTE "&Lipește" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Fișiere pictogramă (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Orice fișier (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Fișiere executabile (*.exe)\0*.exe\0Orice fișier (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dosar" IDS_BAT_FILE "Fișier de comenzi ReactOS" IDS_CMD_FILE "Script de comenzi ReactOS" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 803ba702fd..5c424adadf 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Форматировать..." IDS_RENAME "Переименовать" IDS_PASTE "Вставить" + IDS_EJECT "Извлечь" + IDS_DISCONNECT "Отсоединить" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файлы значков (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Все файлы (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Исполняемые файлы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Не удалось заблокировать том (код ошибки: %lu)." + IDS_CANTDISMOUNTVOLUME "Не удалось размонтировать том (код ошибки: %lu)." + IDS_CANTEJECTMEDIA "Не удалось извлечь носитель (код ошибки: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка с файлами" IDS_BAT_FILE "Пакетный файл ReactOS" IDS_CMD_FILE "Командный скрипт ReactOS" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 70894c80b0..bcc759b9ed 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formátovať..." IDS_RENAME "Premenovať" IDS_PASTE "Vložiť" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Všetky súbory (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Spustiteľné súbory (*.exe)\0*.exe\0Všetky súbory (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Priečinok" IDS_BAT_FILE "Dávkový súbor systému ReactOS" IDS_CMD_FILE "Príkazový skript systému ReactOS" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index f0a5b186a0..ea4b4218c1 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_PASTE "Paste" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index c12d2611d8..eced885141 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -687,6 +687,8 @@ BEGIN IDS_FORMATDRIVE "Format..." IDS_RENAME "Riemërto" IDS_PASTE "Fut" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -780,6 +782,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikonë Programi (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0T'gjith Dokumentat (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Dokumente Ekzekutues (*.exe)\0*.exe\0T'gjith Dokumentat (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dosje" IDS_BAT_FILE "ReactOS Dokument Batch" IDS_CMD_FILE "ReactOS Skript Komande" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e9c4590073..f2f4641a87 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Formatera..." IDS_RENAME "Byt namn" IDS_PASTE "Klistra in" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Ikoner (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alla filer (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Körbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Mapp" IDS_BAT_FILE "ReactOS Batch-fil" IDS_CMD_FILE "ReactOS Kommandoradsskript" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 8d23faf0cd..a7aeae86c5 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -685,6 +685,8 @@ BEGIN IDS_FORMATDRIVE "Biçimlendir..." IDS_RENAME "Yeniden Adlandır" IDS_PASTE "Yapıştır" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" @@ -778,6 +780,12 @@ BEGIN IDS_PICK_ICON_FILTER "Simge Kütükleri (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Tüm Kütükler (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Çalıştırılabilir Kütükler (*.exe)\0*.exe\0Tüm Kütükler (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Dizin" IDS_BAT_FILE "ReactOS Toplu İş Kütüğü" IDS_CMD_FILE "ReactOS Komut Betiği" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 434f55458c..114a03432e 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -683,6 +683,8 @@ BEGIN IDS_FORMATDRIVE "Форматувати..." IDS_RENAME "Перейменувати" IDS_PASTE "Вставити" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -776,6 +778,12 @@ BEGIN IDS_PICK_ICON_FILTER "Файли значків (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Всі Файли (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Виконувані файли (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетний файл ReactOS" IDS_CMD_FILE "Командний скрипт ReactOS" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 4d579987f6..7c40bed54b 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -690,6 +690,8 @@ BEGIN IDS_FORMATDRIVE "格式..." IDS_RENAME "重命名" IDS_PASTE "贴上" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -783,6 +785,12 @@ BEGIN IDS_PICK_ICON_FILTER "图标文件 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "可执行文件 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "文件夹" IDS_BAT_FILE "ReactOS 批处理文件" IDS_CMD_FILE "ReactOS 命令脚本" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index eecd735d4b..6fb5a237ac 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -691,6 +691,8 @@ BEGIN IDS_FORMATDRIVE "格式化..." IDS_RENAME "重新命名" IDS_PASTE "插入" + IDS_EJECT "Eject" + IDS_DISCONNECT "Disconnect" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -784,6 +786,12 @@ BEGIN IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." + IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." + IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 417759e82e..5b607a6943 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -134,6 +134,11 @@ #define IDS_RECYCLEBIN_LOCATION 153 #define IDS_RECYCLEBIN_DISKSPACE 154 #define IDS_OPEN_WITH_FILTER 155 +#define IDS_CANTLOCKVOLUME 156 +#define IDS_CANTDISMOUNTVOLUME 157 +#define IDS_CANTEJECTMEDIA 158 +#define IDS_CANTSHOWPROPERTIES 159 +#define IDS_CANTDISCONNECT 160 /* Friendly File Type Names */ #define IDS_DIRECTORY 200 @@ -206,6 +211,9 @@ #define IDS_FILEOOP_FROM 337 #define IDS_FILEOOP_PREFLIGHT 338 +#define IDS_EJECT 339 +#define IDS_DISCONNECT 340 + #define IDS_MENU_EMPTY 34561 /* Note: those strings are referenced from the registry */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs