Explicitly load system dlls from system directory.

Author: JeffersonMontgomery-Intel

PresentMon/MainThread.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright 2017-2020 Intel Corporation
+Copyright 2017-2022 Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -197,6 +197,13 @@ void ExitMainThread()
 
 int main(int argc, char** argv)
 {
+    // Load system DLLs
+    LoadLibraryExA("advapi32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    LoadLibraryExA("shell32.dll",  NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    LoadLibraryExA("shlwapi.dll",  NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    LoadLibraryExA("tdh.dll",      NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    LoadLibraryExA("user32.dll",   NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+
     // Parse command line arguments.
     if (!ParseCommandLine(argc, argv)) {
         return 1;

PresentMon/PresentMon.vcxproj

@@ -168,6 +168,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -184,6 +185,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -198,6 +200,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -214,6 +217,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -232,6 +236,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -252,6 +257,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -270,6 +276,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>
@@ -290,6 +297,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\build\obj\PresentData-$(Platform)-$(Configuration)</AdditionalLibraryDirectories>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;PresentData.lib;user32.lib</AdditionalDependencies>
+      <DelayLoadDLLs>advapi32.dll;shell32.dll;shlwapi.dll;user32.dll;tdh.dll</DelayLoadDLLs>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>

PresentMon/Privilege.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright 2017-2021 Intel Corporation
+Copyright 2017-2022 Intel Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -46,7 +46,7 @@ bool InPerfLogUsersGroup()
 
 bool EnableDebugPrivilege()
 {
-    auto hmodule = LoadLibraryA("advapi32.dll");
+    auto hmodule = LoadLibraryExA("advapi32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
     auto pOpenProcessToken      = (decltype(&OpenProcessToken))      GetProcAddress(hmodule, "OpenProcessToken");
     auto pGetTokenInformation   = (decltype(&GetTokenInformation))   GetProcAddress(hmodule, "GetTokenInformation");
     auto pLookupPrivilegeValue  = (decltype(&LookupPrivilegeValueA)) GetProcAddress(hmodule, "LookupPrivilegeValueA");

Tools/run_tests.cmd

@@ -114,6 +114,7 @@ echo Checking generated files...
 for %%a in (%build_platforms%) do for %%b in (%build_configs%) do call :check_exist "build\%%b\PresentMon-%version%-%%a.exe"
 for %%a in (%build_platforms%) do for %%b in (%build_configs%) do call :check_exist "build\%%b\PresentMonTests-%version%-%%a.exe"
 for %%a in (%test_platforms%)  do for %%b in (%build_configs%) do call :check_exist "build\%%b\etw_list-%version%-%%a.exe"
+for %%a in (%build_platforms%) do for %%b in (%build_configs%) do call :check_dlls_delayloaded "build\%%b\PresentMon-%version%-%%a.exe" %%a
 for %%a in (%test_platforms%)  do for %%b in (%build_configs%) do call :check_pm_version "build\%%b\PresentMon-%version%-%%a.exe"
 
 :: -----------------------------------------------------------------------------
@@ -156,6 +157,42 @@ exit /b 0
     )
     exit /b 0
 
+:: -----------------------------------------------------------------------------
+:check_dlls_delayloaded
+    if not exist "%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+        echo error: missing dependency: vswhere.exe
+        set /a errorcount=%errorcount%+1
+        exit /b 1
+    )
+    set vsdir=
+    for /f "tokens=*" %%a in ('"%programfiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -legacy -latest -property installationPath') do (
+        set vsdir=%%a
+    )
+    if not exist "%vsdir%\VC\Tools\MSVC\14.29.30133\bin\Hostx64\%2\dumpbin.exe" (
+        echo error: missing dependency: dumpbin.exe
+        set /a errorcount=%errorcount%+1
+        exit /b 1
+    )
+    set checkdll=0
+    for /f "tokens=1,5" %%a in ('"%vsdir%\VC\Tools\MSVC\14.29.30133\bin\Hostx64\%2\dumpbin.exe" /dependents %~1') do (
+        if "%%a"=="Image" (
+            if "%%b"=="dependencies:" (
+                call set checkdll=1
+            ) else (
+                call set checkdll=0
+            )
+        )
+        if "%%~xa"==".dll" (
+            if !checkdll! equ 1 (
+                if not "%%a"=="KERNEL32.dll" (
+                    echo error: dll dependency is not delay-loaded: %%a
+                    set /a errorcount=%errorcount%+1
+                )
+            )
+        )
+    )
+    exit /b 0
+
 :: -----------------------------------------------------------------------------
 :check_pm_version
     if not exist "%pmdir%\%~1" exit /b 0