Ros-diffs

ros-diffs@reactos.org

81390 discussions

16/18: [FLTMGR] Remove duplicated export
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97066b792cb6ffe2d1dc4… commit 97066b792cb6ffe2d1dc4524ccb1f36d46fd87c3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 29 17:28:01 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Remove duplicated export --- drivers/filters/fltmgr/fltmgr.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 3b68543bf4..9249ac8311 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -3,7 +3,6 @@ @ stdcall FltUnregisterFilter(ptr) @ stdcall FltCloseCommunicationPort(ptr) @ stdcall FltStartFiltering(ptr) - @ stdcall FltCreateCommunicationPort(ptr ptr ptr ptr ptr ptr ptr long) @ stdcall FltBuildDefaultSecurityDescriptor(ptr long) @ stdcall FltFreeSecurityDescriptor(ptr) @ stdcall FltGetDiskDeviceObject(ptr ptr)

1 0

15/18: [FLTMGR] Callers must have registered an unload routine to be allowed to unload
by Ged Murphy 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c73c1825e23b97c77dbb8… commit c73c1825e23b97c77dbb8f2163dcc8b6d5558e05 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Mon Oct 29 11:28:10 2018 +0000 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Callers must have registered an unload routine to be allowed to unload --- drivers/filters/fltmgr/Filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/fltmgr/Filter.c b/drivers/filters/fltmgr/Filter.c index 92a824c0d3..1c50f14738 100644 --- a/drivers/filters/fltmgr/Filter.c +++ b/drivers/filters/fltmgr/Filter.c @@ -250,7 +250,7 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, Filter->OldDriverUnload = (PFLT_FILTER_UNLOAD_CALLBACK)DriverObject->DriverUnload; /* Check we opted not to have an unload routine, or if we want to stop the driver from being unloaded */ - if (!FlagOn(Filter->Flags, FLTFL_REGISTRATION_DO_NOT_SUPPORT_SERVICE_STOP)) + if (Registration->FilterUnloadCallback && !FlagOn(Filter->Flags, FLTFL_REGISTRATION_DO_NOT_SUPPORT_SERVICE_STOP)) { DriverObject->DriverUnload = (PDRIVER_UNLOAD)FltpMiniFilterDriverUnload; }

1 0

