marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compobj: Always set the IMalloc pointer in CoInitialize(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Zebediah Figura 2020-01-15 00:24:30 -06:00 committed by Alexandre Julliard
parent 464b74bf5b
commit ba3ca99703
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/compobj.dll16/compobj.c
View File

@ -253,8 +253,6 @@ DWORD WINAPI CoBuildVersion16(void)
*/
HRESULT WINAPI CoGetMalloc16(MEMCTX context, SEGPTR *malloc)
{
if (!compobj_malloc)
compobj_malloc = IMalloc16_Constructor();
*malloc = compobj_malloc;
return S_OK;
}
@ -275,17 +273,13 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc)
*/
SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown)
{
SEGPTR malloc;
TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown);
if (context != MEMCTX_TASK)
FIXME("Ignoring context %d.\n", context);
if (unknown)
FIXME("Ignoring unknown parameter %#x.\n", unknown);
if (CoGetMalloc16(0, &malloc))
return 0;
return call_IMalloc_Alloc(malloc, size);
return call_IMalloc_Alloc(compobj_malloc, size);
}
/***********************************************************************
@ -293,6 +287,8 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown)
*/
HRESULT WINAPI CoInitialize16(SEGPTR malloc)
{
if (!malloc)
CoCreateStandardMalloc16(MEMCTX_TASK, &malloc);
compobj_malloc = malloc;
return S_OK;
}