From 30986920687b2e35a0bc280a71da85f8743d216c Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Thu, 14 Nov 2019 15:01:55 +0100 Subject: [PATCH] [SHELLBTRFS] Use again .data() method of vector class This reverts commit 45a643a136eedf8b39d22f5add94fd372320fdee. This reverts commit a3c13c624f4a115f99560990f065dd94e4526304. This reverts commit 1725ddfd8f06bbff1b853c93be35f2b0ab672a01. --- dll/shellext/shellbtrfs/contextmenu.cpp | 20 ---------- dll/shellext/shellbtrfs/mountmgr_local.cpp | 44 ---------------------- 2 files changed, 64 deletions(-) diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index bf4b5e92c09..3fbca1cb7c2 100755 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -833,25 +833,15 @@ void BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast(streambuf.data()); -#else - auto fsi = reinterpret_cast(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { @@ -1535,25 +1525,15 @@ static void reflink_copy2(const wstring& srcfn, const wstring& destdir, const ws streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast(streambuf.data()); -#else - auto fsi = reinterpret_cast(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp index 45a47e68e15..164cf4d4804 100644 --- a/dll/shellext/shellbtrfs/mountmgr_local.cpp +++ b/dll/shellext/shellbtrfs/mountmgr_local.cpp @@ -33,11 +33,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev IO_STATUS_BLOCK iosb; vector buf(sizeof(MOUNTMGR_CREATE_POINT_INPUT) + ((symlink.length() + device.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mcpi = reinterpret_cast(buf.data()); -#else - auto mcpi = reinterpret_cast(&buf[0]); -#endif mcpi->SymbolicLinkNameOffset = sizeof(MOUNTMGR_CREATE_POINT_INPUT); mcpi->SymbolicLinkNameLength = (USHORT)(symlink.length() * sizeof(WCHAR)); @@ -48,11 +44,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev memcpy((uint8_t*)mcpi + mcpi->DeviceNameOffset, device.data(), device.length() * sizeof(WCHAR)); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_CREATE_POINT, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), nullptr, 0); -#else - &buf[0], (ULONG)buf.size(), nullptr, 0); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); @@ -63,11 +55,7 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un IO_STATUS_BLOCK iosb; vector buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast(buf.data()); -#else - auto mmp = reinterpret_cast(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -100,28 +88,16 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un } vector buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast(buf2.data()); -#else - auto mmps = reinterpret_cast(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (Status == STATUS_BUFFER_OVERFLOW) { buf2.resize(mmps->Size); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif } if (!NT_SUCCESS(Status)) @@ -134,11 +110,7 @@ vector mountmgr::query_points(const wstring_view& symlink, const vector v; vector buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast(buf.data()); -#else - auto mmp = reinterpret_cast(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -171,35 +143,19 @@ vector mountmgr::query_points(const wstring_view& symlink, const } vector buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast(buf2.data()); -#else - auto mmps = reinterpret_cast(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) throw ntstatus_error(Status); buf2.resize(mmps->Size); -#ifndef __REACTOS__ mmps = reinterpret_cast(buf2.data()); -#else - mmps = reinterpret_cast(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -- 2.17.1