Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: Update README.md: Add CONTRIBUTING mention
by Alexander Shaposhnikov 17 Oct '17

17 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba35d63da15f1e5355bb0… commit ba35d63da15f1e5355bb04bc0469d67b4e2be2a2 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Oct 17 20:09:36 2017 +0300 Update README.md: Add CONTRIBUTING mention --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 06d7906045..a16f2699ac 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,10 @@ See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide. __NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum). +## Contributing + +We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. + ## More information ReactOS is a Free and Open Source operating system based on the Windows architecture,

1 0

[reactos] 01/02: Create CONTRIBUTING.md (#46) CONTRIBUTING.md is a common way to tell external developers on how to contribute. This way we can link to this file in case of git author name issues for example.
by Alexander Shaposhnikov 17 Oct '17

17 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7c8a574581c8005303a5… commit d7c8a574581c8005303a523fe08c5f0cc853dbe4 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Oct 10 11:43:18 2017 +0300 Create CONTRIBUTING.md (#46) CONTRIBUTING.md is a common way to tell external developers on how to contribute. This way we can link to this file in case of git author name issues for example. --- CONTRIBUTING.md | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..17465a2063 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,93 @@ +# How To Contribute + +There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy. + +- [What To Do?](#what-to-do?) +- [How To Contribute?](#how-to-contribute?) +- [Where To Start?](#where-to-start?) + +## What To Do? + +### Fix bugs + +You can try to fix a few bugs that are already listed in [JIRA]. Squashing bugs is not a simple task. It requires a lot more skill than simply searching for them, and can be time consuming; however, by doing that you greatly help ReactOS become a stable system. + +_NOTE: patches related to 3rd party code such as Wine or BtrFS should be sent to upstream of the said projects. See [3rd Party Files.txt], [README.WINE] and [README.FSD] in [media/doc](media/doc) for details._ + +### Fix tests + +Tests are used to check the functionality and correctness of APIs on ReactOS compared to Windows implementations. There are some unit tests that you could help ReactOS pass, which can be found [in the Web Test Manager][testman] and some that are broken or yet to be written. + +### Fix Coverity scans + +[Coverity] is enhanced static analysis that uncovers leaks, buffer overflows, security issues and other. We do such scans on ReactOS codebase pretty often. You can [request][request-coverity] to see Coverity 'defects' and help to fix them. + +### Test ReactOS + +By localizing bugs, developers can identify what causes the bug and which part it affects. There are a variety of methods to [debug] ReactOS while testing it. After identifying a bug, check if it is already known about by searching on JIRA and adding any additional information to the report. If you think that it is an unidentified bug, consider [filing a bug report]. + +### Implement new things + +Considering ReactOS is alpha quality software, there is a lot of [missing functionality] that Windows operating systems have. Before starting a project to implement something, find out whether another person is working on the same thing. If you find that someone is already working on it, ask if any assistance is needed for what specifically is being worked on or a related project. More often than not, someone will start to implement something and move onto something else before it's comp [...] + +### Write documentation + +There are some important points if you would like to help document ReactOS: + +1. Make sure the documentation does not exist yet (if it does, help improve it). +2. Respect [clean room reverse engineering] practices. +3. Add your knowledge to a place where the other developers can find it. + +## How To Contribute? + +Your contribution can be of numerous forms. We currently accept two ways to contribute - Pull Requests and Patches. + +### Pull Requests + +Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull requests let you tell others about changes you have pushed to a repository on GitHub. Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before the changes are merged into the repository. __Pull request is a prefered way to submit your work__ - it makes reviewing and merging your contribution much easier. + +### Patches + +A __[patch]__ is a set of changes to existing source code. The changes in a patch can be merged into existing source code. This process is referred to as applying a patch (to source code). Which changes a patch contains and the way the patch is structured can have significant impact on the consequences that can happen from applying the patch. + +See [Submitting Patches] for details. + +### Rules and Recommendations + +- *Use your __real name__ and __real email__.* We do not accept anonymous contributions! +- *Ensure your contribution is properly described.* Include the relevant issue number if applicable. +- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed. +- *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead. +- *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system. +- *Respect our __[Coding Style]__ and __[Programming Guidelines]__.* +- *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel. + +## Where To Start? + +Finding a good project to start with can be a challenge, because when starting out you are (usually) not aware of all the possibilities. To help you find a project, here are some ideas to try: + +- Find a test that fails, and try to make it succeed: <https://www.reactos.org/testman/> +- Look around in JIRA, and if you have problems finding nice projects to start with, there is a label for this: <https://jira.reactos.org/issues/?jql=labels%20%3D%20starter-project> +- Ask for help on [IRC] +- Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125> + + [clean room reverse engineering]: https://en.wikipedia.org/wiki/Clean_room_design + [debug]: https://reactos.org/wiki/Debugging + [JIRA]: https://jira.reactos.org/ + [filing a bug report]: https://reactos.org/wiki/File_Bugs + [testman]: https://www.reactos.org/testman/ + [migration to GitHub]: https://www.reactos.org/project-news/reactos-repository-migrated-github + [humans are terrible at tracking large amount of information]: https://www.eurekalert.org/pub_releases/2005-03/aps-hmc030805.php + [Pull requests]: https://help.github.com/articles/about-pull-requests/ + [tips for reviewing patches]: https://drupal.org/patch/review + [missing functionality]: https://reactos.org/wiki/Missing_ReactOS_Functionality + [patch]: https://git-scm.com/docs/git-format-patch + [Submitting Patches]: https://reactos.org/wiki/Submitting_Patches + [Coding Style]: https://reactos.org/wiki/Coding_Style + [IRC]: https://reactos.org/wiki/Connect_to_the_ReactOS_IRC_Channels + [Programming Guidelines]: https://reactos.org/wiki/Programming_Guidelines + [3rd Party Files.txt]: /media/doc/3rd_Party_Files.txt + [README.WINE]: /media/doc/README.WINE + [README.FSD]: /media/doc/README.FSD + [Coverity]: https://scan.coverity.com/projects/reactos + [request-coverity]: https://scan.coverity.com/memberships/new?project_id=reactos

1 0

[reactos] 01/01: [SYSSETUP] [USERINIT] "sLanguage" relates to LOCALE_SABBREVLANGNAME actually, not LOCALE_SLANGUAGE. CORE-13128 #62
by Serge Gautherie 17 Oct '17

17 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba507ba43949b206637db… commit ba507ba43949b206637dbc6fac5782a9c9d437d4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Oct 17 14:59:18 2017 +0200 [SYSSETUP] [USERINIT] "sLanguage" relates to LOCALE_SABBREVLANGNAME actually, not LOCALE_SLANGUAGE. CORE-13128 #62 --- base/system/userinit/livecd.c | 2 +- dll/win32/syssetup/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index a5236d4426..6a17bbb797 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -465,7 +465,7 @@ InitializeDefaultUserLocale( /* Misc */ {LOCALE_SCOUNTRY, L"sCountry"}, - {LOCALE_SLANGUAGE, L"sLanguage"}, + {LOCALE_SABBREVLANGNAME, L"sLanguage"}, {LOCALE_ICOUNTRY, L"iCountry"}, {0, NULL}}; diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 2243b89aad..8c4ab5e591 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -1113,7 +1113,7 @@ InitializeDefaultUserLocale(VOID) /* Misc */ {LOCALE_SCOUNTRY, L"sCountry"}, - {LOCALE_SLANGUAGE, L"sLanguage"}, + {LOCALE_SABBREVLANGNAME, L"sLanguage"}, {LOCALE_ICOUNTRY, L"iCountry"}, {0, NULL}};

1 0

[reactos] 01/01: [STORPORT] Implement StorPortGetDeviceBase(). CORE-13866
by Eric Kohl 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b22c128070db97a76b27a… commit b22c128070db97a76b27a0d6fbacf2fc2558ce4e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Oct 17 00:05:26 2017 +0200 [STORPORT] Implement StorPortGetDeviceBase(). CORE-13866 --- drivers/storage/port/storport/misc.c | 104 +++++++++++++++++++++++++++++++ drivers/storage/port/storport/precomp.h | 29 +++++++-- drivers/storage/port/storport/storport.c | 65 +++++++++++++++++-- 3 files changed, 188 insertions(+), 10 deletions(-) diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index bcbdb05912..56b7c6fd3d 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -217,4 +217,108 @@ QueryBusInterface( return Status; } + +BOOLEAN +TranslateResourceListAddress( + PFDO_DEVICE_EXTENSION DeviceExtension, + INTERFACE_TYPE BusType, + ULONG SystemIoBusNumber, + STOR_PHYSICAL_ADDRESS IoAddress, + ULONG NumberOfBytes, + BOOLEAN InIoSpace, + PPHYSICAL_ADDRESS TranslatedAddress) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptorA, FullDescriptorT; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorA, PartialDescriptorT; + INT i, j; + + DPRINT1("TranslateResourceListAddress(%p)\n", DeviceExtension); + + FullDescriptorA = DeviceExtension->AllocatedResources->List; + FullDescriptorT = DeviceExtension->TranslatedResources->List; + for (i = 0; i < DeviceExtension->AllocatedResources->Count; i++) + { + for (j = 0; j < FullDescriptorA->PartialResourceList.Count; j++) + { + PartialDescriptorA = FullDescriptorA->PartialResourceList.PartialDescriptors + j; + PartialDescriptorT = FullDescriptorT->PartialResourceList.PartialDescriptors + j; + + switch (PartialDescriptorA->Type) + { + case CmResourceTypePort: + DPRINT1("Port: 0x%I64x (0x%lx)\n", + PartialDescriptorA->u.Port.Start.QuadPart, + PartialDescriptorA->u.Port.Length); + if (InIoSpace && + IoAddress.QuadPart >= PartialDescriptorA->u.Port.Start.QuadPart && + IoAddress.QuadPart + NumberOfBytes <= PartialDescriptorA->u.Port.Start.QuadPart + PartialDescriptorA->u.Port.Length) + { + TranslatedAddress->QuadPart = PartialDescriptorT->u.Port.Start.QuadPart + + (IoAddress.QuadPart - PartialDescriptorA->u.Port.Start.QuadPart); + return TRUE; + } + break; + + case CmResourceTypeMemory: + DPRINT1("Memory: 0x%I64x (0x%lx)\n", + PartialDescriptorA->u.Memory.Start.QuadPart, + PartialDescriptorA->u.Memory.Length); + if (!InIoSpace && + IoAddress.QuadPart >= PartialDescriptorA->u.Memory.Start.QuadPart && + IoAddress.QuadPart + NumberOfBytes <= PartialDescriptorA->u.Memory.Start.QuadPart + PartialDescriptorA->u.Memory.Length) + { + TranslatedAddress->QuadPart = PartialDescriptorT->u.Memory.Start.QuadPart + + (IoAddress.QuadPart - PartialDescriptorA->u.Memory.Start.QuadPart); + return TRUE; + } + break; + } + } + + /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ + FullDescriptorA = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorA->PartialResourceList.PartialDescriptors + + FullDescriptorA->PartialResourceList.Count); + + FullDescriptorT = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorT->PartialResourceList.PartialDescriptors + + FullDescriptorT->PartialResourceList.Count); + } + + return FALSE; +} + + +NTSTATUS +AllocateAddressMapping( + PMAPPED_ADDRESS *MappedAddressList, + STOR_PHYSICAL_ADDRESS IoAddress, + PVOID MappedAddress, + ULONG NumberOfBytes, + ULONG BusNumber) +{ + PMAPPED_ADDRESS Mapping; + + DPRINT1("AllocateAddressMapping()\n"); + + Mapping = ExAllocatePoolWithTag(NonPagedPool, + sizeof(MAPPED_ADDRESS), + TAG_ADDRESS_MAPPING); + if (Mapping == NULL) + { + DPRINT1("No memory!\n"); + return STATUS_NO_MEMORY; + } + + RtlZeroMemory(Mapping, sizeof(MAPPED_ADDRESS)); + + Mapping->NextMappedAddress = *MappedAddressList; + *MappedAddressList = Mapping; + + Mapping->IoAddress = IoAddress; + Mapping->MappedAddress = MappedAddress; + Mapping->NumberOfBytes = NumberOfBytes; + Mapping->BusNumber = BusNumber; + + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 1bbd70c00e..30ca7fe78d 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -23,11 +23,12 @@ #include <wdmguid.h> /* Memory Tags */ -#define TAG_GLOBAL_DATA 'DGtS' -#define TAG_INIT_DATA 'DItS' -#define TAG_MINIPORT_DATA 'DMtS' -#define TAG_ACCRESS_RANGE 'RAtS' -#define TAG_RESOURCE_LIST 'LRtS' +#define TAG_GLOBAL_DATA 'DGtS' +#define TAG_INIT_DATA 'DItS' +#define TAG_MINIPORT_DATA 'DMtS' +#define TAG_ACCRESS_RANGE 'RAtS' +#define TAG_RESOURCE_LIST 'LRtS' +#define TAG_ADDRESS_MAPPING 'MAtS' typedef enum { @@ -95,6 +96,7 @@ typedef struct _FDO_DEVICE_EXTENSION PCM_RESOURCE_LIST TranslatedResources; BUS_INTERFACE_STANDARD BusInterface; BOOLEAN BusInitialized; + PMAPPED_ADDRESS MappedAddressList; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -166,6 +168,23 @@ QueryBusInterface( PBUS_INTERFACE_STANDARD Interface, PVOID InterfaceSpecificData); +BOOLEAN +TranslateResourceListAddress( + PFDO_DEVICE_EXTENSION DeviceExtension, + INTERFACE_TYPE BusType, + ULONG SystemIoBusNumber, + STOR_PHYSICAL_ADDRESS IoAddress, + ULONG NumberOfBytes, + BOOLEAN InIoSpace, + PPHYSICAL_ADDRESS TranslatedAddress); + +NTSTATUS +AllocateAddressMapping( + PMAPPED_ADDRESS *MappedAddressList, + STOR_PHYSICAL_ADDRESS IoAddress, + PVOID MappedAddress, + ULONG NumberOfBytes, + ULONG BusNumber); /* pdo.c */ diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 706b0b50e4..d25064bba1 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -528,7 +528,8 @@ StorPortFreeDeviceBase( _In_ PVOID HwDeviceExtension, _In_ PVOID MappedAddress) { - DPRINT1("StorPortFreeDeviceBase()\n"); + DPRINT1("StorPortFreeDeviceBase(%p %p)\n", + HwDeviceExtension, MappedAddress); } @@ -568,6 +569,7 @@ StorPortGetBusData( DPRINT1("StorPortGetBusData(%p %lu %lu %lu %p %lu)\n", DeviceExtension, BusDataType, SystemIoBusNumber, SlotNumber, Buffer, Length); + /* Get the miniport extension */ MiniportExtension = CONTAINING_RECORD(DeviceExtension, MINIPORT_DEVICE_EXTENSION, HwDeviceExtension); @@ -591,7 +593,7 @@ StorPortGetBusData( /* - * @unimplemented + * @implemented */ STORPORT_API PVOID @@ -604,9 +606,62 @@ StorPortGetDeviceBase( _In_ ULONG NumberOfBytes, _In_ BOOLEAN InIoSpace) { - DPRINT1("StorPortGetDeviceBase()\n"); - UNIMPLEMENTED; - return NULL; + PMINIPORT_DEVICE_EXTENSION MiniportExtension; + + PHYSICAL_ADDRESS TranslatedAddress; + PVOID MappedAddress; + NTSTATUS Status; + + DPRINT1("StorPortGetDeviceBase(%p %lu %lu 0x%I64x %lu %u)\n", + HwDeviceExtension, BusType, SystemIoBusNumber, IoAddress.QuadPart, NumberOfBytes, InIoSpace); + + /* Get the miniport extension */ + MiniportExtension = CONTAINING_RECORD(HwDeviceExtension, + MINIPORT_DEVICE_EXTENSION, + HwDeviceExtension); + DPRINT1("HwDeviceExtension %p MiniportExtension %p\n", + HwDeviceExtension, MiniportExtension); + + if (!TranslateResourceListAddress(MiniportExtension->Miniport->DeviceExtension, + BusType, + SystemIoBusNumber, + IoAddress, + NumberOfBytes, + InIoSpace, + &TranslatedAddress)) + { + DPRINT1("Checkpoint!\n"); + return NULL; + } + + DPRINT1("Translated Address: 0x%I64x\n", TranslatedAddress.QuadPart); + + /* In I/O space */ + if (InIoSpace) + { + DPRINT1("Translated Address: %p\n", (PVOID)(ULONG_PTR)TranslatedAddress.QuadPart); + return (PVOID)(ULONG_PTR)TranslatedAddress.QuadPart; + } + + /* In memory space */ + MappedAddress = MmMapIoSpace(TranslatedAddress, + NumberOfBytes, + FALSE); + DPRINT1("Mapped Address: %p\n", MappedAddress); + + Status = AllocateAddressMapping(&MiniportExtension->Miniport->DeviceExtension->MappedAddressList, + IoAddress, + MappedAddress, + NumberOfBytes, + SystemIoBusNumber); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Checkpoint!\n"); + MappedAddress = NULL; + } + + DPRINT1("Mapped Address: %p\n", MappedAddress); + return MappedAddress; }

1 0

[reactos] 01/01: [QCKLNCH] Remove qcklnch (#61)
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0f1e5ffdb989023d91fa… commit f0f1e5ffdb989023d91fa9c99cb253463ba9f202 Author: Giannis Adamopoulos <johnyadams(a)outlook.com> AuthorDate: Mon Oct 16 23:56:34 2017 +0300 [QCKLNCH] Remove qcklnch (#61) - Move CIFSBand to the shellbars static lib which is linked to browseui and rshell. - Move CQuickLaunchBand to rshell. - Make nescessary adjustments so that they can both be registered and instantiated. --- base/shell/rshell/CMakeLists.txt | 1 + .../shell/rshell}/CQuickLaunchBand.cpp | 50 +++++++++------- .../shell/rshell}/CQuickLaunchBand.h | 1 - base/shell/rshell/misc.cpp | 13 ++++ dll/shellext/CMakeLists.txt | 1 - dll/shellext/qcklnch/CMakeLists.txt | 46 -------------- dll/shellext/qcklnch/lang/en-US.rc | 19 ------ dll/shellext/qcklnch/precomp.h | 41 ------------- dll/shellext/qcklnch/qcklnch.cpp | 70 ---------------------- dll/shellext/qcklnch/qcklnch.rc | 15 ----- dll/shellext/qcklnch/qcklnch.spec | 4 -- dll/shellext/qcklnch/resource.h | 11 ---- dll/shellext/qcklnch/rgs/qcklnch.rgs | 13 ---- dll/win32/browseui/browseui.cpp | 1 + dll/win32/browseui/browseui.rc | 1 + dll/win32/browseui/lang/bg-BG.rc | 13 ++++ dll/win32/browseui/lang/de-DE.rc | 13 ++++ dll/win32/browseui/lang/en-US.rc | 13 ++++ dll/win32/browseui/lang/es-ES.rc | 13 ++++ dll/win32/browseui/lang/fr-FR.rc | 13 ++++ dll/win32/browseui/lang/he-IL.rc | 13 ++++ dll/win32/browseui/lang/it-IT.rc | 13 ++++ dll/win32/browseui/lang/ja-JP.rc | 13 ++++ dll/win32/browseui/lang/pl-PL.rc | 13 ++++ dll/win32/browseui/lang/pt-BR.rc | 13 ++++ dll/win32/browseui/lang/ro-RO.rc | 13 ++++ dll/win32/browseui/lang/ru-RU.rc | 13 ++++ dll/win32/browseui/lang/sq-AL.rc | 13 ++++ dll/win32/browseui/lang/tr-TR.rc | 13 ++++ dll/win32/browseui/lang/uk-UA.rc | 13 ++++ dll/win32/browseui/lang/zh-CN.rc | 13 ++++ dll/win32/browseui/lang/zh-TW.rc | 13 ++++ dll/win32/browseui/precomp.h | 1 + dll/win32/browseui/res/isfband.rgs | 13 ++++ dll/win32/browseui/resource.h | 7 +++ .../browseui/shellbars}/CISFBand.cpp | 16 +++-- .../browseui/shellbars}/CISFBand.h | 6 +- dll/win32/browseui/shellbars/CMakeLists.txt | 1 + dll/win32/browseui/shellbars/shellbars.h | 1 + 39 files changed, 300 insertions(+), 253 deletions(-) diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt index 3d70d6bef7..94337e9efe 100644 --- a/base/shell/rshell/CMakeLists.txt +++ b/base/shell/rshell/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( spec2def(rshell.dll rshell.spec ADD_IMPORTLIB) list(APPEND SOURCE + CQuickLaunchBand.cpp misc.cpp ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) diff --git a/dll/shellext/qcklnch/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp similarity index 93% rename from dll/shellext/qcklnch/CQuickLaunchBand.cpp rename to base/shell/rshell/CQuickLaunchBand.cpp index 487fb9725e..6f3c6dee51 100644 --- a/dll/shellext/qcklnch/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -6,9 +6,35 @@ * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ -#include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <winnls.h> +#include <wincon.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi.h> +#include <shlguid_undoc.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> + +#include <undocshell.h> +#include <shellutils.h> + +#include "CQuickLaunchBand.h" + +extern "C" +HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv); // {260CB95D-4544-44F6-A079-575BAA60B72F} const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; @@ -64,8 +90,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); } - CString biTitle((LPCSTR)IDS_BROWSEINFO_TITLE); - BROWSEINFO bi = { hwnd, pidlRoot, path, biTitle, 0, NULL, 0, 0 }; + BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); return pidlSelected; @@ -114,8 +139,6 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 // IObjectWithSite STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) { - TRACE("CQuickLaunchBand::SetSite(0x%p)\n", pUnkSite); - // Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); @@ -127,9 +150,6 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) { - TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); - - // Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); if (FAILED(hr)) @@ -197,8 +217,6 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) { - TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p)\n", dwBandID, dwViewMode, pdbi); - // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); @@ -211,9 +229,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 /*****************************************************************************/ // IPersistStream STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) - { - TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID); - + { // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); @@ -236,9 +252,6 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) { - TRACE("CQuickLaunchBand::Load called\n"); - - // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); if (FAILED(hr)) @@ -260,9 +273,6 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) { - TRACE("CQuickLaunchBand::GetSizeMax called\n"); - - // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); if (FAILED(hr)) diff --git a/dll/shellext/qcklnch/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h similarity index 98% rename from dll/shellext/qcklnch/CQuickLaunchBand.h rename to base/shell/rshell/CQuickLaunchBand.h index c8a71dc9f4..2889e6ef1f 100644 --- a/dll/shellext/qcklnch/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -156,7 +156,6 @@ class CQuickLaunchBand : //***************************************************************************************************** - DECLARE_REGISTRY_RESOURCEID(IDR_QCKLNCH) DECLARE_NOT_AGGREGATABLE(CQuickLaunchBand) DECLARE_PROTECT_FINAL_CONSTRUCT() diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index d984555b60..ce1eb7a98b 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -50,6 +50,8 @@ #include <shellutils.h> +#include <CQuickLaunchBand.h> + #include <wine/debug.h> extern "C" @@ -177,24 +179,32 @@ DllCanUnloadNow(void) STDAPI DllRegisterServer(void) { +#if 0 RegisterComponent(CLSID_StartMenu, L"Shell Start Menu"); RegisterComponent(CLSID_MenuDeskBar, L"Shell Menu Desk Bar"); RegisterComponent(CLSID_MenuBand, L"Shell Menu Band"); RegisterComponent(CLSID_MenuBandSite, L"Shell Menu Band Site"); RegisterComponent(CLSID_MergedFolder, L"Merged Shell Folder"); RegisterComponent(CLSID_RebarBandSite, L"Shell Rebar Band Site"); +#endif + RegisterComponent(CLSID_QuickLaunchBand, L"Quick Launch"); + RegisterComCat(); return S_OK; } STDAPI DllUnregisterServer(void) { +#if 0 UnregisterComponent(CLSID_StartMenu); UnregisterComponent(CLSID_MenuDeskBar); UnregisterComponent(CLSID_MenuBand); UnregisterComponent(CLSID_MenuBandSite); UnregisterComponent(CLSID_MergedFolder); UnregisterComponent(CLSID_RebarBandSite); +#endif + UnregisterComponent(CLSID_QuickLaunchBand); + UnregisterComCat(); return S_OK; } @@ -235,6 +245,9 @@ public: if (IsEqualCLSID(m_Clsid, CLSID_MergedFolder)) return RSHELL_CMergedFolder_CreateInstance(riid, ppvObject); + if (IsEqualCLSID(m_Clsid, CLSID_QuickLaunchBand)) + return ShellObjectCreator<CQuickLaunchBand>(riid, ppvObject); + return E_NOINTERFACE; } diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 2b5b3c6c65..56fabe1299 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -6,6 +6,5 @@ add_subdirectory(devcpux) add_subdirectory(fontext) add_subdirectory(netshell) add_subdirectory(ntobjshex) -add_subdirectory(qcklnch) add_subdirectory(shellbtrfs) add_subdirectory(stobject) diff --git a/dll/shellext/qcklnch/CMakeLists.txt b/dll/shellext/qcklnch/CMakeLists.txt deleted file mode 100644 index 29b7ac8768..0000000000 --- a/dll/shellext/qcklnch/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ - -project(SHELL) - -set_cpp(WITH_RUNTIME) - -if(NOT MSVC) - # HACK: this should be enabled globally! - add_compile_flags_language("-std=c++11" "CXX") -endif() - -add_definitions( - -D_ATL_NO_EXCEPTIONS) - -include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/atl - ${REACTOS_SOURCE_DIR}) - -spec2def(qcklnch.dll qcklnch.spec) - -add_library(qcklnch SHARED - qcklnch.rc - qcklnch.cpp - CQuickLaunchBand.cpp - CISFBand.cpp - CQuickLaunchBand.h - CISFBand.h - ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) - -set_module_type(qcklnch win32dll UNICODE) -target_link_libraries(qcklnch uuid wine atlnew) - -add_importlibs(qcklnch - advapi32 - winmm - ole32 - oleaut32 - shlwapi - shell32 - comctl32 - msvcrt - gdi32 - user32 - kernel32 - ntdll) - -add_cd_file(TARGET qcklnch DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/qcklnch/lang/en-US.rc b/dll/shellext/qcklnch/lang/en-US.rc deleted file mode 100644 index 81c08eb5d0..0000000000 --- a/dll/shellext/qcklnch/lang/en-US.rc +++ /dev/null @@ -1,19 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDM_POPUPMENU MENUEX DISCARDABLE -BEGIN - POPUP "" - BEGIN - POPUP "&View", IDM_VIEW_MENU - BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS - END - MENUITEM "&Show Text", IDM_SHOW_TEXT - END -END - -STRINGTABLE -BEGIN - IDS_BROWSEINFO_TITLE "Choose a folder" -END diff --git a/dll/shellext/qcklnch/precomp.h b/dll/shellext/qcklnch/precomp.h deleted file mode 100644 index 12b27a9c15..0000000000 --- a/dll/shellext/qcklnch/precomp.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <tchar.h> - -#define COBJMACROS -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define NTOS_MODE_USER - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <wincon.h> -#include <ddeml.h> -#include <shlguid_undoc.h> -#include <shlwapi.h> -#include <shlguid.h> -#include <shlobj.h> -#include <shlobj_undoc.h> -#include <shlwapi_undoc.h> -#include <tchar.h> -#include <strsafe.h> -#include <atlbase.h> -#include <atlcom.h> -#include <atlwin.h> -#include <atlstr.h> -#include <undocshell.h> -#include <shellutils.h> - -#include <shellapi.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "resource.h" -#include "CQuickLaunchBand.h" -#include "CISFBand.h" \ No newline at end of file diff --git a/dll/shellext/qcklnch/qcklnch.cpp b/dll/shellext/qcklnch/qcklnch.cpp deleted file mode 100644 index 79a5a45542..0000000000 --- a/dll/shellext/qcklnch/qcklnch.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * PROJECT: ReactOS shell extensions - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/shellext/qcklnch/qcklnch.cpp - * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) - * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> - */ - -#include "precomp.h" - -#include <atlwin.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); - -BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) -END_OBJECT_MAP() - -HINSTANCE g_hInstance; -CComModule g_Module; - -STDAPI_(BOOL) -DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - { - g_hInstance = hinstDLL; - DisableThreadLibraryCalls(g_hInstance); - - g_Module.Init(ObjectMap, g_hInstance, NULL); - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - g_hInstance = NULL; - g_Module.Term(); - } - return TRUE; -} - -STDAPI -DllRegisterServer(void) -{ - HRESULT hr = g_Module.DllRegisterServer(FALSE); - if (FAILED(hr)) - return hr; - - return RegisterComCat(); -} - -STDAPI -DllUnregisterServer(void) -{ - HRESULT hr = UnregisterComCat(); - if (FAILED(hr)) - return hr; - - return g_Module.DllUnregisterServer(FALSE); -} - -STDAPI -DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - return g_Module.DllGetClassObject(rclsid, riid, ppv); -} - -STDAPI -DllCanUnloadNow(void) -{ - return g_Module.DllCanUnloadNow(); -} diff --git a/dll/shellext/qcklnch/qcklnch.rc b/dll/shellext/qcklnch/qcklnch.rc deleted file mode 100644 index f44528e0af..0000000000 --- a/dll/shellext/qcklnch/qcklnch.rc +++ /dev/null @@ -1,15 +0,0 @@ -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDR_QCKLNCH REGISTRY "rgs/qcklnch.rgs" - -#include <reactos/manifest_dll.rc> - -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif - diff --git a/dll/shellext/qcklnch/qcklnch.spec b/dll/shellext/qcklnch/qcklnch.spec deleted file mode 100644 index 069be11627..0000000000 --- a/dll/shellext/qcklnch/qcklnch.spec +++ /dev/null @@ -1,4 +0,0 @@ -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() \ No newline at end of file diff --git a/dll/shellext/qcklnch/resource.h b/dll/shellext/qcklnch/resource.h deleted file mode 100644 index b5613db3c2..0000000000 --- a/dll/shellext/qcklnch/resource.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#define IDR_QCKLNCH 1001 - -#define IDM_POPUPMENU 2001 -#define IDM_LARGE_ICONS 1 -#define IDM_SMALL_ICONS 2 -#define IDM_SHOW_TEXT 3 -#define IDM_VIEW_MENU 4 - -#define IDS_BROWSEINFO_TITLE 101 diff --git a/dll/shellext/qcklnch/rgs/qcklnch.rgs b/dll/shellext/qcklnch/rgs/qcklnch.rgs deleted file mode 100644 index 3df55ca1d3..0000000000 --- a/dll/shellext/qcklnch/rgs/qcklnch.rgs +++ /dev/null @@ -1,13 +0,0 @@ -HKCR -{ - NoRemove CLSID - { - ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'Quick Launch' - { - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Apartment' - } - } - } -} \ No newline at end of file diff --git a/dll/win32/browseui/browseui.cpp b/dll/win32/browseui/browseui.cpp index 9de196c1c5..68326784ba 100644 --- a/dll/win32/browseui/browseui.cpp +++ b/dll/win32/browseui/browseui.cpp @@ -142,6 +142,7 @@ OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar) OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions) OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) OBJECT_ENTRY(CLSID_ProgressDialog, CProgressDialog) +OBJECT_ENTRY(CLSID_ISFBand, CISFBand) END_OBJECT_MAP() CBrowseUIModule gModule; diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index efddc28c46..6badbc9fb0 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -45,6 +45,7 @@ IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" IDR_AUTOCOMPLETE REGISTRY "res/autocomplete.rgs" IDR_ACLISTISF REGISTRY "res/shellautocomplete.rgs" +IDR_ISFBAND REGISTRY "res/isfband.rgs" #include <reactos/manifest_dll.rc> diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 6fe1f3c5bb..de44ec5f46 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -93,6 +93,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 9bcbd8b9d7..283d28f9a3 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -111,6 +111,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 91bede91db..2a005e949f 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -111,6 +111,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index a27939bc3e..414be97dbc 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 61a0930213..67f4fdeaf8 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -111,6 +111,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index 29ed7e52de..2afa8d7f1a 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 6a5bf82fdf..9afabf4373 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -93,6 +93,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 4641cb8087..9dfedaf9c6 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -111,6 +111,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 3932ddef53..91d2e36941 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -101,6 +101,19 @@ BEGIN MENUITEM "&Zamknij pasek narzędzi", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 7db17de7cd..2a9fa160f3 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index ee30d3dfa7..2f14f4e29a 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "As&cunde bara de instrumente", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index dfd8f3a345..b985bb76c5 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "Закрыть панель инструментов", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index d6d657f414..74f95ce269 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -112,6 +112,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index a1856f1013..14790d6eaf 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index ea8de8a3a9..366104ad1b 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -95,6 +95,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 622e665c1e..c62187c922 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -113,6 +113,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index a658735e47..c4d6f00871 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -113,6 +113,19 @@ BEGIN MENUITEM "&Close toolbar", IDM_BAND_CLOSE END +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + /* Dialogs */ IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index b3323511a3..26ff15a23d 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -42,6 +42,7 @@ #include "bandproxy.h" #include "shellbars/CBandSite.h" #include "shellbars/CBandSiteMenu.h" +#include "shellbars/CISFBand.h" #include "brandband.h" #include "internettoolbar.h" #include "commonbrowser.h" diff --git a/dll/win32/browseui/res/isfband.rgs b/dll/win32/browseui/res/isfband.rgs new file mode 100644 index 0000000000..236a0e74f4 --- /dev/null +++ b/dll/win32/browseui/res/isfband.rgs @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {D82BE2B0-5764-11D0-A96E-00C04FD705A2} = s 'IShellFolderBand' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 399de7d580..2fe0b92807 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -64,6 +64,12 @@ #define IDM_BAND_TITLE 0xA200 #define IDM_BAND_CLOSE 0xA201 +#define IDM_POPUPMENU 2001 +#define IDM_LARGE_ICONS 2002 +#define IDM_SMALL_ICONS 2003 +#define IDM_SHOW_TEXT 2004 +#define IDM_VIEW_MENU 2005 + /* Random id for band close button, feel free to change it */ #define IDM_BASEBAR_CLOSE 0xA200 @@ -95,6 +101,7 @@ #define IDR_PROGRESSDIALOG 140 #define IDR_AUTOCOMPLETE 141 #define IDR_ACLISTISF 142 +#define IDR_ISFBAND 143 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 diff --git a/dll/shellext/qcklnch/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp similarity index 97% rename from dll/shellext/qcklnch/CISFBand.cpp rename to dll/win32/browseui/shellbars/CISFBand.cpp index 34192b45d3..85f44313ec 100644 --- a/dll/shellext/qcklnch/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -6,14 +6,13 @@ * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ -#include "precomp.h" +#include "shellbars.h" #include <commoncontrols.h> +#include <strsafe.h> #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); - // ***Extras*** /*++ * @name _ILIsDesktop @@ -26,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); * @return True if PIDL is of Desktop, otherwise false. * *--*/ -BOOL WINAPI _ILIsDesktop(LPCITEMIDLIST pidl) +static BOOL _ILIsDesktop(LPCITEMIDLIST pidl) { return (pidl == NULL || pidl->mkid.cb == 0); } @@ -99,7 +98,7 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) hr = m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); if (FAILED_UNEXPECTEDLY(hr)) { - strcpyW(sz, L"<Unknown-Name>"); + StringCchCopyW(sz, MAX_PATH, L"<Unknown-Name>"); } else StrRetToBuf(&stret, pidl, sz, _countof(sz)); @@ -277,9 +276,7 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) // *** IPersistStream *** STDMETHODIMP CISFBand::GetClassID(OUT CLSID *pClassID) { - TRACE("CISFBand::GetClassID(0x%p)\n", pClassID); - /* We're going to return the (internal!) CLSID of the quick launch band */ - *pClassID = CLSID_QuickLaunchBand; + *pClassID = CLSID_ISFBand; return S_OK; } @@ -555,7 +552,8 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) STDMETHODIMP CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_POPUPMENU)); + HMENU qMenu = LoadMenu(GetModuleHandleW(L"browseui.dll"), MAKEINTRESOURCE(IDM_POPUPMENU)); + if(m_textFlag) CheckMenuItem(qMenu, IDM_SHOW_TEXT, MF_CHECKED); else diff --git a/dll/shellext/qcklnch/CISFBand.h b/dll/win32/browseui/shellbars/CISFBand.h similarity index 96% rename from dll/shellext/qcklnch/CISFBand.h rename to dll/win32/browseui/shellbars/CISFBand.h index fc74db0b7c..c8de82f50e 100644 --- a/dll/shellext/qcklnch/CISFBand.h +++ b/dll/win32/browseui/shellbars/CISFBand.h @@ -7,11 +7,10 @@ */ #pragma once -// COM class for cisfband class CISFBand : public CWindow, - public CComCoClass<CISFBand>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CComCoClass<CBandSiteMenu, &CLSID_ISFBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, public IDeskBand, public IPersistStream, @@ -174,6 +173,7 @@ public: //***************************************************************************************************** + DECLARE_REGISTRY_RESOURCEID(IDR_ISFBAND) DECLARE_NOT_AGGREGATABLE(CISFBand) DECLARE_PROTECT_FINAL_CONSTRUCT() diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index 3807056b20..d52e71807c 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE CBandSite.cpp CBandSiteMenu.cpp CBaseBar.cpp + CISFBand.cpp CSHEnumClassesOfCategories.cpp) add_library(shellbars ${SOURCE}) diff --git a/dll/win32/browseui/shellbars/shellbars.h b/dll/win32/browseui/shellbars/shellbars.h index 0c3b58b3de..731ecfdde5 100644 --- a/dll/win32/browseui/shellbars/shellbars.h +++ b/dll/win32/browseui/shellbars/shellbars.h @@ -30,6 +30,7 @@ #include "CBandSite.h" #include "CBandSiteMenu.h" +#include "CISFBand.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui);

1 0

[reactos] 01/01: [NTDLL_APITEST] Add simple tests for RtlUnicodeStringToAnsiString() that were used to test the kernel32 regression
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a33ab96380c1ed213a08… commit 3a33ab96380c1ed213a083e490027a11ca5fbb58 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 22:04:22 2017 +0200 [NTDLL_APITEST] Add simple tests for RtlUnicodeStringToAnsiString() that were used to test the kernel32 regression --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/RtlUnicodeStringToAnsiString.c | 52 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 55 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 7a56d74a85..23da6c5570 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -50,6 +50,7 @@ list(APPEND SOURCE RtlNtPathNameToDosPathName.c RtlpEnsureBufferSize.c RtlReAllocateHeap.c + RtlUnicodeStringToAnsiString.c RtlUpcaseUnicodeStringToCountedOemString.c StackOverflow.c SystemInfo.c diff --git a/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c b/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c new file mode 100644 index 0000000000..a517299568 --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlUnicodeStringToAnsiString.c @@ -0,0 +1,52 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlUnicodeStringToAnsiString + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <apitest.h> +#include <ndk/rtlfuncs.h> + +START_TEST(RtlUnicodeStringToAnsiString) +{ + WCHAR BufferU[10]; + CHAR BufferA[10]; + UNICODE_STRING StringU; + ANSI_STRING StringA; + NTSTATUS Status; + DWORD i; + + memset(BufferU, 0xAA, sizeof(BufferU)); + memset(BufferA, 0xAA, sizeof(BufferA)); + + BufferU[0] = L'A'; + BufferU[1] = UNICODE_NULL; + + StringU.Buffer = BufferU; + StringU.MaximumLength = 10 * sizeof(WCHAR); + + RtlInitUnicodeString(&StringU, BufferU); + ok(StringU.Length == 1 * sizeof(WCHAR), "Invalid size: %d\n", StringU.Length); + ok(StringU.MaximumLength == 2 * sizeof(WCHAR), "Invalid size: %d\n", StringU.MaximumLength); + ok(StringU.Buffer == BufferU, "Invalid buffer: %p\n", StringU.Buffer); + + StringA.Buffer = BufferA; + StringA.MaximumLength = 10 * sizeof(CHAR); + + Status = RtlUnicodeStringToAnsiString(&StringA, &StringU, FALSE); + ok(NT_SUCCESS(Status), "RtlUnicodeStringToAnsiString failed: %lx\n", Status); + ok(StringA.Length == 1 * sizeof(CHAR), "Invalid size: %d\n", StringA.Length); + ok(StringA.MaximumLength == 10 * sizeof(CHAR), "Invalid size: %d\n", StringA.MaximumLength); + ok(StringA.Buffer == BufferA, "Invalid buffer: %p\n", StringA.Buffer); + + for (i = 0; i < 10; ++i) + { + if (BufferA[i] == 0) + { + break; + } + } + + ok(i != 10, "String was not null terminated!\n"); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 8b4f8f657d..f17f87267c 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -54,6 +54,7 @@ extern void func_RtlMemoryStream(void); extern void func_RtlNtPathNameToDosPathName(void); extern void func_RtlpEnsureBufferSize(void); extern void func_RtlReAllocateHeap(void); +extern void func_RtlUnicodeStringToAnsiString(void); extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); extern void func_StackOverflow(void); extern void func_TimerResolution(void); @@ -111,6 +112,7 @@ const struct test winetest_testlist[] = { "RtlNtPathNameToDosPathName", func_RtlNtPathNameToDosPathName }, { "RtlpEnsureBufferSize", func_RtlpEnsureBufferSize }, { "RtlReAllocateHeap", func_RtlReAllocateHeap }, + { "RtlUnicodeStringToAnsiString", func_RtlUnicodeStringToAnsiString }, { "RtlUpcaseUnicodeStringToCountedOemString", func_RtlUpcaseUnicodeStringToCountedOemString }, { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution },

1 0

[reactos] 04/04: [DOC] Reflect BtrFS Update
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36abd95390c4962102f08… commit 36abd95390c4962102f08178c15b0c0f9bb3a04c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 20:26:53 2017 +0200 [DOC] Reflect BtrFS Update CORE-13896 --- media/doc/README.FSD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media/doc/README.FSD b/media/doc/README.FSD index f81290939f..14c6d60eca 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -3,9 +3,9 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. -reactos/drivers/filesystems/btrfs # Synced to 1.0 -reactos/dll/shellext/shellbtrfs # Synced to 1.0 -reactos/sdk/lib/fslib/btrfslib # Synced to 1.0 +reactos/drivers/filesystems/btrfs # Synced to 1.0.1 +reactos/dll/shellext/shellbtrfs # Synced to 1.0.1 +reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.1 The following FSD are shared with: http://www.ext2fsd.com/

1 0

[reactos] 03/04: [UBTRFS] Update to 1.0.1
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed263291d1a6acbf1b885… commit ed263291d1a6acbf1b885ff68807018e47aa77f8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 20:26:16 2017 +0200 [UBTRFS] Update to 1.0.1 CORE-13896 --- dll/win32/ubtrfs/ubtrfs.rc | 20 +++++++++----------- sdk/lib/fslib/btrfslib/btrfslib.c | 7 +++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dll/win32/ubtrfs/ubtrfs.rc b/dll/win32/ubtrfs/ubtrfs.rc index 6651280b23..cf70d78b56 100644 --- a/dll/win32/ubtrfs/ubtrfs.rc +++ b/dll/win32/ubtrfs/ubtrfs.rc @@ -7,19 +7,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources +// English (United Kingdom) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -34,7 +32,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""winres.h""\r\n" "\0" END @@ -53,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +68,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "Btrfs utility DLL" - VALUE "FileVersion", "0.8" + VALUE "FileVersion", "1.0.1" VALUE "InternalName", "ubtrfs" - VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016" + VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" VALUE "OriginalFilename", "ubtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "0.8" + VALUE "ProductVersion", "1.0.1" END END BLOCK "VarFileInfo" @@ -84,7 +82,7 @@ BEGIN END END -#endif // English (U.K.) resources +#endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/sdk/lib/fslib/btrfslib/btrfslib.c b/sdk/lib/fslib/btrfslib/btrfslib.c index 7677fbea59..9999f2c51b 100644 --- a/sdk/lib/fslib/btrfslib/btrfslib.c +++ b/sdk/lib/fslib/btrfslib/btrfslib.c @@ -1454,6 +1454,7 @@ NTSTATUS NTAPI BtrfsFormatEx(PUNICODE_STRING DriveRoot, FMIFS_MEDIA_FLAG MediaFl LUID luid; #endif UINT64 incompat_flags; + UNICODE_STRING empty_label; static WCHAR btrfs[] = L"\\Btrfs"; @@ -1543,6 +1544,12 @@ NTSTATUS NTAPI BtrfsFormatEx(PUNICODE_STRING DriveRoot, FMIFS_MEDIA_FLAG MediaFl incompat_flags = def_incompat_flags; incompat_flags |= BTRFS_INCOMPAT_FLAGS_MIXED_BACKREF | BTRFS_INCOMPAT_FLAGS_BIG_METADATA; + if (!Label) { + empty_label.Buffer = NULL; + empty_label.Length = empty_label.MaximumLength = 0; + Label = &empty_label; + } + Status = write_btrfs(h, gli.Length.QuadPart, Label, sector_size, node_size, incompat_flags); NtFsControlFile(h, NULL, NULL, NULL, &iosb, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0);

1 0

[reactos] 02/04: [SHELLBTRFS] Upgrade to 1.0.1 CID 1419312
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb2a56e02adafb7751c5b… commit fb2a56e02adafb7751c5bb1253323c716c1f1682 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 20:20:21 2017 +0200 [SHELLBTRFS] Upgrade to 1.0.1 CID 1419312 CORE-13896 --- dll/shellext/shellbtrfs/send.cpp | 2 + dll/shellext/shellbtrfs/shellbtrfs.rc | 86 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/dll/shellext/shellbtrfs/send.cpp b/dll/shellext/shellbtrfs/send.cpp index 7a582d4224..220d5e212c 100644 --- a/dll/shellext/shellbtrfs/send.cpp +++ b/dll/shellext/shellbtrfs/send.cpp @@ -562,6 +562,7 @@ void CALLBACK SendSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int if (!LookupPrivilegeValueW(NULL, L"SeManageVolumePrivilege", &luid)) { ShowError(hwnd, GetLastError()); + CloseHandle(token); return; } @@ -571,6 +572,7 @@ void CALLBACK SendSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int if (!AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL)) { ShowError(hwnd, GetLastError()); + CloseHandle(token); return; } diff --git a/dll/shellext/shellbtrfs/shellbtrfs.rc b/dll/shellext/shellbtrfs/shellbtrfs.rc index bf4e7c080d..23d46d238b 100644 --- a/dll/shellext/shellbtrfs/shellbtrfs.rc +++ b/dll/shellext/shellbtrfs/shellbtrfs.rc @@ -13,13 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources +// English (United Kingdom) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -27,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -56,14 +54,15 @@ END // remains consistent on all systems. IDI_ICON1 ICON "subvol.ico" + ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +78,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs shell extension" - VALUE "FileVersion", "1.0" + VALUE "FileVersion", "1.0.1" VALUE "InternalName", "btrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" VALUE "OriginalFilename", "shellbtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0" + VALUE "ProductVersion", "1.0.1" END END BLOCK "VarFileInfo" @@ -484,6 +483,7 @@ END 2 RT_MANIFEST "shellbtrfs.manifest" + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -575,9 +575,9 @@ BEGIN IDS_DEVLIST_READONLY_NO "No" IDS_DEVLIST_ALLOC "Allocated" IDS_DEVLIST_ALLOC_PC "%" - IDS_BALANCE_RUNNING_REMOVAL + IDS_BALANCE_RUNNING_REMOVAL "Currently removing device %llu (%llu out of %llu chunks processed, %1.1f%%)" - IDS_BALANCE_PAUSED_REMOVAL + IDS_BALANCE_PAUSED_REMOVAL "Removal of device %llu paused (%llu out of %llu chunks processed, %1.1f%%)" IDS_BALANCE_CANCELLED_REMOVAL "Device removal cancelled." IDS_BALANCE_COMPLETE_REMOVAL "Device removal completed successfully." @@ -588,12 +588,12 @@ END STRINGTABLE BEGIN IDS_CANNOT_REMOVE_RAID "The current RAID levels do not allow this device to be removed. You must do a conversion balance before you will be able to proceed." - IDS_REMOVE_DEVICE_CONFIRMATION + IDS_REMOVE_DEVICE_CONFIRMATION "Are you sure that you want to remove device %s, %s?" IDS_CONFIRMATION_TITLE "Confirmation" - IDS_ADD_DEVICE_CONFIRMATION + IDS_ADD_DEVICE_CONFIRMATION "Are you sure that you want to add this device?" - IDS_ADD_DEVICE_CONFIRMATION_FS + IDS_ADD_DEVICE_CONFIRMATION_FS "Are you sure that you want to add this device? It already appears to contain a filesystem (%s)." IDS_BALANCE_FAILED "Balance failed (error %08x, %s)" IDS_BALANCE_FAILED_REMOVAL "Device removal failed (error %08x, %s)" @@ -604,32 +604,32 @@ BEGIN IDS_SCRUB_FINISHED "Scrub finished." IDS_SCRUB_PAUSED "Scrub paused (%llu out of %llu chunks processed, %1.1f%%)" IDS_SCRUB_MSG_STARTED "Scrub started at %s %s." - IDS_SCRUB_MSG_RECOVERABLE_DATA + IDS_SCRUB_MSG_RECOVERABLE_DATA "Recovered from data checksum error at %llx on device %llx." - IDS_SCRUB_MSG_RECOVERABLE_METADATA + IDS_SCRUB_MSG_RECOVERABLE_METADATA "Recovered from metadata checksum error at %llx on device %llx." END STRINGTABLE BEGIN - IDS_SCRUB_MSG_UNRECOVERABLE_DATA + IDS_SCRUB_MSG_UNRECOVERABLE_DATA "Unrecoverable data checksum error at %llx on device %llx (%.*s, offset %llx)" - IDS_SCRUB_MSG_UNRECOVERABLE_DATA_SUBVOL + IDS_SCRUB_MSG_UNRECOVERABLE_DATA_SUBVOL "Unrecoverable data checksum error at %llx on device %llx (subvol %llx, %.*s, offset %llx)" - IDS_SCRUB_MSG_UNRECOVERABLE_METADATA + IDS_SCRUB_MSG_UNRECOVERABLE_METADATA "Unrecoverable metadata checksum error at %llx on device %llx (root %llx, level %x)" - IDS_SCRUB_MSG_UNRECOVERABLE_METADATA_FIRSTITEM + IDS_SCRUB_MSG_UNRECOVERABLE_METADATA_FIRSTITEM "Unrecoverable metadata checksum error at %llx on device %llx (root %llx, level %x, first item %llx,%x,%llx)" IDS_SCRUB_MSG_FINISHED "Scrub finished at %s %s." IDS_SCRUB_MSG_SUMMARY "Scrubbed %s in %llu seconds (%s/s)." IDS_BALANCE_SCRUB_RUNNING "Cannot start balance while scrub running." IDS_SCRUB_BALANCE_RUNNING "Cannot start scrub while balance running." IDS_SCRUB_MSG_SUMMARY_ERRORS_RECOVERABLE "Recovered from %llu error(s)." - IDS_SCRUB_MSG_SUMMARY_ERRORS_UNRECOVERABLE + IDS_SCRUB_MSG_SUMMARY_ERRORS_UNRECOVERABLE "%llu unrecoverable error(s) found." IDS_SCRUB_FAILED "Scrub failed with error %08x." IDS_LOCK_FAILED "Unable to lock volume: error %08x. Make sure that there are no files open, and that you have closed any Explorer windows." - IDS_SCRUB_MSG_RECOVERABLE_PARITY + IDS_SCRUB_MSG_RECOVERABLE_PARITY "Recovered from parity error at %llx on device %llx." IDS_COMPRESS_ANY "(any)" IDS_COMPRESS_ZLIB "Zlib" @@ -649,12 +649,12 @@ BEGIN IDS_RECV_UNKNOWN_COMMAND "Unrecognized command %u encountered." IDS_RECV_CANT_OPEN_PATH "Couldn't open path %s (error %u, %s)." IDS_RECV_RTLUTF8TOUNICODEN_FAILED "RtlUTF8ToUnicodeN returned %08x (%s)." - IDS_RECV_CREATE_SUBVOL_FAILED + IDS_RECV_CREATE_SUBVOL_FAILED "FSCTL_BTRFS_CREATE_SUBVOL returned %08x (%s)." IDS_RECV_MISSING_PARAM "%S: could not find %s parameter." IDS_RECV_SHORT_PARAM "%S: length of parameter %s was %u, expected %u." IDS_RECV_MKNOD_FAILED "FSCTL_BTRFS_MKNOD returned %08x (%s)." - IDS_RECV_SET_REPARSE_POINT_FAILED + IDS_RECV_SET_REPARSE_POINT_FAILED "FSCTL_SET_REPARSE_POINT returned %08x (%s)." END @@ -663,19 +663,19 @@ BEGIN IDS_RECV_MOVEFILE_FAILED "MoveFile (%s -> %s) failed (error %u, %s)." IDS_RECV_SETFILEPOINTER_FAILED "SetFilePointer failed (error %u, %s)." IDS_RECV_WRITEFILE_FAILED "WriteFile failed (error %u, %s)." - IDS_RECV_CREATEHARDLINK_FAILED + IDS_RECV_CREATEHARDLINK_FAILED "CreateHardLink (%s -> %s) failed (error %u, %s)." IDS_RECV_SETENDOFFILE_FAILED "SetEndOfFile failed (error %u, %s)." IDS_RECV_CANT_CREATE_FILE "Couldn't create %s (error %u, %s)." - IDS_RECV_SETFILEINFO_FAILED + IDS_RECV_SETFILEINFO_FAILED "SetFileInformationByHandle failed (error %u, %s)." - IDS_RECV_SETINODEINFO_FAILED + IDS_RECV_SETINODEINFO_FAILED "FSCTL_BTRFS_SET_INODE_INFO returned %08x (%s)." IDS_RECV_SUCCESS "Received 1 subvolume successfully." IDS_RECV_BUTTON_OK "OK" - IDS_RECV_SETFILEATTRIBUTES_FAILED + IDS_RECV_SETFILEATTRIBUTES_FAILED "SetFileAttributes failed (error %u, %s)." - IDS_RECV_GETFILEATTRIBUTES_FAILED + IDS_RECV_GETFILEATTRIBUTES_FAILED "GetFileAttributes failed (error %u, %s)." IDS_RECV_CSUM_ERROR "Checksum error." IDS_RECV_NOT_A_SEND_STREAM "File was not a send stream." @@ -685,28 +685,28 @@ END STRINGTABLE BEGIN - IDS_RECV_RECEIVED_SUBVOL_FAILED + IDS_RECV_RECEIVED_SUBVOL_FAILED "FSCTL_BTRFS_RECEIVED_SUBVOL returned %08x (%s)." - IDS_RECV_SETSECURITYOBJECT_FAILED + IDS_RECV_SETSECURITYOBJECT_FAILED "NtSetSecurityObject returned %08x (%s)." IDS_RECV_SETXATTR_FAILED "FSCTL_BTRFS_SET_XATTR returned %08x (%s)." IDS_RECV_CREATETHREAD_FAILED "CreateThread failed (error %u, %s)." IDS_RECV_FILE_TRUNCATED "File was truncated." - IDS_RECV_RESERVE_SUBVOL_FAILED + IDS_RECV_RESERVE_SUBVOL_FAILED "FSCTL_BTRFS_RESERVE_SUBVOL returned %08x (%s)." IDS_RECV_CANCELLED "Receiving cancelled." IDS_RECV_CANT_FIND_PARENT_SUBVOL "Could not find parent subvolume." IDS_RECV_FIND_SUBVOL_FAILED "FSCTL_BTRFS_FIND_SUBVOL returned %08x (%s)." - IDS_RECV_CREATE_SNAPSHOT_FAILED + IDS_RECV_CREATE_SNAPSHOT_FAILED "FSCTL_BTRFS_CREATE_SNAPSHOT returned %08x (%s)." - IDS_RECV_GETVOLUMEPATHNAME_FAILED + IDS_RECV_GETVOLUMEPATHNAME_FAILED "GetVolumePathName failed (error %u, %s)." IDS_RECV_DELETEFILE_FAILED "DeleteFile failed for %s (error %u, %s)." - IDS_RECV_REMOVEDIRECTORY_FAILED + IDS_RECV_REMOVEDIRECTORY_FAILED "RemoveDirectory failed for %s (error %u, %s)." IDS_RECV_CANT_FIND_CLONE_SUBVOL "Could not find clone subvolume." IDS_RECV_GETFILESIZEEX_FAILED "GetFileSizeEx failed (error %u, %s)." - IDS_RECV_DUPLICATE_EXTENTS_FAILED + IDS_RECV_DUPLICATE_EXTENTS_FAILED "FSCTL_DUPLICATE_EXTENTS_TO_FILE returned %08x (%s)." END @@ -717,13 +717,13 @@ BEGIN IDS_SEND_SUBVOL_HELP "Exports a subvolume so that it can be recreated on another volume." IDS_SEND_CANT_OPEN_FILE "Error opening file %s (error %u, %s)." IDS_SEND_CANT_OPEN_DIR "Error opening directory %s (error %u, %s)." - IDS_SEND_FSCTL_BTRFS_SEND_SUBVOL_FAILED + IDS_SEND_FSCTL_BTRFS_SEND_SUBVOL_FAILED "FSCTL_BTRFS_SEND_SUBVOL returned error %08x (%s)." - IDS_SEND_FSCTL_BTRFS_READ_SEND_BUFFER_FAILED + IDS_SEND_FSCTL_BTRFS_READ_SEND_BUFFER_FAILED "FSCTL_BTRFS_READ_SEND_BUFFER returned error %08x (%s)." IDS_SEND_SUCCESS "Stream written successfully." IDS_SEND_WRITEFILE_FAILED "Writing to file failed (error %u, %s)." - IDS_SEND_GET_FILE_INFO_FAILED + IDS_SEND_GET_FILE_INFO_FAILED "GetFileInformationByHandle failed (error %u, %s)." IDS_SEND_NOT_READONLY "Subvolume not readonly." IDS_NOT_SUBVOL "Directory was not a subvolume." @@ -739,16 +739,16 @@ BEGIN IDS_SEND_WRITING "Writing..." IDS_MISSING "(missing)" IDS_RESIZE_SUCCESSFUL "Device %llx successfully resized to %s." - IDS_BALANCE_RUNNING_SHRINK + IDS_BALANCE_RUNNING_SHRINK "Currently shrinking device %llu (%llu out of %llu chunks processed, %1.1f%%)" - IDS_BALANCE_PAUSED_SHRINK + IDS_BALANCE_PAUSED_SHRINK "Shrinking of device %llu paused (%llu out of %llu chunks processed, %1.1f%%)" IDS_BALANCE_CANCELLED_SHRINK "Device shrinking cancelled." IDS_BALANCE_COMPLETE_SHRINK "Device successfully shrunk." IDS_BALANCE_FAILED_SHRINK "Device shrinking failed (error %08x, %s)" END -#endif // English (U.K.) resources +#endif // English (United Kingdom) resources /////////////////////////////////////////////////////////////////////////////

1 0

[reactos] 01/04: [BTRFS] Upgrade to BtrFS 1.0.1 CID 1419459, 1419378
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4672b2ba5e111fe9730cd… commit 4672b2ba5e111fe9730cdbf4e51fb28c1ce7d473 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 20:05:33 2017 +0200 [BTRFS] Upgrade to BtrFS 1.0.1 CID 1419459, 1419378 CORE-13896 --- drivers/filesystems/btrfs/balance.c | 4 +- drivers/filesystems/btrfs/btrfs.c | 66 +++++++--- drivers/filesystems/btrfs/btrfs.rc | 8 +- drivers/filesystems/btrfs/btrfs_drv.h | 54 ++++++++- drivers/filesystems/btrfs/create.c | 208 ++++++++++++++++++++++---------- drivers/filesystems/btrfs/dirctrl.c | 11 +- drivers/filesystems/btrfs/fileinfo.c | 22 ++-- drivers/filesystems/btrfs/flushthread.c | 9 +- drivers/filesystems/btrfs/fsctl.c | 37 +++--- drivers/filesystems/btrfs/pnp.c | 8 +- drivers/filesystems/btrfs/read.c | 21 ++-- drivers/filesystems/btrfs/reparse.c | 16 ++- drivers/filesystems/btrfs/search.c | 3 +- drivers/filesystems/btrfs/volume.c | 2 +- drivers/filesystems/btrfs/write.c | 12 +- 15 files changed, 329 insertions(+), 152 deletions(-) diff --git a/drivers/filesystems/btrfs/balance.c b/drivers/filesystems/btrfs/balance.c index cf9717480d..980089618a 100644 --- a/drivers/filesystems/btrfs/balance.c +++ b/drivers/filesystems/btrfs/balance.c @@ -2112,7 +2112,7 @@ end: // update open FCBs // FIXME - speed this up(?) - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); le = Vcb->all_fcbs.Flink; while (le != &Vcb->all_fcbs) { @@ -2153,7 +2153,7 @@ end: le = le->Flink; } - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } else do_rollback(Vcb, &rollback); diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 0e3e917531..236184eafa 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -1352,7 +1352,7 @@ void send_notification_fcb(_In_ file_ref* fileref, _In_ ULONG filter_match, _In_ return; } - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); le = fcb->hardlinks.Flink; while (le != &fcb->hardlinks) { @@ -1419,7 +1419,7 @@ void send_notification_fcb(_In_ file_ref* fileref, _In_ ULONG filter_match, _In_ le = le->Flink; } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); } void mark_fcb_dirty(_In_ fcb* fcb) { @@ -1698,14 +1698,14 @@ static NTSTATUS close_file(_In_ PFILE_OBJECT FileObject, _In_ PIRP Irp) { Vcb = fcb->Vcb; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (fileref) free_fileref(fcb->Vcb, fileref); else free_fcb(Vcb, fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); return STATUS_SUCCESS; } @@ -1804,10 +1804,10 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { KeSetTimer(&Vcb->flush_thread_timer, time, NULL); // trigger the timer early KeWaitForSingleObject(&Vcb->flush_thread_finished, Executive, KernelMode, FALSE, NULL); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, Vcb->volume_fcb); free_fcb(Vcb, Vcb->dummy_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (Vcb->root_file) ObDereferenceObject(Vcb->root_file); @@ -1817,9 +1817,9 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { chunk* c = CONTAINING_RECORD(le, chunk, list_entry); if (c->cache) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, c->cache); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); c->cache = NULL; } @@ -1855,9 +1855,9 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { ExFreePool(c->devices); if (c->cache) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, c->cache); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } ExDeleteResourceLite(&c->range_locks_lock); @@ -1915,7 +1915,7 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { ZwClose(Vcb->flush_thread_handle); } -NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback) { +NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_opt_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback) { LARGE_INTEGER newlength, time; BTRFS_TIME now; NTSTATUS Status; @@ -1995,6 +1995,18 @@ NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _I } fileref->fcb->deleted = TRUE; + + le = fileref->children.Flink; + while (le != &fileref->children) { + file_ref* fr2 = CONTAINING_RECORD(le, file_ref, list_entry); + + if (fr2->fcb->ads) { + fr2->fcb->deleted = TRUE; + mark_fcb_dirty(fr2->fcb); + } + + le = le->Flink; + } } if (fileref->dc) { @@ -2024,11 +2036,25 @@ NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _I mark_fcb_dirty(fileref->fcb); // so ROOT_ITEM gets updated } else { + LIST_ENTRY* le; + // FIXME - we need a lock here RemoveEntryList(&fileref->fcb->subvol->list_entry); InsertTailList(&fileref->fcb->Vcb->drop_roots, &fileref->fcb->subvol->list_entry); + + le = fileref->children.Flink; + while (le != &fileref->children) { + file_ref* fr2 = CONTAINING_RECORD(le, file_ref, list_entry); + + if (fr2->fcb->ads) { + fr2->fcb->deleted = TRUE; + mark_fcb_dirty(fr2->fcb); + } + + le = le->Flink; + } } } } else { @@ -2209,18 +2235,18 @@ static NTSTATUS drv_cleanup(_In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { locked = FALSE; // fcb_lock needs to be acquired before fcb->Header.Resource - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); Status = delete_fileref(fileref, FileObject, Irp, &rollback); if (!NT_SUCCESS(Status)) { ERR("delete_fileref returned %08x\n", Status); do_rollback(fcb->Vcb, &rollback); - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); ExReleaseResourceLite(&fcb->Vcb->tree_lock); goto exit; } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); locked = FALSE; @@ -4522,19 +4548,19 @@ exit2: if (Vcb->root_file) ObDereferenceObject(Vcb->root_file); else if (Vcb->root_fileref) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, Vcb->root_fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } else if (root_fcb) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, root_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } if (Vcb->volume_fcb) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, Vcb->volume_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } ExDeleteResourceLite(&Vcb->tree_lock); diff --git a/drivers/filesystems/btrfs/btrfs.rc b/drivers/filesystems/btrfs/btrfs.rc index f18e6ef56a..d79da1aa15 100644 --- a/drivers/filesystems/btrfs/btrfs.rc +++ b/drivers/filesystems/btrfs/btrfs.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs" - VALUE "FileVersion", "1.0" + VALUE "FileVersion", "1.0.1" VALUE "InternalName", "btrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" VALUE "OriginalFilename", "btrfs.sys" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0" + VALUE "ProductVersion", "1.0.1" END END BLOCK "VarFileInfo" diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index b658726f9a..1cb50cbfa4 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -170,6 +170,9 @@ typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER { #define _Create_lock_level_(a) #define _Lock_level_order_(a,b) #define _Has_lock_level_(a) +#define _Requires_lock_not_held_(a) +#define _Acquires_exclusive_lock_(a) +#define _Acquires_shared_lock_(a) #endif #endif @@ -634,6 +637,9 @@ typedef struct { UINT64 create_total_time; UINT64 open_fcb_calls; UINT64 open_fcb_time; + UINT64 open_fileref_child_calls; + UINT64 open_fileref_child_time; + UINT64 fcb_lock_time; } debug_stats; #endif @@ -890,6 +896,52 @@ typedef struct { LIST_ENTRY list_entry; } name_bit; +_Requires_lock_not_held_(Vcb->fcb_lock) +_Acquires_shared_lock_(Vcb->fcb_lock) +static __inline void acquire_fcb_lock_shared(device_extension* Vcb) { +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; + + if (ExAcquireResourceSharedLite(&Vcb->fcb_lock, FALSE)) + return; + + time1 = KeQueryPerformanceCounter(NULL); +#endif + + ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.fcb_lock_time += time2.QuadPart - time1.QuadPart; +#endif +} + +_Requires_lock_not_held_(Vcb->fcb_lock) +_Acquires_exclusive_lock_(Vcb->fcb_lock) +static __inline void acquire_fcb_lock_exclusive(device_extension* Vcb) { +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; + + if (ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, FALSE)) + return; + + time1 = KeQueryPerformanceCounter(NULL); +#endif + + ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.fcb_lock_time += time2.QuadPart - time1.QuadPart; +#endif +} + +_Requires_lock_held_(Vcb->fcb_lock) +_Releases_lock_(Vcb->fcb_lock) +static __inline void release_fcb_lock(device_extension* Vcb) { + ExReleaseResourceLite(&Vcb->fcb_lock); +} + static __inline void* map_user_buffer(PIRP Irp, ULONG priority) { if (!Irp->MdlAddress) { return Irp->UserBuffer; @@ -1043,7 +1095,7 @@ WCHAR* file_desc(_In_ PFILE_OBJECT FileObject); WCHAR* file_desc_fileref(_In_ file_ref* fileref); void mark_fcb_dirty(_In_ fcb* fcb); void mark_fileref_dirty(_In_ file_ref* fileref); -NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback); +NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_opt_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback); void chunk_lock_range(_In_ device_extension* Vcb, _In_ chunk* c, _In_ UINT64 start, _In_ UINT64 length); void chunk_unlock_range(_In_ device_extension* Vcb, _In_ chunk* c, _In_ UINT64 start, _In_ UINT64 length); void init_device(_In_ device_extension* Vcb, _Inout_ device* dev, _In_ BOOL get_nums); diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index 0ea66bb8db..15728de757 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -1418,6 +1418,13 @@ NTSTATUS open_fileref(_Requires_lock_held_(_Curr_->tree_lock) _Requires_exclusiv return STATUS_OBJECT_PATH_NOT_FOUND; } + // if path starts with two backslashes, ignore one of them + if (fnus2.Length >= 2 * sizeof(WCHAR) && fnus2.Buffer[1] == '\\') { + fnus2.Buffer++; + fnus2.Length -= sizeof(WCHAR); + fnus2.MaximumLength -= sizeof(WCHAR); + } + if (fnus2.Length == sizeof(WCHAR)) { if (Vcb->root_fileref->open_count == 0 && !(Vcb->Vpb->Flags & VPB_MOUNTED)) // don't allow root to be opened on unmounted FS return STATUS_DEVICE_NOT_READY; @@ -1487,8 +1494,19 @@ NTSTATUS open_fileref(_Requires_lock_held_(_Curr_->tree_lock) _Requires_exclusiv name_bit* nb = CONTAINING_RECORD(le, name_bit, list_entry); BOOL lastpart = le->Flink == &parts || (has_stream && le->Flink->Flink == &parts); BOOL streampart = has_stream && le->Flink == &parts; +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; +#endif +#ifdef DEBUG_STATS + time1 = KeQueryPerformanceCounter(NULL); +#endif Status = open_fileref_child(Vcb, sf, &nb->us, case_sensitive, lastpart, streampart, pooltype, &sf2, Irp); +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.open_fileref_child_calls++; + Vcb->stats.open_fileref_child_time += time2.QuadPart - time1.QuadPart; +#endif if (!NT_SUCCESS(Status)) { if (Status == STATUS_OBJECT_PATH_NOT_FOUND || Status == STATUS_OBJECT_NAME_NOT_FOUND) TRACE("open_fileref_child returned %08x\n", Status); @@ -1655,6 +1673,9 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr if (parfileref->fcb == Vcb->dummy_fcb) return STATUS_ACCESS_DENIED; + if (options & FILE_DIRECTORY_FILE && IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_TEMPORARY) + return STATUS_INVALID_PARAMETER; + Status = RtlUnicodeToUTF8N(NULL, 0, &utf8len, fpus->Buffer, fpus->Length); if (!NT_SUCCESS(Status)) { ERR("RtlUnicodeToUTF8N returned %08x\n", Status); @@ -1701,9 +1722,7 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr TRACE("requested attributes = %x\n", IrpSp->Parameters.Create.FileAttributes); - IrpSp->Parameters.Create.FileAttributes |= FILE_ATTRIBUTE_ARCHIVE; - - defda = FILE_ATTRIBUTE_ARCHIVE; + defda = 0; if (utf8[0] == '.') defda |= FILE_ATTRIBUTE_HIDDEN; @@ -1714,6 +1733,11 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr } else IrpSp->Parameters.Create.FileAttributes &= ~FILE_ATTRIBUTE_DIRECTORY; + if (!(IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + IrpSp->Parameters.Create.FileAttributes |= FILE_ATTRIBUTE_ARCHIVE; + defda |= FILE_ATTRIBUTE_ARCHIVE; + } + TRACE("defda = %x\n", defda); if (IrpSp->Parameters.Create.FileAttributes == FILE_ATTRIBUTE_NORMAL) @@ -2235,7 +2259,7 @@ static NTSTATUS create_stream(_Requires_lock_held_(_Curr_->tree_lock) _Requires_ *pfileref = fileref; - send_notification_fileref(parfileref, options & FILE_DIRECTORY_FILE ? FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME, FILE_ACTION_ADDED, &fileref->dc->name); + send_notification_fileref(parfileref, FILE_NOTIFY_CHANGE_STREAM_NAME, FILE_ACTION_ADDED_STREAM, &fileref->dc->name); return STATUS_SUCCESS; } @@ -2279,6 +2303,9 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R if (Vcb->readonly) return STATUS_MEDIA_WRITE_PROTECTED; + if (options & FILE_DELETE_ON_CLOSE && IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) + return STATUS_CANNOT_DELETE; + dsus.Buffer = datasuf; dsus.Length = dsus.MaximumLength = (USHORT)wcslen(datasuf) * sizeof(WCHAR); fpus.Buffer = NULL; @@ -2836,7 +2863,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur goto exit; } - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (options & FILE_OPEN_BY_FILE_ID) { if (fn.Length == sizeof(UINT64) && related && RequestedDisposition == FILE_OPEN) { @@ -2857,13 +2884,13 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur } else { WARN("FILE_OPEN_BY_FILE_ID only supported for inodes\n"); Status = STATUS_NOT_IMPLEMENTED; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else { if (related && fn.Length != 0 && fn.Buffer[0] == '\\') { - Status = STATUS_OBJECT_NAME_INVALID; - ExReleaseResourceLite(&Vcb->fcb_lock); + Status = STATUS_INVALID_PARAMETER; + release_fcb_lock(Vcb); goto exit; } @@ -2922,7 +2949,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Irp->Tail.Overlay.AuxiliaryBuffer = (void*)data; free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2937,23 +2964,23 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Status = STATUS_OBJECT_NAME_COLLISION; free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { if (RequestedDisposition == FILE_OPEN || RequestedDisposition == FILE_OVERWRITE) { TRACE("file doesn't exist, returning STATUS_OBJECT_NAME_NOT_FOUND\n"); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else if (Status == STATUS_OBJECT_PATH_NOT_FOUND) { TRACE("open_fileref returned %08x\n", Status); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } else { ERR("open_fileref returned %08x\n", Status); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2961,7 +2988,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur file_ref* sf; BOOL readonly; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (RequestedDisposition == FILE_SUPERSEDE || RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF) { LARGE_INTEGER zero; @@ -2972,9 +2999,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (fileref->fcb->type == BTRFS_TYPE_DIRECTORY || is_subvol_readonly(fileref->fcb->subvol, Irp)) { Status = STATUS_ACCESS_DENIED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2982,9 +3009,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (Vcb->readonly) { Status = STATUS_MEDIA_WRITE_PROTECTED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2993,9 +3020,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (!MmCanFileBeTruncated(&fileref->fcb->nonpaged->segment_object, &zero)) { Status = STATUS_USER_MAPPED_FILE; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3012,9 +3039,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur SeUnlockSubjectContext(&IrpSp->Parameters.Create.SecurityContext->AccessState->SubjectSecurityContext); TRACE("SeAccessCheck failed, returning %08x\n", Status); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3031,9 +3058,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur TRACE("could not open as deletion pending\n"); Status = STATUS_DELETE_PENDING; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3043,6 +3070,16 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur readonly = (!fileref->fcb->ads && fileref->fcb->atts & FILE_ATTRIBUTE_READONLY) || (fileref->fcb->ads && fileref->parent->fcb->atts & FILE_ATTRIBUTE_READONLY) || is_subvol_readonly(fileref->fcb->subvol, Irp) || fileref->fcb == Vcb->dummy_fcb || Vcb->readonly; + if (options & FILE_DELETE_ON_CLOSE && (fileref == Vcb->root_fileref || readonly)) { + Status = STATUS_CANNOT_DELETE; + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + goto exit; + } + if (readonly) { ACCESS_MASK allowed; @@ -3070,25 +3107,14 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur } else if (granted_access & ~allowed) { Status = Vcb->readonly ? STATUS_MEDIA_WRITE_PROTECTED : STATUS_ACCESS_DENIED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } - if (options & FILE_DELETE_ON_CLOSE && (fileref == Vcb->root_fileref || Vcb->readonly || - is_subvol_readonly(fileref->fcb->subvol, Irp) || readonly)) { - Status = STATUS_CANNOT_DELETE; - - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); - free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); - - goto exit; - } - if ((fileref->fcb->type == BTRFS_TYPE_SYMLINK || fileref->fcb->atts & FILE_ATTRIBUTE_REPARSE_POINT) && !(options & FILE_OPEN_REPARSE_POINT)) { REPARSE_DATA_BUFFER* data; @@ -3112,9 +3138,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Irp->Tail.Overlay.AuxiliaryBuffer = (void*)data; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3124,9 +3150,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (options & FILE_NON_DIRECTORY_FILE && !(fileref->fcb->atts & FILE_ATTRIBUTE_REPARSE_POINT)) { Status = STATUS_FILE_IS_A_DIRECTORY; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3134,9 +3160,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur TRACE("returning STATUS_NOT_A_DIRECTORY (type = %u, %S)\n", fileref->fcb->type, file_desc_fileref(fileref)); Status = STATUS_NOT_A_DIRECTORY; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3150,9 +3176,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur else WARN("IoCheckShareAccess failed, returning %08x\n", Status); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3167,9 +3193,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3186,13 +3212,24 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } + if (!fileref->fcb->ads && (IrpSp->Parameters.Create.FileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != ((fileref->fcb->atts & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)))) { + IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + Status = STATUS_ACCESS_DENIED; + goto exit; + } + if (fileref->fcb->ads) { Status = stream_set_end_of_file_information(Vcb, 0, fileref->fcb, fileref, FALSE); if (!NT_SUCCESS(Status)) { @@ -3200,9 +3237,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3213,9 +3250,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3229,15 +3266,17 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } if (!fileref->fcb->ads) { + LIST_ENTRY* le; + if (Irp->AssociatedIrp.SystemBuffer && IrpSp->Parameters.Create.EaLength > 0) { ULONG offset; FILE_FULL_EA_INFORMATION* eainfo; @@ -3248,9 +3287,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3285,9 +3324,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3304,6 +3343,41 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur fileref->fcb->ealen = 0; } } + + // remove streams and send notifications + le = fileref->fcb->dir_children_index.Flink; + while (le != &fileref->fcb->dir_children_index) { + dir_child* dc = CONTAINING_RECORD(le, dir_child, list_entry_index); + LIST_ENTRY* le2 = le->Flink; + + if (dc->index == 0) { + if (!dc->fileref) { + file_ref* fr2; + + Status = open_fileref_child(Vcb, fileref, &dc->name, TRUE, TRUE, TRUE, PagedPool, &fr2, NULL); + if (!NT_SUCCESS(Status)) + WARN("open_fileref_child returned %08x\n", Status); + } + + if (dc->fileref) { + send_notification_fcb(fileref, FILE_NOTIFY_CHANGE_STREAM_NAME, FILE_ACTION_REMOVED_STREAM, &dc->name); + + Status = delete_fileref(dc->fileref, NULL, NULL, rollback); + if (!NT_SUCCESS(Status)) { + ERR("delete_fileref returned %08x\n", Status); + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + goto exit; + } + } + } else + break; + + le = le2; + } } KeQuerySystemTime(&time); @@ -3355,9 +3429,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3379,9 +3453,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3467,8 +3541,8 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur #ifdef DEBUG_STATS open_type = 2; #endif - Status = file_create(Irp, DeviceObject->DeviceExtension, FileObject, related, loaded_related, &fn, RequestedDisposition, options, rollback); - ExReleaseResourceLite(&Vcb->fcb_lock); + Status = file_create(Irp, Vcb, FileObject, related, loaded_related, &fn, RequestedDisposition, options, rollback); + release_fcb_lock(Vcb); Irp->IoStatus.Information = NT_SUCCESS(Status) ? FILE_CREATED : 0; } @@ -3478,9 +3552,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur exit: if (loaded_related) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, related); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } if (Status == STATUS_SUCCESS) { diff --git a/drivers/filesystems/btrfs/dirctrl.c b/drivers/filesystems/btrfs/dirctrl.c index 5c78146153..0ae95d636c 100644 --- a/drivers/filesystems/btrfs/dirctrl.c +++ b/drivers/filesystems/btrfs/dirctrl.c @@ -628,7 +628,7 @@ static NTSTATUS query_directory(PIRP Irp) { return STATUS_NO_MORE_FILES; ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); TRACE("%S\n", file_desc(IrpSp->FileObject)); @@ -658,8 +658,6 @@ static NTSTATUS query_directory(PIRP Irp) { TRACE(" unknown flags: %u\n", flags); } - initial = !ccb->query_string.Buffer; - if (IrpSp->Flags & SL_RESTART_SCAN) { ccb->query_dir_offset = 0; @@ -667,8 +665,13 @@ static NTSTATUS query_directory(PIRP Irp) { RtlFreeUnicodeString(&ccb->query_string); ccb->query_string.Buffer = NULL; } + + ccb->has_wildcard = FALSE; + ccb->specific_file = FALSE; } + initial = !ccb->query_string.Buffer; + if (IrpSp->Parameters.QueryDirectory.FileName && IrpSp->Parameters.QueryDirectory.FileName->Length > 1) { TRACE("QD filename: %.*S\n", IrpSp->Parameters.QueryDirectory.FileName->Length / sizeof(WCHAR), IrpSp->Parameters.QueryDirectory.FileName->Buffer); @@ -906,7 +909,7 @@ end: ExReleaseResourceLite(&fileref->fcb->nonpaged->dir_children_lock); end2: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); TRACE("returning %08x\n", Status); diff --git a/drivers/filesystems/btrfs/fileinfo.c b/drivers/filesystems/btrfs/fileinfo.c index e79f453511..9f736671da 100644 --- a/drivers/filesystems/btrfs/fileinfo.c +++ b/drivers/filesystems/btrfs/fileinfo.c @@ -188,7 +188,7 @@ static NTSTATUS set_disposition_information(device_extension* Vcb, PIRP Irp, PFI if (!fileref) return STATUS_INVALID_PARAMETER; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); @@ -235,7 +235,7 @@ static NTSTATUS set_disposition_information(device_extension* Vcb, PIRP Irp, PFI end: ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); // send notification that directory is about to be deleted if (NT_SUCCESS(Status) && fdi->DeleteFile && fcb->type == BTRFS_TYPE_DIRECTORY) { @@ -1348,7 +1348,7 @@ static NTSTATUS set_rename_information(device_extension* Vcb, PIRP Irp, PFILE_OB } ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); if (fcb->ads) { @@ -1885,7 +1885,7 @@ end: do_rollback(Vcb, &rollback); ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return Status; @@ -1913,7 +1913,7 @@ NTSTATUS stream_set_end_of_file_information(device_extension* Vcb, UINT16 end, f TRACE("extending stream to %llx bytes\n", end); if (end > fcb->adsmaxlen) { - ERR("error - xattr too long (%llu > %u)\n", end, fcb->adsmaxlen); + ERR("error - xattr too long (%u > %u)\n", end, fcb->adsmaxlen); return STATUS_DISK_FULL; } @@ -2009,7 +2009,7 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI set_size = TRUE; } - filter = FILE_NOTIFY_CHANGE_SIZE; + filter = FILE_NOTIFY_CHANGE_STREAM_SIZE; if (!ccb->user_set_write_time) { KeQuerySystemTime(&time); @@ -2020,7 +2020,7 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI mark_fcb_dirty(fileref->parent->fcb); } - send_notification_fcb(fileref->parent, filter, FILE_ACTION_MODIFIED, &fileref->dc->name); + send_notification_fcb(fileref->parent, filter, FILE_ACTION_MODIFIED_STREAM, &fileref->dc->name); goto end; } @@ -2182,7 +2182,7 @@ static NTSTATUS set_link_information(device_extension* Vcb, PIRP Irp, PFILE_OBJE } ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); if (fcb->type == BTRFS_TYPE_DIRECTORY) { @@ -2451,7 +2451,7 @@ end: do_rollback(Vcb, &rollback); ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return Status; @@ -3472,7 +3472,7 @@ static NTSTATUS fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, file_ len = bytes_needed; } } else { - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); if (IsListEmpty(&fcb->hardlinks)) { bytes_needed += sizeof(FILE_LINK_ENTRY_INFORMATION) + fileref->dc->name.Length - sizeof(WCHAR); @@ -3565,7 +3565,7 @@ static NTSTATUS fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, file_ } } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); } fli->BytesNeeded = bytes_needed; diff --git a/drivers/filesystems/btrfs/flushthread.c b/drivers/filesystems/btrfs/flushthread.c index aa3d9b6b0f..ceb37c5a2a 100644 --- a/drivers/filesystems/btrfs/flushthread.c +++ b/drivers/filesystems/btrfs/flushthread.c @@ -7289,6 +7289,8 @@ NTSTATUS do_write(device_extension* Vcb, PIRP Irp) { #ifdef DEBUG_STATS static void print_stats(device_extension* Vcb) { + LARGE_INTEGER freq; + ERR("READ STATS:\n"); ERR("number of reads: %llu\n", Vcb->stats.num_reads); ERR("data read: %llu bytes\n", Vcb->stats.data_read); @@ -7297,7 +7299,9 @@ static void print_stats(device_extension* Vcb) { ERR("disk time taken: %llu\n", Vcb->stats.read_disk_time); ERR("other time taken: %llu\n", Vcb->stats.read_total_time - Vcb->stats.read_csum_time - Vcb->stats.read_disk_time); - ERR("OPEN STATS:\n"); + KeQueryPerformanceCounter(&freq); + + ERR("OPEN STATS (freq = %llu):\n", freq.QuadPart); ERR("number of opens: %llu\n", Vcb->stats.num_opens); ERR("total time taken: %llu\n", Vcb->stats.open_total_time); ERR("number of overwrites: %llu\n", Vcb->stats.num_overwrites); @@ -7305,6 +7309,9 @@ static void print_stats(device_extension* Vcb) { ERR("number of creates: %llu\n", Vcb->stats.num_creates); ERR("calls to open_fcb: %llu\n", Vcb->stats.open_fcb_calls); ERR("time spent in open_fcb: %llu\n", Vcb->stats.open_fcb_time); + ERR("calls to open_fileref_child: %llu\n", Vcb->stats.open_fileref_child_calls); + ERR("time spent in open_fileref_child: %llu\n", Vcb->stats.open_fileref_child_time); + ERR("time spent waiting for fcb_lock: %llu\n", Vcb->stats.fcb_lock_time); ERR("total time taken: %llu\n", Vcb->stats.create_total_time); RtlZeroMemory(&Vcb->stats, sizeof(debug_stats)); diff --git a/drivers/filesystems/btrfs/fsctl.c b/drivers/filesystems/btrfs/fsctl.c index 8e0fb3437b..87556c47e1 100644 --- a/drivers/filesystems/btrfs/fsctl.c +++ b/drivers/filesystems/btrfs/fsctl.c @@ -1002,10 +1002,10 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo rootfcb->inode_item_changed = TRUE; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); InsertTailList(&r->fcbs, &rootfcb->list_entry); InsertTailList(&Vcb->all_fcbs, &rootfcb->list_entry_all); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); rootfcb->Header.IsFastIoPossible = fast_io_possible(rootfcb); rootfcb->Header.AllocationSize.QuadPart = 0; @@ -1049,9 +1049,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo if (!fr) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, rootfcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; @@ -1073,9 +1073,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo fr->fcb->hash_ptrs = ExAllocatePoolWithTag(PagedPool, sizeof(LIST_ENTRY*) * 256, ALLOC_TAG); if (!fr->fcb->hash_ptrs) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; } @@ -1085,9 +1085,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo fr->fcb->hash_ptrs_uc = ExAllocatePoolWithTag(PagedPool, sizeof(LIST_ENTRY*) * 256, ALLOC_TAG); if (!fr->fcb->hash_ptrs_uc) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; } @@ -1155,9 +1155,9 @@ end: end2: if (fr) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } return Status; @@ -2194,15 +2194,15 @@ static NTSTATUS lock_volume(device_extension* Vcb, PIRP Irp) { if (Vcb->locked) return STATUS_SUCCESS; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto end; } - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (Vcb->balance.thread && KeReadStateEvent(&Vcb->balance.event)) { ExAcquireResourceExclusiveLite(&Vcb->tree_lock, TRUE); @@ -2377,6 +2377,7 @@ static NTSTATUS invalidate_volumes(PIRP Irp) { if (!NT_SUCCESS(Status)) { ERR("do_write returned %08x\n", Status); ExReleaseResourceLite(&Vcb->tree_lock); + ExFreePool(newvpb); goto end; } @@ -3742,7 +3743,7 @@ static NTSTATUS mknod(device_extension* Vcb, PFILE_OBJECT FileObject, void* data name.Length = name.MaximumLength = bmn->namelen; name.Buffer = bmn->name; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); Status = find_file_in_dir(&name, parfcb, &subvol, &inode, &dc, TRUE); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) { @@ -3982,7 +3983,7 @@ static NTSTATUS mknod(device_extension* Vcb, PFILE_OBJECT FileObject, void* data Status = STATUS_SUCCESS; end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExFreePool(utf8.Buffer); @@ -4429,11 +4430,11 @@ static NTSTATUS get_subvol_path(device_extension* Vcb, UINT64 id, WCHAR* out, UL return STATUS_INTERNAL_ERROR; } - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); Status = open_fileref_by_inode(Vcb, r, r->root_item.objid, &fr, Irp); if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ERR("open_fileref_by_inode returned %08x\n", Status); return Status; } @@ -4451,7 +4452,7 @@ static NTSTATUS get_subvol_path(device_extension* Vcb, UINT64 id, WCHAR* out, UL free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); return Status; } diff --git a/drivers/filesystems/btrfs/pnp.c b/drivers/filesystems/btrfs/pnp.c index aac3ea3a54..34997cfd59 100644 --- a/drivers/filesystems/btrfs/pnp.c +++ b/drivers/filesystems/btrfs/pnp.c @@ -161,7 +161,7 @@ static NTSTATUS pnp_cancel_remove_device(PDEVICE_OBJECT DeviceObject) { ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; @@ -175,7 +175,7 @@ static NTSTATUS pnp_cancel_remove_device(PDEVICE_OBJECT DeviceObject) { } end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return STATUS_SUCCESS; @@ -187,7 +187,7 @@ NTSTATUS pnp_query_remove_device(PDEVICE_OBJECT DeviceObject, PIRP Irp) { ExAcquireResourceExclusiveLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; @@ -216,7 +216,7 @@ NTSTATUS pnp_query_remove_device(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Status = STATUS_SUCCESS; end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); diff --git a/drivers/filesystems/btrfs/read.c b/drivers/filesystems/btrfs/read.c index 4fda650402..ddeea66c7a 100644 --- a/drivers/filesystems/btrfs/read.c +++ b/drivers/filesystems/btrfs/read.c @@ -3209,17 +3209,6 @@ NTSTATUS do_read(PIRP Irp, BOOLEAN wait, ULONG* bytes_read) { return STATUS_PENDING; } - if (!(Irp->Flags & IRP_PAGING_IO) && FileObject->SectionObjectPointer->DataSectionObject) { - IO_STATUS_BLOCK iosb; - - CcFlushCache(FileObject->SectionObjectPointer, &IrpSp->Parameters.Read.ByteOffset, length, &iosb); - - if (!NT_SUCCESS(iosb.Status)) { - ERR("CcFlushCache returned %08x\n", iosb.Status); - return iosb.Status; - } - } - if (fcb->ads) Status = read_stream(fcb, data, start, length, bytes_read); else @@ -3325,6 +3314,16 @@ NTSTATUS drv_read(PDEVICE_OBJECT DeviceObject, PIRP Irp) { if (Irp->Flags & IRP_PAGING_IO) wait = TRUE; + if (!(Irp->Flags & IRP_PAGING_IO) && FileObject->SectionObjectPointer->DataSectionObject) { + IO_STATUS_BLOCK iosb; + + CcFlushCache(FileObject->SectionObjectPointer, &IrpSp->Parameters.Read.ByteOffset, IrpSp->Parameters.Read.Length, &iosb); + if (!NT_SUCCESS(iosb.Status)) { + ERR("CcFlushCache returned %08x\n", iosb.Status); + return iosb.Status; + } + } + if (!ExIsResourceAcquiredSharedLite(fcb->Header.Resource)) { if (!ExAcquireResourceSharedLite(fcb->Header.Resource, wait)) { Status = STATUS_PENDING; diff --git a/drivers/filesystems/btrfs/reparse.c b/drivers/filesystems/btrfs/reparse.c index 440894323c..8e8d319b58 100644 --- a/drivers/filesystems/btrfs/reparse.c +++ b/drivers/filesystems/btrfs/reparse.c @@ -289,6 +289,10 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_INVALID_PARAMETER; } + // IFSTest insists on this, for some reason... + if (Irp->UserBuffer) + return STATUS_INVALID_PARAMETER; + fcb = FileObject->FsContext; ccb = FileObject->FsContext2; @@ -297,9 +301,7 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_INVALID_PARAMETER; } - // It isn't documented what permissions FSCTL_SET_REPARSE_POINT needs, but CreateSymbolicLinkW - // creates a file with FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE. - if (Irp->RequestorMode == UserMode && !(ccb->access & FILE_WRITE_ATTRIBUTES)) { + if (Irp->RequestorMode == UserMode && !(ccb->access & (FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA))) { WARN("insufficient privileges\n"); return STATUS_ACCESS_DENIED; } @@ -333,7 +335,13 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { if (buflen < sizeof(ULONG)) { WARN("buffer was not long enough to hold tag\n"); - Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_BUFFER_SIZE; + goto end; + } + + Status = FsRtlValidateReparsePointBuffer(buflen, rdb); + if (!NT_SUCCESS(Status)) { + ERR("FsRtlValidateReparsePointBuffer returned %08x\n", Status); goto end; } diff --git a/drivers/filesystems/btrfs/search.c b/drivers/filesystems/btrfs/search.c index 6f3dd62a2b..bec1aba420 100644 --- a/drivers/filesystems/btrfs/search.c +++ b/drivers/filesystems/btrfs/search.c @@ -913,8 +913,7 @@ void mountmgr_thread(_In_ void* context) { if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) ERR("IOCTL_MOUNTMGR_QUERY_POINTS 1 returned %08x\n", Status); - - if (mmps.Size > 0) { + else if (mmps.Size > 0) { MOUNTMGR_MOUNT_POINTS* mmps2; mmps2 = ExAllocatePoolWithTag(NonPagedPool, mmps.Size, ALLOC_TAG); diff --git a/drivers/filesystems/btrfs/volume.c b/drivers/filesystems/btrfs/volume.c index eff7f07c4c..5f7516a5c2 100755 --- a/drivers/filesystems/btrfs/volume.c +++ b/drivers/filesystems/btrfs/volume.c @@ -983,9 +983,9 @@ static BOOL allow_degraded_mount(BTRFS_UUID* uuid) { ZwClose(h); +end: ExFreePool(kvfi); -end: ExFreePool(path.Buffer); return degraded; diff --git a/drivers/filesystems/btrfs/write.c b/drivers/filesystems/btrfs/write.c index 95e6397424..c3a8fb7476 100644 --- a/drivers/filesystems/btrfs/write.c +++ b/drivers/filesystems/btrfs/write.c @@ -4335,6 +4335,11 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void Status = _SEH2_GetExceptionCode(); } _SEH2_END; + if (changed_length) { + send_notification_fcb(fcb->ads ? fileref->parent : fileref, fcb->ads ? FILE_NOTIFY_CHANGE_STREAM_SIZE : FILE_NOTIFY_CHANGE_SIZE, + fcb->ads ? FILE_ACTION_MODIFIED_STREAM : FILE_ACTION_MODIFIED, fcb->ads && fileref->dc ? &fileref->dc->name : NULL); + } + goto end; } @@ -4553,7 +4558,9 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void fileref->parent->fcb->inode_item_changed = TRUE; if (changed_length) - filter |= FILE_NOTIFY_CHANGE_SIZE; + filter |= FILE_NOTIFY_CHANGE_STREAM_SIZE; + + filter |= FILE_NOTIFY_CHANGE_STREAM_WRITE; } if (!ccb->user_set_write_time) { @@ -4585,7 +4592,8 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void Status = STATUS_SUCCESS; if (filter != 0) - send_notification_fcb(fcb->ads ? fileref->parent : fileref, filter, FILE_ACTION_MODIFIED, fcb->ads && fileref->dc ? &fileref->dc->name : NULL); + send_notification_fcb(fcb->ads ? fileref->parent : fileref, filter, fcb->ads ? FILE_ACTION_MODIFIED_STREAM : FILE_ACTION_MODIFIED, + fcb->ads && fileref->dc ? &fileref->dc->name : NULL); end: if (NT_SUCCESS(Status) && FileObject->Flags & FO_SYNCHRONOUS_IO && !paging_io) {

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