wineoss.drv: Ignore volume settings on primary buffer

Michael Stefaniuc mstefani at redhat.com
Wed Jan 13 03:24:32 CST 2010


Maarten,

Maarten Lankhorst wrote:
> dsound shouldn't be able to mess with the system-wide volume
if this is a deliberate design decision then the FIXME("stub") is wrong.
It needs to be replaced by a TRACE (or WARN if you insist) with a message
like: "Explicitly ignoring wodSetVolume request; dsound shouldn't mess
with the system-wide volume".

> Fixes bug 15710 and makes the bsd's happier
> ---
> --- a/dlls/wineoss.drv/dsrender.c
> +++ b/dlls/wineoss.drv/dsrender.c
> @@ -533,14 +533,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, P
>  {
>      DWORD vol;
>      IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
> -    TRACE("(%p,%p)\n",This,pVolPan);
> -
> -    vol = pVolPan->dwTotalLeftAmpFactor | (pVolPan->dwTotalRightAmpFactor << 16);
> -
> -    if (wodSetVolume(This->drv->wDevID, vol) != MMSYSERR_NOERROR) {
> -	WARN("wodSetVolume failed\n");
> -	return DSERR_INVALIDPARAM;
> -    }
> +    FIXME("(%p,%p) stub\n",This,pVolPan);
> 
>      return DS_OK;
>  }

thanks
bye
	michael



More information about the wine-devel mailing list