Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 08:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.11] [OLE32] Apply the proper Wine fix for CORE-14696

Browse source 
Don't free handles that are just copied in the inproc case.

This imports wine commit 25b136d40080a80c006b89e02708d2e248504a42,
by Huw Davies and Zebediah Figura

cherry picked from commit 0.4.12-dev-96-g
959994b67c
This commit is contained in:
Mark Jansen 2018-12-16 22:03:26 +01:00 committed by Joachim Henze
parent b93990e7fb
commit 2522ec1b06
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dll/win32/ole32/usrmarshal.c
View file

@ -2036,11 +2036,29 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char
* which the first parameter is a ULONG.
* This function is only intended to be called by the RPC runtime.
*/
void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium)
void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med)
{
TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium);
TRACE("(%s, %p)\n", debugstr_user_flags(flags), med);
ReleaseStgMedium(pStgMedium);
switch (med->tymed)
{
case TYMED_NULL:
case TYMED_FILE:
case TYMED_ISTREAM:
case TYMED_ISTORAGE:
ReleaseStgMedium(med);
break;
case TYMED_HGLOBAL:
case TYMED_GDI:
case TYMED_MFPICT:
case TYMED_ENHMF:
if (LOWORD(*flags) == MSHCTX_INPROC)
med->tymed = TYMED_NULL;
ReleaseStgMedium(med);
break;
default:
RaiseException(DV_E_TYMED, 0, 0, NULL);
}
}
ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium)