https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f6b395cc10f65d5ab1e3642f5406b7f4deba78e
commit 3f6b395cc10f65d5ab1e3642f5406b7f4deba78e Author: Amine Khaldi <[email protected]> AuthorDate: Tue Jan 29 13:08:43 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Tue Jan 29 13:08:43 2019 +0100 [MSVCRTD_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/msvcrtd/debug.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msvcrtd/debug.c b/modules/rostests/winetests/msvcrtd/debug.c index 9055db1382..4af4c815b3 100644 --- a/modules/rostests/winetests/msvcrtd/debug.c +++ b/modules/rostests/winetests/msvcrtd/debug.c @@ -31,6 +31,7 @@ /**********************************************************************/ static void * (__cdecl *pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL; +static void * (__cdecl *pMSVCRTD_operator_delete)(void *) = NULL; /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y) @@ -46,9 +47,15 @@ static BOOL init_functions(void) } if (sizeof(void *) > sizeof(int)) /* 64-bit has a different mangled name */ + { SET(pMSVCRTD_operator_new_dbg, "??2@YAPEAX_KHPEBDH@Z"); + SET(pMSVCRTD_operator_delete, "??3@YAXPEAX@Z"); + } else + { SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z"); + SET(pMSVCRTD_operator_delete, "??3@YAXPAX@Z"); + } if (pMSVCRTD_operator_new_dbg == NULL) return FALSE; @@ -64,7 +71,11 @@ static void test_new(void) mem = pMSVCRTD_operator_new_dbg(42, _NORMAL_BLOCK, __FILE__, __LINE__); ok(mem != NULL, "memory not allocated\n"); - HeapFree(GetProcessHeap(), 0, mem); + pMSVCRTD_operator_delete(mem); + + mem = pMSVCRTD_operator_new_dbg(42, _CRT_BLOCK, __FILE__, __LINE__); + ok(mem != NULL, "memory not allocated\n"); + pMSVCRTD_operator_delete(mem); } /**********************************************************************/
