niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

rpcrt4/tests: Fix some malloc/HeapAlloc mismatches.

Browse source 
Fixes regressions caused by a38e05636d.
This commit is contained in:
Alexandre Julliard 2024-02-16 14:23:28 +01:00
parent 4e74e9dfa9
commit 18bdd435f1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/rpcrt4/tests/cstub.c
View file

@ -62,13 +62,13 @@ static int my_free_called;
static void * CALLBACK my_alloc(SIZE_T size) static void * CALLBACK my_alloc(SIZE_T size)
{ {
my_alloc_called++; my_alloc_called++;
return NdrOleAllocate(size); return malloc(size);
} }
static void CALLBACK my_free(void *ptr) static void CALLBACK my_free(void *ptr)
{ {
my_free_called++; my_free_called++;
NdrOleFree(ptr); free(ptr);
} }
typedef struct _MIDL_PROC_FORMAT_STRING typedef struct _MIDL_PROC_FORMAT_STRING

8
dlls/rpcrt4/tests/ndr_marshall.c
View file

@ -41,13 +41,13 @@ static int my_free_called;
static void * CALLBACK my_alloc(SIZE_T size) static void * CALLBACK my_alloc(SIZE_T size)
{ {
my_alloc_called++; my_alloc_called++;
return NdrOleAllocate(size); return malloc(size);
} }
static void CALLBACK my_free(void *ptr) static void CALLBACK my_free(void *ptr)
{ {
my_free_called++; my_free_called++;
NdrOleFree(ptr); free(ptr);
} }
static const MIDL_STUB_DESC Object_StubDesc = static const MIDL_STUB_DESC Object_StubDesc =
@ -2222,7 +2222,7 @@ static void test_nonconformant_string(void)
ok(mem != mem_orig, "mem not alloced\n"); ok(mem != mem_orig, "mem not alloced\n");
ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n");
ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called);
NdrOleFree(mem); free(mem);
my_alloc_called = 0; my_alloc_called = 0;
mem = mem_orig; mem = mem_orig;
@ -2295,7 +2295,7 @@ static void test_nonconformant_string(void)
ok(mem != mem_orig, "mem not alloced\n"); ok(mem != mem_orig, "mem not alloced\n");
ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n");
ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called);
NdrOleFree(mem); free(mem);
my_alloc_called = 0; my_alloc_called = 0;
mem = mem_orig; mem = mem_orig;