Convert HMETAFILE to a void*

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello!

License: LGPL, X11
Chnagelog:
    Michael Stefaniuc <mstefani@redhat.com>
    - Convert HMETAFILE to a void*

bye
	michael
-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
System Administration           Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani@redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart
Index: dlls/ole32/datacache.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/datacache.c,v
retrieving revision 1.13
diff -u -r1.13 datacache.c
--- dlls/ole32/datacache.c	31 May 2002 23:25:50 -0000	1.13
+++ dlls/ole32/datacache.c	28 Jul 2002 22:37:57 -0000
@@ -826,7 +826,7 @@
 	   &presStream);
 
   if (FAILED(hres))
-    return hres;
+    return (HMETAFILE)hres;
 
   /*
    * Get the size of the stream.
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.15
diff -u -r1.15 olepicture.c
--- dlls/oleaut32/olepicture.c	19 Jul 2002 00:30:16 -0000	1.15
+++ dlls/oleaut32/olepicture.c	28 Jul 2002 22:37:59 -0000
@@ -412,7 +412,7 @@
     *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;
Index: include/windef.h
===================================================================
RCS file: /home/wine/wine/include/windef.h,v
retrieving revision 1.66
diff -u -r1.66 windef.h
--- include/windef.h	28 Jul 2002 17:42:05 -0000	1.66
+++ include/windef.h	28 Jul 2002 22:37:59 -0000
@@ -85,7 +85,7 @@
 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);

Attachment: pgp00021.pgp
Description: PGP signature


[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux