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

oleaut32: Check pointer in IPicture::get_Type.

oldstable
Nikolay Sivov 2009-01-07 09:31:00 +03:00 committed by Alexandre Julliard
parent a22ca1c2d9
commit b91f4a3dae
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/olepicture.c
View File

@ -595,6 +595,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
{
OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p): type is %d\n", This, ptype, This->desc.picType);
if(!ptype)
return E_POINTER;
*ptype = This->desc.picType;
return S_OK;
}

14
dlls/oleaut32/tests/olepicture.c
View File

@ -687,6 +687,19 @@ static void test_get_Handle(void)
IPicture_Release(pic);
}
static void test_get_Type(void)
{
IPicture *pic;
HRESULT hres;
OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic);
hres = IPicture_get_Type(pic, NULL);
ole_expect(hres, E_POINTER);
IPicture_Release(pic);
}
START_TEST(olepicture)
{
hOleaut32 = GetModuleHandleA("oleaut32.dll");
@ -716,6 +729,7 @@ START_TEST(olepicture)
test_Render();
test_get_Attributes();
test_get_Handle();
test_get_Type();
}