Changeset 89232 in vbox for trunk/include

Timestamp:

May 23, 2021 1:02:56 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Need to copy PDMAUDIOHOSTDEV::pszId in PDMAudioHostDevDup. bugref:9890

Location:

trunk/include/VBox/vmm

Files:

• pdmaudiohostenuminline.h (modified) (4 diffs)
• pdmaudioifs.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudiohostenuminline.h

@@ -94 +94 @@
         pDev->cbSelf = 0;
 
+        if (pDev->fFlags & PDMAUDIOHOSTDEV_F_ID_ALLOC)
+        {
+            RTStrFree(pDev->pszId);
+            pDev->pszId = NULL;
+        }
+
         RTMemFree(pDev);
     }
@@ -120 +126 @@
         RTListInit(&pDevDup->ListEntry);
         pDevDup->cbSelf = cbToDup;
+        if (pDev->pszId)
+        {
+            pDevDup->fFlags |= PDMAUDIOHOSTDEV_F_ID_ALLOC;
+            pDevDup->pszId   = RTStrDup(pDev->pszId);
+            AssertReturnStmt(pDevDup->pszId, RTMemFree(pDevDup), NULL);
+        }
     }
 
@@ -322 +334 @@
 /** The max string length for all PDMAUDIOHOSTDEV_F_XXX.
  * @sa PDMAudioHostDevFlagsToString */
-#define PDMAUDIOHOSTDEV_MAX_FLAGS_STRING_LEN    sizeof("DEFAULT_OUT DEFAULT_IN HOTPLUG BUGGY IGNORE LOCKED DEAD NO_DUP ")
+#define PDMAUDIOHOSTDEV_MAX_FLAGS_STRING_LEN sizeof("DEFAULT_OUT DEFAULT_IN HOTPLUG BUGGY IGNORE LOCKED DEAD ID_ALLOC NO_DUP ")
 
 /**
@@ -339 +351 @@
         { RT_STR_TUPLE("DEFAULT_OUT "), PDMAUDIOHOSTDEV_F_DEFAULT_OUT },
         { RT_STR_TUPLE("DEFAULT_IN "),  PDMAUDIOHOSTDEV_F_DEFAULT_IN },
-        { RT_STR_TUPLE("HOTPLUG "), PDMAUDIOHOSTDEV_F_HOTPLUG },
-        { RT_STR_TUPLE("BUGGY "),   PDMAUDIOHOSTDEV_F_BUGGY   },
-        { RT_STR_TUPLE("IGNORE "),  PDMAUDIOHOSTDEV_F_IGNORE  },
-        { RT_STR_TUPLE("LOCKED "),  PDMAUDIOHOSTDEV_F_LOCKED  },
-        { RT_STR_TUPLE("DEAD "),    PDMAUDIOHOSTDEV_F_DEAD    },
-        { RT_STR_TUPLE("NO_DUP "),  PDMAUDIOHOSTDEV_F_NO_DUP  },
+        { RT_STR_TUPLE("HOTPLUG "),     PDMAUDIOHOSTDEV_F_HOTPLUG },
+        { RT_STR_TUPLE("BUGGY "),       PDMAUDIOHOSTDEV_F_BUGGY   },
+        { RT_STR_TUPLE("IGNORE "),      PDMAUDIOHOSTDEV_F_IGNORE  },
+        { RT_STR_TUPLE("LOCKED "),      PDMAUDIOHOSTDEV_F_LOCKED  },
+        { RT_STR_TUPLE("DEAD "),        PDMAUDIOHOSTDEV_F_DEAD    },
+        { RT_STR_TUPLE("ID_ALLOC "),    PDMAUDIOHOSTDEV_F_ID_ALLOC  },
+        { RT_STR_TUPLE("NO_DUP "),      PDMAUDIOHOSTDEV_F_NO_DUP  },
     };
     size_t offDst = 0;

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -327 +327 @@
 /** The device is present but not in an alive state (dead). */
 #define PDMAUDIOHOSTDEV_F_DEAD              RT_BIT_32(6)
+/** Set if the PDMAUDIOHOSTDEV::pszId is allocated. */
+#define PDMAUDIOHOSTDEV_F_ID_ALLOC          RT_BIT_32(30)
 /** Set if the extra backend specific data cannot be duplicated. */
 #define PDMAUDIOHOSTDEV_F_NO_DUP            RT_BIT_32(31)
@@ -377 +379 @@
     uint8_t             cMaxOutputChannels;
     uint8_t             abAlignment[ARCH_BITS == 32 ? 2 + 12 : 2];
-    /** Device identifier, OS specific, can be NULL.  It it isn't, it'll point to
-     *  the non-public part (or into szName if creative). */
-    const char         *pszId;
+    /** Device identifier, OS specific, can be NULL.
+     * This can either point into some non-public part of this structure or to a
+     * RTStrAlloc allocation.  PDMAUDIOHOSTDEV_F_ID_ALLOC is set in the latter
+     * case. */
+    char               *pszId;
     /** Friendly name of the device, if any. Could be truncated. */
     char                szName[64];