Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [DNSAPI] DNSRSLVR_HANDLE_bind(): Demote 1 DPRINT1() (#4733)
by Serge Gautherie 28 Sep '22

28 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0e13157c6e4cf72a095d… commit f0e13157c6e4cf72a095da63195f4097644a4e48 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Sep 28 21:38:35 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 28 22:38:35 2022 +0300 [DNSAPI] DNSRSLVR_HANDLE_bind(): Demote 1 DPRINT1() (#4733) Addendum to b79246c534d (0.4.14-dev-174). CORE-18384 --- dll/win32/dnsapi/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/dnsapi/rpc.c b/dll/win32/dnsapi/rpc.c index 528f87e6b7e..cf4c8d50fe6 100644 --- a/dll/win32/dnsapi/rpc.c +++ b/dll/win32/dnsapi/rpc.c @@ -16,7 +16,7 @@ DNSRSLVR_HANDLE_bind(DNSRSLVR_HANDLE pszMachineName) LPWSTR pszStringBinding; RPC_STATUS Status; - DPRINT1("DNSRSLVR_HANDLE_bind(%S)\n", pszMachineName); + DPRINT("DNSRSLVR_HANDLE_bind(%S)\n", pszMachineName); Status = RpcStringBindingComposeW(NULL, L"ncalrpc",

1 0

[reactos] 01/01: [DOC] 3rd Party Files.txt: Update WinBtrfs to v1.8.1 (#4732)
by Serge Gautherie 28 Sep '22

28 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=421b89eea16b52d5b4104… commit 421b89eea16b52d5b4104a6af7a02c4ceb930e3a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Sep 28 20:38:42 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 28 21:38:42 2022 +0300 [DOC] 3rd Party Files.txt: Update WinBtrfs to v1.8.1 (#4732) Addendum to 29d1938258c (0.4.15-dev-5113). CORE-18322 --- media/doc/3rd Party Files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 1b0385c3d5f..0ab9cc921ab 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -77,7 +77,7 @@ Title: WinBtrfs Path: dll/shellext/shellbtrfs Path: drivers/filesystems/btrfs Path: sdk/lib/fslib/btrfslib -Used Version: 1.8.0 +Used Version: 1.8.1 License: LGPL-3.0-or-later (https://spdx.org/licenses/LGPL-3.0-or-later.html) URL: https://github.com/maharmstone/btrfs

1 0

[reactos] 01/01: [WIN32SS] Change LDEVOBJ_bProbeAndCaptureDevmode to account for not provided fields when searching an exact mode
by Hervé Poussineau 28 Sep '22

28 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7278ed20159f95550b5bd… commit 7278ed20159f95550b5bd0468e2be453320f0359 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Sep 28 18:26:44 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Sep 28 18:31:19 2022 +0200 [WIN32SS] Change LDEVOBJ_bProbeAndCaptureDevmode to account for not provided fields when searching an exact mode This fixes mode change if an application requests (for example) 640x480x32, without providing display frequency. --- win32ss/gdi/eng/ldevobj.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 6408c20648f..803cbd37fe1 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -804,9 +804,9 @@ LDEVOBJ_bProbeAndCaptureDevmode( if (!bResult) return FALSE; - if (bSearchClosestMode) + if (LDEVOBJ_bGetClosestMode(pGraphicsDevice, &dmSearch, &pdmSelected)) { - if (LDEVOBJ_bGetClosestMode(pGraphicsDevice, &dmSearch, &pdmSelected)) + if (bSearchClosestMode) { /* Ok, found a closest mode. Update search */ dmSearch.dmBitsPerPel = pdmSelected->dmBitsPerPel; @@ -814,6 +814,29 @@ LDEVOBJ_bProbeAndCaptureDevmode( dmSearch.dmPelsHeight = pdmSelected->dmPelsHeight; dmSearch.dmDisplayFrequency = pdmSelected->dmDisplayFrequency; } + else + { + /* Only update not provided fields */ + _SEH2_TRY + { + if (!(RequestedMode->dmFields & DM_BITSPERPEL) || RequestedMode->dmBitsPerPel == 0) + dmSearch.dmBitsPerPel = pdmSelected->dmBitsPerPel; + if (!(RequestedMode->dmFields & DM_PELSWIDTH) || RequestedMode->dmPelsWidth == 0) + dmSearch.dmPelsWidth = pdmSelected->dmPelsWidth; + if (!(RequestedMode->dmFields & DM_PELSHEIGHT) || RequestedMode->dmPelsHeight == 0) + dmSearch.dmPelsHeight = pdmSelected->dmPelsHeight; + if (!(RequestedMode->dmFields & DM_DISPLAYFREQUENCY) || RequestedMode->dmDisplayFrequency == 0) + dmSearch.dmDisplayFrequency = pdmSelected->dmDisplayFrequency; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bResult = FALSE; + } + _SEH2_END; + + if (!bResult) + return FALSE; + } } /* Now, search the exact mode to return to caller */

1 0

[reactos] 01/01: [BTRFS][UBTRFS][SHELLBTRFS] Upgrade to 1.8.1 (#4729)
by Johannes Obermayr 28 Sep '22

28 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29d1938258cc83423d422… commit 29d1938258cc83423d42281d87d58ffe8cc63bc2 Author: Johannes Obermayr <johannesobermayr(a)gmx.de> AuthorDate: Wed Sep 28 18:08:10 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 28 18:08:10 2022 +0200 [BTRFS][UBTRFS][SHELLBTRFS] Upgrade to 1.8.1 (#4729) CORE-18322 v1.8.1 (2022-08-23): - Fixed use-after-free when flushing - Fixed crash when opening volume when AppLocker installed - Compression now disabled for no-COW files, as on Linux - Flushing now scales better on very fast drives - Fixed small files getting padded to 4,096 bytes by lazy writer - Added NoDataCOW registry option --- dll/shellext/shellbtrfs/propsheet.cpp | 15 ++++ dll/shellext/shellbtrfs/shellbtrfs.rc | 8 +- dll/win32/ubtrfs/ubtrfs.rc | 8 +- drivers/filesystems/btrfs/btrfs.c | 102 +++++++++++----------- drivers/filesystems/btrfs/btrfs.inf | 2 +- drivers/filesystems/btrfs/btrfs.rc | 8 +- drivers/filesystems/btrfs/btrfs_drv.h | 16 +++- drivers/filesystems/btrfs/create.c | 17 ++-- drivers/filesystems/btrfs/fileinfo.c | 35 ++++++-- drivers/filesystems/btrfs/flushthread.c | 148 ++++++++++++++++++++++++++++---- drivers/filesystems/btrfs/free-space.c | 4 +- drivers/filesystems/btrfs/fsctl.c | 4 + drivers/filesystems/btrfs/registry.c | 10 ++- drivers/filesystems/btrfs/treefuncs.c | 53 ++++++++---- 14 files changed, 317 insertions(+), 113 deletions(-) diff --git a/dll/shellext/shellbtrfs/propsheet.cpp b/dll/shellext/shellbtrfs/propsheet.cpp index f31ce2eb85f..3730038567f 100644 --- a/dll/shellext/shellbtrfs/propsheet.cpp +++ b/dll/shellext/shellbtrfs/propsheet.cpp @@ -597,6 +597,16 @@ void BtrfsPropSheet::change_inode_flag(HWND hDlg, uint64_t flag, UINT state) { flags_set = ~flag; } + if (flags & BTRFS_INODE_NODATACOW && flags_set & BTRFS_INODE_NODATACOW) { + EnableWindow(GetDlgItem(hDlg, IDC_COMPRESS), false); + EnableWindow(GetDlgItem(hDlg, IDC_COMPRESS_TYPE), false); + } else { + EnableWindow(GetDlgItem(hDlg, IDC_COMPRESS), true); + EnableWindow(GetDlgItem(hDlg, IDC_COMPRESS_TYPE), flags & BTRFS_INODE_COMPRESS && flags_set & BTRFS_INODE_COMPRESS); + } + + EnableWindow(GetDlgItem(hDlg, IDC_NODATACOW), !(flags & BTRFS_INODE_COMPRESS) || !(flags_set & BTRFS_INODE_COMPRESS)); + flags_changed = true; SendMessageW(GetParent(hDlg), PSM_CHANGED, (WPARAM)hDlg, 0); @@ -995,6 +1005,11 @@ void BtrfsPropSheet::init_propsheet(HWND hwndDlg) { set_check_box(hwndDlg, IDC_NODATACOW, min_flags & BTRFS_INODE_NODATACOW, max_flags & BTRFS_INODE_NODATACOW); set_check_box(hwndDlg, IDC_COMPRESS, min_flags & BTRFS_INODE_COMPRESS, max_flags & BTRFS_INODE_COMPRESS); + if (min_flags & BTRFS_INODE_NODATACOW || max_flags & BTRFS_INODE_NODATACOW) + EnableWindow(GetDlgItem(hwndDlg, IDC_COMPRESS), false); + else if (min_flags & BTRFS_INODE_COMPRESS || max_flags & BTRFS_INODE_COMPRESS) + EnableWindow(GetDlgItem(hwndDlg, IDC_NODATACOW), false); + comptype = GetDlgItem(hwndDlg, IDC_COMPRESS_TYPE); while (SendMessageW(comptype, CB_GETCOUNT, 0, 0) > 0) { diff --git a/dll/shellext/shellbtrfs/shellbtrfs.rc b/dll/shellext/shellbtrfs/shellbtrfs.rc index b83d7288147..5140d8d3498 100644 --- a/dll/shellext/shellbtrfs/shellbtrfs.rc +++ b/dll/shellext/shellbtrfs/shellbtrfs.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "subvol.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,0,0 - PRODUCTVERSION 1,8,0,0 + FILEVERSION 1,8,1,0 + PRODUCTVERSION 1,8,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -78,12 +78,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs shell extension" - VALUE "FileVersion", "1.8.0" + VALUE "FileVersion", "1.8.1" VALUE "InternalName", "btrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-22" VALUE "OriginalFilename", "shellbtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.8.0" + VALUE "ProductVersion", "1.8.1" END END BLOCK "VarFileInfo" diff --git a/dll/win32/ubtrfs/ubtrfs.rc b/dll/win32/ubtrfs/ubtrfs.rc index e723033ba8e..014cd9e6dba 100644 --- a/dll/win32/ubtrfs/ubtrfs.rc +++ b/dll/win32/ubtrfs/ubtrfs.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,0,0 - PRODUCTVERSION 1,8,0,0 + FILEVERSION 1,8,1,0 + PRODUCTVERSION 1,8,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "Btrfs utility DLL" - VALUE "FileVersion", "1.8.0" + VALUE "FileVersion", "1.8.1" VALUE "InternalName", "ubtrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-22" VALUE "OriginalFilename", "ubtrfs.dll" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.8.0" + VALUE "ProductVersion", "1.8.1" END END BLOCK "VarFileInfo" diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 866f80a9205..f6d9ea0c196 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -83,6 +83,7 @@ uint32_t mount_clear_cache = 0; uint32_t mount_allow_degraded = 0; uint32_t mount_readonly = 0; uint32_t mount_no_root_dir = 0; +uint32_t mount_nodatacow = 0; uint32_t no_pnp = 0; bool log_started = false; UNICODE_STRING log_device, log_file, registry_path; @@ -645,6 +646,36 @@ static void calculate_total_space(_In_ device_extension* Vcb, _Out_ uint64_t* to } #ifndef __REACTOS__ +// simplified version of FsRtlAreNamesEqual, which can be a bottleneck! +static bool compare_strings(const UNICODE_STRING* us1, const UNICODE_STRING* us2) { + if (us1->Length != us2->Length) + return false; + + WCHAR* s1 = us1->Buffer; + WCHAR* s2 = us2->Buffer; + + for (unsigned int i = 0; i < us1->Length; i++) { + WCHAR c1 = *s1; + WCHAR c2 = *s2; + + if (c1 != c2) { + if (c1 >= 'a' && c1 <= 'z') + c1 = c1 - 'a' + 'A'; + + if (c2 >= 'a' && c2 <= 'z') + c2 = c2 - 'a' + 'A'; + + if (c1 != c2) + return false; + } + + s1++; + s2++; + } + + return true; +} + #define INIT_UNICODE_STRING(var, val) UNICODE_STRING us##var; us##var.Buffer = (WCHAR*)val; us##var.Length = us##var.MaximumLength = sizeof(val) - sizeof(WCHAR); // This function exists because we have to lie about our FS type in certain situations. @@ -707,7 +738,7 @@ static bool lie_about_fs_type() { name.Buffer = &entry->FullDllName.Buffer[(entry->FullDllName.Length - usmpr.Length) / sizeof(WCHAR)]; name.Length = name.MaximumLength = usmpr.Length; - blacklist = FsRtlAreNamesEqual(&name, &usmpr, true, NULL); + blacklist = compare_strings(&name, &usmpr); } if (!blacklist && entry->FullDllName.Length >= uscmd.Length) { @@ -716,7 +747,7 @@ static bool lie_about_fs_type() { name.Buffer = &entry->FullDllName.Buffer[(entry->FullDllName.Length - uscmd.Length) / sizeof(WCHAR)]; name.Length = name.MaximumLength = uscmd.Length; - blacklist = FsRtlAreNamesEqual(&name, &uscmd, true, NULL); + blacklist = compare_strings(&name, &uscmd); } if (!blacklist && entry->FullDllName.Length >= usfsutil.Length) { @@ -725,7 +756,7 @@ static bool lie_about_fs_type() { name.Buffer = &entry->FullDllName.Buffer[(entry->FullDllName.Length - usfsutil.Length) / sizeof(WCHAR)]; name.Length = name.MaximumLength = usfsutil.Length; - blacklist = FsRtlAreNamesEqual(&name, &usfsutil, true, NULL); + blacklist = compare_strings(&name, &usfsutil); } if (!blacklist && entry->FullDllName.Length >= usstorsvc.Length) { @@ -734,7 +765,7 @@ static bool lie_about_fs_type() { name.Buffer = &entry->FullDllName.Buffer[(entry->FullDllName.Length - usstorsvc.Length) / sizeof(WCHAR)]; name.Length = name.MaximumLength = usstorsvc.Length; - blacklist = FsRtlAreNamesEqual(&name, &usstorsvc, true, NULL); + blacklist = compare_strings(&name, &usstorsvc); } if (!blacklist && entry->FullDllName.Length >= usifstest.Length) { @@ -743,7 +774,7 @@ static bool lie_about_fs_type() { name.Buffer = &entry->FullDllName.Buffer[(entry->FullDllName.Length - usifstest.Length) / sizeof(WCHAR)]; name.Length = name.MaximumLength = usifstest.Length; - blacklist = FsRtlAreNamesEqual(&name, &usifstest, true, NULL); + blacklist = compare_strings(&name, &usifstest); } if (blacklist) { @@ -5943,59 +5974,32 @@ static void init_serial(bool first_time) { #if !defined(__REACTOS__) && (defined(_X86_) || defined(_AMD64_)) static void check_cpu() { bool have_sse2 = false, have_sse42 = false, have_avx2 = false; + int cpu_info[4]; -#ifndef _MSC_VER - { - uint32_t eax, ebx, ecx, edx; - - __cpuid(1, eax, ebx, ecx, edx); - - if (__get_cpuid(1, &eax, &ebx, &ecx, &edx)) { - have_sse42 = ecx & bit_SSE4_2; - have_sse2 = edx & bit_SSE2; - } - - if (__get_cpuid_count(7, 0, &eax, &ebx, &ecx, &edx)) - have_avx2 = ebx & bit_AVX2; + __cpuid(cpu_info, 1); + have_sse42 = cpu_info[2] & (1 << 20); + have_sse2 = cpu_info[3] & (1 << 26); - if (have_avx2) { - // check Windows has enabled AVX2 - Windows 10 doesn't immediately + __cpuidex(cpu_info, 7, 0); + have_avx2 = cpu_info[1] & (1 << 5); - if (__readcr4() & (1 << 18)) { - uint32_t xcr0; + if (have_avx2) { + // check Windows has enabled AVX2 - Windows 10 doesn't immediately - __asm__("xgetbv" : "=a" (xcr0) : "c" (0) : "edx" ); + if (__readcr4() & (1 << 18)) { + uint32_t xcr0; - if ((xcr0 & 6) != 6) - have_avx2 = false; - } else - have_avx2 = false; - } - } +#ifdef _MSC_VER + xcr0 = (uint32_t)_xgetbv(0); #else - { - unsigned int cpu_info[4]; - - __cpuid(cpu_info, 1); - have_sse42 = cpu_info[2] & (1 << 20); - have_sse2 = cpu_info[3] & (1 << 26); - - __cpuidex(cpu_info, 7, 0); - have_avx2 = cpu_info[1] & (1 << 5); - - if (have_avx2) { - // check Windows has enabled AVX2 - Windows 10 doesn't immediately - - if (__readcr4() & (1 << 18)) { - uint32_t xcr0 = (uint32_t)_xgetbv(0); + __asm__("xgetbv" : "=a" (xcr0) : "c" (0) : "edx"); +#endif - if ((xcr0 & 6) != 6) - have_avx2 = false; - } else + if ((xcr0 & 6) != 6) have_avx2 = false; - } + } else + have_avx2 = false; } -#endif if (have_sse42) { TRACE("SSE4.2 is supported\n"); diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index 18dc5cd25e9..fd3512b4f2f 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -10,7 +10,7 @@ Signature = "$Windows NT$" Class = Volume ClassGuid = {71a27cdd-812a-11d0-bec7-08002be2092f} Provider = %Me% -DriverVer = 03/12/2022,1.8.0 +DriverVer = 08/23/2022,1.8.1 CatalogFile = btrfs.cat [DestinationDirs] diff --git a/drivers/filesystems/btrfs/btrfs.rc b/drivers/filesystems/btrfs/btrfs.rc index 59f9d2ccb1f..085aedd131b 100644 --- a/drivers/filesystems/btrfs/btrfs.rc +++ b/drivers/filesystems/btrfs/btrfs.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,0,0 - PRODUCTVERSION 1,8,0,0 + FILEVERSION 1,8,1,0 + PRODUCTVERSION 1,8,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs" - VALUE "FileVersion", "1.8.0" + VALUE "FileVersion", "1.8.1" VALUE "InternalName", "btrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-22" VALUE "OriginalFilename", "btrfs.sys" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.8.0" + VALUE "ProductVersion", "1.8.1" END END BLOCK "VarFileInfo" diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index e06770adfac..46e62e04d05 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -492,8 +492,15 @@ typedef struct { } batch_item; typedef struct { - root* r; + KEY key; LIST_ENTRY items; + unsigned int num_items; + LIST_ENTRY list_entry; +} batch_item_ind; + +typedef struct { + root* r; + LIST_ENTRY items_ind; LIST_ENTRY list_entry; } batch_root; @@ -674,6 +681,7 @@ typedef struct { bool clear_cache; bool allow_degraded; bool no_root_dir; + bool nodatacow; } mount_options; #define VCB_TYPE_FS 1 @@ -1182,6 +1190,7 @@ extern uint32_t mount_clear_cache; extern uint32_t mount_allow_degraded; extern uint32_t mount_readonly; extern uint32_t mount_no_root_dir; +extern uint32_t mount_nodatacow; extern uint32_t no_pnp; #ifndef __GNUC__ @@ -1468,8 +1477,6 @@ NTSTATUS do_tree_writes(device_extension* Vcb, LIST_ENTRY* tree_writes, bool no_ void add_checksum_entry(device_extension* Vcb, uint64_t address, ULONG length, void* csum, PIRP Irp); bool find_metadata_address_in_chunk(device_extension* Vcb, chunk* c, uint64_t* address); void add_trim_entry_avoid_sb(device_extension* Vcb, device* dev, uint64_t address, uint64_t size); -NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, root* r, uint64_t objid, uint8_t objtype, uint64_t offset, - _In_opt_ _When_(return >= 0, __drv_aliasesMem) void* data, uint16_t datalen, enum batch_operation operation); NTSTATUS flush_partial_stripe(device_extension* Vcb, chunk* c, partial_stripe* ps); NTSTATUS update_dev_item(device_extension* Vcb, device* device, PIRP Irp); void calc_tree_checksum(device_extension* Vcb, tree_header* th); @@ -1697,6 +1704,9 @@ static __inline void print_open_trees(device_extension* Vcb) { } static __inline bool write_fcb_compressed(fcb* fcb) { + if (fcb->inode_item.flags & BTRFS_INODE_NODATACOW) + return false; + // make sure we don't accidentally write the cache inodes or pagefile compressed if (fcb->subvol->id == BTRFS_ROOT_ROOT || fcb->Header.Flags2 & FSRTL_FLAG2_IS_PAGING_FILE) return false; diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index c5d27d1ce27..c87a85b5015 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -2319,19 +2319,24 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr fcb->inode_item.flags = BTRFS_INODE_NODATACOW | BTRFS_INODE_NODATASUM | BTRFS_INODE_NOCOMPRESS; } else { // inherit nodatacow flag from parent directory - if (parfileref->fcb->inode_item.flags & BTRFS_INODE_NODATACOW) { + if (parfileref->fcb->inode_item.flags & BTRFS_INODE_NODATACOW || Vcb->options.nodatacow) { fcb->inode_item.flags |= BTRFS_INODE_NODATACOW; if (type != BTRFS_TYPE_DIRECTORY) fcb->inode_item.flags |= BTRFS_INODE_NODATASUM; } - if (parfileref->fcb->inode_item.flags & BTRFS_INODE_COMPRESS) + if (parfileref->fcb->inode_item.flags & BTRFS_INODE_COMPRESS && + !(fcb->inode_item.flags & BTRFS_INODE_NODATACOW)) { fcb->inode_item.flags |= BTRFS_INODE_COMPRESS; + } } - fcb->prop_compression = parfileref->fcb->prop_compression; - fcb->prop_compression_changed = fcb->prop_compression != PropCompression_None; + if (!(fcb->inode_item.flags & BTRFS_INODE_NODATACOW)) { + fcb->prop_compression = parfileref->fcb->prop_compression; + fcb->prop_compression_changed = fcb->prop_compression != PropCompression_None; + } else + fcb->prop_compression = PropCompression_None; fcb->inode_item_changed = true; @@ -2838,7 +2843,7 @@ static NTSTATUS create_stream(_Requires_lock_held_(_Curr_->tree_lock) _Requires_ fcb->adsmaxlen = Vcb->superblock.node_size - sizeof(tree_header) - sizeof(leaf_node) - (sizeof(DIR_ITEM) - 1); if (utf8len + sizeof(xapref) - 1 + overhead > fcb->adsmaxlen) { - WARN("not enough room for new DIR_ITEM (%Iu + %lu > %lu)", utf8len + sizeof(xapref) - 1, overhead, fcb->adsmaxlen); + WARN("not enough room for new DIR_ITEM (%Iu + %lu > %lu)\n", utf8len + sizeof(xapref) - 1, overhead, fcb->adsmaxlen); reap_fcb(fcb); free_fileref(parfileref); return STATUS_DISK_FULL; @@ -4551,7 +4556,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur uint64_t inode; if (!related) { - WARN("cannot open by short file ID unless related fileref also provided"); + WARN("cannot open by short file ID unless related fileref also provided"\n); Status = STATUS_INVALID_PARAMETER; goto exit; } diff --git a/drivers/filesystems/btrfs/fileinfo.c b/drivers/filesystems/btrfs/fileinfo.c index 16febd612d6..5b51b8ac56b 100644 --- a/drivers/filesystems/btrfs/fileinfo.c +++ b/drivers/filesystems/btrfs/fileinfo.c @@ -3248,6 +3248,7 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI LIST_ENTRY rollback; bool set_size = false; ULONG filter; + uint64_t new_end_of_file; if (!fileref) { ERR("fileref is NULL\n"); @@ -3306,35 +3307,43 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI TRACE("FileObject: AllocationSize = %I64x, FileSize = %I64x, ValidDataLength = %I64x\n", fcb->Header.AllocationSize.QuadPart, fcb->Header.FileSize.QuadPart, fcb->Header.ValidDataLength.QuadPart); - TRACE("setting new end to %I64x bytes (currently %I64x)\n", feofi->EndOfFile.QuadPart, fcb->inode_item.st_size); + new_end_of_file = feofi->EndOfFile.QuadPart; - if ((uint64_t)feofi->EndOfFile.QuadPart < fcb->inode_item.st_size) { + /* The lazy writer sometimes tries to round files to the next page size through CcSetValidData - + * ignore these. See fastfat!FatSetEndOfFileInfo, where Microsoft does the same as we're + * doing below. */ + if (advance_only && new_end_of_file >= (uint64_t)fcb->Header.FileSize.QuadPart) + new_end_of_file = fcb->Header.FileSize.QuadPart; + + TRACE("setting new end to %I64x bytes (currently %I64x)\n", new_end_of_file, fcb->inode_item.st_size); + + if (new_end_of_file < fcb->inode_item.st_size) { if (advance_only) { Status = STATUS_SUCCESS; goto end; } - TRACE("truncating file to %I64x bytes\n", feofi->EndOfFile.QuadPart); + TRACE("truncating file to %I64x bytes\n", new_end_of_file); if (!MmCanFileBeTruncated(&fcb->nonpaged->segment_object, &feofi->EndOfFile)) { Status = STATUS_USER_MAPPED_FILE; goto end; } - Status = truncate_file(fcb, feofi->EndOfFile.QuadPart, Irp, &rollback); + Status = truncate_file(fcb, new_end_of_file, Irp, &rollback); if (!NT_SUCCESS(Status)) { ERR("error - truncate_file failed\n"); goto end; } - } else if ((uint64_t)feofi->EndOfFile.QuadPart > fcb->inode_item.st_size) { - TRACE("extending file to %I64x bytes\n", feofi->EndOfFile.QuadPart); + } else if (new_end_of_file > fcb->inode_item.st_size) { + TRACE("extending file to %I64x bytes\n", new_end_of_file); - Status = extend_file(fcb, fileref, feofi->EndOfFile.QuadPart, prealloc, NULL, &rollback); + Status = extend_file(fcb, fileref, new_end_of_file, prealloc, NULL, &rollback); if (!NT_SUCCESS(Status)) { ERR("error - extend_file failed\n"); goto end; } - } else if ((uint64_t)feofi->EndOfFile.QuadPart == fcb->inode_item.st_size && advance_only) { + } else if (new_end_of_file == fcb->inode_item.st_size && advance_only) { Status = STATUS_SUCCESS; goto end; } @@ -5502,6 +5511,11 @@ NTSTATUS __stdcall drv_query_ea(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { goto end; } + if (fcb == fcb->Vcb->volume_fcb) { + Status = STATUS_INVALID_PARAMETER; + goto end; + } + ccb = FileObject->FsContext2; if (!ccb) { @@ -5753,6 +5767,11 @@ NTSTATUS __stdcall drv_set_ea(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { goto end; } + if (fcb == fcb->Vcb->volume_fcb) { + Status = STATUS_INVALID_PARAMETER; + goto end; + } + ccb = FileObject->FsContext2; if (!ccb) { diff --git a/drivers/filesystems/btrfs/flushthread.c b/drivers/filesystems/btrfs/flushthread.c index bdaf15bf69e..a39e174313f 100644 --- a/drivers/filesystems/btrfs/flushthread.c +++ b/drivers/filesystems/btrfs/flushthread.c @@ -29,6 +29,8 @@ // #define DEBUG_WRITE_LOOPS +#define BATCH_ITEM_LIMIT 1000 + typedef struct { KEVENT Event; IO_STATUS_BLOCK iosb; @@ -49,6 +51,10 @@ typedef struct { static NTSTATUS create_chunk(device_extension* Vcb, chunk* c, PIRP Irp); static NTSTATUS update_tree_extents(device_extension* Vcb, tree* t, PIRP Irp, LIST_ENTRY* rollback); +static NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, root* r, uint64_t objid, + uint8_t objtype, uint64_t offset, _In_opt_ _When_(return >= 0, __drv_aliasesMem) void* data, + uint16_t datalen, enum batch_operation operation); + _Function_class_(IO_COMPLETION_ROUTINE) static NTSTATUS __stdcall write_completion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID conptr) { write_context* context = conptr; @@ -2923,7 +2929,7 @@ static NTSTATUS update_chunk_usage(device_extension* Vcb, PIRP Irp, LIST_ENTRY* #ifdef DEBUG_PARANOID if (bgi->used & 0x8000000000000000) { - ERR("refusing to write BLOCK_GROUP_ITEM with negative usage value (%I64x)", bgi->used); + ERR("refusing to write BLOCK_GROUP_ITEM with negative usage value (%I64x)\n", bgi->used); int3; } #endif @@ -4429,12 +4435,88 @@ static NTSTATUS insert_sparse_extent(fcb* fcb, LIST_ENTRY* batchlist, uint64_t s return STATUS_SUCCESS; } +static NTSTATUS split_batch_item_list(batch_item_ind* bii) { + LIST_ENTRY* le; + unsigned int i = 0; + LIST_ENTRY* midpoint = NULL; + batch_item_ind* bii2; + batch_item* midpoint_item; + LIST_ENTRY* before_midpoint; + + le = bii->items.Flink; + while (le != &bii->items) { + if (i >= bii->num_items / 2) { + midpoint = le; + break; + } + + i++; + + le = le->Flink; + } + + if (!midpoint) + return STATUS_SUCCESS; + + // make sure items on either side of split don't have same key + + while (midpoint->Blink != &bii->items) { + batch_item* item = CONTAINING_RECORD(midpoint, batch_item, list_entry); + batch_item* prev = CONTAINING_RECORD(midpoint->Blink, batch_item, list_entry); + + if (item->key.obj_id != prev->key.obj_id) + break; + + if (item->key.obj_type != prev->key.obj_type) + break; + + if (item->key.offset != prev->key.offset) + break; + + midpoint = midpoint->Blink; + i--; + } + + if (midpoint->Blink == &bii->items) + return STATUS_SUCCESS; + + bii2 = ExAllocatePoolWithTag(PagedPool, sizeof(batch_item_ind), ALLOC_TAG); + if (!bii2) { + ERR("out of memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + midpoint_item = CONTAINING_RECORD(midpoint, batch_item, list_entry); + + bii2->key.obj_id = midpoint_item->key.obj_id; + bii2->key.obj_type = midpoint_item->key.obj_type; + bii2->key.offset = midpoint_item->key.offset; + + bii2->num_items = bii->num_items - i; + bii->num_items = i; + + before_midpoint = midpoint->Blink; + + bii2->items.Flink = midpoint; + midpoint->Blink = &bii2->items; + bii2->items.Blink = bii->items.Blink; + bii->items.Blink->Flink = &bii2->items; + + bii->items.Blink = before_midpoint; + before_midpoint->Flink = &bii->items; + + InsertHeadList(&bii->list_entry, &bii2->list_entry); + + return STATUS_SUCCESS; +} + #ifdef _MSC_VER #pragma warning(push) #pragma warning(suppress: 28194) #endif -NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, root* r, uint64_t objid, uint8_t objtype, uint64_t offset, - _In_opt_ _When_(return >= 0, __drv_aliasesMem) void* data, uint16_t datalen, enum batch_operation operation) { +static NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, root* r, uint64_t objid, + uint8_t objtype, uint64_t offset, _In_opt_ _When_(return >= 0, __drv_aliasesMem) void* data, + uint16_t datalen, enum batch_operation operation) { LIST_ENTRY* le; batch_root* br = NULL; batch_item* bi; @@ -4459,10 +4541,27 @@ NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, ro } br->r = r; - InitializeListHead(&br->items); + InitializeListHead(&br->items_ind); InsertTailList(batchlist, &br->list_entry); } + if (IsListEmpty(&br->items_ind)) { + batch_item_ind* bii; + + bii = ExAllocatePoolWithTag(PagedPool, sizeof(batch_item_ind), ALLOC_TAG); + if (!bii) { + ERR("out of memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + bii->key.obj_id = 0; + bii->key.obj_type = 0; + bii->key.offset = 0; + InitializeListHead(&bii->items); + bii->num_items = 0; + InsertTailList(&br->items_ind, &bii->list_entry); + } + bi = ExAllocateFromPagedLookasideList(&Vcb->batch_item_lookaside); if (!bi) { ERR("out of memory\n"); @@ -4476,22 +4575,41 @@ NTSTATUS insert_tree_item_batch(LIST_ENTRY* batchlist, device_extension* Vcb, ro bi->datalen = datalen; bi->operation = operation; - le = br->items.Blink; - while (le != &br->items) { - batch_item* bi2 = CONTAINING_RECORD(le, batch_item, list_entry); - int cmp = keycmp(bi2->key, bi->key); + le = br->items_ind.Blink; + while (le != &br->items_ind) { + LIST_ENTRY* le2; + batch_item_ind* bii = CONTAINING_RECORD(le, batch_item_ind, list_entry); - if (cmp == -1 || (cmp == 0 && bi->operation >= bi2->operation)) { - InsertHeadList(&bi2->list_entry, &bi->list_entry); - return STATUS_SUCCESS; + if (keycmp(bii->key, bi->key) == 1) { + le = le->Blink; + continue; } - le = le->Blink; - } + le2 = bii->items.Blink; + while (le2 != &bii->items) { + batch_item* bi2 = CONTAINING_RECORD(le2, batch_item, list_entry); + int cmp = keycmp(bi2->key, bi->key); + + if (cmp == -1 || (cmp == 0 && bi->operation >= bi2->operation)) { + InsertHeadList(&bi2->list_entry, &bi->list_entry); + bii->num_items++; + goto end; + } - InsertHeadList(&br->items, &bi->list_entry); + le2 = le2->Blink; + } - return STATUS_SUCCESS; + InsertHeadList(&bii->items, &bi->list_entry); + bii->num_items++; + +end: + if (bii->num_items > BATCH_ITEM_LIMIT) + return split_batch_item_list(bii); + + return STATUS_SUCCESS; + } + + return STATUS_INTERNAL_ERROR; } #ifdef _MSC_VER #pragma warning(pop) diff --git a/drivers/filesystems/btrfs/free-space.c b/drivers/filesystems/btrfs/free-space.c index 50b8141ee6f..5e6350af444 100644 --- a/drivers/filesystems/btrfs/free-space.c +++ b/drivers/filesystems/btrfs/free-space.c @@ -1892,16 +1892,16 @@ static NTSTATUS update_chunk_cache_tree(device_extension* Vcb, chunk* c, PIRP Ir fsi_count++; - ExFreePool(s); RemoveHeadList(&space_list); + ExFreePool(s); continue; } else if (s->address == tp.item->key.obj_id && s->size == tp.item->key.offset) { // unchanged entry fsi_count++; - ExFreePool(s); RemoveHeadList(&space_list); + ExFreePool(s); } else { // remove entry diff --git a/drivers/filesystems/btrfs/fsctl.c b/drivers/filesystems/btrfs/fsctl.c index 356031e395f..c1f12ecd57e 100644 --- a/drivers/filesystems/btrfs/fsctl.c +++ b/drivers/filesystems/btrfs/fsctl.c @@ -1363,6 +1363,10 @@ static NTSTATUS set_inode_info(PFILE_OBJECT FileObject, void* data, ULONG length return STATUS_ACCESS_DENIED; } + // nocow and compression are mutually exclusive + if (bsii->flags_changed && bsii->flags & BTRFS_INODE_NODATACOW && bsii->flags & BTRFS_INODE_COMPRESS) + return STATUS_INVALID_PARAMETER; + ExAcquireResourceExclusiveLite(fcb->Header.Resource, true); if (bsii->flags_changed) { diff --git a/drivers/filesystems/btrfs/registry.c b/drivers/filesystems/btrfs/registry.c index 3f70cf83b14..63b51ea9ae4 100644 --- a/drivers/filesystems/btrfs/registry.c +++ b/drivers/filesystems/btrfs/registry.c @@ -38,7 +38,7 @@ NTSTATUS registry_load_volume_options(device_extension* Vcb) { mount_options* options = &Vcb->options; UNICODE_STRING path, ignoreus, compressus, compressforceus, compresstypeus, readonlyus, zliblevelus, flushintervalus, maxinlineus, subvolidus, skipbalanceus, nobarrierus, notrimus, clearcacheus, allowdegradedus, zstdlevelus, - norootdirus; + norootdirus, nodatacowus; OBJECT_ATTRIBUTES oa; NTSTATUS Status; ULONG i, j, kvfilen, index, retlen; @@ -59,6 +59,8 @@ NTSTATUS registry_load_volume_options(device_extension* Vcb) { options->clear_cache = mount_clear_cache; options->allow_degraded = mount_allow_degraded; options->subvol_id = 0; + options->no_root_dir = mount_no_root_dir; + options->nodatacow = mount_nodatacow; path.Length = path.MaximumLength = registry_path.Length + (37 * sizeof(WCHAR)); path.Buffer = ExAllocatePoolWithTag(PagedPool, path.Length, ALLOC_TAG); @@ -123,6 +125,7 @@ NTSTATUS registry_load_volume_options(device_extension* Vcb) { RtlInitUnicodeString(&allowdegradedus, L"AllowDegraded"); RtlInitUnicodeString(&zstdlevelus, L"ZstdLevel"); RtlInitUnicodeString(&norootdirus, L"NoRootDir"); + RtlInitUnicodeString(&nodatacowus, L"NoDataCOW"); do { Status = ZwEnumerateValueKey(h, index, KeyValueFullInformation, kvfi, kvfilen, &retlen); @@ -199,6 +202,10 @@ NTSTATUS registry_load_volume_options(device_extension* Vcb) { DWORD* val = (DWORD*)((uint8_t*)kvfi + kvfi->DataOffset); options->no_root_dir = *val; + } else if (FsRtlAreNamesEqual(&nodatacowus, &us, true, NULL) && kvfi->DataOffset > 0 && kvfi->DataLength > 0 && kvfi->Type == REG_DWORD) { + DWORD* val = (DWORD*)((uint8_t*)kvfi + kvfi->DataOffset); + + options->nodatacow = *val; } } else if (Status != STATUS_NO_MORE_ENTRIES) { ERR("ZwEnumerateValueKey returned %08lx\n", Status); @@ -813,6 +820,7 @@ void read_registry(PUNICODE_STRING regpath, bool refresh) { get_registry_value(h, L"Readonly", REG_DWORD, &mount_readonly, sizeof(mount_readonly)); get_registry_value(h, L"ZstdLevel", REG_DWORD, &mount_zstd_level, sizeof(mount_zstd_level)); get_registry_value(h, L"NoRootDir", REG_DWORD, &mount_no_root_dir, sizeof(mount_no_root_dir)); + get_registry_value(h, L"NoDataCOW", REG_DWORD, &mount_nodatacow, sizeof(mount_nodatacow)); if (!refresh) get_registry_value(h, L"NoPNP", REG_DWORD, &no_pnp, sizeof(no_pnp)); diff --git a/drivers/filesystems/btrfs/treefuncs.c b/drivers/filesystems/btrfs/treefuncs.c index 3b9483a7b08..157e453b29a 100644 --- a/drivers/filesystems/btrfs/treefuncs.c +++ b/drivers/filesystems/btrfs/treefuncs.c @@ -1254,11 +1254,16 @@ void clear_batch_list(device_extension* Vcb, LIST_ENTRY* batchlist) { LIST_ENTRY* le = RemoveHeadList(batchlist); batch_root* br = CONTAINING_RECORD(le, batch_root, list_entry); - while (!IsListEmpty(&br->items)) { - LIST_ENTRY* le2 = RemoveHeadList(&br->items); - batch_item* bi = CONTAINING_RECORD(le2, batch_item, list_entry); + while (!IsListEmpty(&br->items_ind)) { + batch_item_ind* bii = CONTAINING_RECORD(RemoveHeadList(&br->items_ind), batch_item_ind, list_entry); - ExFreeToPagedLookasideList(&Vcb->batch_item_lookaside, bi); + while (!IsListEmpty(&bii->items)) { + batch_item* bi = CONTAINING_RECORD(RemoveHeadList(&bii->items), batch_item, list_entry); + + ExFreeToPagedLookasideList(&Vcb->batch_item_lookaside, bi); + } + + ExFreePool(bii); } ExFreePool(br); @@ -1901,15 +1906,31 @@ static NTSTATUS handle_batch_collision(device_extension* Vcb, batch_item* bi, tr __attribute__((nonnull(1,2))) static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tree_lock) device_extension* Vcb, batch_root* br, PIRP Irp) { + LIST_ENTRY items; LIST_ENTRY* le; NTSTATUS Status; TRACE("root: %I64x\n", br->r->id); - le = br->items.Flink; - while (le != &br->items) { + InitializeListHead(&items); + + // move sub-lists into one big list + + while (!IsListEmpty(&br->items_ind)) { + batch_item_ind* bii = CONTAINING_RECORD(RemoveHeadList(&br->items_ind), batch_item_ind, list_entry); + + items.Blink->Flink = bii->items.Flink; + bii->items.Flink->Blink = items.Blink; + items.Blink = bii->items.Blink; + bii->items.Blink->Flink = &items; + + ExFreePool(bii); + } + + le = items.Flink; + while (le != &items) { batch_item* bi = CONTAINING_RECORD(le, batch_item, list_entry); - LIST_ENTRY *le2; + LIST_ENTRY* le2; traverse_ptr tp; KEY tree_end; bool no_end; @@ -2174,7 +2195,7 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr if (td) InsertHeadList(tp.item->list_entry.Blink, &td->list_entry); } else { - Status = handle_batch_collision(Vcb, bi, tp.tree, tp.item, td, &br->items, &ignore); + Status = handle_batch_collision(Vcb, bi, tp.tree, tp.item, td, &items, &ignore); if (!NT_SUCCESS(Status)) { ERR("handle_batch_collision returned %08lx\n", Status); #ifdef _DEBUG @@ -2192,7 +2213,7 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr } if (bi->operation == Batch_DeleteInodeRef && cmp != 0 && Vcb->superblock.incompat_flags & BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF) { - add_delete_inode_extref(Vcb, bi, &br->items); + add_delete_inode_extref(Vcb, bi, &items); } if (!ignore && td) { @@ -2214,7 +2235,7 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr } le2 = le->Flink; - while (le2 != &br->items) { + while (le2 != &items) { batch_item* bi2 = CONTAINING_RECORD(le2, batch_item, list_entry); if (bi2->operation == Batch_DeleteInode || bi2->operation == Batch_DeleteExtentData || bi2->operation == Batch_DeleteFreeSpace) @@ -2255,10 +2276,10 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr InsertHeadList(le3->Blink, &td->list_entry); inserted = true; } else if (bi2->operation == Batch_DeleteInodeRef && Vcb->superblock.incompat_flags & BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF) { - add_delete_inode_extref(Vcb, bi2, &br->items); + add_delete_inode_extref(Vcb, bi2, &items); } } else { - Status = handle_batch_collision(Vcb, bi2, tp.tree, td2, td, &br->items, &ignore); + Status = handle_batch_collision(Vcb, bi2, tp.tree, td2, td, &items, &ignore); if (!NT_SUCCESS(Status)) { ERR("handle_batch_collision returned %08lx\n", Status); #ifdef _DEBUG @@ -2275,7 +2296,7 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr InsertHeadList(le3->Blink, &td->list_entry); inserted = true; } else if (bi2->operation == Batch_DeleteInodeRef && Vcb->superblock.incompat_flags & BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF) { - add_delete_inode_extref(Vcb, bi2, &br->items); + add_delete_inode_extref(Vcb, bi2, &items); } break; } @@ -2294,7 +2315,7 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr listhead = td; } } else if (!inserted && bi2->operation == Batch_DeleteInodeRef && Vcb->superblock.incompat_flags & BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF) { - add_delete_inode_extref(Vcb, bi2, &br->items); + add_delete_inode_extref(Vcb, bi2, &items); } while (listhead->list_entry.Blink != &tp.tree->itemlist) { @@ -2330,8 +2351,8 @@ static NTSTATUS commit_batch_list_root(_Requires_exclusive_lock_held_(_Curr_->tr } // FIXME - remove as we are going along - while (!IsListEmpty(&br->items)) { - batch_item* bi = CONTAINING_RECORD(RemoveHeadList(&br->items), batch_item, list_entry); + while (!IsListEmpty(&items)) { + batch_item* bi = CONTAINING_RECORD(RemoveHeadList(&items), batch_item, list_entry); if ((bi->operation == Batch_DeleteDirItem || bi->operation == Batch_DeleteInodeRef || bi->operation == Batch_DeleteInodeExtRef || bi->operation == Batch_DeleteXattr) && bi->data)

1 0

[reactos] 01/01: [FRAMEBUF] Implement required DirectDraw functions
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22d8c0fd541eaf92b3462… commit 22d8c0fd541eaf92b3462ae1d252cdbba16e30db Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:41:47 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:45:56 2022 +0200 [FRAMEBUF] Implement required DirectDraw functions However, do not support any optional callback. dxdiag now accepts to run DirectDraw tests. --- win32ss/drivers/displays/framebuf/enable.c | 38 +++++++++++++++++++++++++++- win32ss/drivers/displays/framebuf/framebuf.h | 11 ++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/win32ss/drivers/displays/framebuf/enable.c b/win32ss/drivers/displays/framebuf/enable.c index 3bd273bf916..04fc1b71c6e 100644 --- a/win32ss/drivers/displays/framebuf/enable.c +++ b/win32ss/drivers/displays/framebuf/enable.c @@ -31,10 +31,46 @@ static DRVFN DrvFunctionTable[] = {INDEX_DrvGetModes, (PFN)DrvGetModes}, {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, - {INDEX_DrvMovePointer, (PFN)DrvMovePointer} + {INDEX_DrvMovePointer, (PFN)DrvMovePointer}, + {INDEX_DrvEnableDirectDraw, (PFN)DrvEnableDirectDraw}, + {INDEX_DrvDisableDirectDraw, (PFN)DrvDisableDirectDraw}, }; +/* + * DrvEnableDirectDraw + */ + +BOOL APIENTRY +DrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallbacks, + DD_SURFACECALLBACKS *pSurfaceCallbacks, + DD_PALETTECALLBACKS *pPaletteCallbacks) +{ + RtlZeroMemory(pCallbacks, sizeof(*pCallbacks)); + RtlZeroMemory(pSurfaceCallbacks, sizeof(*pSurfaceCallbacks)); + RtlZeroMemory(pPaletteCallbacks, sizeof(*pPaletteCallbacks)); + + pCallbacks->dwSize = sizeof(*pCallbacks); + pSurfaceCallbacks->dwSize = sizeof(*pSurfaceCallbacks); + pPaletteCallbacks->dwSize = sizeof(*pPaletteCallbacks); + + /* We don't support any optional callback */ + + return TRUE; +} + +/* + * DrvDisableDirectDraw + */ + +VOID APIENTRY +DrvDisableDirectDraw( + DHPDEV dhpdev) +{ +} + /* * DrvEnableDriver * diff --git a/win32ss/drivers/displays/framebuf/framebuf.h b/win32ss/drivers/displays/framebuf/framebuf.h index 9d01f49d047..8a8046f7302 100644 --- a/win32ss/drivers/displays/framebuf/framebuf.h +++ b/win32ss/drivers/displays/framebuf/framebuf.h @@ -71,6 +71,17 @@ typedef struct _PDEV #define ALLOC_TAG 'FUBF' +BOOL APIENTRY +DrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallbacks, + DD_SURFACECALLBACKS *pSurfaceCallbacks, + DD_PALETTECALLBACKS *pPaletteCallbacks); + +VOID APIENTRY +DrvDisableDirectDraw( + DHPDEV dhpdev); + DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm,

1 0

[reactos] 02/02: [NTOS:PNP] Partially implement NtPlugPlayControl(PlugPlayControlQueryAndRemoveDevice)
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b3ee43c24dd93f607cd… commit 06b3ee43c24dd93f607cd3d749d309aa5ad4bf1b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:35:09 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:35:09 2022 +0200 [NTOS:PNP] Partially implement NtPlugPlayControl(PlugPlayControlQueryAndRemoveDevice) CORE-12307 --- ntoskrnl/io/pnpmgr/plugplay.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index e3412c4cfa3..c35aa58fd5f 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -1147,6 +1147,39 @@ PiControlSyncDeviceAction( return Status; } +static +NTSTATUS +PiControlQueryRemoveDevice( + _In_ PPLUGPLAY_CONTROL_QUERY_REMOVE_DATA ControlData) +{ + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + UNICODE_STRING DeviceInstance; + + Status = IopCaptureUnicodeString(&DeviceInstance, &ControlData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } + if (DeviceObject == NULL) + { + return STATUS_NO_SUCH_DEVICE; + } + + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + + ObDereferenceObject(DeviceObject); + + return Status; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -1400,7 +1433,10 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, PlugPlayControlClass); // case PlugPlayControlUnlockDevice: -// case PlugPlayControlQueryAndRemoveDevice: + case PlugPlayControlQueryAndRemoveDevice: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_QUERY_REMOVE_DATA)) + return STATUS_INVALID_PARAMETER; + return PiControlQueryRemoveDevice((PPLUGPLAY_CONTROL_QUERY_REMOVE_DATA)Buffer); case PlugPlayControlUserResponse: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_USER_RESPONSE_DATA))

1 0

[reactos] 01/02: [NETSHELL] Return error if disconnection failed
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5eeeb1c23541b0eaf5edc… commit 5eeeb1c23541b0eaf5edcc356ec35578d43b5da8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:33:16 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:33:57 2022 +0200 [NETSHELL] Return error if disconnection failed CORE-12307 --- dll/shellext/netshell/connectmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 78e2059df51..fd934b09b09 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -135,9 +135,10 @@ CNetConnection::Disconnect() PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; PropChangeParams.HwProfile = 0; - if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) + if (!SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS)) || + !SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo)) { - SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo); + hr = HRESULT_FROM_WIN32(GetLastError()); } } SetupDiDestroyDeviceInfoList(hInfo); @@ -145,6 +146,9 @@ CNetConnection::Disconnect() swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); CoTaskMemFree(pDisplayName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return E_FAIL;

1 0

[reactos] 01/01: [NTUSER][KBSWITCH] Realize Alt+Shift keyboard switch (retry) (#4721)
by Katayama Hirofumi MZ 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2469ce2c317ba8c8ab0f4… commit 2469ce2c317ba8c8ab0f49feeb3fecad15cca19e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 26 08:07:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 26 08:07:50 2022 +0900 [NTUSER][KBSWITCH] Realize Alt+Shift keyboard switch (retry) (#4721) Alt+Shift is a useful key combination to switch the current keyboard layout. CORE-11737 - Add ID_NEXTLAYOUT command to kbswitch. - Send command ID_NEXTLAYOUT to kbswitch on Alt+Shift key combination in WM_SYSKEYDOWN handling of IntDefWindowProc function. - Make IntFindWindow a non-static function. --- base/applications/kbswitch/kbswitch.c | 6 ++++++ base/applications/kbswitch/resource.h | 1 + win32ss/user/ntuser/defwnd.c | 18 ++++++++++++++++++ win32ss/user/ntuser/window.c | 2 +- win32ss/user/ntuser/window.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index d1b39320561..187661e7d1b 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -546,6 +546,12 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) break; } + case ID_NEXTLAYOUT: + { + ActivateLayout(hwnd, GetNextLayout()); + break; + } + default: { ActivateLayout(hwnd, LOWORD(wParam)); diff --git a/base/applications/kbswitch/resource.h b/base/applications/kbswitch/resource.h index b7410bd20e0..ef71d848be4 100644 --- a/base/applications/kbswitch/resource.h +++ b/base/applications/kbswitch/resource.h @@ -9,3 +9,4 @@ /* Menu items */ #define ID_EXIT 10001 #define ID_PREFERENCES 10002 +#define ID_NEXTLAYOUT 10003 diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 846a131cfb3..9d2021a70eb 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -945,6 +945,24 @@ IntDefWindowProc( wParamTmp = UserGetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; co_IntSendMessage( Active, WM_SYSCOMMAND, wParamTmp, wParam ); } + else if (wParam == VK_SHIFT) // Alt+Shift + { + RTL_ATOM ClassAtom = 0; + UNICODE_STRING ustrClass, ustrWindow; + HWND hwndSwitch; + + RtlInitUnicodeString(&ustrClass, L"kbswitcher"); + RtlInitUnicodeString(&ustrWindow, L""); + + IntGetAtomFromStringOrAtom(&ustrClass, &ClassAtom); + + hwndSwitch = IntFindWindow(UserGetDesktopWindow(), NULL, ClassAtom, &ustrWindow); + if (hwndSwitch) + { +#define ID_NEXTLAYOUT 10003 + UserPostMessage(hwndSwitch, WM_COMMAND, ID_NEXTLAYOUT, 0); + } + } } else if( wParam == VK_F10 ) { diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index a2b9e24b6d8..c880ddcc173 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3040,7 +3040,7 @@ CLEANUP: } -static HWND FASTCALL +HWND FASTCALL IntFindWindow(PWND Parent, PWND ChildAfter, RTL_ATOM ClassAtom, diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index b68c1657c5d..0efbd4987a3 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -98,6 +98,8 @@ extern PWINDOWLIST gpwlCache; PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti); VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); +HWND FASTCALL IntFindWindow(PWND Parent, PWND ChildAfter, RTL_ATOM ClassAtom, + PUNICODE_STRING WindowName); /* Undocumented dwFlags for IntBuildHwndList */ #define IACE_LIST 0x0002

1 0

[reactos] 01/01: [CMD] Fix build. Addendum to 67ac583b5.
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38870875ba5d9ddcf381a… commit 38870875ba5d9ddcf381aaf41f8b8ad2cc9d668f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 23:59:07 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 23:59:18 2022 +0200 [CMD] Fix build. Addendum to 67ac583b5. --- base/shell/cmd/copy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/copy.c b/base/shell/cmd/copy.c index 73901d7cd91..907222148f9 100644 --- a/base/shell/cmd/copy.c +++ b/base/shell/cmd/copy.c @@ -259,7 +259,7 @@ copy(TCHAR source[MAX_PATH], TRACE ("setting mode\n"); /* For MS-DOS backwards-compatibility, always remove the read-only attribute */ - SetFileAttributes (dest, dwAttribs & ~FILE_ATTRIBUTE_READONLY); + SetFileAttributes (dest, dwAttrib & ~FILE_ATTRIBUTE_READONLY); /* Now finish off the copy if needed with CopyFileEx */ if (lpdwFlags & COPY_RESTART)

1 0

[reactos] 01/01: [CMD] COPY: Always remove the read-only attribute, for MS-DOS backwards-compatibility.
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67ac583b5bfb5c72fd1cd… commit 67ac583b5bfb5c72fd1cd88ee7c211979d6e190b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 23:50:25 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 23:55:27 2022 +0200 [CMD] COPY: Always remove the read-only attribute, for MS-DOS backwards-compatibility. Tested and compared with MS CMD.EXE when copying files within the same directory, across directories and across drives. This is not done for the MOVE, REN and REPLACE commands however. CORE-18090 --- base/shell/cmd/copy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/copy.c b/base/shell/cmd/copy.c index 40bf43eda0d..73901d7cd91 100644 --- a/base/shell/cmd/copy.c +++ b/base/shell/cmd/copy.c @@ -258,7 +258,8 @@ copy(TCHAR source[MAX_PATH], CloseHandle (hFileSrc); TRACE ("setting mode\n"); - SetFileAttributes (dest, dwAttrib); + /* For MS-DOS backwards-compatibility, always remove the read-only attribute */ + SetFileAttributes (dest, dwAttribs & ~FILE_ATTRIBUTE_READONLY); /* Now finish off the copy if needed with CopyFileEx */ if (lpdwFlags & COPY_RESTART)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022