Changeset 65676 in vbox for trunk/src

Timestamp:

Feb 8, 2017 11:53:48 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvHostDSound.cpp: Fixed crashes.

File:

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

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

@@ -469 +469 @@
 static HRESULT directSoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+
     if (pStreamDS->Out.pDS != NULL)
     {
@@ -509 +512 @@
 static HRESULT directSoundPlayClose(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
-    AssertPtrReturn(pThis, E_POINTER);
+    AssertPtrReturn(pThis,     E_POINTER);
     AssertPtrReturn(pStreamDS, E_POINTER);
 
@@ -636 +639 @@
         RT_ZERO(bc);
         bc.dwSize = sizeof(bc);
+
         hr = IDirectSoundBuffer8_GetCaps(pStreamDS->Out.pDSB, &bc);
         if (FAILED(hr))
@@ -770 +774 @@
 static HRESULT directSoundPlayGetStatus(PDRVHOSTDSOUND pThis, LPDIRECTSOUNDBUFFER8 pDSB, DWORD *pdwStatus)
 {
-    AssertPtr(pThis);
+    AssertPtrReturn(pThis, E_POINTER);
     AssertPtrReturn(pDSB,  E_POINTER);
+
     AssertPtrNull(pdwStatus);
 
@@ -843 +848 @@
 static HRESULT directSoundPlayStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
-    AssertPtrReturn(pThis,         E_POINTER);
+    AssertPtrReturn(pThis,     E_POINTER);
     AssertPtrReturn(pStreamDS, E_POINTER);
 
@@ -886 +891 @@
  */
 
-static LPCGUID dsoundCaptureSelectDevice(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
-{
-    AssertPtrReturn(pThis,     NULL);
-    AssertPtrReturn(pStreamDS, NULL);
-    AssertPtrReturn(pStreamDS->pCfg, NULL);
+static LPCGUID dsoundCaptureSelectDevice(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pThis, NULL);
+    AssertPtrReturn(pCfg,  NULL);
 
     int rc = VINF_SUCCESS;
@@ -899 +903 @@
         PDSOUNDDEV pDev = NULL;
 
-        switch (pStreamDS->pCfg->DestSource.Source)
+        switch (pCfg->DestSource.Source)
         {
             case PDMAUDIORECSOURCE_LINE:
@@ -932 +936 @@
         {
             DSLOG(("DSound: Guest source '%s' is using host recording device '%s'\n",
-                   DrvAudioHlpRecSrcToStr(pStreamDS->pCfg->DestSource.Source), pDev->pszName));
+                   DrvAudioHlpRecSrcToStr(pCfg->DestSource.Source), pDev->pszName));
 
             pGUID = &pDev->Guid;
@@ -948 +952 @@
     /* This always has to be in the release log. */
     LogRel(("DSound: Guest source '%s' is using host recording device with GUID '%s'\n",
-            DrvAudioHlpRecSrcToStr(pStreamDS->pCfg->DestSource.Source), pszGUID ? pszGUID: "{?}"));
+            DrvAudioHlpRecSrcToStr(pCfg->DestSource.Source), pszGUID ? pszGUID: "{?}"));
 
     if (pszGUID)
@@ -971 +975 @@
 
 
-static HRESULT directSoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
-{
+static HRESULT directSoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+    AssertPtrReturn(pCfg,      E_POINTER);
+
     if (pStreamDS->In.pDSC != NULL)
     {
@@ -987 +995 @@
     else
     {
-        LPCGUID pGUID = dsoundCaptureSelectDevice(pThis, pStreamDS);
+        LPCGUID pGUID = dsoundCaptureSelectDevice(pThis, pCfg);
         hr = IDirectSoundCapture_Initialize(pStreamDS->In.pDSC, pGUID);
         if (FAILED(hr))
@@ -1061 +1069 @@
         return E_INVALIDARG;
 
-    HRESULT hr = directSoundCaptureInterfaceCreate(pThis, pStreamDS);
+    HRESULT hr = directSoundCaptureInterfaceCreate(pThis, pStreamDS, pCfgReq);
     if (FAILED(hr))
         return hr;
@@ -1280 +1288 @@
 
         RTMemFree(pDev);
+        pDev = NULL;
     }
 }
@@ -1619 +1628 @@
         directSoundPlayUnlock(pThis, pDSB, pv1, pv2, cb1, cb2);
 
-        pStreamDS->Out.offPlayWritePos = (pStreamDS->Out.offPlayWritePos + PDMAUDIOPCMPROPS_S2B(pProps, cbWrittenTotal))
-                                       % cbBuffer;
+        pStreamDS->Out.offPlayWritePos = (pStreamDS->Out.offPlayWritePos + cbWrittenTotal) % cbBuffer;
 
         DSLOGF(("DSound: %RU32/%RU32, buffer write pos %ld, rc=%Rrc\n",
-                PDMAUDIOPCMPROPS_S2B(pProps, cbWrittenTotal), cbLive, pStreamDS->Out.offPlayWritePos, rc));
+                cbWrittenTotal, cbLive, pStreamDS->Out.offPlayWritePos, rc));
 
         if (pStreamDS->Out.fRestartPlayback)