oleaut32: Replace memcmp with IsEqualIID macro.
Replace memcmp with IsEqualIID macro that doesn't require a size parameter and remove the unneeded brackets to give more compact and more readable code.
This commit is contained in:
parent
8c7706bad0
commit
aa2214626e
|
@ -451,30 +451,17 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
|
||||||
/*
|
/*
|
||||||
* Compare the riid with the interface IDs implemented by this object.
|
* Compare the riid with the interface IDs implemented by this object.
|
||||||
*/
|
*/
|
||||||
if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
|
if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid))
|
||||||
{
|
|
||||||
*ppvObject = (IPicture*)This;
|
*ppvObject = (IPicture*)This;
|
||||||
}
|
else if (IsEqualIID(&IID_IDispatch, riid))
|
||||||
else if (memcmp(&IID_IPicture, riid, sizeof(IID_IPicture)) == 0)
|
|
||||||
{
|
|
||||||
*ppvObject = (IPicture*)This;
|
|
||||||
}
|
|
||||||
else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0)
|
|
||||||
{
|
|
||||||
*ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
|
*ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
|
||||||
}
|
else if (IsEqualIID(&IID_IPictureDisp, riid))
|
||||||
else if (memcmp(&IID_IPictureDisp, riid, sizeof(IID_IPictureDisp)) == 0)
|
|
||||||
{
|
|
||||||
*ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
|
*ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
|
||||||
}
|
else if (IsEqualIID(&IID_IPersistStream, riid))
|
||||||
else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0)
|
|
||||||
{
|
|
||||||
*ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream);
|
*ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream);
|
||||||
}
|
else if (IsEqualIID(&IID_IConnectionPointContainer, riid))
|
||||||
else if (memcmp(&IID_IConnectionPointContainer, riid, sizeof(IID_IConnectionPointContainer)) == 0)
|
|
||||||
{
|
|
||||||
*ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer);
|
*ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer);
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
* Check that we obtained an interface.
|
* Check that we obtained an interface.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue