Module: wine Branch: master Commit: 18bdd435f12714859794da49ba52806f37a120f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bdd435f12714859794da49ba52806...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 16 14:23:28 2024 +0100
rpcrt4/tests: Fix some malloc/HeapAlloc mismatches.
Fixes regressions caused by a38e05636df9596ff3e41301c771fe93523808f1.
---
dlls/rpcrt4/tests/cstub.c | 4 ++-- dlls/rpcrt4/tests/ndr_marshall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 266d34c3c7f..12ea13363b0 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -62,13 +62,13 @@ static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) { my_alloc_called++; - return NdrOleAllocate(size); + return malloc(size); }
static void CALLBACK my_free(void *ptr) { my_free_called++; - NdrOleFree(ptr); + free(ptr); }
typedef struct _MIDL_PROC_FORMAT_STRING diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ba9ceaf18fb..d86f3b0556e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -41,13 +41,13 @@ static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) { my_alloc_called++; - return NdrOleAllocate(size); + return malloc(size); }
static void CALLBACK my_free(void *ptr) { my_free_called++; - NdrOleFree(ptr); + free(ptr); }
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 != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); - NdrOleFree(mem); + free(mem);
my_alloc_called = 0; mem = mem_orig; @@ -2295,7 +2295,7 @@ static void test_nonconformant_string(void) ok(mem != mem_orig, "mem not alloced\n"); ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); - NdrOleFree(mem); + free(mem);
my_alloc_called = 0; mem = mem_orig;