marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32/olepicture: No need to check interface pointer in vtable methods.

oldstable
Nikolay Sivov 2010-08-23 11:54:07 +04:00 committed by Alexandre Julliard
parent 32c2ef6c97
commit b5a8c33182
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/oleaut32/olepicture.c
View File

@ -438,22 +438,14 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
void** ppvObject)
{
OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
/*
* Perform a sanity check on the parameters.
*/
if ( (This==0) || (ppvObject==0) )
if (!ppvObject)
return E_INVALIDARG;
/*
* Initialize the return parameter.
*/
*ppvObject = 0;
/*
* Compare the riid with the interface IDs implemented by this object.
*/
if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid))
*ppvObject = This;
else if (IsEqualIID(&IID_IDispatch, riid))
@ -465,20 +457,13 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
else if (IsEqualIID(&IID_IConnectionPointContainer, riid))
*ppvObject = &This->lpvtblIConnectionPointContainer;
/*
* Check that we obtained an interface.
*/
if ((*ppvObject)==0)
if (!*ppvObject)
{
FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid));
return E_NOINTERFACE;
}
/*
* Query Interface always increases the reference count by one when it is
* successful
*/
OLEPictureImpl_AddRef((IPicture*)This);
IPicture_AddRef(iface);
return S_OK;
}
@ -1335,9 +1320,9 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This,
*
* Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF
*/
static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) {
HRESULT hr;
BOOL headerisdata = FALSE;
BOOL headerisdata;
BOOL statfailed = FALSE;
ULONG xread, toread;
ULONG headerread;