forked from Mirrors/wine-wine
wmp: Fix a crash in put_volume when basic_audio is NULL.
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 9e8cf8082c
)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
parent
cc0b0b9fcf
commit
7d8a34d6a1
|
@ -969,18 +969,18 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p)
|
||||||
|
|
||||||
static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v)
|
static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v)
|
||||||
{
|
{
|
||||||
HRESULT hres;
|
|
||||||
WindowsMediaPlayer *This = impl_from_IWMPSettings(iface);
|
WindowsMediaPlayer *This = impl_from_IWMPSettings(iface);
|
||||||
TRACE("(%p)->(%d)\n", This, v);
|
TRACE("(%p)->(%d)\n", This, v);
|
||||||
This->volume = v;
|
This->volume = v;
|
||||||
if (!This->filter_graph) {
|
if (!This->filter_graph)
|
||||||
hres = S_OK;
|
return S_OK;
|
||||||
} else {
|
|
||||||
/* IBasicAudio - [-10000, 0], wmp - [0, 100] */
|
/* IBasicAudio - [-10000, 0], wmp - [0, 100] */
|
||||||
v = 10000 * v / 100 - 10000;
|
v = 10000 * v / 100 - 10000;
|
||||||
hres = IBasicAudio_put_Volume(This->basic_audio, v);
|
if (!This->basic_audio)
|
||||||
}
|
return S_FALSE;
|
||||||
return hres;
|
|
||||||
|
return IBasicAudio_put_Volume(This->basic_audio, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)
|
static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)
|
||||||
|
|
Loading…
Reference in New Issue