windowscodecs: Do not assume that vtable is the first element of the object, avoid not necessary casts.
This commit is contained in:
parent
9f212a6c95
commit
2a08532cfb
|
@ -95,7 +95,7 @@ static HRESULT WINAPI IcoFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface
|
||||||
IsEqualIID(&IID_IWICBitmapSource, iid) ||
|
IsEqualIID(&IID_IWICBitmapSource, iid) ||
|
||||||
IsEqualIID(&IID_IWICBitmapFrameDecode, iid))
|
IsEqualIID(&IID_IWICBitmapFrameDecode, iid))
|
||||||
{
|
{
|
||||||
*ppv = This;
|
*ppv = &This->IWICBitmapFrameDecode_iface;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -446,9 +446,10 @@ static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID
|
||||||
|
|
||||||
if (!ppv) return E_INVALIDARG;
|
if (!ppv) return E_INVALIDARG;
|
||||||
|
|
||||||
if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid))
|
if (IsEqualIID(&IID_IUnknown, iid) ||
|
||||||
|
IsEqualIID(&IID_IWICBitmapDecoder, iid))
|
||||||
{
|
{
|
||||||
*ppv = This;
|
*ppv = &This->IWICBitmapDecoder_iface;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -692,7 +693,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface,
|
||||||
}
|
}
|
||||||
if (FAILED(hr)) goto fail;
|
if (FAILED(hr)) goto fail;
|
||||||
|
|
||||||
*ppIBitmapFrame = (IWICBitmapFrameDecode*)result;
|
*ppIBitmapFrame = &result->IWICBitmapFrameDecode_iface;
|
||||||
|
|
||||||
LeaveCriticalSection(&This->lock);
|
LeaveCriticalSection(&This->lock);
|
||||||
|
|
||||||
|
@ -747,8 +748,8 @@ HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
|
||||||
InitializeCriticalSection(&This->lock);
|
InitializeCriticalSection(&This->lock);
|
||||||
This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcoDecoder.lock");
|
This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcoDecoder.lock");
|
||||||
|
|
||||||
ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv);
|
ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv);
|
||||||
IUnknown_Release((IUnknown*)This);
|
IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue