Update Burn algorithm for picking elevated temp path to use SystemTemp.

5 files changed, 94 insertions, 1 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index ee9f505e..a1f13239 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -40,7 +40,7 @@
 
   <PropertyGroup>
     <ProjectAdditionalIncludeDirectories>..\..\WixToolset.DUtil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;shlwapi.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;shlwapi.lib;urlmon.lib;userenv.lib;wininet.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
   <ItemGroup>
@@ -57,6 +57,7 @@
     <ClCompile Include="MemUtilTest.cpp" />
     <ClCompile Include="MonUtilTest.cpp" />
     <ClCompile Include="PathUtilTest.cpp" />
+    <ClCompile Include="ProcUtilTest.cpp" />
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <!-- Warnings from referencing netstandard dlls -->
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index bcda6df0..cb0c8a73 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="PathUtilTest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ProcUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="precomp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp
index 76dfa774..94b9ab8e 100644
--- a/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp
@@ -3,8 +3,10 @@
 #include "precomp.h"
 
 using namespace System;
+using namespace System::Collections;
 using namespace Xunit;
 using namespace WixBuildTools::TestSupport;
+using namespace WixBuildTools::TestSupport::XunitExtensions;
 
 namespace DutilTests
 {
@@ -46,5 +48,48 @@ namespace DutilTests
                 ReleaseStr(sczExpanded);
             }
         }
+
+        [SkippableFact]
+        void EnvExpandEnvironmentStringsForUserTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczExpanded = NULL;
+            SIZE_T cchExpanded = 0;
+            String^ variableName = nullptr;
+            String^ variableValue = nullptr;
+
+            // Find a system environment variable that doesn't have variables in its value;
+            for each (DictionaryEntry^ entry in Environment::GetEnvironmentVariables(EnvironmentVariableTarget::Machine))
+            {
+                variableValue = (String^)entry->Value;
+                if (variableValue->Contains("%"))
+                {
+                    continue;
+                }
+
+                variableName = (String^)entry->Key;
+                break;
+            }
+
+            if (nullptr == variableName)
+            {
+                WixAssert::Skip("No suitable system environment variables");
+            }
+
+            pin_ptr<const wchar_t> wzUnexpanded = PtrToStringChars("%" + variableName + "%_%USERNAME%");
+            String^ expandedValue = variableValue + "_SYSTEM";
+
+            try
+            {
+                hr = EnvExpandEnvironmentStringsForUser(NULL, wzUnexpanded, &sczExpanded, &cchExpanded);
+                NativeAssert::Succeeded(hr, "Failed to expand %ls.", wzUnexpanded);
+                WixAssert::StringEqual(expandedValue, gcnew String(sczExpanded), false);
+                NativeAssert::Equal<SIZE_T>(expandedValue->Length + 1, cchExpanded);
+            }
+            finally
+            {
+                ReleaseStr(sczExpanded);
+            }
+        }
     };
 }
diff --git a/src/libs/dutil/test/DUtilUnitTest/ProcUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/ProcUtilTest.cpp
new file mode 100644
index 00000000..297d90f4
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/ProcUtilTest.cpp
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+using namespace System;
+using namespace System::Security::Principal;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+
+namespace DutilTests
+{
+    public ref class ProcUtil
+    {
+    public:
+        [Fact]
+        void ProcTokenUserTest()
+        {
+            HRESULT hr = S_OK;
+            TOKEN_USER* pTokenUser = NULL;
+            LPWSTR sczSid = NULL;
+
+            try
+            {
+                hr = ProcTokenUser(::GetCurrentProcess(), &pTokenUser);
+                NativeAssert::Succeeded(hr, "Failed to get TokenUser for current process.");
+
+                if (!::ConvertSidToStringSidW(pTokenUser->User.Sid, &sczSid))
+                {
+                    hr = HRESULT_FROM_WIN32(::GetLastError());
+                    NativeAssert::Succeeded(hr, "Failed to get string SID from TokenUser SID.");
+                }
+
+                Assert::Equal<String^>(WindowsIdentity::GetCurrent()->User->Value, gcnew String(sczSid));
+            }
+            finally
+            {
+                ReleaseMem(pTokenUser);
+                ReleaseStr(sczSid);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index bc628816..ac57cdd4 100644
--- a/src/libs/dutil/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -5,6 +5,7 @@
 #include <windows.h>
 #include <strsafe.h>
 #include <ShlObj.h>
+#include <sddl.h>
 
 // Include error.h before dutil.h
 #include <dutilsources.h>
@@ -21,6 +22,7 @@
 #include <iniutil.h>
 #include <memutil.h>
 #include <pathutil.h>
+#include <procutil.h>
 #include <strutil.h>
 #include <monutil.h>
 #include <regutil.h>