14/18: [FLTMGR] Delete unused file
by Ged Murphy 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d603e689ee269efecc82… commit 4d603e689ee269efecc82e4675290dc6aac247a8 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Mon Oct 29 11:17:21 2018 +0000 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Delete unused file --- drivers/filters/fltmgr/Registration.c | 252 ---------------------------------- 1 file changed, 252 deletions(-) diff --git a/drivers/filters/fltmgr/Registration.c b/drivers/filters/fltmgr/Registration.c deleted file mode 100644 index 851140dc7a..0000000000 --- a/drivers/filters/fltmgr/Registration.c +++ /dev/null @@ -1,252 +0,0 @@ -/* -* PROJECT: Filesystem Filter Manager -* LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/fs_minifilter/fltmgr/Registration.c -* PURPOSE: Handles registration of mini filters -* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) -*/ - -/* INCLUDES ******************************************************************/ - -#include "fltmgr.h" - -#define NDEBUG -#include <debug.h> - - -/* DATA *********************************************************************/ - - -NTSTATUS -FltpStartingToDrainObject( - _Inout_ PFLT_OBJECT Object -); - - -/* EXPORTED FUNCTIONS ******************************************************/ - -NTSTATUS -NTAPI -FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, - _In_ const FLT_REGISTRATION *Registration, - _Out_ PFLT_FILTER *RetFilter) -{ - PFLT_OPERATION_REGISTRATION Callbacks; - PFLT_FILTER Filter; - ULONG CallbackBufferSize; - ULONG FilterBufferSize; - ULONG Count = 0; - PCHAR Ptr; - NTSTATUS Status; - - Status = 0; //remove me - - /* Make sure we're targeting the correct major revision */ - if ((Registration->Version & 0xFF00) != FLT_MAJOR_VERSION) - { - return STATUS_INVALID_PARAMETER; - } - - /* Make sure our namespace callbacks are valid */ - if ((!Registration->GenerateFileNameCallback && Registration->NormalizeNameComponentCallback) || - (!Registration->NormalizeNameComponentCallback && Registration->NormalizeContextCleanupCallback)) - { - return STATUS_INVALID_PARAMETER; - } - - /* Count the number of operations that were requested */ - Callbacks = (PFLT_OPERATION_REGISTRATION)Registration->OperationRegistration; - while (Callbacks) - { - Count++; - - /* Bail when we find the last one */ - if (Callbacks->MajorFunction == IRP_MJ_OPERATION_END) - break; - - /* Move to the next item */ - Callbacks++; - } - - /* Calculate the buffer sizes */ - CallbackBufferSize = Count * sizeof(FLT_OPERATION_REGISTRATION); - FilterBufferSize = sizeof(FLT_FILTER) + CallbackBufferSize + - DriverObject->DriverExtension->ServiceKeyName.Length; - - /* Allocate a buffer to hold our filter data */ - Filter = ExAllocatePoolWithTag(NonPagedPool, - FilterBufferSize, - FM_TAG_FILTER); - if (Filter == NULL) return STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(Filter, FilterBufferSize); - - /* Find the end of the fixed struct */ - Ptr = (PCHAR)(Filter + 1); - - /* Store a copy of the driver object of this filter */ - Filter->DriverObject = DriverObject; - - /* Initialize the base object data */ - Filter->Base.Flags = FLT_OBFL_TYPE_FILTER; - Filter->Base.PointerCount = 1; - FltpExInitializeRundownProtection(&Filter->Base.RundownRef); - FltObjectReference(&Filter->Base); - - /* Set the callback addresses */ - Filter->FilterUnload = Registration->FilterUnloadCallback; - Filter->InstanceSetup = Registration->InstanceSetupCallback; - Filter->InstanceQueryTeardown = Registration->InstanceQueryTeardownCallback; - Filter->InstanceTeardownStart = Registration->InstanceTeardownStartCallback; - Filter->InstanceTeardownComplete = Registration->InstanceTeardownCompleteCallback; - Filter->GenerateFileName = Registration->GenerateFileNameCallback; - Filter->NormalizeNameComponent = Registration->NormalizeNameComponentCallback; - Filter->NormalizeContextCleanup = Registration->NormalizeContextCleanupCallback; - - /* Initialize the instance list */ - ExInitializeResourceLite(&Filter->InstanceList.rLock); - InitializeListHead(&Filter->InstanceList.rList); - Filter->InstanceList.rCount = 0; - - ExInitializeFastMutex(&Filter->ActiveOpens.mLock); - InitializeListHead(&Filter->ActiveOpens.mList); - Filter->ActiveOpens.mCount = 0; - - /* Initialize the usermode port list */ - ExInitializeFastMutex(&Filter->PortList.mLock); - InitializeListHead(&Filter->PortList.mList); - Filter->PortList.mCount = 0; - - /* Check if the caller requested any context data */ - if (Registration->ContextRegistration) - { - // register the context information - } - - if (Registration->OperationRegistration) - { - /* The callback data comes after the fixed struct */ - Filter->Operations = (PFLT_OPERATION_REGISTRATION)Ptr; - Ptr += (Count * sizeof(FLT_OPERATION_REGISTRATION)); - - /* Tag the operation data onto the end of the filter data */ - RtlCopyMemory(Filter->Operations, Registration->OperationRegistration, CallbackBufferSize); - - /* walk through the requested callbacks */ - for (Callbacks = Filter->Operations; - Callbacks->MajorFunction != IRP_MJ_OPERATION_END; - Callbacks++) - { - // http://fsfilters.blogspot.co.uk/2011/03/how-file-system-filters-attach-to_1… - /* Check if this is an attach to a volume */ - if (Callbacks->MajorFunction == IRP_MJ_VOLUME_MOUNT) - { - Filter->PreVolumeMount = Callbacks->PreOperation; - Filter->PostVolumeMount = Callbacks->PostOperation; - } - else if (Callbacks->MajorFunction == IRP_MJ_SHUTDOWN) - { - Callbacks->PostOperation = NULL; - } - } - } - - /* Add the filter name buffer onto the end of the data and fill in the string */ - Filter->Name.Length = 0; - Filter->Name.MaximumLength = DriverObject->DriverExtension->ServiceKeyName.Length; - Filter->Name.Buffer = (PWCH)Ptr; - RtlCopyUnicodeString(&Filter->Name, &DriverObject->DriverExtension->ServiceKeyName); - - // - // - Get the altitude string - // - Slot the filter into the correct altitude location - // - More stuff?? - // - -//Quit: - if (!NT_SUCCESS(Status)) - { - // Add cleanup for context resources - - ExDeleteResourceLite(&Filter->InstanceList.rLock); - ExFreePoolWithTag(Filter, FM_TAG_FILTER); - } - - return Status; -} - -VOID -FLTAPI -FltUnregisterFilter(_In_ PFLT_FILTER Filter) -{ - PFLT_INSTANCE Instance; - PLIST_ENTRY CurrentEntry; - NTSTATUS Status; - - /* Set the draining flag */ - Status = FltpStartingToDrainObject(&Filter->Base); - if (!NT_SUCCESS(Status)) - { - /* Someone already unregistered us, just remove our ref and bail */ - FltObjectDereference(&Filter->Base); - return; - } - - /* Lock the instance list */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&Filter->InstanceList.rLock, TRUE); - - /* Set the first entry in the list */ - CurrentEntry = Filter->InstanceList.rList.Flink; - - /* Free all instances referenced by the filter */ - while (CurrentEntry != &Filter->InstanceList.rList) - { - /* Get the record pointer */ - Instance = CONTAINING_RECORD(CurrentEntry, FLT_INSTANCE, FilterLink); - - // FIXME: implement - (void)Instance; - - /* Reset the pointer and move to next entry */ - Instance = NULL; - CurrentEntry = CurrentEntry->Flink; - } - - /* We're done with instances now */ - ExReleaseResourceLite(&Filter->InstanceList.rLock); - KeLeaveCriticalRegion(); - - /* Remove the reference from the base object */ - FltObjectDereference(&Filter->Base); - - /* Wait until we're sure nothing is using the filter */ - FltpObjectRundownWait(&Filter->Base.RundownRef); - - /* Delete the instance list lock */ - ExDeleteResourceLite(&Filter->InstanceList.rLock); - - /* We're finished cleaning up now */ - FltpExRundownCompleted(&Filter->Base.RundownRef); - - /* Hand the memory back */ - ExFreePoolWithTag(Filter, FM_TAG_FILTER); -} - - -/* INTERNAL FUNCTIONS ******************************************************/ - -NTSTATUS -FltpStartingToDrainObject(_Inout_ PFLT_OBJECT Object) -{ - /* - * Set the draining flag for the filter. This let's us force - * a post op callback for minifilters currently awaiting one. - */ - if (InterlockedOr((PLONG)&Object->Flags, FLT_OBFL_DRAINING) & 1) - { - /* We've been called once, we're already being deleted */ - return STATUS_FLT_DELETING_OBJECT; - } - - return STATUS_SUCCESS; -}

