Zebediah Figura : ole32: Add user marshalling for TYMED_GDI.
Alexandre Julliard
julliard at winehq.org
Fri Dec 8 13:51:30 CST 2017
Module: wine
Branch: master
Commit: d9c9791b505f288186b9f459f6ff1060840c4ea8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9791b505f288186b9f459f6ff1060840c4ea8
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Dec 7 11:20:12 2017 -0600
ole32: Add user marshalling for TYMED_GDI.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ole32/usrmarshal.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 015c6a7..6efd99e 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -1722,9 +1722,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM
case TYMED_GDI:
TRACE("TYMED_GDI\n");
if (pStgMedium->u.hBitmap)
- {
- FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap);
- }
+ size = HBITMAP_UserSize(pFlags, size, &pStgMedium->u.hBitmap);
break;
case TYMED_MFPICT:
TRACE("TYMED_MFPICT\n");
@@ -1834,9 +1832,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p
case TYMED_GDI:
TRACE("TYMED_GDI\n");
if (pStgMedium->u.hBitmap)
- {
- FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap);
- }
+ pBuffer = HBITMAP_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hBitmap);
break;
case TYMED_MFPICT:
TRACE("TYMED_MFPICT\n");
@@ -1972,9 +1968,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char
case TYMED_GDI:
TRACE("TYMED_GDI\n");
if (content)
- {
- FIXME("not implemented for GDI object\n");
- }
+ pBuffer = HBITMAP_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hBitmap);
else
pStgMedium->u.hBitmap = NULL;
break;
More information about the wine-cvs
mailing list