Converted HENHMETAFILE and HMETAFILE to a void*.

dlls/ole32/datacache.c

@@ -826,7 +826,7 @@ static HMETAFILE DataCache_ReadPresMetafile(
 	   &presStream);
 
   if (FAILED(hres))
-    return hres;
+    return (HMETAFILE)hres;
 
   /*
    * Get the size of the stream.

dlls/oleaut32/olepicture.c

@@ -412,13 +412,13 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
     *phandle = This->desc.u.bmp.hbitmap;
     break;
   case PICTYPE_METAFILE:
-    *phandle = This->desc.u.wmf.hmeta;
+    *phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta;
     break;
   case PICTYPE_ICON:
     *phandle = This->desc.u.icon.hicon;
     break;
   case PICTYPE_ENHMETAFILE:
-    *phandle = This->desc.u.emf.hemf;
+    *phandle = (OLE_HANDLE)This->desc.u.emf.hemf;
     break;
   default:
     FIXME("Unimplemented type %d\n", This->desc.picType);

include/windef.h

@@ -77,7 +77,7 @@ DECLARE_OLD_HANDLE(HBRUSH);
 DECLARE_HANDLE(HCOLORSPACE);
 DECLARE_OLD_HANDLE(HDC);
 DECLARE_HANDLE(HDESK);
-DECLARE_OLD_HANDLE(HENHMETAFILE);
+DECLARE_HANDLE(HENHMETAFILE);
 DECLARE_OLD_HANDLE(HFONT);
 DECLARE_HANDLE(HHOOK);
 DECLARE_OLD_HANDLE(HICON);
@@ -85,7 +85,7 @@ DECLARE_OLD_HANDLE(HINSTANCE);
 DECLARE_OLD_HANDLE(HKEY);
 DECLARE_OLD_HANDLE(HKL);
 DECLARE_OLD_HANDLE(HMENU);
-DECLARE_OLD_HANDLE(HMETAFILE);
+DECLARE_HANDLE(HMETAFILE);
 DECLARE_HANDLE(HMONITOR);
 DECLARE_OLD_HANDLE(HPALETTE);
 DECLARE_OLD_HANDLE(HPEN);