Merge remote-tracking branch 'frog/nightly' into nightly

Author: qiin2333

src/platform/windows/display_device/windows_utils.cpp

@@ -396,18 +396,16 @@ namespace display_device::w_utils {
 
   boost::optional<UINT32>
   get_source_index(const DISPLAYCONFIG_PATH_INFO &path, const std::vector<DISPLAYCONFIG_MODE_INFO> &modes) {
-    UINT32 index {};
-    if (path.flags & DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE) {
-      index = path.sourceInfo.sourceModeInfoIdx;
-      if (index == DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID) {
-        return boost::none;
-      }
-    }
-    else {
-      index = path.sourceInfo.modeInfoIdx;
-      if (index == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) {
-        return boost::none;
-      }
+    // The MS docs is not clear when to access union struct or not. It appears that union struct is available,
+    // whenever QDC_VIRTUAL_MODE_AWARE is specified when querying.
+    //
+    // The docs state, however, that it is only available when
+    // DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE flag is set, but that is just BS (maybe copy-pasta mistake), because some cases
+    // were found where the flag is not set and the union is still being used.
+
+    const UINT32 index { path.sourceInfo.sourceModeInfoIdx };
+    if (index == DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID) {
+      return boost::none;
     }
 
     if (index >= modes.size()) {
@@ -420,65 +418,69 @@ namespace display_device::w_utils {
 
   void
   set_source_index(DISPLAYCONFIG_PATH_INFO &path, const boost::optional<UINT32> &index) {
-    if (path.flags & DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE) {
-      if (index) {
-        path.sourceInfo.sourceModeInfoIdx = *index;
-      }
-      else {
-        path.sourceInfo.sourceModeInfoIdx = DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID;
-      }
+    // The MS docs is not clear when to access union struct or not. It appears that union struct is available,
+    // whenever QDC_VIRTUAL_MODE_AWARE is specified when querying.
+    //
+    // The docs state, however, that it is only available when
+    // DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE flag is set, but that is just BS (maybe copy-pasta mistake), because some cases
+    // were found where the flag is not set and the union is still being used.
+
+    if (index) {
+      path.sourceInfo.sourceModeInfoIdx = *index;
     }
     else {
-      if (index) {
-        path.sourceInfo.modeInfoIdx = *index;
-      }
-      else {
-        path.sourceInfo.modeInfoIdx = DISPLAYCONFIG_PATH_MODE_IDX_INVALID;
-      }
+      path.sourceInfo.sourceModeInfoIdx = DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID;
     }
   }
 
   void
   set_target_index(DISPLAYCONFIG_PATH_INFO &path, const boost::optional<UINT32> &index) {
-    if (path.flags & DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE) {
-      if (index) {
-        path.targetInfo.targetModeInfoIdx = *index;
-      }
-      else {
-        path.targetInfo.targetModeInfoIdx = DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID;
-      }
+    // The MS docs is not clear when to access union struct or not. It appears that union struct is available,
+    // whenever QDC_VIRTUAL_MODE_AWARE is specified when querying.
+    //
+    // The docs state, however, that it is only available when
+    // DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE flag is set, but that is just BS (maybe copy-pasta mistake), because some cases
+    // were found where the flag is not set and the union is still being used.
+
+    if (index) {
+      path.targetInfo.targetModeInfoIdx = *index;
     }
     else {
-      if (index) {
-        path.targetInfo.modeInfoIdx = *index;
-      }
-      else {
-        path.targetInfo.modeInfoIdx = DISPLAYCONFIG_PATH_MODE_IDX_INVALID;
-      }
+      path.targetInfo.targetModeInfoIdx = DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID;
     }
   }
 
   void
   set_desktop_index(DISPLAYCONFIG_PATH_INFO &path, const boost::optional<UINT32> &index) {
-    if (path.flags & DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE) {
-      if (index) {
-        path.targetInfo.desktopModeInfoIdx = *index;
-      }
-      else {
-        path.targetInfo.desktopModeInfoIdx = DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID;
-      }
+    // The MS docs is not clear when to access union struct or not. It appears that union struct is available,
+    // whenever QDC_VIRTUAL_MODE_AWARE is specified when querying.
+    //
+    // The docs state, however, that it is only available when
+    // DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE flag is set, but that is just BS (maybe copy-pasta mistake), because some cases
+    // were found where the flag is not set and the union is still being used.
+
+    if (index) {
+      path.targetInfo.desktopModeInfoIdx = *index;
+    }
+    else {
+      path.targetInfo.desktopModeInfoIdx = DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID;
     }
   }
 
   void
   set_clone_group_id(DISPLAYCONFIG_PATH_INFO &path, const boost::optional<UINT32> &id) {
-    if (path.flags & DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE) {
-      if (id) {
-        path.sourceInfo.cloneGroupId = *id;
-      }
-      else {
-        path.sourceInfo.cloneGroupId = DISPLAYCONFIG_PATH_CLONE_GROUP_INVALID;
-      }
+    // The MS docs is not clear when to access union struct or not. It appears that union struct is available,
+    // whenever QDC_VIRTUAL_MODE_AWARE is specified when querying.
+    //
+    // The docs state, however, that it is only available when
+    // DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE flag is set, but that is just BS (maybe copy-pasta mistake), because some cases
+    // were found where the flag is not set and the union is still being used.
+
+    if (id) {
+      path.sourceInfo.cloneGroupId = *id;
+    }
+    else {
+      path.sourceInfo.cloneGroupId = DISPLAYCONFIG_PATH_CLONE_GROUP_INVALID;
     }
   }
 

src/platform/windows/display_device/windows_utils.h

@@ -264,9 +264,6 @@ namespace display_device::w_utils {
   /**
    * @brief Get the source mode index from the path.
    *
-   * This function correctly retrieves the index from the path based on
-   * some flags that indicate how to access the union structure containing the index.
-   *
    * It performs sanity checks on the modes list that the index is indeed correct.
    *
    * @param path Path to get the source mode index for.
@@ -287,10 +284,6 @@ namespace display_device::w_utils {
 
   /**
    * @brief Set the source mode index in the path.
-   *
-   * This function correctly sets the index in the path based on
-   * some flags that indicate how to access the union structure containing the index.
-   *
    * @param path Path to modify.
    * @param index Index value to set or empty optional to mark the index as invalid.
    * @see query_display_config on how to get paths and modes from the system.
@@ -307,10 +300,6 @@ namespace display_device::w_utils {
 
   /**
    * @brief Set the target mode index in the path.
-   *
-   * This function correctly sets the index in the path based on
-   * some flags that indicate how to access the union structure containing the index.
-   *
    * @param path Path to modify.
    * @param index Index value to set or empty optional to mark the index as invalid.
    * @see query_display_config on how to get paths and modes from the system.
@@ -327,10 +316,6 @@ namespace display_device::w_utils {
 
   /**
    * @brief Set the desktop mode index in the path.
-   *
-   * This function correctly sets the index in the path based on
-   * some flags that indicate how to access the union structure containing the index.
-   *
    * @param path Path to modify.
    * @param index Index value to set or empty optional to mark the index as invalid.
    * @see query_display_config on how to get paths and modes from the system.
@@ -347,10 +332,6 @@ namespace display_device::w_utils {
 
   /**
    * @brief Set the clone group id in the path.
-   *
-   * This function correctly sets the id in the path based on
-   * some flags that indicate how to access the union structure containing the id.
-   *
    * @param path Path to modify.
    * @param id Id value to set or empty optional to mark the id as invalid.
    * @see query_display_config on how to get paths and modes from the system.

src_assets/common/assets/web/template_header.html

@@ -9,7 +9,7 @@
 <script type="module" src="bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 <style>
     body {
-        background: url(https://w.wallhaven.cc/full/6d/wallhaven-6dge5w.jpg) no-repeat;
+        background: url(https://s21.ax1x.com/2024/03/19/pFRIHNF.jpg) no-repeat;
         background-size: cover;
     }
 </style>

src_assets/common/assets/web/troubleshooting.html

@@ -199,6 +199,18 @@ <h2 id="logs">Logs</h2>
               }, 5000);
             });
         },
+        resetDisplayDevicePersistence() {
+          this.resetDisplayDevicePressed = true;
+          fetch("/api/reset-display-device-persistence", { method: "POST" })
+            .then((r) => r.json())
+            .then((r) => {
+              this.resetDisplayDevicePressed = false;
+              this.resetDisplayDeviceStatus = r.status.toString() === "true";
+              setTimeout(() => {
+                this.resetDisplayDeviceStatus = null;
+              }, 5000);
+            });
+        },
         copyLogs() {
           navigator.clipboard.writeText(this.actualLogs);
         },