1 0

13/18: [FLTMGR] Stub FltReleaseFileNameInformation()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f21a2a6cfb827abadb6a1… commit f21a2a6cfb827abadb6a106b3e52edd64acd0038 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:24:36 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Stub FltReleaseFileNameInformation() --- drivers/filters/fltmgr/Misc.c | 8 ++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c index c45d3156a7..e5ffe127be 100644 --- a/drivers/filters/fltmgr/Misc.c +++ b/drivers/filters/fltmgr/Misc.c @@ -103,3 +103,11 @@ FltGetDestinationFileNameInformation( *RetFileNameInformation = NULL; return 0; } + +VOID +FLTAPI +FltReleaseFileNameInformation( + _In_ PFLT_FILE_NAME_INFORMATION FileNameInformation) +{ + UNREFERENCED_PARAMETER(FileNameInformation); +} diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index a847710ba1..3b68543bf4 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -23,4 +23,5 @@ @ stdcall FltCloseCommunicationPort(ptr) @ stdcall FltAttachVolume(ptr ptr ptr ptr) @ stdcall FltGetDestinationFileNameInformation(ptr ptr ptr ptr long long ptr) + @ stdcall FltReleaseFileNameInformation(ptr)

1 0

12/18: [FLTMGR] Stub FltGetDestinationFileNameInformation()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6b9ee5649456e238c699… commit c6b9ee5649456e238c6996b05fbd97de58e91d95 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:23:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Stub FltGetDestinationFileNameInformation() --- drivers/filters/fltmgr/Misc.c | 21 +++++++++++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 22 insertions(+) diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c index 3f4fc1ff58..c45d3156a7 100644 --- a/drivers/filters/fltmgr/Misc.c +++ b/drivers/filters/fltmgr/Misc.c @@ -82,3 +82,24 @@ FltGetFileNameInformation( *FileNameInformation = NULL; return 0; } + +NTSTATUS +FLTAPI +FltGetDestinationFileNameInformation( + _In_ PFLT_INSTANCE Instance, + _In_ PFILE_OBJECT FileObject, + _In_opt_ HANDLE RootDirectory, + _In_reads_bytes_(FileNameLength) PWSTR FileName, + _In_ ULONG FileNameLength, + _In_ FLT_FILE_NAME_OPTIONS NameOptions, + _Outptr_ PFLT_FILE_NAME_INFORMATION *RetFileNameInformation) +{ + UNREFERENCED_PARAMETER(Instance); + UNREFERENCED_PARAMETER(FileObject); + UNREFERENCED_PARAMETER(RootDirectory); + UNREFERENCED_PARAMETER(FileName); + UNREFERENCED_PARAMETER(FileNameLength); + UNREFERENCED_PARAMETER(NameOptions); + *RetFileNameInformation = NULL; + return 0; +} diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index ec9cd662cc..a847710ba1 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -22,4 +22,5 @@ @ stdcall FltCreateCommunicationPort(ptr ptr ptr ptr ptr ptr ptr long) @ stdcall FltCloseCommunicationPort(ptr) @ stdcall FltAttachVolume(ptr ptr ptr ptr) + @ stdcall FltGetDestinationFileNameInformation(ptr ptr ptr ptr long long ptr)

