Skip to content

W
wine-cw
Commit 78561f3e authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

IDirectSoundBuffer.GetCaps should fail if caps.dwSize is not set.

parent 2aff85c9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
dlls/dsound/buffer.c
View file @ 78561f3e
...@@ -766,13 +766,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps( ...@@ -766,13 +766,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps(
ICOM_THIS(IDirectSoundBufferImpl,iface); ICOM_THIS(IDirectSoundBufferImpl,iface);
TRACE("(%p)->(%p)\n",This,caps); TRACE("(%p)->(%p)\n",This,caps);
if (caps == NULL) if (caps == NULL || caps->dwSize!=sizeof(*caps))
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
/* I think we should check this value, not set it. See */
/* Inside DirectX, p215. That should apply here, too. */
caps->dwSize = sizeof(*caps);
caps->dwFlags = This->dsbd.dwFlags; caps->dwFlags = This->dsbd.dwFlags;
if (This->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE; if (This->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE;
else caps->dwFlags |= DSBCAPS_LOCSOFTWARE; else caps->dwFlags |= DSBCAPS_LOCSOFTWARE;
......
dlls/dsound/primary.c
View file @ 78561f3e
...@@ -754,13 +754,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps( ...@@ -754,13 +754,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(
ICOM_THIS(PrimaryBufferImpl,iface); ICOM_THIS(PrimaryBufferImpl,iface);
TRACE("(%p)->(%p)\n",This,caps); TRACE("(%p)->(%p)\n",This,caps);
if (caps == NULL) if (caps == NULL || caps->dwSize!=sizeof(*caps))
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
/* I think we should check this value, not set it. See */
/* Inside DirectX, p215. That should apply here, too. */
caps->dwSize = sizeof(*caps);
caps->dwFlags = This->dsbd.dwFlags; caps->dwFlags = This->dsbd.dwFlags;
if (This->dsound->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE; if (This->dsound->hwbuf) caps->dwFlags |= DSBCAPS_LOCHARDWARE;
else caps->dwFlags |= DSBCAPS_LOCSOFTWARE; else caps->dwFlags |= DSBCAPS_LOCSOFTWARE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment