Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BTRFS] Reenable the MountMgr thread
by Pierre Schweitzer 07 Sep '19

07 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ff3658f109357ea033c7… commit 7ff3658f109357ea033c759e993ccc3b2027cac1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 7 23:28:58 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 23:28:58 2019 +0200 [BTRFS] Reenable the MountMgr thread Now that IOCTL_MOUNTMGR_QUERY_POINTS and IOCTL_MOUNTMGR_CHANGE_NOTIFY have been fixed, the thread no longer eats 100% CPU nor prevent ReactOS shutdown --- drivers/filesystems/btrfs/btrfs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 2f0c97d5675..2977667de9a 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -6013,11 +6013,9 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_S KeInitializeEvent(&mountmgr_thread_event, NotificationEvent, false); -#ifndef __REACTOS__ Status = PsCreateSystemThread(&mountmgr_thread_handle, 0, NULL, NULL, NULL, mountmgr_thread, NULL); if (!NT_SUCCESS(Status)) WARN("PsCreateSystemThread returned %08x\n", Status); -#endif IoRegisterFileSystem(DeviceObject);

1 0

[reactos] 01/01: [MOUNTMGR] Properly return EpicNumber in MountMgrChangeNotify
by Pierre Schweitzer 07 Sep '19

07 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d904ee19c5cda7d7a6548… commit d904ee19c5cda7d7a6548b888ae9d6742658e5d0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 7 23:07:54 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 23:07:54 2019 +0200 [MOUNTMGR] Properly return EpicNumber in MountMgrChangeNotify --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 7172a3b5da8..ce8f58ce855 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -57,7 +57,7 @@ MountMgrChangeNotify(IN PDEVICE_EXTENSION DeviceExtension, if (DeviceExtension->EpicNumber != ChangeNotify->EpicNumber) { ChangeNotify->EpicNumber = DeviceExtension->EpicNumber; - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = sizeof(MOUNTMGR_CHANGE_NOTIFY_INFO); return STATUS_SUCCESS; }

1 0

[reactos] 02/02: [BTRFS] Revert "Allow driver to start at first stage when no hive is present."
by Serge Gautherie 07 Sep '19

07 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=400eb23a6474f15ed65fd… commit 400eb23a6474f15ed65fdb49b9618436017dc035 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 7 02:41:26 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 19:58:03 2019 +0200 [BTRFS] Revert "Allow driver to start at first stage when no hive is present." Not needed anymore. This reverts commit 80e11516b12b19530b56be7539ecc6af2039ed7b. --- drivers/filesystems/btrfs/btrfs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index ada1cc18f45..2f0c97d5675 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -5949,19 +5949,12 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_S InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateKey(&regh, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY, &oa, 0, NULL, REG_OPTION_NON_VOLATILE, &dispos); - /* ReactOS specific hack: allow BtrFS driver to start in 1st stage with no hive */ -#ifndef __REACTOS__ if (!NT_SUCCESS(Status)) { ERR("ZwCreateKey returned %08x\n", Status); return Status; } watch_registry(regh); -#else - if (NT_SUCCESS(Status)) { - watch_registry(regh); - } -#endif Status = IoCreateDevice(DriverObject, sizeof(bus_device_extension), NULL, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, false, &busobj);

1 0

[reactos] 01/02: [BTRFS] Revert "Leak the root stream file object on mount."
by Serge Gautherie 07 Sep '19

07 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e08dc305696616b7d52e7… commit e08dc305696616b7d52e7e7591c1810e2e8f2ff6 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 7 02:38:46 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 19:58:03 2019 +0200 [BTRFS] Revert "Leak the root stream file object on mount." Not needed anymore. This reverts commit c13ccc92f66d9fd537ffdd4c0324af5b9c2723e1. --- drivers/filesystems/btrfs/btrfs.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 61f3dc666db..ada1cc18f45 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -4785,21 +4785,7 @@ static NTSTATUS mount_vol(_In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { goto exit; } - /* HACK: stream file object seems to get deleted at some point - * leading to use after free when installing ReactOS on - * BtrFS. - * Workaround: leak a handle to the fileobject - * XXX: Could be improved by storing it somewhere and releasing it - * on dismount. Or even by referencing again the file object. - */ -#ifndef __REACTOS__ Vcb->root_file = IoCreateStreamFileObject(NULL, DeviceToMount); -#else - { - HANDLE Dummy; - Vcb->root_file = IoCreateStreamFileObjectEx(NULL, DeviceToMount, &Dummy); - } -#endif Vcb->root_file->FsContext = root_fcb; Vcb->root_file->SectionObjectPointer = &root_fcb->nonpaged->segment_object; Vcb->root_file->Vpb = DeviceObject->Vpb;

1 0

[reactos] 02/02: [SDK] Workaround MSVC2010 not having _Bool type
by Pierre Schweitzer 06 Sep '19

06 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddc853a4be9c8ae821149… commit ddc853a4be9c8ae821149a7ed4f5bbc7c44abbfc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:56:58 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:56:58 2019 +0200 [SDK] Workaround MSVC2010 not having _Bool type CORE-16366 --- sdk/include/crt/stdbool.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/crt/stdbool.h b/sdk/include/crt/stdbool.h index 5cb66b55d02..497bb493cb6 100644 --- a/sdk/include/crt/stdbool.h +++ b/sdk/include/crt/stdbool.h @@ -28,7 +28,11 @@ /* Don't define bool, true, and false in C++, except as a GNU extension. */ #ifndef __cplusplus +#if _MSC_VER <= 1600 +#define bool unsigned char +#else #define bool _Bool +#endif #define true 1 #define false 0 #elif defined(__GNUC__) && !defined(__STRICT_ANSI__)

1 0

[reactos] 01/02: [BTRFS] bool must be 1-sized
by Pierre Schweitzer 06 Sep '19

06 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e3c0d360b58a005f84e8… commit 6e3c0d360b58a005f84e8ccf236f2b577a3adb2e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:56:26 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:56:26 2019 +0200 [BTRFS] bool must be 1-sized CORE-16366 --- drivers/filesystems/btrfs/btrfs_drv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index 3af0170e6c9..67cb24902c7 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -70,6 +70,10 @@ #include "btrfs.h" #include "btrfsioctl.h" +#ifdef __REACTOS__ +C_ASSERT(sizeof(bool) == 1); +#endif + #ifdef _DEBUG // #define DEBUG_FCB_REFCOUNTS // #define DEBUG_LONG_MESSAGES

1 0

[reactos] 01/01: [MOUNTMGR] Remove a leftover UNREFERENCED_PARAMETER()
by Serge Gautherie 06 Sep '19

06 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b45f27cf2e9d0f554b5ca… commit b45f27cf2e9d0f554b5ca96158a737e72f269274 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Sep 6 01:50:34 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:34:14 2019 +0200 [MOUNTMGR] Remove a leftover UNREFERENCED_PARAMETER() Addendum to 77657c22c950dc1d5404df1cac7ce06e0cf8fa24. --- drivers/filters/mountmgr/symlink.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filters/mountmgr/symlink.c b/drivers/filters/mountmgr/symlink.c index 254eb2fb452..f4d23815249 100644 --- a/drivers/filters/mountmgr/symlink.c +++ b/drivers/filters/mountmgr/symlink.c @@ -114,8 +114,6 @@ GlobalCreateSymbolicLink(IN PUNICODE_STRING DosName, NTSTATUS Status; UNICODE_STRING GlobalName; - UNREFERENCED_PARAMETER(DeviceName); - /* First create the global string */ Status = CreateStringWithGlobal(DosName, &GlobalName); if (!NT_SUCCESS(Status))

1 0

[reactos] 02/02: [MOUNTMGR] Don't overrun output buffer in QueryPointsFromMemory
by Pierre Schweitzer 06 Sep '19

06 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff19ce934bf35768e3478… commit ff19ce934bf35768e3478bf484ed4935bb826eb3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:30:18 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:30:18 2019 +0200 [MOUNTMGR] Don't overrun output buffer in QueryPointsFromMemory --- drivers/filters/mountmgr/point.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 77fc6fba95f..4c1d843db50 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -342,6 +342,8 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) { + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS); + return STATUS_BUFFER_OVERFLOW; }

1 0

[reactos] 01/02: [MOUNTMGR] Fix QueryPointsFromSymbolicLinkName and make it working
by Pierre Schweitzer 06 Sep '19

06 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26a31b160ab3db16bf92c… commit 26a31b160ab3db16bf92cc786e9d5ecf080057fe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:28:36 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:28:36 2019 +0200 [MOUNTMGR] Fix QueryPointsFromSymbolicLinkName and make it working Select the current stack location for output buffer And set output size so that buffer gets properly copied to caller --- drivers/filters/mountmgr/point.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index d63ec3a4592..77fc6fba95f 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -518,7 +518,7 @@ QueryPointsFromSymbolicLinkName(IN PDEVICE_EXTENSION DeviceExtension, } /* Get output buffer */ - Stack = IoGetNextIrpStackLocation(Irp); + Stack = IoGetCurrentIrpStackLocation(Irp); MountPoints = (PMOUNTMGR_MOUNT_POINTS)Irp->AssociatedIrp.SystemBuffer; /* Compute output length */ @@ -528,9 +528,12 @@ QueryPointsFromSymbolicLinkName(IN PDEVICE_EXTENSION DeviceExtension, /* Give length to allow reallocation */ MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalLength; MountPoints->NumberOfMountPoints = 1; + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalLength; if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) { + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS); + return STATUS_BUFFER_OVERFLOW; }

1 0

[reactos] 04/04: [MOUNTMGR_APITEST] Add a test suite for the mount manager
by Pierre Schweitzer 05 Sep '19

05 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16ec2e2aa53b403a9e59f… commit 16ec2e2aa53b403a9e59ffd7c9db09ce356335e3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Sep 5 08:35:23 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Sep 5 08:36:20 2019 +0200 [MOUNTMGR_APITEST] Add a test suite for the mount manager It only tests IOCTL_MOUNTMGR_QUERY_POINTS for now --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/mountmgr/CMakeLists.txt | 11 +++++ modules/rostests/apitests/mountmgr/QueryPoints.c | 55 +++++++++++++++++++++++ modules/rostests/apitests/mountmgr/precomp.h | 12 +++++ modules/rostests/apitests/mountmgr/testlist.c | 11 +++++ 5 files changed, 90 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 5bff8ce7604..1d623104fc7 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -19,6 +19,7 @@ if(NOT ARCH STREQUAL "amd64") add_subdirectory(kernel32) endif() add_subdirectory(localspl) +add_subdirectory(mountmgr) add_subdirectory(msgina) add_subdirectory(mspatcha) add_subdirectory(msvcrt) diff --git a/modules/rostests/apitests/mountmgr/CMakeLists.txt b/modules/rostests/apitests/mountmgr/CMakeLists.txt new file mode 100644 index 00000000000..73317c628b6 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/CMakeLists.txt @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + QueryPoints.c + precomp.h) + +add_executable(mountmgr_apitest ${SOURCE} testlist.c) +target_link_libraries(mountmgr_apitest wine ${PSEH_LIB}) +set_module_type(mountmgr_apitest win32cui) +add_importlibs(mountmgr_apitest msvcrt kernel32 ntdll) +add_pch(mountmgr_apitest precomp.h SOURCE) +add_rostests_file(TARGET mountmgr_apitest) diff --git a/modules/rostests/apitests/mountmgr/QueryPoints.c b/modules/rostests/apitests/mountmgr/QueryPoints.c new file mode 100644 index 00000000000..b7e6bee3250 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/QueryPoints.c @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for QueryPoints IOCTL + * PROGRAMMER: Pierre Schweitzer + */ + +#include "precomp.h" + +START_TEST(QueryPoints) +{ + BOOL Ret; + DWORD BytesReturned; + HANDLE MountMgrHandle; + MOUNTMGR_MOUNT_POINT SinglePoint; + MOUNTMGR_MOUNT_POINTS MountPoints; + PMOUNTMGR_MOUNT_POINTS AllocatedPoints; + + MountMgrHandle = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + INVALID_HANDLE_VALUE); + if (MountMgrHandle == INVALID_HANDLE_VALUE) + { + win_skip("MountMgr unavailable: %lx\n", GetLastError()); + return; + } + + ZeroMemory(&SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT)); + + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_POINTS, + &SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT), + &MountPoints, sizeof(MOUNTMGR_MOUNT_POINTS), + &BytesReturned, NULL); + ok(Ret == FALSE, "IOCTL unexpectedly succeed\n"); + ok(GetLastError() == ERROR_MORE_DATA, "Unexcepted failure: %lx\n", GetLastError()); + + AllocatedPoints = RtlAllocateHeap(RtlGetProcessHeap(), 0, MountPoints.Size); + if (AllocatedPoints == NULL) + { + win_skip("Insufficiant memory\n"); + goto Done; + } + + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_POINTS, + &SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT), + AllocatedPoints, MountPoints.Size, + &BytesReturned, NULL); + ok(Ret == TRUE, "IOCTL unexpectedly failed %lx\n", GetLastError()); + + RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPoints); + +Done: + CloseHandle(MountMgrHandle); +} diff --git a/modules/rostests/apitests/mountmgr/precomp.h b/modules/rostests/apitests/mountmgr/precomp.h new file mode 100644 index 00000000000..33509fb8083 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/precomp.h @@ -0,0 +1,12 @@ +#ifndef _MOUNTMGR_APITEST_PRECOMP_H_ +#define _MOUNTMGR_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS + +#include <apitest.h> +#include <strsafe.h> +#include <ntstatus.h> +#include <mountmgr.h> +#include <ndk/rtlfuncs.h> + +#endif /* _MOUNTMGR_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/mountmgr/testlist.c b/modules/rostests/apitests/mountmgr/testlist.c new file mode 100644 index 00000000000..ab7c0921a26 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/testlist.c @@ -0,0 +1,11 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_QueryPoints(void); + +const struct test winetest_testlist[] = +{ + { "QueryPoints", func_QueryPoints }, + { 0, 0 } +}; +

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