Merge pull request #490 from GameTechDev/feature/injector-upgrades

Feature/injector upgrades

Author: markgalvan-intel

.gitignore

@@ -49,3 +49,11 @@ IntelPresentMon/SampleClient/log.txt
 ETLTrimmer/Release/ETLTrimmer.Build.CppClean.log
 
 ETLTrimmer/Release/ETLTrimmer.vcxproj.FileListAbsolute.txt
+
+PresentMon/ddETWExternalEvents_MSG00001.bin
+
+PresentMon/ddETWExternalEvents.h
+
+PresentMon/ddETWExternalEvents.rc
+
+PresentMon/ddETWExternalEventsTEMP.BIN

IntelPresentMon/AppCef/ipm-ui-vue/src/core/preferences.ts

@@ -53,6 +53,8 @@ export interface Preferences {
     };    
     adapterId:number|null;
     enableFlashInjection:boolean;
+    flashInjectionEnableTargetOverride:boolean,
+    flashInjectionTargetOverride:string;
     flashInjectionSize:number;
     flashInjectionColor:RgbaColor;
     flashInjectionBackgroundEnable:boolean;
@@ -110,6 +112,8 @@ export function makeDefaultPreferences(): Preferences {
         upscaleFactor: 2,        
         adapterId: null,
         enableFlashInjection: false,
+        flashInjectionEnableTargetOverride: false,
+        flashInjectionTargetOverride: '',
         flashInjectionSize: 0.25,
         flashInjectionColor: {
             r: 255, 

IntelPresentMon/AppCef/ipm-ui-vue/src/views/FlashConfigView.vue

@@ -2,9 +2,27 @@
 <!-- SPDX-License-Identifier: MIT -->
 
 <script setup lang="ts">
+import { watch, nextTick, ref } from 'vue';
 import { usePreferencesStore } from '@/stores/preferences';
 import ColorPicker from '@/components/ColorPicker.vue';
+import { VTextField } from 'vuetify/components';
 const prefs = usePreferencesStore();
+
+// ref on field
+const overrideTextField = ref<InstanceType<typeof VTextField>|null>(null);
+// Vuetify rule: only validate (and flag red) when enabled
+const overrideRules = [
+  (v: string) => !prefs.preferences.flashInjectionEnableTargetOverride || !!v || 'Required'
+];
+// whenever we enable override, force validation
+watch(
+  () => prefs.preferences.flashInjectionEnableTargetOverride,
+  (enabled) => {
+    if (enabled) {
+      nextTick(() => overrideTextField.value?.validate());
+    }
+  }
+);
 </script>
 
 <template>
@@ -24,6 +42,32 @@ const prefs = usePreferencesStore();
         </v-col>
       </v-row>
 
+      <v-row class="mt-8">
+        <v-col cols="3">
+          Enable Target Override
+          <p class="text-medium-emphasis text-caption mb-0">Use a custom name instead of last-targeted process name.</p>
+        </v-col>
+        <v-col cols="9">
+          <v-switch v-model="prefs.preferences.flashInjectionEnableTargetOverride" label="Enable"></v-switch>
+        </v-col>
+      </v-row>
+
+      <v-row class="mt-8" v-if="prefs.preferences.flashInjectionEnableTargetOverride">
+        <v-col cols="3">
+          Target Name Override
+          <p class="text-medium-emphasis text-caption mb-0">Process module name to use for injection.</p>
+        </v-col>
+        <v-col cols="9">
+          <v-text-field
+            ref="overrideTextField"
+            v-model="prefs.preferences.flashInjectionTargetOverride"
+            label="Module Name"
+            :rules="overrideRules"
+            required
+          />
+        </v-col>
+      </v-row>
+
       <v-row class="mt-8">
         <v-col cols="3">
           Enable Background

IntelPresentMon/AppCef/source/util/FontEnumerator.cpp

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: MIT
 #include "FontEnumerator.h"
 #include <CommonUtilities/win/WinAPI.h>
-#include <Core/source/gfx/base/ComPtr.h>
+#include <CommonUtilities/win/com/ComPtr.h>
 #include "Logging.h"
 #include <CommonUtilities/log/HrLogger.h>
 #include <dwrite.h>
 
 
 namespace p2c::client::util
 {
-    using gfx::ComPtr;
+    using pmon::util::win::com::ComPtr;
 
 	FontEnumerator::FontEnumerator()
 	{

IntelPresentMon/AppCef/source/util/async/GetTopGpuProcess.h

@@ -27,9 +27,9 @@ namespace p2c::client::util::async
             builder.FillWindowHandles();
             builder.FilterHavingWindow();
             const auto procMap = builder.Extract();
-            std::vector<win::Process> procList;
+            std::vector<::pmon::util::win::Process> procList;
             for (auto&&[pid, proc] : procMap) {
-                procList.push_back(static_cast<const win::Process&>(proc));
+                procList.push_back(static_cast<const ::pmon::util::win::Process&>(proc));
             }
             // check if a blacklist was provided
             if (pArgObj->GetType() != CefValueType::VTYPE_NULL) {
@@ -38,7 +38,7 @@ namespace p2c::client::util::async
                 // build hash table set from vector
                 std::unordered_set<std::string> blacklistSet(blacklist.begin(), blacklist.end());
                 // remove candidate target processes that match blacklist (lower case compare)
-                std::erase_if(procList, [&](const win::Process& proc) {
+                std::erase_if(procList, [&](const ::pmon::util::win::Process& proc) {
                     auto narrowName = ::pmon::util::str::ToNarrow(proc.name);
                     for (auto& c : narrowName) {
                         c = std::tolower(c);

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -87,6 +87,13 @@
     <ClInclude Include="rng\PairToRange.h" />
     <ClInclude Include="str\String.h" />
     <ClInclude Include="third\reflect.hpp" />
+    <ClInclude Include="win\com\Comdef.h" />
+    <ClInclude Include="win\com\ComManager.h" />
+    <ClInclude Include="win\com\ComPtr.h" />
+    <ClInclude Include="win\com\ProcessSpawnSink.h" />
+    <ClInclude Include="win\com\WbemConnection.h" />
+    <ClInclude Include="win\com\WbemListener.h" />
+    <ClInclude Include="win\com\WbemSink.h" />
     <ClInclude Include="win\Event.h" />
     <ClInclude Include="win\Handle.h" />
     <ClInclude Include="win\HrErrorCodeProvider.h" />
@@ -139,6 +146,11 @@
     <ClCompile Include="Qpc.cpp" />
     <ClCompile Include="ref\GeneratedReflection.cpp" />
     <ClCompile Include="str\String.cpp" />
+    <ClCompile Include="win\com\ComManager.cpp" />
+    <ClCompile Include="win\com\ProcessSpawnSink.cpp" />
+    <ClCompile Include="win\com\WbemConnection.cpp" />
+    <ClCompile Include="win\com\WbemListener.cpp" />
+    <ClCompile Include="win\com\WbemSink.cpp" />
     <ClCompile Include="win\Event.cpp" />
     <ClCompile Include="win\Handle.cpp" />
     <ClCompile Include="win\HrErrorCodeProvider.cpp" />

…ntMon/Core/source/win/com/ComManager.cpp …n/CommonUtilities/win/com/ComManager.cppIntelPresentMon/Core/source/win/com/ComManager.cpp renamed to IntelPresentMon/CommonUtilities/win/com/ComManager.cpp IntelPresentMon/Core/source/win/com/ComManager.cpp renamed to IntelPresentMon/CommonUtilities/win/com/ComManager.cpp

@@ -1,12 +1,12 @@
 // Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "ComManager.h"
-#include <Core/source/infra/Logging.h>
-#include <CommonUtilities/Exception.h>
+#include "../../log/Log.h"
+#include "../../Exception.h"
 #include "Comdef.h"
 
 
-namespace p2c::win::com
+namespace pmon::util::win::com
 {
 	using namespace ::pmon::util;
 

…sentMon/Core/source/win/com/ComManager.h …Mon/CommonUtilities/win/com/ComManager.hIntelPresentMon/Core/source/win/com/ComManager.h renamed to IntelPresentMon/CommonUtilities/win/com/ComManager.h IntelPresentMon/Core/source/win/com/ComManager.h renamed to IntelPresentMon/CommonUtilities/win/com/ComManager.h

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
-namespace p2c::win::com
+namespace pmon::util::win::com
 {
 	class ComManager
 	{

…PresentMon/Core/source/gfx/base/ComPtr.h …sentMon/CommonUtilities/win/com/ComPtr.hIntelPresentMon/Core/source/gfx/base/ComPtr.h renamed to IntelPresentMon/CommonUtilities/win/com/ComPtr.h IntelPresentMon/Core/source/gfx/base/ComPtr.h renamed to IntelPresentMon/CommonUtilities/win/com/ComPtr.h

@@ -1,12 +1,12 @@
 // Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 #pragma once
-#include <Core/source/win/WinAPI.h>
+#include "../WinAPI.h"
 #include <wrl.h>
 
 // TODO: implement this ourselves so that we don't have to include winapi everywhere we use comptr
 
-namespace p2c::gfx
+namespace pmon::util::win::com
 {
     template<class T>
     class ComPtr : public Microsoft::WRL::ComPtr<T>

…lPresentMon/Core/source/win/com/Comdef.h …sentMon/CommonUtilities/win/com/Comdef.hIntelPresentMon/Core/source/win/com/Comdef.h renamed to IntelPresentMon/CommonUtilities/win/com/Comdef.h IntelPresentMon/Core/source/win/com/Comdef.h renamed to IntelPresentMon/CommonUtilities/win/com/Comdef.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <Core/source/win/WinAPI.h>
+#include "../WinAPI.h"
 #define FormatMessage FormatMessageW
 #define _WIN32_DCOM
 #include <comdef.h>