[ros-diffs] [reactos] 01/01: [SHELLBTRFS] Properly fix AppVeyor build This reverts bb6fece

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=986f6a4b24745211b49ea…

commit 986f6a4b24745211b49ea74c4317b9661473676b
Author:     Pierre Schweitzer <pierre(a)reactos.org>
AuthorDate: Wed Nov 13 08:22:13 2019 +0100
Commit:     Pierre Schweitzer <pierre(a)reactos.org>
CommitDate: Wed Nov 13 08:22:13 2019 +0100

    [SHELLBTRFS] Properly fix AppVeyor build
    This reverts bb6fece
---
 dll/shellext/shellbtrfs/devices.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dll/shellext/shellbtrfs/devices.cpp b/dll/shellext/shellbtrfs/devices.cpp
index f044151721e..dfa10647256 100755
--- a/dll/shellext/shellbtrfs/devices.cpp
+++ b/dll/shellext/shellbtrfs/devices.cpp
@@ -237,16 +237,22 @@ static void find_devices(HWND hwnd, const GUID* guid, const
mountmgr& mm, vector
                     free(dli);
                 } else {
                     try {
-                        std::vector<mountmgr_point> v;
-                        v = mm.query_points(L"", L"",
wstring_view(path.Buffer, path.Length / sizeof(WCHAR)));
+                        auto v = mm.query_points(L"", L"",
wstring_view(path.Buffer, path.Length / sizeof(WCHAR)));
 
-                        for (size_t i = 0; i < v.size(); ++i)
-                        {
-                            const mountmgr_point& p = v[i];
+#ifndef __REACTOS__
+                        for (const auto& p : v) {
                             if (p.symlink.length() == 14 && p.symlink.substr(0,
dosdevices.length()) == dosdevices && p.symlink[13] == ':') {
+#else
+                        for(auto p = v.begin(); p != v.end(); ++p) {
+                            if ((*p).symlink.length() == 14 &&
(*p).symlink.substr(0, dosdevices.length()) == dosdevices && (*p).symlink[13] ==
':') {
+#endif
                                 WCHAR dr[3];
 
+#ifndef __REACTOS__
                                 dr[0] = p.symlink[12];
+#else
+                                dr[0] = (*p).symlink[12];
+#endif
                                 dr[1] = ':';
                                 dr[2] = 0;