Changeset 57164 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 3, 2015 8:41:21 PM (9 years ago)

Author:

vboxsync

Message:

DrvHostDSound.cpp: Don't uninitialize COM if we didn't succeed in the constructor (the destructor is _always_ called, do remember). All drivers and devices MUST check the PDM instance versions before doing anything (TODO: missing in other drivers too it seems).

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp

@@ -1541 +1541 @@
 static int dsoundConfigQueryStringAlloc(PCFGMNODE pNode, const char *pszName, char **ppszString)
 {
+    /** @todo r=bird: What's wrong with CFGMR3QueryStringAlloc ??   */
     size_t cbString;
     int rc = CFGMR3QuerySize(pNode, pszName, &cbString);
@@ -1602 +1603 @@
 {
     PDRVHOSTDSOUND pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTDSOUND);
-
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
     LogFlowFuncEnter();
 
-    CoUninitialize();
+    if (pThis->pDrvIns)
+        CoUninitialize();
 
     LogFlowFuncLeave();
@@ -1618 +1620 @@
 {
     PDRVHOSTDSOUND pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTDSOUND);
-    DSLOGREL(("Audio: Initializing DirectSound audio driver\n"));
+    LogRel(("Audio: Initializing DirectSound audio driver\n"));
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
     if (FAILED(hr))
     {
-        DSLOGREL(("DSound: COM initialize %Rhrc\n", hr));
+        LogRel(("DSound: COM initialize %Rhrc\n", hr));
         return VERR_NOT_SUPPORTED;
     }