Always create a property set for secondary buffers.

dlls/dsound/buffer.c

@@ -986,18 +986,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(
 	}
 
 	if ( IsEqualGUID( &IID_IKsPropertySet, riid ) ) {
-		/* only supported on hardware 3D secondary buffers */
-		if (!(This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) &&
-		     (This->dsbd.dwFlags & DSBCAPS_CTRL3D) &&
-		     (This->hwbuf != NULL) ) {
 		if (!This->iks)
 			IKsBufferPropertySetImpl_Create(This, &(This->iks));
 		if (This->iks) {
-				IKsPropertySet_AddRef((LPKSPROPERTYSET)*ppobj);
+			IKsPropertySet_AddRef((LPKSPROPERTYSET)This->iks);
 	    		*ppobj = This->iks;
 			return S_OK;
 		}
-		}
 		WARN("IID_IKsPropertySet\n");
 		return E_NOINTERFACE;
 	}

dlls/dsound/propset.c

@@ -109,6 +109,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
     TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
 	This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
 
+    if (This->dsb->hwbuf) {
         IDsDriver_QueryInterface(This->dsb->hwbuf, &IID_IDsDriverPropertySet, (void **)&ps);
 
         if (ps) {
@@ -126,6 +127,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
 
 	    return hres;
         }
+    }
 
     return E_PROP_ID_UNSUPPORTED;
 }
@@ -143,6 +145,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
     PIDSDRIVERPROPERTYSET ps;
     TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
 
+    if (This->dsb->hwbuf) {
         IDsDriver_QueryInterface(This->dsb->hwbuf, &IID_IDsDriverPropertySet, (void **)&ps);
 
         if (ps) {
@@ -159,6 +162,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
 
 	    return hres;
         }
+    }
 
     return E_PROP_ID_UNSUPPORTED;
 }
@@ -173,6 +177,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport(
     PIDSDRIVERPROPERTYSET ps;
     TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
 
+    if (This->dsb->hwbuf) {
         IDsDriver_QueryInterface(This->dsb->hwbuf, &IID_IDsDriverPropertySet, (void **)&ps);
 
         if (ps) {
@@ -184,6 +189,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport(
 
             return hres;
         }
+    }
 
     return E_PROP_ID_UNSUPPORTED;
 }
@@ -205,6 +211,12 @@ HRESULT WINAPI IKsBufferPropertySetImpl_Create(
     TRACE("(%p,%p)\n",dsb,piks);
 
     iks = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*iks));
+    if (iks == 0) {
+        WARN("out of memory\n");
+        *piks = NULL;
+        return DSERR_OUTOFMEMORY;
+    }
+
     iks->ref = 0;
     iks->dsb = dsb;
     dsb->iks = iks;