1 0

11/18: [FLTMGR] Stub FltAttachVolume()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08c495400710b7ec7edaf… commit 08c495400710b7ec7edaf3c9e5e4e3ebcb296882 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:20:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Stub FltAttachVolume() --- drivers/filters/fltmgr/Volume.c | 12 ++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/drivers/filters/fltmgr/Volume.c b/drivers/filters/fltmgr/Volume.c index 8e2a1339c8..4457c59560 100644 --- a/drivers/filters/fltmgr/Volume.c +++ b/drivers/filters/fltmgr/Volume.c @@ -190,6 +190,18 @@ FltDetachVolume( return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +FLTAPI +FltAttachVolume( + _Inout_ PFLT_FILTER Filter, + _Inout_ PFLT_VOLUME Volume, + _In_opt_ PCUNICODE_STRING InstanceName, + _Outptr_opt_result_maybenull_ PFLT_INSTANCE *RetInstance) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS FLTAPI FltGetVolumeName( diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 34b7d6aee5..ec9cd662cc 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -21,4 +21,5 @@ @ stdcall FltGetFileNameInformation(ptr long ptr) @ stdcall FltCreateCommunicationPort(ptr ptr ptr ptr ptr ptr ptr long) @ stdcall FltCloseCommunicationPort(ptr) + @ stdcall FltAttachVolume(ptr ptr ptr ptr)

1 0

10/18: [FLTMGR] Export FltCreateCommunicationPort() and FltCloseCommunicationPort()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b67887df10c70d3aaaf5d… commit b67887df10c70d3aaaf5d51103511d60c524a441 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:18:21 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Export FltCreateCommunicationPort() and FltCloseCommunicationPort() --- drivers/filters/fltmgr/fltmgr.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index e002d22afd..34b7d6aee5 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -19,4 +19,6 @@ @ stdcall FltDetachVolume(ptr ptr ptr) @ stdcall FltGetVolumeName(ptr ptr ptr) @ stdcall FltGetFileNameInformation(ptr long ptr) + @ stdcall FltCreateCommunicationPort(ptr ptr ptr ptr ptr ptr ptr long) + @ stdcall FltCloseCommunicationPort(ptr)

1 0

09/18: [FLTMGR] Stub FltGetFileNameInformation()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c5cc0ff082ac7aca43ef… commit 1c5cc0ff082ac7aca43ef2e7983c21823083b5af Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:15:44 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Stub FltGetFileNameInformation() --- drivers/filters/fltmgr/Misc.c | 13 +++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 14 insertions(+) diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c index c2516af136..3f4fc1ff58 100644 --- a/drivers/filters/fltmgr/Misc.c +++ b/drivers/filters/fltmgr/Misc.c @@ -69,3 +69,16 @@ FltGetFileNameInformationUnsafe( *FileNameInformation = NULL; return 0; } + +NTSTATUS +FLTAPI +FltGetFileNameInformation( + _In_ PFLT_CALLBACK_DATA CallbackData, + _In_ FLT_FILE_NAME_OPTIONS NameOptions, + _Outptr_ PFLT_FILE_NAME_INFORMATION *FileNameInformation) +{ + UNREFERENCED_PARAMETER(CallbackData); + UNREFERENCED_PARAMETER(NameOptions); + *FileNameInformation = NULL; + return 0; +} diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 0cc2288ce0..e002d22afd 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -18,4 +18,5 @@ @ stdcall FltCreateFile(ptr ptr ptr long ptr ptr ptr long long long long ptr long long) @ stdcall FltDetachVolume(ptr ptr ptr) @ stdcall FltGetVolumeName(ptr ptr ptr) + @ stdcall FltGetFileNameInformation(ptr long ptr)

1 0

08/18: [FLTMGR] Implement FltGetVolumeName()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5a314b0f2699b7c3e691… commit c5a314b0f2699b7c3e691be46f7a551d8a621708 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 11:12:45 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Implement FltGetVolumeName() --- drivers/filters/fltmgr/Volume.c | 45 ++++++++++++++++++++++++++++++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 46 insertions(+) diff --git a/drivers/filters/fltmgr/Volume.c b/drivers/filters/fltmgr/Volume.c index b448fd3115..8e2a1339c8 100644 --- a/drivers/filters/fltmgr/Volume.c +++ b/drivers/filters/fltmgr/Volume.c @@ -190,5 +190,50 @@ FltDetachVolume( return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +FLTAPI +FltGetVolumeName( + _In_ PFLT_VOLUME Volume, + _Inout_opt_ PUNICODE_STRING VolumeName, + _Out_opt_ PULONG BufferSizeNeeded) +{ + NTSTATUS Status; + + /* Check if caller just probes for size */ + if (VolumeName == NULL) + { + /* Totally broken call */ + if (BufferSizeNeeded == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the appropriate size and quit */ + *BufferSizeNeeded = Volume->DeviceName.Length; + return STATUS_BUFFER_TOO_SMALL; + } + + /* We have an output buffer! Assume it's too small */ + Status = STATUS_BUFFER_TOO_SMALL; + + /* If we have output size, fill it */ + if (BufferSizeNeeded != NULL) + { + *BufferSizeNeeded = Volume->DeviceName.Length; + } + + /* Init that we didn't return a thing */ + VolumeName->Length = 0; + + /* If we have enough room, copy and return success */ + if (VolumeName->MaximumLength >= Volume->DeviceName.Length) + { + RtlCopyUnicodeString(VolumeName, &Volume->DeviceName); + Status = STATUS_SUCCESS; + } + + return Status; +} + /* INTERNAL FUNCTIONS ******************************************************/ diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 3bf66621c4..0cc2288ce0 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -17,4 +17,5 @@ @ stdcall FltCreateFileEx(ptr ptr ptr ptr long ptr ptr ptr long long long long ptr long long) @ stdcall FltCreateFile(ptr ptr ptr long ptr ptr ptr long long long long ptr long long) @ stdcall FltDetachVolume(ptr ptr ptr) + @ stdcall FltGetVolumeName(ptr ptr ptr)

1 0

07/18: [FLTMGR] Stub FltDetachVolume()
by Pierre Schweitzer 29 Oct '18

29 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21fcbcb37ff013419c086… commit 21fcbcb37ff013419c086883678eaaa2c74cc592 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 28 10:37:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 29 23:56:39 2018 +0100 [FLTMGR] Stub FltDetachVolume() --- drivers/filters/fltmgr/Volume.c | 11 +++++++++++ drivers/filters/fltmgr/fltmgr.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/drivers/filters/fltmgr/Volume.c b/drivers/filters/fltmgr/Volume.c index d4c21bb999..b448fd3115 100644 --- a/drivers/filters/fltmgr/Volume.c +++ b/drivers/filters/fltmgr/Volume.c @@ -179,5 +179,16 @@ FltEnumerateVolumes( return Status; } +NTSTATUS +FLTAPI +FltDetachVolume( + _Inout_ PFLT_FILTER Filter, + _Inout_ PFLT_VOLUME Volume, + _In_opt_ PCUNICODE_STRING InstanceName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* INTERNAL FUNCTIONS ******************************************************/ diff --git a/drivers/filters/fltmgr/fltmgr.spec b/drivers/filters/fltmgr/fltmgr.spec index 3aae9326a0..3bf66621c4 100644 --- a/drivers/filters/fltmgr/fltmgr.spec +++ b/drivers/filters/fltmgr/fltmgr.spec @@ -16,4 +16,5 @@ @ stdcall FltClose(ptr) @ stdcall FltCreateFileEx(ptr ptr ptr ptr long ptr ptr ptr long long long long ptr long long) @ stdcall FltCreateFile(ptr ptr ptr long ptr ptr ptr long long long long ptr long long) + @ stdcall FltDetachVolume(ptr ptr ptr)

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