[PATCH 0/1] MR8626: include: Add _callnewh declaration.
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/concrt140/concrt140.c | 1 - dlls/msvcp140_1/msvcp140_1.c | 1 - dlls/msvcp90/msvcp90.h | 1 - include/msvcrt/corecrt_malloc.h | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/concrt140/concrt140.c b/dlls/concrt140/concrt140.c index ed9da4e80c3..8b5ebd847ef 100644 --- a/dlls/concrt140/concrt140.c +++ b/dlls/concrt140/concrt140.c @@ -34,7 +34,6 @@ static HMODULE msvcp140; extern const vtable_ptr exception_vtable; -int CDECL _callnewh(size_t size); void (__cdecl *_Xmem)(void); void (__cdecl *_Xout_of_range)(const char*); diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 14bf4aba234..44b412515c0 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -34,7 +34,6 @@ CREATE_TYPE_INFO_VTABLE static HMODULE msvcp140; -int CDECL _callnewh(size_t size); void (__cdecl *throw_bad_alloc)(void); /* non-static, needed by type_info */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e5134f4634c..7a4964712ec 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -36,7 +36,6 @@ typedef SSIZE_T streamsize; void __cdecl _invalid_parameter_noinfo(void); BOOL __cdecl __uncaught_exception(void); -int __cdecl _callnewh(size_t); void __cdecl operator_delete(void*); void* __cdecl operator_new(size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(operator_delete) __WINE_MALLOC; diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h index 29475a05dfa..4f348e4d9e3 100644 --- a/include/msvcrt/corecrt_malloc.h +++ b/include/msvcrt/corecrt_malloc.h @@ -32,6 +32,7 @@ _ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP void* __cdecl realloc(void*,size_t); _ACRTIMP void* __cdecl _recalloc(void*,size_t,size_t) __WINE_ALLOC_SIZE(2,3) __WINE_DEALLOC(free); +_ACRTIMP int __cdecl _callnewh(size_t); _ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP size_t __cdecl _msize(void*); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8626
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8626
participants (3)
-
Jacek Caban -
Jacek Caban (@jacek) -
Piotr Caban (@piotr)