From 31cb0b5caaa93f69573dc52f0ccc7fc75ea7d53d Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 12 Jan 2025 17:11:03 -0600
Subject: [PATCH] feat(capture/windows): hook APIs to avoid output reparenting
 that breaks DDA (#3530)

* Revert "feat(ddprobe): allow to manually specify gpu preference (#3521)"

This reverts commit 6a233cbcbfe1475d88bbedd03b848df205f2b268.

* Keep display revert delay input type change from 6a233cbcb

* Remove ddprobe

* feat(capture/windows): hook APIs to avoid output reparenting that breaks DDA
---
 .codeql-prebuild-cpp-Windows.sh          |  37 +-
 cmake/dependencies/common.cmake          |   2 +-
 cmake/packaging/windows.cmake            |   1 -
 docs/building.md                         |   1 +
 docs/configuration.md                    |   2 +-
 src/platform/windows/display_base.cpp    |  57 ++-
 src_assets/common/assets/web/config.html | 446 ++++++++++-------------
 tools/CMakeLists.txt                     |   9 -
 8 files changed, 259 insertions(+), 296 deletions(-)

diff --git a/.codeql-prebuild-cpp-Windows.sh b/.codeql-prebuild-cpp-Windows.sh
index 5b83812173b..16e844282ce 100644
--- a/.codeql-prebuild-cpp-Windows.sh
+++ b/.codeql-prebuild-cpp-Windows.sh
@@ -5,26 +5,23 @@ set -e
 pacman --noconfirm -Syu
 
 # install dependencies
-pacman -S --noconfirm \
-  base-devel \
-  diffutils \
-  gcc \
-  git \
-  make \
-  mingw-w64-ucrt-x86_64-boost \
-  mingw-w64-ucrt-x86_64-cmake \
-  mingw-w64-ucrt-x86_64-cppwinrt \
-  mingw-w64-ucrt-x86_64-curl-winssl \
-  mingw-w64-ucrt-x86_64-graphviz \
-  mingw-w64-ucrt-x86_64-miniupnpc \
-  mingw-w64-ucrt-x86_64-nlohmann-json \
-  mingw-w64-ucrt-x86_64-nodejs \
-  mingw-w64-ucrt-x86_64-nsis \
-  mingw-w64-ucrt-x86_64-onevpl \
-  mingw-w64-ucrt-x86_64-openssl \
-  mingw-w64-ucrt-x86_64-opus \
-  mingw-w64-ucrt-x86_64-rust \
-  mingw-w64-ucrt-x86_64-toolchain
+dependencies=(
+  "git"
+  "mingw-w64-ucrt-x86_64-boost"
+  "mingw-w64-ucrt-x86_64-cmake"
+  "mingw-w64-ucrt-x86_64-cppwinrt"
+  "mingw-w64-ucrt-x86_64-curl-winssl"
+  "mingw-w64-ucrt-x86_64-MinHook"
+  "mingw-w64-ucrt-x86_64-miniupnpc"
+  "mingw-w64-ucrt-x86_64-nlohmann-json"
+  "mingw-w64-ucrt-x86_64-nodejs"
+  "mingw-w64-ucrt-x86_64-nsis"
+  "mingw-w64-ucrt-x86_64-onevpl"
+  "mingw-w64-ucrt-x86_64-openssl"
+  "mingw-w64-ucrt-x86_64-opus"
+  "mingw-w64-ucrt-x86_64-toolchain"
+)
+pacman -S --noconfirm "${dependencies[@]}"
 
 # build
 mkdir -p build
diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
index 3fe92bf6f4e..dd1b8539493 100644
--- a/cmake/dependencies/common.cmake
+++ b/cmake/dependencies/common.cmake
@@ -25,7 +25,7 @@ include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
 # ffmpeg pre-compiled binaries
 if(NOT DEFINED FFMPEG_PREPARED_BINARIES)
     if(WIN32)
-        set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl)
+        set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl MinHook)
     elseif(UNIX AND NOT APPLE)
         set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11)
     endif()
