Dmitry Timoshkov : oleaut32: IPicture::get_hPal() supports only bitmaps.
Alexandre Julliard
julliard at winehq.org
Mon Jul 9 16:00:34 CDT 2018
Module: wine
Branch: master
Commit: e5553bbd05c84fb0f5073cb931a46e15dfbb1257
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5553bbd05c84fb0f5073cb931a46e15dfbb1257
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Jul 6 16:09:38 2018 +0800
oleaut32: IPicture::get_hPal() supports only bitmaps.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/oleaut32/olepicture.c | 38 ++++++++++----------------------------
1 file changed, 10 insertions(+), 28 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index da71946..773bc21 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -555,37 +555,19 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
OLE_HANDLE *phandle)
{
- OLEPictureImpl *This = impl_from_IPicture(iface);
- HRESULT hres;
- TRACE("(%p)->(%p)\n", This, phandle);
+ OLEPictureImpl *This = impl_from_IPicture(iface);
- if (!phandle)
- return E_POINTER;
+ TRACE("(%p)->(%p)\n", This, phandle);
- switch (This->desc.picType) {
- case (UINT)PICTYPE_UNINITIALIZED:
- case PICTYPE_NONE:
- *phandle = 0;
- hres = S_FALSE;
- break;
- case PICTYPE_BITMAP:
- *phandle = HandleToUlong(This->desc.u.bmp.hpal);
- hres = S_OK;
- break;
- case PICTYPE_METAFILE:
- hres = E_FAIL;
- break;
- case PICTYPE_ICON:
- case PICTYPE_ENHMETAFILE:
- default:
- FIXME("unimplemented for type %d. Returning 0 palette.\n",
- This->desc.picType);
- *phandle = 0;
- hres = S_OK;
- }
+ if (!phandle) return E_POINTER;
- TRACE("returning 0x%08x, palette handle %08x\n", hres, *phandle);
- return hres;
+ if (This->desc.picType == PICTYPE_BITMAP)
+ {
+ *phandle = HandleToUlong(This->desc.u.bmp.hpal);
+ return S_OK;
+ }
+
+ return E_FAIL;
}
/************************************************************************
More information about the wine-cvs
mailing list