[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:03:45 UTC 2012
The following commit has been merged in the wheezy branch:
commit 126475c13fd4133f232b1dbf04d19ce5a43ea2ff
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat May 19 02:06:06 2012 +0400
urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium.
(cherry picked from commit 6c4bdf3bdf95718db25ccf67d16ee0e7bdf1a55d)
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index a3d1c10..f91ce3d 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -544,6 +544,21 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst)
if(dst->u.pstg)
IStorage_AddRef(dst->u.pstg);
break;
+ case TYMED_HGLOBAL:
+ if(dst->u.hGlobal) {
+ SIZE_T size = GlobalSize(src->u.hGlobal);
+ char *src_ptr, *dst_ptr;
+
+ dst->u.hGlobal = GlobalAlloc(GMEM_FIXED, size);
+ if(!dst->u.hGlobal)
+ return E_OUTOFMEMORY;
+ dst_ptr = GlobalLock(dst->u.hGlobal);
+ src_ptr = GlobalLock(src->u.hGlobal);
+ memcpy(dst_ptr, src_ptr, size);
+ GlobalUnlock(src_ptr);
+ GlobalUnlock(dst_ptr);
+ }
+ break;
default:
FIXME("Unimplemented tymed %d\n", src->tymed);
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list