diff --git a/cmake/packaging/windows.cmake b/cmake/packaging/windows.cmake
index cd41a61da93..b0333f9c6bf 100644
--- a/cmake/packaging/windows.cmake
+++ b/cmake/packaging/windows.cmake
@@ -11,7 +11,6 @@ install(TARGETS dxgi-info RUNTIME DESTINATION "tools" COMPONENT dxgi)
 install(TARGETS audio-info RUNTIME DESTINATION "tools" COMPONENT audio)
 
 # Mandatory tools
-install(TARGETS ddprobe RUNTIME DESTINATION "tools" COMPONENT application)
 install(TARGETS sunshinesvc RUNTIME DESTINATION "tools" COMPONENT application)
 
 # Mandatory scripts
diff --git a/docs/building.md b/docs/building.md
index 298c4872f67..a7d38f68abf 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -88,6 +88,7 @@ dependencies=(
   "mingw-w64-ucrt-x86_64-cppwinrt"
   "mingw-w64-ucrt-x86_64-curl-winssl"
   "mingw-w64-ucrt-x86_64-graphviz"  # Optional, for docs
+  "mingw-w64-ucrt-x86_64-MinHook"
   "mingw-w64-ucrt-x86_64-miniupnpc"
   "mingw-w64-ucrt-x86_64-nlohmann-json"
   "mingw-w64-ucrt-x86_64-nodejs"
diff --git a/docs/configuration.md b/docs/configuration.md
index e787e135208..decd76b293a 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -819,7 +819,7 @@ editing the `conf` file in a text editor. Use the examples as reference.
     </tr>
 </table>
 
-### [output_name](https://localhost:47990/config/#output_name)
+### output_name
 
 <table>
     <tr>
diff --git a/src/platform/windows/display_base.cpp b/src/platform/windows/display_base.cpp
index ed7877988bc..e4ee9aec219 100644
--- a/src/platform/windows/display_base.cpp
+++ b/src/platform/windows/display_base.cpp
@@ -9,10 +9,22 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/process/v1.hpp>
 
+#include <MinHook.h>
+
 // We have to include boost/process/v1.hpp before display.h due to WinSock.h,
 // but that prevents the definition of NTSTATUS so we must define it ourself.
 typedef long NTSTATUS;
 
+// Definition from the WDK's d3dkmthk.h
+typedef enum _D3DKMT_GPU_PREFERENCE_QUERY_STATE: DWORD {
+  D3DKMT_GPU_PREFERENCE_STATE_UNINITIALIZED,  ///< The GPU preference isn't initialized.
+  D3DKMT_GPU_PREFERENCE_STATE_HIGH_PERFORMANCE,  ///< The highest performing GPU is preferred.
+  D3DKMT_GPU_PREFERENCE_STATE_MINIMUM_POWER,  ///< The minimum-powered GPU is preferred.
+  D3DKMT_GPU_PREFERENCE_STATE_UNSPECIFIED,  ///< A GPU preference isn't specified.
+  D3DKMT_GPU_PREFERENCE_STATE_NOT_FOUND,  ///< A GPU preference isn't found.
+  D3DKMT_GPU_PREFERENCE_STATE_USER_SPECIFIED_GPU  ///< A specific GPU is preferred.
+} D3DKMT_GPU_PREFERENCE_QUERY_STATE;
+
 #include "display.h"
 #include "misc.h"
 #include "src/config.h"
@@ -525,6 +537,27 @@ namespace platf::dxgi {
     return false;
   }
 
+  /**
+   * @brief Hook for NtGdiDdDDIGetCachedHybridQueryValue() from win32u.dll.
+   * @param gpuPreference A pointer to the location where the preference will be written.
+   * @return Always STATUS_SUCCESS if valid arguments are provided.
+   */
+  NTSTATUS
+  __stdcall NtGdiDdDDIGetCachedHybridQueryValueHook(D3DKMT_GPU_PREFERENCE_QUERY_STATE *gpuPreference) {
+    // By faking a cached GPU preference state of D3DKMT_GPU_PREFERENCE_STATE_UNSPECIFIED, this will
+    // prevent DXGI from performing the normal GPU preference resolution that looks at the registry,
+    // power settings, and the hybrid adapter DDI interface to pick a GPU. Instead, we will not be
+    // bound to any specific GPU. This will prevent DXGI from performing output reparenting (moving
+    // outputs from their true location to the render GPU), which breaks DDA.
+    if (gpuPreference) {
+      *gpuPreference = D3DKMT_GPU_PREFERENCE_STATE_UNSPECIFIED;
+      return 0;  // STATUS_SUCCESS
+    }
+    else {
+      return STATUS_INVALID_PARAMETER;
+    }
+  }
+
   int
   display_base_t::init(const ::video::config_t &config, const std::string &display_name) {
     std::once_flag windows_cpp_once_flag;
@@ -534,13 +567,22 @@ namespace platf::dxgi {
 
       typedef BOOL (*User32_SetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT value);
 
-      auto user32 = LoadLibraryA("user32.dll");
-      auto f = (User32_SetProcessDpiAwarenessContext) GetProcAddress(user32, "SetProcessDpiAwarenessContext");
-      if (f) {
-        f(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+      {
+        auto user32 = LoadLibraryA("user32.dll");
+        auto f = (User32_SetProcessDpiAwarenessContext) GetProcAddress(user32, "SetProcessDpiAwarenessContext");
+        if (f) {
+          f(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+        }
+
+        FreeLibrary(user32);
       }
 
-      FreeLibrary(user32);
+      {
+        // We aren't calling MH_Uninitialize(), but that's okay because this hook lasts for the life of the process
+        MH_Initialize();
+        MH_CreateHookApi(L"win32u.dll", "NtGdiDdDDIGetCachedHybridQueryValue", (void *) NtGdiDdDDIGetCachedHybridQueryValueHook, nullptr);
+        MH_EnableHook(MH_ALL_HOOKS);
+      }
     });
 
     // Get rectangle of full desktop for absolute mouse coordinates
@@ -549,11 +591,6 @@ namespace platf::dxgi {
 
     HRESULT status;
 
-    // We must set the GPU preference before calling any DXGI APIs!
-    if (!probe_for_gpu_preference(display_name)) {
-      BOOST_LOG(warning) << "Failed to set GPU preference. Capture may not work!"sv;
-    }
-
     status = CreateDXGIFactory1(IID_IDXGIFactory1, (void **) &factory);
     if (FAILED(status)) {
       BOOST_LOG(error) << "Failed to create DXGIFactory1 [0x"sv << util::hex(status).to_string_view() << ']';
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 520df83a1cb..d1892fa8db5 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -30,11 +30,7 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
         <!-- Header -->
         <ul class="nav nav-tabs">
           <li class="nav-item" v-for="tab in tabs" :key="tab.id">
-            <a
-              class="nav-link"
-              :class="{'active': tab.id === currentTab}"
-              href="#"
-              @click="currentTab = tab.id"
+            <a class="nav-link" :class="{'active': tab.id === currentTab}" href="#" @click="currentTab = tab.id"
               >{{tab.name}}</a
             >
           </li>
@@ -50,12 +46,7 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
         </general>
 
         <!-- Input Tab -->
-        <inputs
-          v-if="currentTab === 'input'"
-          :config="config"
-          :platform="platform"
-        >
-        </inputs>
+        <inputs v-if="currentTab === 'input'" :config="config" :platform="platform"> </inputs>
 
         <!-- Audio/Video Tab -->
         <audio-video
@@ -69,35 +60,15 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
         </audio-video>
 
         <!-- Network Tab -->
-        <network
-          v-if="currentTab === 'network'"
-          :config="config"
-          :platform="platform"
-        >
-        </network>
+        <network v-if="currentTab === 'network'" :config="config" :platform="platform"> </network>
 
         <!-- Files Tab -->
-        <files
-          v-if="currentTab === 'files'"
-          :config="config"
-          :platform="platform"
-        >
-        </files>
+        <files v-if="currentTab === 'files'" :config="config" :platform="platform"> </files>
 
         <!-- Advanced Tab -->
-        <advanced
-          v-if="currentTab === 'advanced'"
-          :config="config"
-          :platform="platform"
-        >
-        </advanced>
+        <advanced v-if="currentTab === 'advanced'" :config="config" :platform="platform"> </advanced>
 
-        <container-encoders
-          :current-tab="currentTab"
-          :config="config"
-          :platform="platform"
-        >
-        </container-encoders>
+        <container-encoders :current-tab="currentTab" :config="config" :platform="platform"> </container-encoders>
       </div>
 
       <!-- Save and Apply buttons -->
@@ -108,32 +79,24 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
         <b>{{ $t('_common.success') }}</b> {{ $t('config.restart_note') }}
       </div>
       <div class="mb-3 buttons">
-        <button class="btn btn-primary" @click="save">
-          {{ $t('_common.save') }}
-        </button>
-        <button
-          class="btn btn-success"
-          @click="apply"
-          v-if="saved && !restarted"
-        >
-          {{ $t('_common.apply') }}
-        </button>
+        <button class="btn btn-primary" @click="save">{{ $t('_common.save') }}</button>
+        <button class="btn btn-success" @click="apply" v-if="saved && !restarted">{{ $t('_common.apply') }}</button>
       </div>
     </div>
   </body>
 
   <script type="module">
-    import { computed, createApp } from "vue";
-    import { initApp } from "./init";
-    import Navbar from "./Navbar.vue";
-    import General from "./configs/tabs/General.vue";
-    import Inputs from "./configs/tabs/Inputs.vue";
-    import Network from "./configs/tabs/Network.vue";
-    import Files from "./configs/tabs/Files.vue";
-    import Advanced from "./configs/tabs/Advanced.vue";
-    import AudioVideo from "./configs/tabs/AudioVideo.vue";
-    import ContainerEncoders from "./configs/tabs/ContainerEncoders.vue";
-    import { $tp, usePlatformI18n } from "./platform-i18n";
+    import { computed, createApp } from 'vue'
+    import { initApp } from './init'
+    import Navbar from './Navbar.vue'
+    import General from './configs/tabs/General.vue'
+    import Inputs from './configs/tabs/Inputs.vue'
+    import Network from './configs/tabs/Network.vue'
+    import Files from './configs/tabs/Files.vue'
+    import Advanced from './configs/tabs/Advanced.vue'
+    import AudioVideo from './configs/tabs/AudioVideo.vue'
+    import ContainerEncoders from './configs/tabs/ContainerEncoders.vue'
+    import { $tp, usePlatformI18n } from './platform-i18n'
 
     const app = createApp({
       components: {
@@ -149,200 +112,199 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
       },
       data() {
         return {
-          platform: "",
+          platform: '',
           saved: false,
           restarted: false,
           config: null,
           fps: [],
           resolutions: [],
-          currentTab: "general",
+          currentTab: 'general',
           global_prep_cmd: [],
           display_mode_remapping: [],
           tabs: [
             // TODO: Move the options to each Component instead, encapsulate.
             {
-              id: "general",
-              name: "General",
+              id: 'general',
+              name: 'General',
               options: {
-                locale: "en",
-                sunshine_name: "",
+                locale: 'en',
+                sunshine_name: '',
                 min_log_level: 2,
-                global_prep_cmd: "[]",
-                notify_pre_releases: "disabled",
+                global_prep_cmd: '[]',
+                notify_pre_releases: 'disabled',
               },
             },
             {
-              id: "input",
-              name: "Input",
+              id: 'input',
+              name: 'Input',
               options: {
-                controller: "enabled",
-                gamepad: "auto",
-                ds4_back_as_touchpad_click: "enabled",
-                motion_as_ds4: "enabled",
-                touchpad_as_ds4: "enabled",
+                controller: 'enabled',
+                gamepad: 'auto',
+                ds4_back_as_touchpad_click: 'enabled',
+                motion_as_ds4: 'enabled',
+                touchpad_as_ds4: 'enabled',
                 back_button_timeout: -1,
-                keyboard: "enabled",
+                keyboard: 'enabled',
                 key_repeat_delay: 500,
                 key_repeat_frequency: 24.9,
-                always_send_scancodes: "enabled",
-                key_rightalt_to_key_win: "disabled",
-                mouse: "enabled",
-                high_resolution_scrolling: "enabled",
-                native_pen_touch: "enabled",
-                keybindings: "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
+                always_send_scancodes: 'enabled',
+                key_rightalt_to_key_win: 'disabled',
+                mouse: 'enabled',
+                high_resolution_scrolling: 'enabled',
+                native_pen_touch: 'enabled',
+                keybindings: '[0x10,0xA0,0x11,0xA2,0x12,0xA4]', // todo: add this to UI
               },
             },
             {
-              id: "av",
-              name: "Audio/Video",
+              id: 'av',
+              name: 'Audio/Video',
               options: {
-                audio_sink: "",
-                virtual_sink: "",
-                install_steam_audio_drivers: "enabled",
-                adapter_name: "",
-                output_name: "",
-                display_device_prep: "no_operation",
-                resolution_change: "automatic",
-                manual_resolution: "",
-                refresh_rate_change: "automatic",
-                manual_refresh_rate: "",
-                hdr_prep: "automatic",
-                display_mode_remapping: "[]",
-                resolutions:
-                  "[1280x720,1920x1080,2560x1080,2560x1440,2560x1600,3440x1440,3840x2160]",
-                fps: "[60,90,120,144]",
+                audio_sink: '',
+                virtual_sink: '',
+                install_steam_audio_drivers: 'enabled',
+                adapter_name: '',
+                output_name: '',
+                display_device_prep: 'no_operation',
+                resolution_change: 'automatic',
+                manual_resolution: '',
+                refresh_rate_change: 'automatic',
+                manual_refresh_rate: '',
+                hdr_prep: 'automatic',
+                display_mode_remapping: '[]',
+                resolutions: '[1280x720,1920x1080,2560x1080,2560x1440,2560x1600,3440x1440,3840x2160]',
+                fps: '[60,90,120,144]',
                 min_fps_factor: 1,
               },
             },
             {
-              id: "network",
-              name: "Network",
+              id: 'network',
+              name: 'Network',
               options: {
-                upnp: "disabled",
-                address_family: "ipv4",
+                upnp: 'disabled',
+                address_family: 'ipv4',
                 port: 47989,
-                origin_web_ui_allowed: "lan",
-                external_ip: "",
+                origin_web_ui_allowed: 'lan',
+                external_ip: '',
                 lan_encryption_mode: 0,
                 wan_encryption_mode: 1,
                 ping_timeout: 10000,
               },
             },
             {
-              id: "files",
-              name: "Config Files",
+              id: 'files',
+              name: 'Config Files',
               options: {
-                file_apps: "",
-                credentials_file: "",
-                log_path: "",
-                pkey: "",
-                cert: "",
-                file_state: "",
+                file_apps: '',
+                credentials_file: '',
+                log_path: '',
+                pkey: '',
+                cert: '',
+                file_state: '',
               },
             },
             {
-              id: "advanced",
-              name: "Advanced",
+              id: 'advanced',
+              name: 'Advanced',
               options: {
                 fec_percentage: 20,
                 qp: 28,
                 min_threads: 2,
                 hevc_mode: 0,
                 av1_mode: 0,
-                capture: "",
-                encoder: "",
+                capture: '',
+                encoder: '',
               },
             },
             {
-              id: "nv",
-              name: "NVIDIA NVENC Encoder",
+              id: 'nv',
+              name: 'NVIDIA NVENC Encoder',
               options: {
                 nvenc_preset: 1,
-                nvenc_twopass: "quarter_res",
-                nvenc_spatial_aq: "disabled",
+                nvenc_twopass: 'quarter_res',
+                nvenc_spatial_aq: 'disabled',
                 nvenc_vbv_increase: 0,
-                nvenc_realtime_hags: "enabled",
-                nvenc_split_encode: "driver_decides",
-                nvenc_latency_over_power: "enabled",
-                nvenc_opengl_vulkan_on_dxgi: "enabled",
-                nvenc_h264_cavlc: "disabled",
+                nvenc_realtime_hags: 'enabled',
+                nvenc_split_encode: 'driver_decides',
+                nvenc_latency_over_power: 'enabled',
+                nvenc_opengl_vulkan_on_dxgi: 'enabled',
+                nvenc_h264_cavlc: 'disabled',
               },
             },
             {
-              id: "qsv",
-              name: "Intel QuickSync Encoder",
+              id: 'qsv',
+              name: 'Intel QuickSync Encoder',
               options: {
-                qsv_preset: "medium",
-                qsv_coder: "auto",
-                qsv_slow_hevc: "disabled",
+                qsv_preset: 'medium',
+                qsv_coder: 'auto',
+                qsv_slow_hevc: 'disabled',
               },
             },
             {
-              id: "amd",
-              name: "AMD AMF Encoder",
+              id: 'amd',
+              name: 'AMD AMF Encoder',
               options: {
-                amd_usage: "ultralowlatency",
-                amd_rc: "vbr_latency",
-                amd_enforce_hrd: "disabled",
-                amd_quality: "balanced",
-                amd_preanalysis: "disabled",
-                amd_vbaq: "enabled",
-                amd_coder: "auto",
+                amd_usage: 'ultralowlatency',
+                amd_rc: 'vbr_latency',
+                amd_enforce_hrd: 'disabled',
+                amd_quality: 'balanced',
+                amd_preanalysis: 'disabled',
+                amd_vbaq: 'enabled',
+                amd_coder: 'auto',
               },
             },
             {
-              id: "vt",
-              name: "VideoToolbox Encoder",
+              id: 'vt',
+              name: 'VideoToolbox Encoder',
               options: {
-                vt_coder: "auto",
-                vt_software: "auto",
-                vt_realtime: "enabled",
+                vt_coder: 'auto',
+                vt_software: 'auto',
+                vt_realtime: 'enabled',
               },
             },
             {
-              id: "sw",
-              name: "Software Encoder",
+              id: 'sw',
+              name: 'Software Encoder',
               options: {
-                sw_preset: "superfast",
-                sw_tune: "zerolatency",
+                sw_preset: 'superfast',
+                sw_tune: 'zerolatency',
               },
             },
           ],
-        };
+        }
       },
       provide() {
         return {
           platform: computed(() => this.platform),
-        };
+        }
       },
       created() {
-        fetch("/api/config")
+        fetch('/api/config')
           .then((r) => r.json())
           .then((r) => {
-            this.config = r;
-            this.platform = this.config.platform;
+            this.config = r
+            this.platform = this.config.platform
 
-            var app = document.getElementById("app");
-            if (this.platform === "windows") {
+            var app = document.getElementById('app')
+            if (this.platform === 'windows') {
               this.tabs = this.tabs.filter((el) => {
-                return el.id !== "vt";
-              });
+                return el.id !== 'vt' && el.id !== 'vaapi'
+              })
             }
-            if (this.platform === "linux") {
+            if (this.platform === 'linux') {
               this.tabs = this.tabs.filter((el) => {
-                return el.id !== "amd" && el.id !== "qsv" && el.id !== "vt";
-              });
+                return el.id !== 'amd' && el.id !== 'qsv' && el.id !== 'vt'
+              })
             }
-            if (this.platform === "macos") {
+            if (this.platform === 'macos') {
               this.tabs = this.tabs.filter((el) => {
-                return el.id !== "amd" && el.id !== "nv" && el.id !== "qsv";
-              });
+                return el.id !== 'amd' && el.id !== 'nv' && el.id !== 'qsv' && el.id !== 'vaapi'
+              })
             }
 
             // remove values we don't want in the config file
-            delete this.config.platform;
-            delete this.config.status;
-            delete this.config.version;
+            delete this.config.platform
+            delete this.config.status
+            delete this.config.version
 
             // TODO: let each tab's Component handle it's own data instead of doing it here
 
@@ -350,164 +312,140 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
             this.tabs.forEach((tab) => {
               Object.keys(tab.options).forEach((optionKey) => {
                 if (this.config[optionKey] === undefined) {
-                  this.config[optionKey] = tab.options[optionKey];
+                  this.config[optionKey] = tab.options[optionKey]
                 }
-              });
-            });
+              })
+            })
 
-            this.fps = JSON.parse(this.config.fps);
+            this.fps = JSON.parse(this.config.fps)
             //Resolutions should be fixed because are not valid JSON
-            let res = this.config.resolutions.substring(
-              1,
-              this.config.resolutions.length - 1
-            );
-            let resolutions = [];
-            res.split(",").forEach((r) => resolutions.push(r.trim()));
-            this.resolutions = resolutions;
-
-            this.config.global_prep_cmd = this.config.global_prep_cmd || [];
-            this.global_prep_cmd = JSON.parse(this.config.global_prep_cmd);
-
-            this.config.display_mode_remapping =
-              this.config.display_mode_remapping || [];
-            this.display_mode_remapping = JSON.parse(
-              this.config.display_mode_remapping
-            );
-          });
+            let res = this.config.resolutions.substring(1, this.config.resolutions.length - 1)
+            let resolutions = []
+            res.split(',').forEach((r) => resolutions.push(r.trim()))
+            this.resolutions = resolutions
+
+            this.config.global_prep_cmd = this.config.global_prep_cmd || []
+            this.global_prep_cmd = JSON.parse(this.config.global_prep_cmd)
+
+            this.config.display_mode_remapping = this.config.display_mode_remapping || []
+            this.display_mode_remapping = JSON.parse(this.config.display_mode_remapping)
+          })
       },
       methods: {
         forceUpdate() {
-          this.$forceUpdate();
+          this.$forceUpdate()
         },
         serialize() {
-          let nl = this.config === "windows" ? "\r\n" : "\n";
-          this.config.resolutions =
-            "[" +
-            nl +
-            "    " +
-            this.resolutions.join("," + nl + "    ") +
-            nl +
-            "]";
+          let nl = this.config === 'windows' ? '\r\n' : '\n'
+          this.config.resolutions = '[' + nl + '    ' + this.resolutions.join(',' + nl + '    ') + nl + ']'
           // remove values that don't supported in vdd
-          this.fps = this.fps.filter((item) => +item >= 30 && +item <= 500);
+          this.fps = this.fps.filter((item) => +item >= 30 && +item <= 500)
           // remove quotes from values in fps
-          this.config.fps = JSON.stringify(this.fps).replace(/"/g, "");
-          this.config.global_prep_cmd = JSON.stringify(this.global_prep_cmd);
-          this.config.display_mode_remapping = JSON.stringify(
-            this.display_mode_remapping
-          );
+          this.config.fps = JSON.stringify(this.fps).replace(/"/g, '')
+          this.config.global_prep_cmd = JSON.stringify(this.global_prep_cmd)
+          this.config.display_mode_remapping = JSON.stringify(this.display_mode_remapping)
         },
         save() {
-          this.saved = false;
-          this.restarted = false;
-          this.serialize();
+          this.saved = false
+          this.restarted = false
+          this.serialize()
 
           // create a temp copy of this.config to use for the post request
-          let config = JSON.parse(JSON.stringify(this.config));
+          let config = JSON.parse(JSON.stringify(this.config))
 
           // delete default values from this.config
           this.tabs.forEach((tab) => {
             Object.keys(tab.options).forEach((optionKey) => {
-              let delete_value = false;
-
-              if (["resolutions", "fps", "adapter_name"].includes(optionKey))
-                return false;
-
-              if (
-                ["global_prep_cmd", "display_mode_remapping"].includes(
-                  optionKey
-                )
-              ) {
-                if (
-                  JSON.parse(config[optionKey]) ===
-                  JSON.parse(tab.options[optionKey])
-                ) {
-                  delete_value = true;
+              let delete_value = false
+
+              if (['resolutions', 'fps', 'adapter_name'].includes(optionKey)) return false
+
+              if (['global_prep_cmd', 'display_mode_remapping'].includes(optionKey)) {
+                if (JSON.parse(config[optionKey]) === JSON.parse(tab.options[optionKey])) {
+                  delete_value = true
                 }
               }
 
               // todo: add proper type checking
-              if (
-                String(config[optionKey]) === String(tab.options[optionKey])
-              ) {
-                delete_value = true;
+              if (String(config[optionKey]) === String(tab.options[optionKey])) {
+                delete_value = true
               }
 
               if (delete_value) {
-                delete config[optionKey];
+                delete config[optionKey]
               }
-            });
-          });
+            })
+          })
 
-          return fetch("/api/config", {
-            method: "POST",
+          return fetch('/api/config', {
+            method: 'POST',
             body: JSON.stringify(config),
           }).then((r) => {
             if (r.status === 200) {
-              this.saved = true;
-              return this.saved;
+              this.saved = true
+              return this.saved
             } else {
-              return false;
+              return false
             }
-          });
+          })
         },
         apply() {
-          this.saved = this.restarted = false;
-          let saved = this.save();
+          this.saved = this.restarted = false
+          let saved = this.save()
 
           saved.then((result) => {
             if (result === true) {
-              this.restarted = true;
+              this.restarted = true
               setTimeout(() => {
-                this.saved = this.restarted = false;
-              }, 5000);
-              fetch("/api/restart", {
-                method: "POST",
-              });
+                this.saved = this.restarted = false
+              }, 5000)
+              fetch('/api/restart', {
+                method: 'POST',
+              })
             }
-          });
+          })
         },
       },
       mounted() {
         // Handle hashchange events
         const handleHash = () => {
-          let hash = window.location.hash;
+          let hash = window.location.hash
           if (hash) {
             // remove the # from the hash
-            let stripped_hash = hash.substring(1);
+            let stripped_hash = hash.substring(1)
 
             this.tabs.forEach((tab) => {
               Object.keys(tab.options).forEach((key) => {
                 if (tab.id === stripped_hash || key === stripped_hash) {
-                  this.currentTab = tab.id;
+                  this.currentTab = tab.id
                 }
                 if (key === stripped_hash) {
                   // sleep for 2 seconds to allow the page to load
                   setTimeout(() => {
-                    let element = document.getElementById(stripped_hash);
+                    let element = document.getElementById(stripped_hash)
                     if (element) {
-                      window.location.hash = hash;
+                      window.location.hash = hash
                     }
-                  }, 2000);
+                  }, 2000)
                 }
 
                 if (this.currentTab === tab.id) {
                   // stop looping
-                  return true;
+                  return true
                 }
-              });
-            });
+              })
+            })
           }
-        };
+        }
 
         // Call handleHash for the initial load
-        handleHash();
+        handleHash()
 
         // Add hashchange event listener
-        window.addEventListener("hashchange", handleHash);
+        window.addEventListener('hashchange', handleHash)
       },
-    });
+    })
 
-    initApp(app);
+    initApp(app)
   </script>
 </html>
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index fb56b38b3c4..de67f0bcc41 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -27,12 +27,3 @@ target_link_libraries(sunshinesvc
         wtsapi32
         ${PLATFORM_LIBRARIES})
 target_compile_options(sunshinesvc PRIVATE ${SUNSHINE_COMPILE_OPTIONS})
-
-add_executable(ddprobe ddprobe.cpp)
-set_target_properties(ddprobe PROPERTIES CXX_STANDARD 20)
-target_link_libraries(ddprobe
-        ${CMAKE_THREAD_LIBS_INIT}
-        dxgi
-        d3d11
-        ${PLATFORM_LIBRARIES})
-target_compile_options(ddprobe PRIVATE ${SUNSHINE_COMPILE_OPTIONS})