From 0042316c4b57cf91ded8e474a8dda354340e7381 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 29 Nov 2016 18:08:53 -0800
Subject: Introduce filesystem_fs.h

---
 toolsrc/src/metrics.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'toolsrc/src/metrics.cpp')

diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index ada065fd6..23962bcfe 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -10,12 +10,10 @@
 #include <Windows.h>
 #include <winhttp.h>
 #include <fstream>
-#include <filesystem>
+#include "filesystem_fs.h"
 #include "vcpkg_Strings.h"
 #include "vcpkg_System.h"
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg
 {
     static std::string GetCurrentDateTime()
-- 
cgit v1.2.3


From 1310e9e052de50a8d53bc9b88696f8b6c61bece6 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 12 Dec 2016 14:03:13 -0800
Subject: Add SQM User Id to metrics

---
 toolsrc/src/metrics.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'toolsrc/src/metrics.cpp')

diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index 23962bcfe..51c7179c8 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -235,6 +235,40 @@ true
         return DISABLE_METRICS == 0;
     }
 
+    std::wstring GetSQMUser()
+    {
+        LONG err = NULL;
+
+        struct RAII_HKEY {
+            HKEY hkey = NULL;
+            ~RAII_HKEY()
+            {
+                if (hkey != NULL)
+                    RegCloseKey(hkey);
+            }
+        } HKCU_SQMClient;
+
+        err = RegOpenKeyExW(HKEY_CURRENT_USER, LR"(Software\Microsoft\SQMClient)", NULL, KEY_READ, &HKCU_SQMClient.hkey);
+        if (err != ERROR_SUCCESS)
+        {
+            return L"{}";
+        }
+
+        std::array<wchar_t,128> buffer;
+        DWORD lType = 0;
+        DWORD dwBufferSize = static_cast<DWORD>(buffer.size() * sizeof(wchar_t));
+        err = RegQueryValueExW(HKCU_SQMClient.hkey, L"UserId", NULL, &lType, reinterpret_cast<LPBYTE>(buffer.data()), &dwBufferSize);
+        if (err == ERROR_SUCCESS && lType == REG_SZ && dwBufferSize >= sizeof(wchar_t))
+        {
+            size_t sz = dwBufferSize / sizeof(wchar_t);
+            if (buffer[sz - 1] == '\0')
+                --sz;
+            return std::wstring(buffer.begin(), buffer.begin() + sz);
+        }
+
+        return L"{}";
+    }
+
     void SetUserInformation(const std::string& user_id, const std::string& first_use_time)
     {
         g_metricmessage.user_id = user_id;
-- 
cgit v1.2.3


From 1565cafb836a8efdb7c39c9c1df1ca4d671f3d90 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Jan 2017 14:09:48 -0800
Subject: Use nullptr

---
 toolsrc/src/metrics.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'toolsrc/src/metrics.cpp')

diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index 51c7179c8..1806dad87 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -237,13 +237,13 @@ true
 
     std::wstring GetSQMUser()
     {
-        LONG err = NULL;
+        LONG err;
 
         struct RAII_HKEY {
-            HKEY hkey = NULL;
+            HKEY hkey = nullptr;
             ~RAII_HKEY()
             {
-                if (hkey != NULL)
+                if (hkey != nullptr)
                     RegCloseKey(hkey);
             }
         } HKCU_SQMClient;
@@ -257,7 +257,7 @@ true
         std::array<wchar_t,128> buffer;
         DWORD lType = 0;
         DWORD dwBufferSize = static_cast<DWORD>(buffer.size() * sizeof(wchar_t));
-        err = RegQueryValueExW(HKCU_SQMClient.hkey, L"UserId", NULL, &lType, reinterpret_cast<LPBYTE>(buffer.data()), &dwBufferSize);
+        err = RegQueryValueExW(HKCU_SQMClient.hkey, L"UserId", nullptr, &lType, reinterpret_cast<LPBYTE>(buffer.data()), &dwBufferSize);
         if (err == ERROR_SUCCESS && lType == REG_SZ && dwBufferSize >= sizeof(wchar_t))
         {
             size_t sz = dwBufferSize / sizeof(wchar_t);
-- 
cgit v1.2.3


From 050e4a0f7a8156bd862f95c06ea298ab6697e147 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 27 Jan 2017 12:49:09 -0800
Subject: Introduce precompiled headers

---
 toolsrc/src/metrics.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'toolsrc/src/metrics.cpp')

diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index 1806dad87..263d6eb74 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -1,15 +1,5 @@
+#include "pch.h"
 #include "metrics.h"
-#include <utility>
-#include <array>
-#include <string>
-#include <iostream>
-#include <vector>
-#include <sys/timeb.h>
-#include <time.h>
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <winhttp.h>
-#include <fstream>
 #include "filesystem_fs.h"
 #include "vcpkg_Strings.h"
 #include "vcpkg_System.h"
-- 
cgit v1.2.3