projects / reactos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 114556b)
[SHELLBTRFS] Use again .data() method of vector class
authorPierre Schweitzer <pierre@reactos.org>
Thu, 14 Nov 2019 14:01:55 +0000 (15:01 +0100)
committerPierre Schweitzer <pierre@reactos.org>
Mon, 18 Nov 2019 22:50:33 +0000 (23:50 +0100)
This reverts commit 45a643a136eedf8b39d22f5add94fd372320fdee.
This reverts commit a3c13c624f4a115f99560990f065dd94e4526304.
This reverts commit 1725ddfd8f06bbff1b853c93be35f2b0ab672a01.

dll/shellext/shellbtrfs/contextmenu.cpp patch | blob | history
dll/shellext/shellbtrfs/mountmgr_local.cpp patch | blob | history

diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp
index bf4b5e9..3fbca1c 100755 (executable)
--- 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);
 
                 streambufsize += 0x1000;
                 streambuf.resize(streambufsize);
 
-#ifndef __REACTOS__
                 memset(streambuf.data(), 0, streambufsize);
 
                 Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation);
                 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);
 
             } while (Status == STATUS_BUFFER_OVERFLOW);
 
             if (!NT_SUCCESS(Status))
                 throw ntstatus_error(Status);
 
-#ifndef __REACTOS__
             auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data());
             auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data());
-#else
-            auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]);
-#endif
 
             while (true) {
                 if (fsi->StreamNameLength > 0) {
 
             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);
 
                 streambufsize += 0x1000;
                 streambuf.resize(streambufsize);
 
-#ifndef __REACTOS__
                 memset(streambuf.data(), 0, streambufsize);
 
                 Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation);
                 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);
 
             } while (Status == STATUS_BUFFER_OVERFLOW);
 
             if (!NT_SUCCESS(Status))
                 throw ntstatus_error(Status);
 
-#ifndef __REACTOS__
             auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data());
             auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data());
-#else
-            auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]);
-#endif
 
             while (true) {
                 if (fsi->StreamNameLength > 0) {
 
             while (true) {
                 if (fsi->StreamNameLength > 0) {
diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp
index 45a47e6..164cf4d 100644 (file)
--- 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<uint8_t> buf(sizeof(MOUNTMGR_CREATE_POINT_INPUT) + ((symlink.length() + device.length()) * sizeof(WCHAR)));
     IO_STATUS_BLOCK iosb;
 
     vector<uint8_t> buf(sizeof(MOUNTMGR_CREATE_POINT_INPUT) + ((symlink.length() + device.length()) * sizeof(WCHAR)));
-#ifndef __REACTOS__
     auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(buf.data());
     auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(buf.data());
-#else
-    auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(&buf[0]);
-#endif
 
     mcpi->SymbolicLinkNameOffset = sizeof(MOUNTMGR_CREATE_POINT_INPUT);
     mcpi->SymbolicLinkNameLength = (USHORT)(symlink.length() * sizeof(WCHAR));
 
     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,
     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);
                                    buf.data(), (ULONG)buf.size(), nullptr, 0);
-#else
-                                   &buf[0], (ULONG)buf.size(), nullptr, 0);
-#endif
 
     if (!NT_SUCCESS(Status))
         throw ntstatus_error(Status);
 
     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<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR)));
     IO_STATUS_BLOCK iosb;
 
     vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR)));
-#ifndef __REACTOS__
     auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data());
     auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data());
-#else
-    auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]);
-#endif
 
     memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT));
 
 
     memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT));
 
@@ -100,28 +88,16 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un
     }
 
     vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS));
     }
 
     vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS));
-#ifndef __REACTOS__
     auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
     auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
-#else
-    auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]);
-#endif
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS,
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS,
-#ifndef __REACTOS__
                                    buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size());
                                    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,
 
     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());
                                        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))
     }
 
     if (!NT_SUCCESS(Status))
@@ -134,11 +110,7 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const
     vector<mountmgr_point> v;
 
     vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR)));
     vector<mountmgr_point> v;
 
     vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR)));
-#ifndef __REACTOS__
     auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data());
     auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data());
-#else
-    auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]);
-#endif
 
     memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT));
 
 
     memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT));
 
@@ -171,35 +143,19 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const
     }
 
     vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS));
     }
 
     vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS));
-#ifndef __REACTOS__
     auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
     auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
-#else
-    auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]);
-#endif
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS,
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS,
-#ifndef __REACTOS__
                                    buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size());
                                    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);
 
     if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW)
         throw ntstatus_error(Status);
 
     buf2.resize(mmps->Size);
-#ifndef __REACTOS__
     mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
     mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data());
-#else
-    mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]);
-#endif
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS,
 
     Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS,
-#ifndef __REACTOS__
                                    buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size());
                                    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);
 
     if (!NT_SUCCESS(Status))
         throw ntstatus_error(Status);
A free Windows-compatible Operating System