Alexandre Julliard : oleaut32: Fix handle cast warnings on 64-bit.
Alexandre Julliard
julliard at winehq.org
Fri Jan 9 09:52:01 CST 2009
Module: wine
Branch: master
Commit: 99132baebd2584af0a3ff75b9c4f9226e8942aff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=99132baebd2584af0a3ff75b9c4f9226e8942aff
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jan 8 17:27:14 2009 +0100
oleaut32: Fix handle cast warnings on 64-bit.
---
dlls/oleaut32/olepicture.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index a0f1855..c80f357 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -529,16 +529,16 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
*phandle = 0;
break;
case PICTYPE_BITMAP:
- *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
+ *phandle = HandleToUlong(This->desc.u.bmp.hbitmap);
break;
case PICTYPE_METAFILE:
- *phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta;
+ *phandle = HandleToUlong(This->desc.u.wmf.hmeta);
break;
case PICTYPE_ICON:
- *phandle = (OLE_HANDLE)This->desc.u.icon.hicon;
+ *phandle = HandleToUlong(This->desc.u.icon.hicon);
break;
case PICTYPE_ENHMETAFILE:
- *phandle = (OLE_HANDLE)This->desc.u.emf.hemf;
+ *phandle = HandleToUlong(This->desc.u.emf.hemf);
break;
default:
FIXME("Unimplemented type %d\n", This->desc.picType);
@@ -568,7 +568,7 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
hres = S_FALSE;
break;
case PICTYPE_BITMAP:
- *phandle = (OLE_HANDLE)This->desc.u.bmp.hpal;
+ *phandle = HandleToUlong(This->desc.u.bmp.hpal);
hres = S_OK;
break;
case PICTYPE_METAFILE:
@@ -782,7 +782,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
*phdcOut = This->hDCCur;
This->hDCCur = hdcIn;
if (phbmpOut)
- *phbmpOut = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
+ *phbmpOut = HandleToUlong(This->desc.u.bmp.hbitmap);
return S_OK;
} else {
FIXME("Don't know how to select picture type %d\n",This->desc.picType);
More information about the wine-cvs
mailing list