From fc52b381e9d48b53e1383fad33b32cc232b6b3cf Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Mon, 21 Feb 2022 12:01:24 +0100
Subject: [PATCH 1/9] [vcpkg-tool-ninja] add port for ninja

---
 ports/vcpkg-cmake/vcpkg.json                  |   10 +-
 ports/vcpkg-tool-meson/vcpkg.json             |   11 +-
 ports/vcpkg-tool-ninja/PR2056.diff            | 1071 +++++++++++++++++
 ports/vcpkg-tool-ninja/portfile.cmake         |   83 ++
 ports/vcpkg-tool-ninja/vcpkg.json             |    8 +
 .../cmake/vcpkg_find_acquire_program.cmake    |   45 +-
 6 files changed, 1205 insertions(+), 23 deletions(-)
 create mode 100644 ports/vcpkg-tool-ninja/PR2056.diff
 create mode 100644 ports/vcpkg-tool-ninja/portfile.cmake
 create mode 100644 ports/vcpkg-tool-ninja/vcpkg.json

diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
index 0061a046eab5c0..65639159b31814 100644
--- a/ports/vcpkg-cmake/vcpkg.json
+++ b/ports/vcpkg-cmake/vcpkg.json
@@ -1,4 +1,12 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-01-19"
+  "version-date": "2022-02-21",
+  "license": "MIT",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-ninja",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
index ec48241bd25769..6a13682cf47028 100644
--- a/ports/vcpkg-tool-meson/vcpkg.json
+++ b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "vcpkg-tool-meson",
   "version": "0.60.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
