Use System32\tar.exe if present instead of 7zip for zip archives. (#406)

* Use System32\tar.exe if present instead of 7zip for zip archives.

This is a more targeted hotfix version of #404 as there are outstanding code review discussions there. (I do still intend to apply the changes therein but don't want code reviewers to feel like they can't say anything because it's resolving a high priority issue)

* Apply Nicole CR feedback.

* Fix e2e test failure.

include/vcpkg/archives.h

@@ -11,6 +11,8 @@ namespace vcpkg
 {
     // Extract `archive` to `to_path` using `tar_tool`.
     void extract_tar(const Path& tar_tool, const Path& archive, const Path& to_path);
+    // Extract `archive` to `to_path` using `cmake_tool`. (CMake's built in tar)
+    void extract_tar_cmake(const Path& cmake_tool, const Path& archive, const Path& to_path);
     // Extract `archive` to `to_path`, deleting `to_path` first.
     void extract_archive(const VcpkgPaths& paths, const Path& archive, const Path& to_path);
 

include/vcpkg/base/system.h

@@ -18,6 +18,10 @@ namespace vcpkg
 
 #ifdef _WIN32
     const ExpectedS<Path>& get_appdata_local() noexcept;
+
+    const ExpectedS<Path>& get_system_root() noexcept;
+
+    const ExpectedS<Path>& get_system32() noexcept;
 #endif
 
     Optional<std::string> get_registry_string(void* base_hkey, StringView subkey, StringView valuename);

include/vcpkg/fwd/tools.h

@@ -0,0 +1,12 @@
+#pragma once
+
+namespace vcpkg
+{
+    enum class RequireExactVersions
+    {
+        YES,
+        NO,
+    };
+
+    struct ToolCache;
+}

include/vcpkg/tools.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <vcpkg/fwd/tools.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
 #include <vcpkg/base/files.h>
@@ -30,15 +31,9 @@ namespace vcpkg
         static const std::string IFW_REPOGEN = "ifw_repogen";
     }
 
-    enum class RequireExactVersions
-    {
-        YES,
-        NO,
-    };
-
     struct ToolCache
     {
-        virtual ~ToolCache() { }
+        virtual ~ToolCache() = default;
 
         virtual const Path& get_tool_path_from_system(const Filesystem& fs, const std::string& tool) const = 0;
         virtual const Path& get_tool_path(const VcpkgPaths& paths, const std::string& tool) const = 0;

src/vcpkg/archives.cpp

@@ -136,9 +136,23 @@ namespace
         {
             win32_extract_msi(archive, to_path);
         }
-        else if (Strings::case_insensitive_ascii_equals(ext, ".zip") ||
-                 Strings::case_insensitive_ascii_equals(ext, ".7z") ||
-                 Strings::case_insensitive_ascii_equals(ext, ".exe"))
+        else if (Strings::case_insensitive_ascii_equals(ext, ".zip"))
+        {
+            const auto tar_path = get_system32().value_or_exit(VCPKG_LINE_INFO) / "tar.exe";
+            if (paths.get_filesystem().exists(tar_path, IgnoreErrors{}))
+            {
+                extract_tar(tar_path, archive, to_path);
+            }
+            else
+            {
+                win32_extract_with_seven_zip(paths, archive, to_path);
+            }
+        }
+        else if (Strings::case_insensitive_ascii_equals(ext, ".7z"))
+        {
+            extract_tar_cmake(paths.get_tool_exe(Tools::CMAKE), archive, to_path);
+        }
+        else if (Strings::case_insensitive_ascii_equals(ext, ".exe"))
         {
             win32_extract_with_seven_zip(paths, archive, to_path);
         }
@@ -183,6 +197,15 @@ namespace vcpkg
         Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", archive);
     }
 
+    void extract_tar_cmake(const Path& cmake_tool, const Path& archive, const Path& to_path)
+    {
+        // Note that CMake's built in tar can extract more archive types than many system tars; e.g. 7z
+        const auto code =
+            cmd_execute(Command{cmake_tool}.string_arg("-E").string_arg("tar").string_arg("xzf").path_arg(archive),
+                        WorkingDirectory{to_path});
+        Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", archive);
+    }
+
     void extract_archive(const VcpkgPaths& paths, const Path& archive, const Path& to_path)
     {
         Filesystem& fs = paths.get_filesystem();

src/vcpkg/base/system.cpp

@@ -273,6 +273,28 @@ namespace vcpkg
         }();
         return s_home;
     }
+
+    const ExpectedS<Path>& get_system_root() noexcept
+    {
+        static const ExpectedS<Path> s_system_root = []() -> ExpectedS<Path> {
+            auto env = get_environment_variable("SystemRoot");
+            if (const auto p = env.get())
+            {
+                return Path(std::move(*p));
+            }
+            else
+            {
+                return std::string("Expected the SystemRoot environment variable to be always set on Windows.");
+            }
+        }();
+        return s_system_root;
+    }
+
+    const ExpectedS<Path>& get_system32() noexcept
+    {
+        static const ExpectedS<Path> s_system32 = get_system_root().map([](const Path& p) { return p / "System32"; });
+        return s_system32;
+    }
 #else
     static const ExpectedS<Path>& get_xdg_cache_home() noexcept
     {

src/vcpkg/base/system.process.cpp

@@ -260,9 +260,8 @@ namespace vcpkg
     Environment get_modified_clean_environment(const std::unordered_map<std::string, std::string>& extra_env,
                                                StringView prepend_to_path)
     {
-        static const std::string system_root_env =
-            get_environment_variable("SystemRoot").value_or_exit(VCPKG_LINE_INFO);
-        static const std::string system32_env = system_root_env + R"(\system32)";
+        const std::string& system_root_env = get_system_root().value_or_exit(VCPKG_LINE_INFO).native();
+        const std::string& system32_env = get_system32().value_or_exit(VCPKG_LINE_INFO).native();
         std::string new_path = "PATH=";
         if (!prepend_to_path.empty())
         {