[PATCH 1/2] msvcrtd: Forward operator_new_dbg to msvcrt
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Sun Apr 8 05:11:51 CDT 2018
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/msvcrtd/debug.c | 39 ---------------------------------------
dlls/msvcrtd/msvcrtd.spec | 4 ++--
2 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c
index b8496526ae..df7a8920b3 100644
--- a/dlls/msvcrtd/debug.c
+++ b/dlls/msvcrtd/debug.c
@@ -25,8 +25,6 @@
#define _DEBUG
#include "crtdbg.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
-
int _crtAssertBusy = -1;
int _crtBreakAlloc = -1;
int _crtDbgFlag = 0;
@@ -39,43 +37,6 @@ typedef unsigned long MSVCRT_size_t;
extern int _callnewh(MSVCRT_size_t);
-/*********************************************************************
- * ??2 at YAPAXIHPBDH@Z (MSVCRTD.@)
- */
-void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse,
- const char *szFileName, int nLine)
-{
- void *retval = NULL;
-
- TRACE("(%lu, %d, '%s', %d)\n", nSize, nBlockUse, szFileName, nLine);
-
- switch(_BLOCK_TYPE(nBlockUse))
- {
- case _NORMAL_BLOCK:
- break;
- case _CLIENT_BLOCK:
- FIXME("Unimplemented case for nBlockUse = _CLIENT_BLOCK\n");
- return NULL;
- case _FREE_BLOCK:
- FIXME("Native code throws an exception here\n");
- return NULL;
- case _CRT_BLOCK:
- case _IGNORE_BLOCK:
- ERR("Not allowed nBlockUse value: %d\n", _BLOCK_TYPE(nBlockUse));
- return NULL;
- default:
- ERR("Unknown nBlockUse value: %d\n", _BLOCK_TYPE(nBlockUse));
- return NULL;
- }
-
- retval = HeapAlloc(GetProcessHeap(), 0, nSize);
-
- if (!retval)
- _callnewh(nSize);
-
- return retval;
-}
-
/*********************************************************************
* _CrtSetDumpClient (MSVCRTD.@)
*/
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index 15066c310f..33c6e9934e 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -31,8 +31,8 @@
@ cdecl -arch=win64 ??1type_info@@UEAA at XZ(ptr) msvcrt.??1type_info@@UEAA at XZ
@ cdecl -arch=win32 ??2 at YAPAXI@Z(long) msvcrt.??2 at YAPAXI@Z
@ cdecl -arch=win64 ??2 at YAPEAX_K@Z(long) msvcrt.??2 at YAPEAX_K@Z
-@ cdecl -arch=win32 ??2 at YAPAXIHPBDH@Z(long long str long) MSVCRTD_operator_new_dbg
-@ cdecl -arch=win64 ??2 at YAPEAX_KHPEBDH@Z(long long str long) MSVCRTD_operator_new_dbg
+@ cdecl -arch=win32 ??2 at YAPAXIHPBDH@Z(long long str long) msvcrt.??2 at YAPAXIHPBDH@Z
+@ cdecl -arch=win64 ??2 at YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??2 at YAPEAX_KHPEBDH@Z
@ cdecl -arch=win32 ??3 at YAXPAX@Z(ptr) msvcrt.??3 at YAXPAX@Z
@ cdecl -arch=win64 ??3 at YAXPEAX@Z(ptr) msvcrt.??3 at YAXPEAX@Z
@ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0 at ABV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0 at ABV0@@Z
--
2.16.3
More information about the wine-devel
mailing list