Take Win10 sdk kits root from registry.

egorpugin · egorpugin · commit 07b9e5859a14 · 2019-09-29T22:15:06.000+03:00
diff --git a/src/sw/client/cli/client.cpp b/src/sw/client/cli/client.cpp
@@ -49,12 +49,6 @@ DECLARE_STATIC_LOGGER(logger, "main");
 
 #ifdef _WIN32
 #include <primitives/win32helpers.h>
-#include <windows.h>
-#include <shellapi.h>
-#include <Objbase.h>
-#include <Shlobj.h>
-
-#include <WinReg.hpp>
 #endif
 
 #if _MSC_VER
diff --git a/src/sw/core/program/detect.cpp b/src/sw/core/program/detect.cpp
@@ -11,6 +11,9 @@
 #include <sw/builder/program.h>
 
 #include <boost/algorithm/string.hpp>
+#ifdef _WIN32
+#include <WinReg.hpp>
+#endif
 
 #include <regex>
 #include <string>
@@ -672,7 +675,32 @@ static path getWindowsKitRoot()
     auto p = getProgramFilesX86() / "Windows Kits";
     if (fs::exists(p))
         return p;
-    throw SW_RUNTIME_ERROR("No Windows Kits available");
+    //throw SW_RUNTIME_ERROR("No Windows Kits available");
+    return {};
+}
+
+static path getWindows10KitRoot()
+{
+#ifdef _WIN32
+    winreg::RegKey kits10(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", KEY_READ);
+    return kits10.GetStringValue(L"KitsRoot10");
+#endif
+    //throw SW_RUNTIME_ERROR("No Windows Kits available");
+    return {};
+}
+
+static VersionSet listWindows10Kits()
+{
+    VersionSet kits;
+#ifdef _WIN32
+    winreg::RegKey kits10(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", KEY_READ);
+    for (auto &k : kits10.EnumSubKeys())
+    {
+        kits.insert(to_string(k));
+    }
+#endif
+    //throw SW_RUNTIME_ERROR("No Windows Kits available");
+    return kits;
 }
 
 static String getWin10KitDirName()
@@ -683,10 +711,16 @@ static String getWin10KitDirName()
 static Strings listWindowsKits()
 {
     // https://en.wikipedia.org/wiki/Microsoft_Windows_SDK
-    static const Strings known_kits{ getWin10KitDirName(), "8.1A", "8.1", "8.0", "7.1A", "7.1", "7.0A", "7.0A","6.0A" };
+    static const Strings known_kits{ "8.1A", "8.1", "8.0", "7.1A", "7.1", "7.0A", "7.0A","6.0A" };
 
     Strings kits;
-    auto kr = getWindowsKitRoot();
+
+    // special handling for win10 kits
+    auto kr = getWindows10KitRoot();
+    if (fs::exists(kr))
+        kits.push_back(getWin10KitDirName());
+
+    kr = getWindowsKitRoot();
     for (auto &k : known_kits)
     {
         auto d = kr / k;
@@ -696,30 +730,6 @@ static Strings listWindowsKits()
     return kits;
 }
 
-static path getWin10KitInspectionDir()
-{
-    auto kr = getWindowsKitRoot();
-    auto dir = kr / getWin10KitDirName() / "Include";
-    return dir;
-}
-
-static VersionSet listWindows10Kits()
-{
-    VersionSet kits;
-    auto dir = getWin10KitInspectionDir();
-    for (auto &i : fs::directory_iterator(dir))
-    {
-        if (fs::is_directory(i))
-        {
-            auto d = i.path().filename().u8string();
-            Version v = d;
-            if (v.isVersion())
-                kits.insert(d);
-        }
-    }
-    return kits;
-}
-
 void detectWindowsSdk(DETECT_ARGS)
 {
     // ucrt - universal CRT
@@ -806,7 +816,7 @@ void detectWindowsSdk(DETECT_ARGS)
 
     for (auto &k : listWindowsKits())
     {
-        auto kr = getWindowsKitRoot() /k;
+        auto kr = getWindowsKitRoot() / k;
         if (k == getWin10KitDirName())
         {
             for (auto &v : listWindows10Kits())
diff --git a/sw.cpp b/sw.cpp
@@ -183,6 +183,7 @@ void build(Solution &s)
         core += "src/sw/core/.*"_rr;
         if (core.getBuildSettings().TargetOS.Type == OSType::Windows)
             core += "OleAut32.lib"_slib;
+        core += "org.sw.demo.giovannidicanio.winreg"_dep;
     }
 
     auto &cpp_driver = p.addTarget<LibraryTarget>("driver.cpp");
@@ -254,7 +255,8 @@ void build(Solution &s)
         client += client_common,
             //"org.sw.demo.microsoft.mimalloc"_dep,
             "pub.egorpugin.primitives.sw.main-master"_dep,
-            "org.sw.demo.giovannidicanio.winreg-master"_dep;
+            "org.sw.demo.giovannidicanio.winreg"_dep
+            ;
         embed("pub.egorpugin.primitives.tools.embedder-master"_dep, client, "src/sw/client/cli/inserts/inserts.cpp.in");
         if (client.getCompilerType() == CompilerType::MSVC)
             client.CompileOptions.push_back("-bigobj");