-  "supports": "native"
+  "license": "Apache-2.0",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-ninja",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/vcpkg-tool-ninja/PR2056.diff b/ports/vcpkg-tool-ninja/PR2056.diff
new file mode 100644
index 00000000000000..4a9c6c4b672873
--- /dev/null
+++ b/ports/vcpkg-tool-ninja/PR2056.diff
@@ -0,0 +1,1071 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57ae548f5b..3fdde943cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,10 +17,16 @@ endif()
+ 
+ # --- compiler flags
+ if(MSVC)
++	option(BUILD_UNICODE "Build with Unicode support. This enables long path support on windows." ON)
++
+ 	set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+ 	string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 	add_compile_options(/W4 /wd4100 /wd4267 /wd4706 /wd4702 /wd4244 /GR- /Zc:__cplusplus)
+ 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
++
++	if(BUILD_UNICODE)
++		add_compile_definitions(UNICODE _UNICODE)
++	endif()
+ else()
+ 	include(CheckCXXCompilerFlag)
+ 	check_cxx_compiler_flag(-Wno-deprecated flag_no_deprecated)
+@@ -152,7 +158,7 @@ add_executable(ninja src/ninja.cc)
+ target_link_libraries(ninja PRIVATE libninja libninja-re2c)
+ 
+ if(WIN32)
+-  target_sources(ninja PRIVATE windows/ninja.manifest)
++	target_sources(ninja PRIVATE windows/ninja.manifest)
+ endif()
+ 
+ # Adds browse mode into the ninja binary if it's supported by the host platform.
+diff --git a/src/build_log.cc b/src/build_log.cc
+index 4dcd6cee53..b069bfaa5a 100644
+--- a/src/build_log.cc
++++ b/src/build_log.cc
+@@ -186,7 +186,7 @@ bool BuildLog::OpenForWriteIfNeeded() {
+   if (log_file_ || log_file_path_.empty()) {
+     return true;
+   }
+-  log_file_ = fopen(log_file_path_.c_str(), "ab");
++  log_file_ = fopen(ToPathWidth(log_file_path_).c_str(), "ab");
+   if (!log_file_) {
+     return false;
+   }
+@@ -260,7 +260,7 @@ struct LineReader {
+ 
+ LoadStatus BuildLog::Load(const string& path, string* err) {
+   METRIC_RECORD(".ninja_log load");
+-  FILE* file = fopen(path.c_str(), "r");
++  FILE* file = fopen(ToPathWidth(path).c_str(), "r");
+   if (!file) {
+     if (errno == ENOENT)
+       return LOAD_NOT_FOUND;
+@@ -283,7 +283,7 @@ LoadStatus BuildLog::Load(const string& path, string* err) {
+         *err = ("build log version invalid, perhaps due to being too old; "
+                 "starting over");
+         fclose(file);
+-        unlink(path.c_str());
++        unlink(ToPathWidth(path).c_str());
+         // Don't report this as a failure.  An empty build log will cause
+         // us to rebuild the outputs anyway.
+         return LOAD_SUCCESS;
+@@ -393,7 +393,7 @@ bool BuildLog::Recompact(const string& path, const BuildLogUser& user,
+ 
+   Close();
+   string temp_path = path + ".recompact";
+-  FILE* f = fopen(temp_path.c_str(), "wb");
++  FILE* f = fopen(ToPathWidth(temp_path).c_str(), "wb");
+   if (!f) {
+     *err = strerror(errno);
+     return false;
+@@ -423,7 +423,7 @@ bool BuildLog::Recompact(const string& path, const BuildLogUser& user,
+     entries_.erase(dead_outputs[i]);
+ 
+   fclose(f);
+-  if (unlink(path.c_str()) < 0) {
++  if (unlink(ToPathWidth(path).c_str()) < 0) {
+     *err = strerror(errno);
+     return false;
+   }
+@@ -444,7 +444,7 @@ bool BuildLog::Restat(const StringPiece path,
+ 
+   Close();
+   std::string temp_path = path.AsString() + ".restat";
+-  FILE* f = fopen(temp_path.c_str(), "wb");
++  FILE* f = fopen(ToPathWidth(temp_path).c_str(), "wb");
+   if (!f) {
+     *err = strerror(errno);
+     return false;
+@@ -480,7 +480,7 @@ bool BuildLog::Restat(const StringPiece path,
+   }
+ 
+   fclose(f);
+-  if (unlink(path.str_) < 0) {
++  if (unlink(ToPathWidth(path.str_).c_str()) < 0) {
+     *err = strerror(errno);
+     return false;
+   }
+diff --git a/src/build_log_perftest.cc b/src/build_log_perftest.cc
+index 5a936198fb..2547cabac1 100644
+--- a/src/build_log_perftest.cc
++++ b/src/build_log_perftest.cc
+@@ -144,7 +144,7 @@ int main() {
+   printf("min %dms  max %dms  avg %.1fms\n",
+          min, max, total / times.size());
+ 
+-  unlink(kTestFilename);
++  unlink(ToPathWidth(kTestFilename).c_str());
+ 
+   return 0;
+ }
+diff --git a/src/build_log_test.cc b/src/build_log_test.cc
+index 37182994d2..010ea3921a 100644
+--- a/src/build_log_test.cc
++++ b/src/build_log_test.cc
+@@ -31,15 +31,15 @@ using namespace std;
+ 
+ namespace {
+ 
+-const char kTestFilename[] = "BuildLogTest-tempfile";
++const file_string kTestFilename(TEXT("BuildLogTest-tempfile"));
+ 
+ struct BuildLogTest : public StateTestWithBuiltinRules, public BuildLogUser {
+   virtual void SetUp() {
+     // In case a crashing test left a stale file behind.
+-    unlink(kTestFilename);
++    unlink(kTestFilename.c_str());
+   }
+   virtual void TearDown() {
+-    unlink(kTestFilename);
++    unlink(kTestFilename.c_str());
+   }
+   virtual bool IsPathDead(StringPiece s) const { return false; }
+ };
+@@ -135,7 +135,7 @@ TEST_F(BuildLogTest, Truncate) {
+   }
+ 
+   struct stat statbuf;
+-  ASSERT_EQ(0, stat(kTestFilename, &statbuf));
++  ASSERT_EQ(0, stat(NarrowPath(kTestFilename).c_str(), &statbuf));
+   ASSERT_GT(statbuf.st_size, 0);
+ 
+   // For all possible truncations of the input file, assert that we don't
+@@ -256,12 +256,13 @@ TEST_F(BuildLogTest, Restat) {
+   TestDiskInterface testDiskInterface;
+   char out2[] = { 'o', 'u', 't', '2', 0 };
+   char* filter2[] = { out2 };
+-  EXPECT_TRUE(log.Restat(kTestFilename, testDiskInterface, 1, filter2, &err));
++  EXPECT_TRUE(log.Restat(NarrowPath(kTestFilename), testDiskInterface, 1, filter2, &err));
+   ASSERT_EQ("", err);
+   e = log.LookupByOutput("out");
+   ASSERT_EQ(3, e->mtime); // unchanged, since the filter doesn't match
+ 
+-  EXPECT_TRUE(log.Restat(kTestFilename, testDiskInterface, 0, NULL, &err));
++  EXPECT_TRUE(
++      log.Restat(NarrowPath(kTestFilename), testDiskInterface, 0, NULL, &err));
+   ASSERT_EQ("", err);
+   e = log.LookupByOutput("out");
+   ASSERT_EQ(4, e->mtime);
+diff --git a/src/clean_test.cc b/src/clean_test.cc
+index e99909c0d0..e1de421a6b 100644
+--- a/src/clean_test.cc
++++ b/src/clean_test.cc
+@@ -469,11 +469,11 @@ TEST_F(CleanTest, CleanDepFileAndRspFileWithSpaces) {
+ struct CleanDeadTest : public CleanTest, public BuildLogUser{
+   virtual void SetUp() {
+     // In case a crashing test left a stale file behind.
+-    unlink(kTestFilename);
++    unlink(ToPathWidth(kTestFilename).c_str());
+     CleanTest::SetUp();
+   }
+   virtual void TearDown() {
+-    unlink(kTestFilename);
++    unlink(ToPathWidth(kTestFilename).c_str());
+   }
+   virtual bool IsPathDead(StringPiece) const { return false; }
+ };
+diff --git a/src/deps_log.cc b/src/deps_log.cc
+index 7e48b38513..e194c42e12 100644
+--- a/src/deps_log.cc
++++ b/src/deps_log.cc
+@@ -152,7 +152,7 @@ void DepsLog::Close() {
+ LoadStatus DepsLog::Load(const string& path, State* state, string* err) {
+   METRIC_RECORD(".ninja_deps load");
+   char buf[kMaxRecordSize + 1];
+-  FILE* f = fopen(path.c_str(), "rb");
++  FILE* f = fopen(ToPathWidth(path).c_str(), "rb");
+   if (!f) {
+     if (errno == ENOENT)
+       return LOAD_NOT_FOUND;
+@@ -175,7 +175,7 @@ LoadStatus DepsLog::Load(const string& path, State* state, string* err) {
+     else
+       *err = "bad deps log signature or version; starting over";
+     fclose(f);
+-    unlink(path.c_str());
++    unlink(ToPathWidth(path).c_str());
+     // Don't report this as a failure.  An empty deps log will cause
+     // us to rebuild the outputs anyway.
+     return LOAD_SUCCESS;
+@@ -316,7 +316,7 @@ bool DepsLog::Recompact(const string& path, string* err) {
+ 
+   // OpenForWrite() opens for append.  Make sure it's not appending to a
+   // left-over file from a previous recompaction attempt that crashed somehow.
+-  unlink(temp_path.c_str());
++  unlink(ToPathWidth(temp_path).c_str());
+ 
+   DepsLog new_log;
+   if (!new_log.OpenForWrite(temp_path, err))
+@@ -348,7 +348,7 @@ bool DepsLog::Recompact(const string& path, string* err) {
+   deps_.swap(new_log.deps_);
+   nodes_.swap(new_log.nodes_);
+ 
+-  if (unlink(path.c_str()) < 0) {
++  if (unlink(ToPathWidth(path).c_str()) < 0) {
+     *err = strerror(errno);
+     return false;
+   }
+@@ -420,7 +420,7 @@ bool DepsLog::OpenForWriteIfNeeded() {
+   if (file_path_.empty()) {
+     return true;
+   }
+-  file_ = fopen(file_path_.c_str(), "ab");
++  file_ = fopen(ToPathWidth(file_path_).c_str(), "ab");
+   if (!file_) {
+     return false;
+   }
+diff --git a/src/deps_log_test.cc b/src/deps_log_test.cc
+index 13fcc788b6..e8d9ca2be9 100644
+--- a/src/deps_log_test.cc
++++ b/src/deps_log_test.cc
+@@ -32,10 +32,10 @@ const char kTestFilename[] = "DepsLogTest-tempfile";
+ struct DepsLogTest : public testing::Test {
+   virtual void SetUp() {
+     // In case a crashing test left a stale file behind.
+-    unlink(kTestFilename);
++    unlink(ToPathWidth(kTestFilename).c_str());
+   }
+   virtual void TearDown() {
+-    unlink(kTestFilename);
++    unlink(ToPathWidth(kTestFilename).c_str());
+   }
+ };
+ 
+@@ -335,7 +335,7 @@ TEST_F(DepsLogTest, InvalidHeader) {
+   };
+   for (size_t i = 0; i < sizeof(kInvalidHeaders) / sizeof(kInvalidHeaders[0]);
+        ++i) {
+-    FILE* deps_log = fopen(kTestFilename, "wb");
++    FILE* deps_log = fopen(ToPathWidth(kTestFilename).c_str(), "wb");
+     ASSERT_TRUE(deps_log != NULL);
+     ASSERT_EQ(
+         strlen(kInvalidHeaders[i]),
+diff --git a/src/disk_interface.cc b/src/disk_interface.cc
+index a37c5703ba..4c87b19ea5 100644
+--- a/src/disk_interface.cc
++++ b/src/disk_interface.cc
+@@ -56,7 +56,7 @@ string DirName(const string& path) {
+ 
+ int MakeDir(const string& path) {
+ #ifdef _WIN32
+-  return _mkdir(path.c_str());
++  return mkdir(ToPathWidth(path).c_str());
+ #else
+   return mkdir(path.c_str(), 0777);
+ #endif
+@@ -75,7 +75,7 @@ TimeStamp TimeStampFromFileTime(const FILETIME& filetime) {
+ 
+ TimeStamp StatSingleFile(const string& path, string* err) {
+   WIN32_FILE_ATTRIBUTE_DATA attrs;
+-  if (!GetFileAttributesExA(path.c_str(), GetFileExInfoStandard, &attrs)) {
++  if (!GetFileAttributesEx(ToPathWidth(path).c_str(), GetFileExInfoStandard, &attrs)) {
+     DWORD win_err = GetLastError();
+     if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND)
+       return 0;
+@@ -104,28 +104,28 @@ bool StatAllFilesInDir(const string& dir, map<string, TimeStamp>* stamps,
+       static_cast<FINDEX_INFO_LEVELS>(1);
+   FINDEX_INFO_LEVELS level =
+       can_use_basic_info ? kFindExInfoBasic : FindExInfoStandard;
+-  WIN32_FIND_DATAA ffd;
+-  HANDLE find_handle = FindFirstFileExA((dir + "\\*").c_str(), level, &ffd,
++  WIN32_FIND_DATA ffd;
++  HANDLE find_handle = FindFirstFileEx(ToPathWidth((dir + "\\*")).c_str(), level, &ffd,
+                                         FindExSearchNameMatch, NULL, 0);
+ 
+   if (find_handle == INVALID_HANDLE_VALUE) {
+     DWORD win_err = GetLastError();
+     if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND)
+       return true;
+-    *err = "FindFirstFileExA(" + dir + "): " + GetLastErrorString();
++    *err = "FindFirstFileExW(" + dir + "): " + GetLastErrorString();
+     return false;
+   }
+   do {
+-    string lowername = ffd.cFileName;
++    file_string lowername = ffd.cFileName;
+     if (lowername == "..") {
+       // Seems to just copy the timestamp for ".." from ".", which is wrong.
+       // This is the case at least on NTFS under Windows 7.
+       continue;
+     }
+     transform(lowername.begin(), lowername.end(), lowername.begin(), ::tolower);
+-    stamps->insert(make_pair(lowername,
++    stamps->insert(make_pair(NarrowPath(lowername),
+                              TimeStampFromFileTime(ffd.ftLastWriteTime)));
+-  } while (FindNextFileA(find_handle, &ffd));
++  } while (FindNextFile(find_handle, &ffd));
+   FindClose(find_handle);
+   return true;
+ }
+@@ -162,9 +162,9 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+ #ifdef _WIN32
+   // MSDN: "Naming Files, Paths, and Namespaces"
+   // http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
+-  if (!path.empty() && path[0] != '\\' && path.size() > MAX_PATH) {
++  if (!path.empty() && path[0] != '\\' && path.size() > PATH_MAX) {
+     ostringstream err_stream;
+-    err_stream << "Stat(" << path << "): Filename longer than " << MAX_PATH
++    err_stream << "Stat(" << path << "): Filename longer than " << PATH_MAX
+                << " characters";
+     *err = err_stream.str();
+     return -1;
+@@ -220,7 +220,7 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+ }
+ 
+ bool RealDiskInterface::WriteFile(const string& path, const string& contents) {
+-  FILE* fp = fopen(path.c_str(), "w");
++  FILE* fp = fopen(ToPathWidth(path).c_str(), "w");
+   if (fp == NULL) {
+     Error("WriteFile(%s): Unable to create file. %s",
+           path.c_str(), strerror(errno));
+@@ -266,7 +266,8 @@ FileReader::Status RealDiskInterface::ReadFile(const string& path,
+ 
+ int RealDiskInterface::RemoveFile(const string& path) {
+ #ifdef _WIN32
+-  DWORD attributes = GetFileAttributes(path.c_str());
++  const file_string pathT = ToPathWidth(path);
++  DWORD attributes = GetFileAttributes(pathT.c_str());
+   if (attributes == INVALID_FILE_ATTRIBUTES) {
+     DWORD win_err = GetLastError();
+     if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND) {
+@@ -277,7 +278,7 @@ int RealDiskInterface::RemoveFile(const string& path) {
+     // On Windows Ninja should behave the same:
+     //   https://github.com/ninja-build/ninja/issues/1886
+     // Skip error checking.  If this fails, accept whatever happens below.
+-    SetFileAttributes(path.c_str(), attributes & ~FILE_ATTRIBUTE_READONLY);
++    SetFileAttributes(pathT.c_str(), attributes & ~FILE_ATTRIBUTE_READONLY);
+   }
+   if (attributes & FILE_ATTRIBUTE_DIRECTORY) {
+     // remove() deletes both files and directories. On Windows we have to 
+@@ -285,7 +286,7 @@ int RealDiskInterface::RemoveFile(const string& path) {
+     // used on a directory)
+     // This fixes the behavior of ninja -t clean in some cases
+     // https://github.com/ninja-build/ninja/issues/828
+-    if (!RemoveDirectory(path.c_str())) {
++    if (!RemoveDirectory(pathT.c_str())) {
+       DWORD win_err = GetLastError();
+       if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND) {
+         return 1;
+@@ -295,7 +296,7 @@ int RealDiskInterface::RemoveFile(const string& path) {
+       return -1;
+     }
+   } else {
+-    if (!DeleteFile(path.c_str())) {
++    if (!DeleteFile(pathT.c_str())) {
+       DWORD win_err = GetLastError();
+       if (win_err == ERROR_FILE_NOT_FOUND || win_err == ERROR_PATH_NOT_FOUND) {
+         return 1;
+diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc
+index 5e952edde5..575204f1b8 100644
+--- a/src/disk_interface_test.cc
++++ b/src/disk_interface_test.cc
+@@ -38,7 +38,7 @@ struct DiskInterfaceTest : public testing::Test {
+   }
+ 
+   bool Touch(const char* path) {
+-    FILE *f = fopen(path, "w");
++    FILE *f = fopen(ToPathWidth(path).c_str(), "w");
+     if (!f)
+       return false;
+     return fclose(f) == 0;
+@@ -178,7 +178,7 @@ TEST_F(DiskInterfaceTest, ReadFile) {
+   err.clear();
+ 
+   const char* kTestFile = "testfile";
+-  FILE* f = fopen(kTestFile, "wb");
++  FILE* f = fopen(ToPathWidth(kTestFile).c_str(), "wb");
+   ASSERT_TRUE(f);
+   const char* kTestContent = "test content\nok";
+   fprintf(f, "%s", kTestContent);
+@@ -193,13 +193,13 @@ TEST_F(DiskInterfaceTest, ReadFile) {
+ TEST_F(DiskInterfaceTest, MakeDirs) {
+   string path = "path/with/double//slash/";
+   EXPECT_TRUE(disk_.MakeDirs(path));
+-  FILE* f = fopen((path + "a_file").c_str(), "w");
++  FILE* f = fopen(ToPathWidth((path + "a_file")).c_str(), "w");
+   EXPECT_TRUE(f);
+   EXPECT_EQ(0, fclose(f));
+ #ifdef _WIN32
+   string path2 = "another\\with\\back\\\\slashes\\";
+   EXPECT_TRUE(disk_.MakeDirs(path2.c_str()));
+-  FILE* f2 = fopen((path2 + "a_file").c_str(), "w");
++  FILE* f2 = fopen(ToPathWidth((path2 + "a_file")).c_str(), "w");
+   EXPECT_TRUE(f2);
+   EXPECT_EQ(0, fclose(f2));
+ #endif
+diff --git a/src/file_path.h b/src/file_path.h
+new file mode 100644
+index 0000000000..c11ab9d94d
+--- /dev/null
++++ b/src/file_path.h
+@@ -0,0 +1,123 @@
++// Copyright 2021 Google Inc. All Rights Reserved.
++//
++// Licensed under the Apache License, Version 2.0 (the "License");
++// you may not use this file except in compliance with the License.
++// You may obtain a copy of the License at
++//
++//     http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// See the License for the specific language governing permissions and
++// limitations under the License.
++
++#ifndef NINJA_FILE_PATH_H_
++#define NINJA_FILE_PATH_H_
++
++#include <string>
++
++#ifndef TEXT
++#ifdef  UNICODE
++#define __TEXT(quote) L##quote
++#else   /* UNICODE */
++#define __TEXT(quote) quote
++#endif /* UNICODE */
++#define TEXT(quote) __TEXT(quote)
++#endif
++
++#ifndef _TCHAR_DEFINED
++#ifdef UNICODE
++typedef wchar_t TCHAR, *PTCHAR;
++#else
++typedef char TCHAR, *PTCHAR;
++#endif
++#define _TCHAR_DEFINED
++#endif /* !_TCHAR_DEFINED */
++
++#ifdef UNICODE
++typedef std::wstring file_string_t;
++#else
++typedef std::string file_string_t;
++#endif
++
++inline std::string NarrowPath(const std::wstring& path) {
++  return std::string(path.begin(), path.end());
++}
++
++inline std::string NarrowPath(const std::string& path) {
++  return path;
++}
++
++inline std::wstring WidenPath(const std::string& path) {
++  return std::wstring(path.begin(), path.end());
++}
++
++inline std::wstring WidenPath(const std::wstring& path) {
++  return path;
++}
++
++#ifdef UNICODE
++inline std::wstring ToPathWidth(const std::string& path) {
++  return WidenPath(path);
++}
++
++inline std::wstring ToPathWidth(const std::wstring& path) {
++  return path;
++}
++#else
++inline std::string ToPathWidth(const std::string& path) {
++  return path;
++}
++
++inline std::string ToPathWidth(const std::wstring& path) {
++  return NarrowPath(path);
++}
++#endif
++
++struct file_string : public file_string_t {
++  file_string() : file_string_t() {}
++  file_string(const std::string& path) : file_string_t(ToPathWidth(path)) {}
++  file_string(const std::wstring& path) : file_string_t(ToPathWidth(path)) {}
++  file_string(const char* path) : file_string_t(ToPathWidth(path)) {}
++  file_string(const wchar_t* path) : file_string_t(ToPathWidth(path)) {}
++
++  operator const TCHAR*() const { return c_str(); }
++
++#ifdef UNICODE
++  operator std::string() const { return NarrowPath(*this); }
++#endif
++  file_string operator+(const std::string& r) {
++    return this->append(ToPathWidth(r));
++  }
++
++  file_string operator+(const std::wstring& r) {
++    return this->append(ToPathWidth(r));
++  }
++
++  file_string operator+(const char* r) {
++    return this->append(ToPathWidth(r));
++  }
++
++  file_string operator+(const wchar_t* r) {
++    return this->append(ToPathWidth(r));
++  }
++
++  bool operator==(const std::string& r) {
++    return this->compare(ToPathWidth(r)) == 0;
++  }
++
++  bool operator==(const std::wstring& r) {
++    return this->compare(ToPathWidth(r)) == 0;
++  }
++
++  bool operator==(const char* r) {
++    return this->compare(ToPathWidth(r)) == 0;
++  }
++
++  bool operator==(const wchar_t* r) {
++    return this->compare(ToPathWidth(r)) == 0;
++  }
++};
++
++#endif  // NINJA_FILE_PATH_H_
+diff --git a/src/includes_normalize-win32.cc b/src/includes_normalize-win32.cc
+index 081e364ac3..ba5031fed6 100644
+--- a/src/includes_normalize-win32.cc
++++ b/src/includes_normalize-win32.cc
+@@ -28,12 +28,12 @@ using namespace std;
+ 
+ namespace {
+ 
+-bool InternalGetFullPathName(const StringPiece& file_name, char* buffer,
++bool InternalGetFullPathName(const StringPiece& file_name, TCHAR* buffer,
+                              size_t buffer_length, string *err) {
+-  DWORD result_size = GetFullPathNameA(file_name.AsString().c_str(),
++  DWORD result_size = GetFullPathName(ToPathWidth(file_name.AsString()).c_str(),
+                                        buffer_length, buffer, NULL);
+   if (result_size == 0) {
+-    *err = "GetFullPathNameA(" + file_name.AsString() + "): " +
++    *err = "GetFullPathName(" + file_name.AsString() + "): " +
+         GetLastErrorString();
+     return false;
+   } else if (result_size > buffer_length) {
+@@ -76,19 +76,19 @@ bool SameDrive(StringPiece a, StringPiece b, string* err)  {
+     return true;
+   }
+ 
+-  char a_absolute[_MAX_PATH];
+-  char b_absolute[_MAX_PATH];
+-  if (!InternalGetFullPathName(a, a_absolute, sizeof(a_absolute), err)) {
++  TCHAR a_absolute[PATH_MAX];
++  TCHAR b_absolute[PATH_MAX];
++  if (!InternalGetFullPathName(a, a_absolute, _countof(a_absolute), err)) {
+     return false;
+   }
+-  if (!InternalGetFullPathName(b, b_absolute, sizeof(b_absolute), err)) {
++  if (!InternalGetFullPathName(b, b_absolute, _countof(b_absolute), err)) {
+     return false;
+   }
+-  char a_drive[_MAX_DIR];
+-  char b_drive[_MAX_DIR];
+-  _splitpath(a_absolute, a_drive, NULL, NULL, NULL);
+-  _splitpath(b_absolute, b_drive, NULL, NULL, NULL);
+-  return _stricmp(a_drive, b_drive) == 0;
++  TCHAR a_drive[_MAX_DIR];
++  TCHAR b_drive[_MAX_DIR];
++  t_splitpath(a_absolute, a_drive, NULL, NULL, NULL);
++  t_splitpath(b_absolute, b_drive, NULL, NULL, NULL);
++  return t_stricmp(a_drive, b_drive) == 0;
+ }
+ 
+ // Check path |s| is FullPath style returned by GetFullPathName.
+@@ -146,14 +146,14 @@ string IncludesNormalize::AbsPath(StringPiece s, string* err) {
+     return result;
+   }
+ 
+-  char result[_MAX_PATH];
+-  if (!InternalGetFullPathName(s, result, sizeof(result), err)) {
++  TCHAR result[PATH_MAX];
++  if (!InternalGetFullPathName(s, result, _countof(result), err)) {
+     return "";
+   }
+-  for (char* c = result; *c; ++c)
+-    if (*c == '\\')
+-      *c = '/';
+-  return result;
++  for (TCHAR* c = result; *c; ++c)
++    if (*c == TEXT('\\'))
++      *c = TEXT('/');
++  return NarrowPath(result);
+ }
+ 
+ string IncludesNormalize::Relativize(
+@@ -183,9 +183,9 @@ string IncludesNormalize::Relativize(
+ 
+ bool IncludesNormalize::Normalize(const string& input,
+                                   string* result, string* err) const {
+-  char copy[_MAX_PATH + 1];
++  char copy[PATH_MAX + 1];
+   size_t len = input.size();
+-  if (len > _MAX_PATH) {
++  if (len > PATH_MAX) {
+     *err = "path too long";
+     return false;
+   }
+diff --git a/src/includes_normalize_test.cc b/src/includes_normalize_test.cc
+index 9214f53495..d0e2efb03c 100644
+--- a/src/includes_normalize_test.cc
++++ b/src/includes_normalize_test.cc
+@@ -27,9 +27,10 @@ using namespace std;
+ namespace {
+ 
+ string GetCurDir() {
+-  char buf[_MAX_PATH];
+-  _getcwd(buf, sizeof(buf));
+-  vector<StringPiece> parts = SplitStringPiece(buf, '\\');
++  TCHAR buf[PATH_MAX];
++  getcwd(buf, _countof(buf));
++  string narrowPath = NarrowPath(buf);
++  vector<StringPiece> parts = SplitStringPiece(narrowPath, '\\');
+   return parts[parts.size() - 1].AsString();
+ }
+ 
+@@ -106,42 +107,47 @@ TEST(IncludesNormalize, LongInvalidPath) {
+       "pdb (for example, mspdb110.dll) could not be found on your path. This "
+       "is usually a configuration error. Compilation will continue using /Z7 "
+       "instead of /Zi, but expect a similar error when you link your program.";
++
++  string longInputString(kLongInputString);
++  while (longInputString.size() <= PATH_MAX) {
++    longInputString += kLongInputString;
++  }
++
+   // Too long, won't be canonicalized. Ensure doesn't crash.
+   string result, err;
+   IncludesNormalize normalizer(".");
+-  EXPECT_FALSE(
+-      normalizer.Normalize(kLongInputString, &result, &err));
++  EXPECT_FALSE(normalizer.Normalize(longInputString, &result, &err));
+   EXPECT_EQ("path too long", err);
+ 
+ 
+   // Construct max size path having cwd prefix.
+   // kExactlyMaxPath = "$cwd\\a\\aaaa...aaaa\0";
+-  char kExactlyMaxPath[_MAX_PATH + 1];
+-  ASSERT_NE(_getcwd(kExactlyMaxPath, sizeof kExactlyMaxPath), NULL);
++  TCHAR kExactlyMaxPath[PATH_MAX + 1];
++  ASSERT_NE(getcwd(kExactlyMaxPath, _countof(kExactlyMaxPath)), NULL);
+ 
+-  int cwd_len = strlen(kExactlyMaxPath);
+-  ASSERT_LE(cwd_len + 3 + 1, _MAX_PATH)
++  int cwd_len = t_strlen(kExactlyMaxPath);
++  ASSERT_LE(cwd_len + 3 + 1, PATH_MAX)
+   kExactlyMaxPath[cwd_len] = '\\';
+   kExactlyMaxPath[cwd_len + 1] = 'a';
+   kExactlyMaxPath[cwd_len + 2] = '\\';
+ 
+   kExactlyMaxPath[cwd_len + 3] = 'a';
+ 
+-  for (int i = cwd_len + 4; i < _MAX_PATH; ++i) {
+-    if (i > cwd_len + 4 && i < _MAX_PATH - 1 && i % 10 == 0)
++  for (int i = cwd_len + 4; i < PATH_MAX; ++i) {
++    if (i > cwd_len + 4 && i < PATH_MAX - 1 && i % 10 == 0)
+       kExactlyMaxPath[i] = '\\';
+     else
+       kExactlyMaxPath[i] = 'a';
+   }
+ 
+-  kExactlyMaxPath[_MAX_PATH] = '\0';
+-  EXPECT_EQ(strlen(kExactlyMaxPath), _MAX_PATH);
++  kExactlyMaxPath[PATH_MAX] = '\0';
++  EXPECT_EQ(t_strlen(kExactlyMaxPath), PATH_MAX);
+ 
+-  string forward_slashes(kExactlyMaxPath);
++  file_string forward_slashes(kExactlyMaxPath);
+   replace(forward_slashes.begin(), forward_slashes.end(), '\\', '/');
+-  // Make sure a path that's exactly _MAX_PATH long is canonicalized.
+-  EXPECT_EQ(forward_slashes.substr(cwd_len + 1),
+-            NormalizeAndCheckNoError(kExactlyMaxPath));
++  // Make sure a path that's exactly PATH_MAX long is canonicalized.
++  EXPECT_EQ(NarrowPath(forward_slashes.substr(cwd_len + 1)),
++            NormalizeAndCheckNoError(NarrowPath(kExactlyMaxPath)));
+ }
+ 
+ TEST(IncludesNormalize, ShortRelativeButTooLongAbsolutePath) {
+@@ -153,17 +159,22 @@ TEST(IncludesNormalize, ShortRelativeButTooLongAbsolutePath) {
+ 
+   // Construct max size path having cwd prefix.
+   // kExactlyMaxPath = "aaaa\\aaaa...aaaa\0";
+-  char kExactlyMaxPath[_MAX_PATH + 1];
+-  for (int i = 0; i < _MAX_PATH; ++i) {
+-    if (i < _MAX_PATH - 1 && i % 10 == 4)
++  char kExactlyMaxPath[PATH_MAX + 1];
++  for (int i = 0; i < PATH_MAX; ++i) {
++    if (i < PATH_MAX - 1 && i % 10 == 4)
+       kExactlyMaxPath[i] = '\\';
+     else
+       kExactlyMaxPath[i] = 'a';
+   }
+-  kExactlyMaxPath[_MAX_PATH] = '\0';
+-  EXPECT_EQ(strlen(kExactlyMaxPath), _MAX_PATH);
++  kExactlyMaxPath[PATH_MAX] = '\0';
++  EXPECT_EQ(strlen(kExactlyMaxPath), PATH_MAX);
+ 
+-  // Make sure a path that's exactly _MAX_PATH long fails with a proper error.
++  // Make sure a path that's exactly PATH_MAX long fails with a proper error.
+   EXPECT_FALSE(normalizer.Normalize(kExactlyMaxPath, &result, &err));
++
++#ifdef UNICODE
++  EXPECT_TRUE(err.find("path too long") != string::npos);
++#else
+   EXPECT_TRUE(err.find("GetFullPathName") != string::npos);
++#endif
+ }
+diff --git a/src/manifest_parser_perftest.cc b/src/manifest_parser_perftest.cc
+index 853d8e0d5d..98952632c9 100644
+--- a/src/manifest_parser_perftest.cc
++++ b/src/manifest_parser_perftest.cc
+@@ -103,7 +103,7 @@ int main(int argc, char* argv[]) {
+     return 1;
+   }
+ 
+-  if (chdir(kManifestDir) < 0)
++  if (chdir(ToPathWidth(kManifestDir).c_str()) < 0)
+     Fatal("chdir: %s", strerror(errno));
+ 
+   const int kNumRepetitions = 5;
+diff --git a/src/minidump-win32.cc b/src/minidump-win32.cc
+index 9aea7678b9..6c59088520 100644
+--- a/src/minidump-win32.cc
++++ b/src/minidump-win32.cc
+@@ -62,7 +62,7 @@ void CreateWin32MiniDump(_EXCEPTION_POINTERS* pep) {
+   HANDLE hFile = CreateFileA(temp_file, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+                              CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+   if (hFile == NULL) {
+-    Error("failed to create minidump: CreateFileA(%s): %s",
++    Error("failed to create minidump: CreateFile(%s): %s",
+           temp_file, GetLastErrorString().c_str());
+     return;
+   }
+diff --git a/src/msvc_helper-win32.cc b/src/msvc_helper-win32.cc
+index 1148ae52a5..be9db63653 100644
+--- a/src/msvc_helper-win32.cc
++++ b/src/msvc_helper-win32.cc
+@@ -46,7 +46,7 @@ int CLWrapper::Run(const string& command, string* output) {
+ 
+   // Must be inheritable so subprocesses can dup to children.
+   HANDLE nul =
+-      CreateFileA("NUL", GENERIC_READ,
++      CreateFile(TEXT("NUL"), GENERIC_READ,
+                   FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                   &security_attributes, OPEN_EXISTING, 0, NULL);
+   if (nul == INVALID_HANDLE_VALUE)
+@@ -60,14 +60,14 @@ int CLWrapper::Run(const string& command, string* output) {
+     Win32Fatal("SetHandleInformation");
+ 
+   PROCESS_INFORMATION process_info = {};
+-  STARTUPINFOA startup_info = {};
+-  startup_info.cb = sizeof(STARTUPINFOA);
++  STARTUPINFO startup_info = {};
++  startup_info.cb = sizeof(STARTUPINFO);
+   startup_info.hStdInput = nul;
+   startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
+   startup_info.hStdOutput = stdout_write;
+   startup_info.dwFlags |= STARTF_USESTDHANDLES;
+ 
+-  if (!CreateProcessA(NULL, (char*)command.c_str(), NULL, NULL,
++  if (!CreateProcess(NULL, (TCHAR*)ToPathWidth(command).c_str(), NULL, NULL,
+                       /* inherit handles */ TRUE, 0,
+                       env_block_, NULL,
+                       &startup_info, &process_info)) {
+diff --git a/src/msvc_helper_main-win32.cc b/src/msvc_helper_main-win32.cc
+index 7d593071f9..b295f34fa6 100644
+--- a/src/msvc_helper_main-win32.cc
++++ b/src/msvc_helper_main-win32.cc
+@@ -50,9 +50,9 @@ void PushPathIntoEnvironment(const string& env_block) {
+   }
+ }
+ 
+-void WriteDepFileOrDie(const char* object_path, const CLParser& parse) {
+-  string depfile_path = string(object_path) + ".d";
+-  FILE* depfile = fopen(depfile_path.c_str(), "w");
++void WriteDepFileOrDie(const TCHAR* object_path, const CLParser& parse) {
++  file_string depfile_path = file_string(object_path) + TEXT(".d");
++  FILE* depfile = fopen(ToPathWidth(depfile_path).c_str(), "w");
+   if (!depfile) {
+     unlink(object_path);
+     Fatal("opening %s: %s", depfile_path.c_str(),
+@@ -133,7 +133,7 @@ int MSVCHelperMain(int argc, char** argv) {
+     string err;
+     if (!parser.Parse(output, deps_prefix, &output, &err))
+       Fatal("%s\n", err.c_str());
+-    WriteDepFileOrDie(output_filename, parser);
++    WriteDepFileOrDie(ToPathWidth(output_filename).c_str(), parser);
+   }
+ 
+   if (output.empty())
+diff --git a/src/ninja.cc b/src/ninja.cc
+index 89580ae94f..a93fa06238 100644
+--- a/src/ninja.cc
++++ b/src/ninja.cc
+@@ -871,11 +871,11 @@ int NinjaMain::ToolCompilationDatabase(const Options* options, int argc,
+   argc -= optind;
+ 
+   bool first = true;
+-  vector<char> cwd;
+-  char* success = NULL;
++  vector<TCHAR> cwd;
++  TCHAR* success = NULL;
+ 
+   do {
+-    cwd.resize(cwd.size() + 1024);
++    cwd.resize(cwd.size() + PATH_MAX);
+     errno = 0;
+     success = getcwd(&cwd[0], cwd.size());
+   } while (!success && errno == ERANGE);
+@@ -893,7 +893,7 @@ int NinjaMain::ToolCompilationDatabase(const Options* options, int argc,
+       if (!first) {
+         putchar(',');
+       }
+-      printCompdb(&cwd[0], *e, eval_mode);
++      printCompdb(NarrowPath(&cwd[0]).c_str(), *e, eval_mode);
+       first = false;
+     } else {
+       for (int i = 0; i != argc; ++i) {
+@@ -901,7 +901,7 @@ int NinjaMain::ToolCompilationDatabase(const Options* options, int argc,
+           if (!first) {
+             putchar(',');
+           }
+-          printCompdb(&cwd[0], *e, eval_mode);
++          printCompdb(NarrowPath(&cwd[0]).c_str(), *e, eval_mode);
+           first = false;
+         }
+       }
+@@ -1442,7 +1442,7 @@ NORETURN void real_main(int argc, char** argv) {
+     // can be piped into a file without this string showing up.
+     if (!options.tool && config.verbosity != BuildConfig::NO_STATUS_UPDATE)
+       status->Info("Entering directory `%s'", options.working_dir);
+-    if (chdir(options.working_dir) < 0) {
++    if (chdir(ToPathWidth(options.working_dir).c_str()) < 0) {
+       Fatal("chdir to '%s' - %s", options.working_dir, strerror(errno));
+     }
+   }
+diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
+index ff3baaca7f..8f5faccdac 100644
+--- a/src/subprocess-win32.cc
++++ b/src/subprocess-win32.cc
+@@ -39,11 +39,11 @@ Subprocess::~Subprocess() {
+ }
+ 
+ HANDLE Subprocess::SetupPipe(HANDLE ioport) {
+-  char pipe_name[100];
+-  snprintf(pipe_name, sizeof(pipe_name),
+-           "\\\\.\\pipe\\ninja_pid%lu_sp%p", GetCurrentProcessId(), this);
++  TCHAR pipe_name[100];
++  t_snprintf(pipe_name, sizeof(pipe_name),
++           TEXT("\\\\.\\pipe\\ninja_pid%lu_sp%p"), GetCurrentProcessId(), this);
+ 
+-  pipe_ = ::CreateNamedPipeA(pipe_name,
++  pipe_ = ::CreateNamedPipe(pipe_name,
+                              PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
+                              PIPE_TYPE_BYTE,
+                              PIPE_UNLIMITED_INSTANCES,
+@@ -62,7 +62,7 @@ HANDLE Subprocess::SetupPipe(HANDLE ioport) {
+ 
+   // Get the write end of the pipe as a handle inheritable across processes.
+   HANDLE output_write_handle =
+-      CreateFileA(pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
++      CreateFile(pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+   HANDLE output_write_child;
+   if (!DuplicateHandle(GetCurrentProcess(), output_write_handle,
+                        GetCurrentProcess(), &output_write_child,
+@@ -83,13 +83,13 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
+   security_attributes.bInheritHandle = TRUE;
+   // Must be inheritable so subprocesses can dup to children.
+   HANDLE nul =
+-      CreateFileA("NUL", GENERIC_READ,
++      CreateFile(TEXT("NUL"), GENERIC_READ,
+                   FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                   &security_attributes, OPEN_EXISTING, 0, NULL);
+   if (nul == INVALID_HANDLE_VALUE)
+     Fatal("couldn't open nul");
+ 
+-  STARTUPINFOA startup_info;
++  STARTUPINFO startup_info;
+   memset(&startup_info, 0, sizeof(startup_info));
+   startup_info.cb = sizeof(STARTUPINFO);
+   if (!use_console_) {
+@@ -109,7 +109,7 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
+ 
+   // Do not prepend 'cmd /c' on Windows, this breaks command
+   // lines greater than 8,191 chars.
+-  if (!CreateProcessA(NULL, (char*)command.c_str(), NULL, NULL,
++  if (!CreateProcess(NULL, (TCHAR*)ToPathWidth(command).c_str(), NULL, NULL,
+                       /* inherit handles */ TRUE, process_flags,
+                       NULL, NULL,
+                       &startup_info, &process_info)) {
+diff --git a/src/test.cc b/src/test.cc
+index 11b1c9ebf0..ec3e522797 100644
+--- a/src/test.cc
++++ b/src/test.cc
+@@ -56,7 +56,7 @@ char* mkdtemp(char* name_template) {
+     return NULL;
+   }
+ 
+-  err = _mkdir(name_template);
++  err = mkdir(ToPathWidth(name_template).c_str());
+   if (err < 0) {
+     perror("mkdir");
+     return NULL;
+@@ -68,8 +68,8 @@ char* mkdtemp(char* name_template) {
+ 
+ string GetSystemTempDir() {
+ #ifdef _WIN32
+-  char buf[1024];
+-  if (!GetTempPath(sizeof(buf), buf))
++  char buf[MAX_PATH + 1];
++  if (!GetTempPathA(sizeof(buf), buf))
+     return "";
+   return buf;
+ #else
+@@ -200,7 +200,7 @@ void ScopedTempDir::CreateAndEnter(const string& name) {
+   start_dir_ = GetSystemTempDir();
+   if (start_dir_.empty())
+     Fatal("couldn't get system temp dir");
+-  if (chdir(start_dir_.c_str()) < 0)
++  if (chdir(ToPathWidth(start_dir_).c_str()) < 0)
+     Fatal("chdir: %s", strerror(errno));
+ 
+   // Create a temporary subdirectory of that.
+@@ -213,7 +213,7 @@ void ScopedTempDir::CreateAndEnter(const string& name) {
+   temp_dir_name_ = tempname;
+ 
+   // chdir into the new temporary directory.
+-  if (chdir(temp_dir_name_.c_str()) < 0)
++  if (chdir(ToPathWidth(temp_dir_name_).c_str()) < 0)
+     Fatal("chdir: %s", strerror(errno));
+ }
+ 
+@@ -222,7 +222,7 @@ void ScopedTempDir::Cleanup() {
+     return;  // Something went wrong earlier.
+ 
+   // Move out of the directory we're about to clobber.
+-  if (chdir(start_dir_.c_str()) < 0)
++  if (chdir(ToPathWidth(start_dir_).c_str()) < 0)
+     Fatal("chdir: %s", strerror(errno));
+ 
+ #ifdef _WIN32
+diff --git a/src/util.cc b/src/util.cc
+index 080883e066..c92dcfe3de 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -140,7 +140,7 @@ void CanonicalizePath(char* path, size_t* len, uint64_t* slash_bits) {
+     return;
+   }
+ 
+-  const int kMaxPathComponents = 60;
++  const int kMaxPathComponents = _MAX_DIR;
+   char* components[kMaxPathComponents];
+   int component_count = 0;
+ 
+@@ -332,12 +332,12 @@ void GetWin32EscapedString(const string& input, string* result) {
+   result->push_back(kQuote);
+ }
+ 
+-int ReadFile(const string& path, string* contents, string* err) {
++int ReadFile(const std::string& path, string* contents, string* err) {
+ #ifdef _WIN32
+   // This makes a ninja run on a set of 1500 manifest files about 4% faster
+   // than using the generic fopen code below.
+   err->clear();
+-  HANDLE f = ::CreateFileA(path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
++  HANDLE f = ::CreateFile(ToPathWidth(path).c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
+                            OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+   if (f == INVALID_HANDLE_VALUE) {
+     err->assign(GetLastErrorString());
+diff --git a/src/util.h b/src/util.h
+index 4a7fea2258..4d110b4a8e 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -17,6 +17,7 @@
+ 
+ #ifdef _WIN32
+ #include "win32port.h"
++#include <io.h>
+ #else
+ #include <stdint.h>
+ #endif
+@@ -26,6 +27,8 @@
+ #include <string>
+ #include <vector>
+ 
++#include "file_path.h"
++
+ #ifdef _MSC_VER
+ #define NORETURN __declspec(noreturn)
+ #else
+@@ -113,13 +116,50 @@ bool Truncate(const std::string& path, size_t size, std::string* err);
+ #ifdef _MSC_VER
+ #define snprintf _snprintf
+ #define fileno _fileno
++#define strtoull _strtoui64
++
++#ifdef UNICODE
++#define unlink _wunlink
++#define fopen(path, mode) _wfopen(path, TEXT(mode))
++#define chdir _wchdir
++#define getcwd _wgetcwd
++#define mkdir _wmkdir
++
++#define t_snprintf _snwprintf
++#define t_splitpath _wsplitpath
++#define t_stricmp _wcsicmp
++#define t_strlen wcslen
++
++#define PATH_MAX 2048
++#else // !UNICODE
+ #define unlink _unlink
++#define fopen(path, mode) fopen(path, TEXT(mode))
+ #define chdir _chdir
+-#define strtoull _strtoui64
+ #define getcwd _getcwd
++#define mkdir _mkdir
++
++#define t_snprintf snprintf
++#define t_splitpath _splitpath
++#define t_stricmp _stricmp
++#define t_strlen strlen
++
++#define PATH_MAX _MAX_PATH
++#endif // !UNICODE
++#else // !_MSC_VER
++#define t_snprintf snprintf
++#define t_splitpath _splitpath
++#define t_stricmp _stricmp
++#define t_strlen strlen
++
++#ifndef PATH_MAX
+ #define PATH_MAX _MAX_PATH
+ #endif
+ 
++#ifndef _MAX_DIR
++#define _MAX_DIR 256
++#endif
++#endif // !_MSC_VER
++
+ #ifdef _WIN32
+ /// Convert the value returned by GetLastError() into a string.
+ std::string GetLastErrorString();
+diff --git a/windows/ninja.manifest b/windows/ninja.manifest
+index dab929e151..aaa0bd362e 100644
+--- a/windows/ninja.manifest
++++ b/windows/ninja.manifest
+@@ -3,6 +3,7 @@
+   <application>
+     <windowsSettings>
+       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
++      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+     </windowsSettings>
+   </application>
+ </assembly>
diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake
new file mode 100644
index 00000000000000..781974ea6a763a
--- /dev/null
+++ b/ports/vcpkg-tool-ninja/portfile.cmake
@@ -0,0 +1,83 @@
+# This port represents a dependency on the Meson build system.
+# In the future, it is expected that this port acquires and installs Meson.
+# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds.
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(program NINJA)
+set(program_version 1.10.2)
+set(program_name "ninja")
+set(search_names "ninja")
+set(apt_package_name "ninja-build")
+set(brew_package_name "ninja-build")
+set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/ninja")
+set(supported_on_unix ON)
+set(version_command --version)
+set(extra_search_args EXACT_VERSION_MATCH)
+
+if(NOT "${program}")
+    vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ninja-build/ninja
+    REF 170c387a7461d476523ae29c115a58f16e4d3430
+    SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521
+    HEAD_REF master
+    PATCHES PR2056.diff # Long path support windows
+)
+    set(generator_arch "")
+    if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+        if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
+            set(generator "Visual Studio 12 2013")
+        elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
+            set(generator "Visual Studio 14 2015")
+        elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141")
+            set(generator "Visual Studio 15 2017")
+        elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142")
+            set(generator "Visual Studio 16 2019")
+        elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143")
+            set(generator "Visual Studio 17 2022")
+        endif()
+
+        if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86")
+            set(generator_arch "Win32")
+        elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64")
+            set(generator_arch "x64")
+        elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm")
+            set(generator_arch "ARM")
+        elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
+            set(generator_arch "ARM64")
+        endif()
+        if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "")
+            message(FATAL_ERROR
+                "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}:
+    platform toolset: ${VCPKG_PLATFORM_TOOLSET}
+    architecture    : ${VCPKG_TARGET_ARCHITECTURE}")
+        endif()
+        vcpkg_list(APPEND cmake_options "-DBUILD_UNICODE:BOOL=ON")
+    else()
+        set(generator "Unix Makefiles")
+    endif()
+    if(NOT "${generator_arch}" STREQUAL "")
+        vcpkg_list(APPEND cmake_options "-A${generator_arch}")
+    endif()
+    
+    set(VCPKG_BUILD_TYPE release) #we only need release here!
+    vcpkg_configure_cmake(
+        DISABLE_PARALLEL_CONFIGURE
+        SOURCE_PATH "${SOURCE_PATH}"
+        GENERATOR "${generator}"
+        OPTIONS ${cmake_options}
+        )
+    vcpkg_install_cmake()
+    set(PORT ninja) # to trick vcpkg_copy_tools
+    vcpkg_copy_tools(TOOL_NAMES ninja AUTO_CLEAN)
+    set(PORT vcpkg-tool-ninja)
+endif()
+unset(NINJA)
+unset(NINJA CACHE)
+z_vcpkg_find_acquire_program_find_internal("${program}"
+    INTERPRETER "${interpreter}"
+    PATHS ${paths_to_search}
+    NAMES ${search_names}
+)
+message(STATUS "Using ninja: ${NINJA}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/ninja/version.txt" "${program_version}") # For vcpkg_find_acquire_program
diff --git a/ports/vcpkg-tool-ninja/vcpkg.json b/ports/vcpkg-tool-ninja/vcpkg.json
new file mode 100644
index 00000000000000..91db0a5542c62a
--- /dev/null
+++ b/ports/vcpkg-tool-ninja/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "vcpkg-tool-ninja",
+  "version-date": "2022-02-21",
+  "description": "Ninja is a small build system with a focus on speed.",
+  "homepage": "https://ninja-build.org/",
+  "license": "Apache-2.0",
+  "supports": "native"
+}
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 591230cfe3be21..90ba139de45ab4 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -317,26 +317,31 @@ function(vcpkg_find_acquire_program program)
         set(program_name ninja)
         set(program_version 1.10.2)
         set(supported_on_unix ON)
-        if(CMAKE_HOST_WIN32)
-            set(download_filename "ninja-win-${program_version}.zip")
-            set(tool_subdirectory "${program_version}-windows")
-            set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
-            set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-            set(download_filename "ninja-mac-${program_version}.zip")
-            set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip")
-            set(tool_subdirectory "${program_version}-osx")
-            set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx")
-            set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
-            set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd")
-            set(supported_on_unix OFF)
-        else()
-            set(download_filename "ninja-linux-${program_version}.zip")
-            set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip")
-            set(tool_subdirectory "${program_version}-linux")
-            set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux")
-            set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3)
+        if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/ninja/version.txt")
+            file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/ninja/version.txt" program_version)
+            set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/ninja")
+        else() # Old behavior
+            if(CMAKE_HOST_WIN32)
+                set(download_filename "ninja-win-${program_version}.zip")
+                set(tool_subdirectory "${program_version}-windows")
+                set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
+                set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3)
+            elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+                set(download_filename "ninja-mac-${program_version}.zip")
+                set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip")
+                set(tool_subdirectory "${program_version}-osx")
+                set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx")
+                set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b)
+            elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+                set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd")
+                set(supported_on_unix OFF)
+            else()
+                set(download_filename "ninja-linux-${program_version}.zip")
+                set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip")
+                set(tool_subdirectory "${program_version}-linux")
+                set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux")
+                set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3)
+            endif()
         endif()
         set(version_command --version)
     elseif(program STREQUAL "NUGET")

From c764b469df82eac2295b5e16b38048ff91e7ddbb Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Mon, 21 Feb 2022 15:13:56 +0100
Subject: [PATCH 2/9] add Unix Makefiles to vcpkg_build_cmake

---
 scripts/cmake/vcpkg_build_cmake.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index b3015ae29e8865..16c559b1135a4c 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -64,8 +64,9 @@ function(vcpkg_build_cmake)
         vcpkg_list(SET parallel_param "/m")
     elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles")
         # No options are currently added for nmake builds
+    elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Unix Makefiles")
     else()
-        message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles")
+        message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: 'Ninja', 'Visual Studio', 'Unix Makefiles' and 'NMake Makefiles'")
     endif()
 
     vcpkg_list(SET target_param)

From 61da82dae0a23f8e5147823ee2229e6e79f5db6f Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Mon, 21 Feb 2022 15:14:46 +0100
Subject: [PATCH 3/9] cleanup

---
 ports/vcpkg-tool-ninja/portfile.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake
index 781974ea6a763a..0025035494f9d9 100644
--- a/ports/vcpkg-tool-ninja/portfile.cmake
+++ b/ports/vcpkg-tool-ninja/portfile.cmake
@@ -1,6 +1,3 @@
-# This port represents a dependency on the Meson build system.
-# In the future, it is expected that this port acquires and installs Meson.
-# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds.
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 set(program NINJA)
@@ -23,6 +20,7 @@ if(NOT "${program}")
     HEAD_REF master
     PATCHES PR2056.diff # Long path support windows
 )
+    # This copied from vcpkg_configure_cmake to find a generator which is not ninja!
     set(generator_arch "")
     if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
@@ -59,7 +57,7 @@ if(NOT "${program}")
     if(NOT "${generator_arch}" STREQUAL "")
         vcpkg_list(APPEND cmake_options "-A${generator_arch}")
     endif()
-    
+
     set(VCPKG_BUILD_TYPE release) #we only need release here!
     vcpkg_configure_cmake(
         DISABLE_PARALLEL_CONFIGURE
@@ -72,8 +70,7 @@ if(NOT "${program}")
     vcpkg_copy_tools(TOOL_NAMES ninja AUTO_CLEAN)
     set(PORT vcpkg-tool-ninja)
 endif()
-unset(NINJA)
-unset(NINJA CACHE)
+
 z_vcpkg_find_acquire_program_find_internal("${program}"
     INTERPRETER "${interpreter}"
     PATHS ${paths_to_search}

From a98a5ff1ea8276dc7475ec5778c6df91cea3f2f3 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Mon, 21 Feb 2022 15:18:02 +0100
Subject: [PATCH 4/9] adjust zlib to use the new cmake functions.

---
 ports/zlib/portfile.cmake | 26 +++++++++++++-------------
 ports/zlib/vcpkg.json     | 11 +++++++++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index 88e9e0fe486f5c..51d2cd83c9b688 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_download_distfile(ARCHIVE_FILE
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE_FILE}
-    REF ${VERSION}
+    ARCHIVE "${ARCHIVE_FILE}"
+    REF "${VERSION}"
     PATCHES
         "cmake_dont_build_more_than_needed.patch"
         "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch"
@@ -18,10 +18,10 @@ vcpkg_extract_source_archive_ex(
 )
 
 # This is generated during the cmake build
-file(REMOVE ${SOURCE_PATH}/zconf.h)
+file(REMOVE "${SOURCE_PATH}/zconf.h")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     PREFER_NINJA
     OPTIONS
         -DSKIP_INSTALL_FILES=ON
@@ -30,27 +30,27 @@ vcpkg_configure_cmake(
         -DSKIP_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_cmake_install()
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 # Install the pkgconfig file
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
     if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc "-lz" "-lzlib")
+        vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib")
     endif()
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 endif()
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc "-lz" "-lzlibd")
+        vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd")
     endif()
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 endif()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json
index 4308e45a4b8273..55108b4032f7ff 100644
--- a/ports/zlib/vcpkg.json
+++ b/ports/zlib/vcpkg.json
@@ -1,7 +1,14 @@
 {
   "name": "zlib",
   "version": "1.2.11",
-  "port-version": 13,
+  "port-version": 14,
   "description": "A compression library",
-  "homepage": "https://www.zlib.net/"
+  "homepage": "https://www.zlib.net/",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }

From aa10744187dd550f133d1a6e6382875ca55a0ca1 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Tue, 22 Feb 2022 09:56:32 +0100
Subject: [PATCH 5/9] version stuff

---
 versions/baseline.json            | 10 +++++++---
 versions/v-/vcpkg-cmake.json      |  5 +++++
 versions/v-/vcpkg-tool-meson.json |  5 +++++
 versions/v-/vcpkg-tool-ninja.json |  9 +++++++++
 versions/z-/zlib.json             |  5 +++++
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 versions/v-/vcpkg-tool-ninja.json

diff --git a/versions/baseline.json b/versions/baseline.json
index 6b3147e52ca18c..0bc3e01aba9dc2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7193,7 +7193,7 @@
       "port-version": 1
     },
     "vcpkg-cmake": {
-      "baseline": "2022-01-19",
+      "baseline": "2022-02-21",
       "port-version": 0
     },
     "vcpkg-cmake-config": {
@@ -7218,7 +7218,11 @@
     },
     "vcpkg-tool-meson": {
       "baseline": "0.60.2",
-      "port-version": 1
+      "port-version": 2
+    },
+    "vcpkg-tool-ninja": {
+      "baseline": "2022-02-21",
+      "port-version": 0
     },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
@@ -7542,7 +7546,7 @@
     },
     "zlib": {
       "baseline": "1.2.11",
-      "port-version": 13
+      "port-version": 14
     },
     "zlib-ng": {
       "baseline": "2.0.5",
diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
index b61a6fe25f1beb..819c4a7dea5b85 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "06ef058e0250cdf8aeb7375958ee68c6942485f2",
+      "version-date": "2022-02-21",
+      "port-version": 0
+    },
     {
       "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee",
       "version-date": "2022-01-19",
diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
index 69969c8559d818..d0d71f978aa256 100644
--- a/versions/v-/vcpkg-tool-meson.json
+++ b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d93e36d6abc3b860f77444fe3294ac1de6cc2939",
+      "version": "0.60.2",
+      "port-version": 2
+    },
     {
       "git-tree": "932036adfc24dd5fa63787b825974b6938402700",
       "version": "0.60.2",
diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json
new file mode 100644
index 00000000000000..e1fd3646fc3483
--- /dev/null
+++ b/versions/v-/vcpkg-tool-ninja.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ff88a4ef8ce484c5b2b50cbac6826f0ae4c52375",
+      "version-date": "2022-02-21",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json
index 7c0d68f33de55e..c1199a8abd1b2a 100644
--- a/versions/z-/zlib.json
+++ b/versions/z-/zlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d35981027a171575f248325b81c271c97c028325",
+      "version": "1.2.11",
+      "port-version": 14
+    },
     {
       "git-tree": "92cfe30c807d343c6359d272242f0765ad906740",
       "version": "1.2.11",

From bfa1f2cfb28f28b2ac867d37c131065ab2ffb834 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Thu, 24 Feb 2022 16:50:32 +0100
Subject: [PATCH 6/9] bump meson port verison

---
 ports/vcpkg-tool-meson/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
index 6a13682cf47028..b6d9bb5fa328e1 100644
--- a/ports/vcpkg-tool-meson/vcpkg.json
+++ b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-tool-meson",
   "version": "0.60.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "license": "Apache-2.0",

From 444df019672b0cc98496a88da6bc25e9f648d33f Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Thu, 24 Feb 2022 16:51:09 +0100
Subject: [PATCH 7/9] version stuff

---
 versions/baseline.json            | 10 +++++++---
 versions/v-/vcpkg-tool-meson.json |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 5f7c521b145264..606006e6f4809a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7205,7 +7205,7 @@
       "port-version": 1
     },
     "vcpkg-cmake": {
-      "baseline": "2022-01-19",
+      "baseline": "2022-02-21",
       "port-version": 0
     },
     "vcpkg-cmake-config": {
@@ -7230,7 +7230,11 @@
     },
     "vcpkg-tool-meson": {
       "baseline": "0.60.2",
-      "port-version": 2
+      "port-version": 3
+    },
+    "vcpkg-tool-ninja": {
+      "baseline": "2022-02-21",
+      "port-version": 0
     },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
@@ -7554,7 +7558,7 @@
     },
     "zlib": {
       "baseline": "1.2.11",
-      "port-version": 13
+      "port-version": 14
     },
     "zlib-ng": {
       "baseline": "2.0.5",
diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
index c5143684dbbe85..7eda9092941eec 100644
--- a/versions/v-/vcpkg-tool-meson.json
+++ b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a2ca2ffc83985ec0f7273f7899248b7a980bfb63",
+      "version": "0.60.2",
+      "port-version": 3
+    },
     {
       "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c",
       "version": "0.60.2",

From 6dc39967bba532f7a01bc1cf117dd830278113e6 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Fri, 4 Mar 2022 16:53:42 +0100
Subject: [PATCH 8/9] remove unnecessary patch part

---
 ports/vcpkg-tool-ninja/PR2056.diff | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ports/vcpkg-tool-ninja/PR2056.diff b/ports/vcpkg-tool-ninja/PR2056.diff
index 4a9c6c4b672873..110cfa0e43d4ba 100644
--- a/ports/vcpkg-tool-ninja/PR2056.diff
+++ b/ports/vcpkg-tool-ninja/PR2056.diff
@@ -19,15 +19,6 @@ index 57ae548f5b..3fdde943cc 100644
  else()
  	include(CheckCXXCompilerFlag)
  	check_cxx_compiler_flag(-Wno-deprecated flag_no_deprecated)
-@@ -152,7 +158,7 @@ add_executable(ninja src/ninja.cc)
- target_link_libraries(ninja PRIVATE libninja libninja-re2c)
- 
- if(WIN32)
--  target_sources(ninja PRIVATE windows/ninja.manifest)
-+	target_sources(ninja PRIVATE windows/ninja.manifest)
- endif()
- 
- # Adds browse mode into the ninja binary if it's supported by the host platform.
 diff --git a/src/build_log.cc b/src/build_log.cc
 index 4dcd6cee53..b069bfaa5a 100644
 --- a/src/build_log.cc

From aa70133452c5810d96d7f49f1644e98b8b808805 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <you@example.com>
Date: Fri, 4 Mar 2022 16:54:14 +0100
Subject: [PATCH 9/9] verison stuff

---
 versions/v-/vcpkg-tool-ninja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json
index e1fd3646fc3483..8fb64d6915b384 100644
--- a/versions/v-/vcpkg-tool-ninja.json
+++ b/versions/v-/vcpkg-tool-ninja.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ff88a4ef8ce484c5b2b50cbac6826f0ae4c52375",
+      "git-tree": "0d052cd85172443e6b8c20b2ac35fa1f26f2bfe4",
       "version-date": "2022-02-21",
       "port-version": 0
     }