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

ole32: Fix spy callback arguments for IMalloc::GetSize(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Nikolay Sivov 2020-04-16 22:01:50 +03:00 committed by Alexandre Julliard
parent 1e3bc9f3a6
commit 06d36b1adf
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/ole32/ifs.c
View File

@ -296,26 +296,33 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv)
* win95: size allocated (4 byte boundaries)
* win2k: size originally requested !!! (allocated on 8 byte boundaries)
*/
static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv)
static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem)
{
SIZE_T cb;
BOOL fSpyed = FALSE;
BOOL spyed_block = FALSE, spy_active = FALSE;
SIZE_T size;
TRACE("(%p)\n",pv);
TRACE("(%p)\n", mem);
if(Malloc32.pSpy) {
EnterCriticalSection(&IMalloc32_SpyCS);
pv = IMallocSpy_PreGetSize(Malloc32.pSpy, pv, fSpyed);
}
if (!mem)
return (SIZE_T)-1;
cb = HeapSize(GetProcessHeap(),0,pv);
if (Malloc32.pSpy)
{
EnterCriticalSection(&IMalloc32_SpyCS);
spyed_block = !!mallocspy_is_allocation_spyed(mem);
spy_active = TRUE;
mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block);
}
if(Malloc32.pSpy) {
cb = IMallocSpy_PostGetSize(Malloc32.pSpy, cb, fSpyed);
LeaveCriticalSection(&IMalloc32_SpyCS);
}
size = HeapSize(GetProcessHeap(), 0, mem);
return cb;
if (spy_active)
{
size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block);
LeaveCriticalSection(&IMalloc32_SpyCS);
}
return size;
}
/******************************************************************************

8
dlls/ole32/tests/compobj.c
View File

@ -3068,6 +3068,7 @@ static void test_CoWaitForMultipleHandles(void)
static void test_CoGetMalloc(void)
{
IMalloc *imalloc;
SIZE_T size;
HRESULT hr;
char *ptr;
int ret;
@ -3121,6 +3122,13 @@ static void test_CoGetMalloc(void)
ret = IMalloc_DidAlloc(imalloc, ptr + 4);
ok(ret == 0, "Unexpected return value %d.\n", ret);
/* GetSize() */
size = IMalloc_GetSize(imalloc, NULL);
ok(size == (SIZE_T)-1, "Unexpected return value.\n");
size = IMalloc_GetSize(imalloc, ptr);
ok(size == 16, "Unexpected return value.\n");
IMalloc_Free(imalloc, ptr);
IMalloc_Release(imalloc);