Commit 42ab0af6 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

msvcrt: Don't include MSVC 8.0+ heap functions in SOs for older DLLs.

parent c36b424e
...@@ -373,8 +373,9 @@ MSVCRT_size_t CDECL _msize(void* mem) ...@@ -373,8 +373,9 @@ MSVCRT_size_t CDECL _msize(void* mem)
return size; return size;
} }
#if _MSVCR_VER>=80
/********************************************************************* /*********************************************************************
* _aligned_msize (MSVCR100.@) * _aligned_msize (MSVCR80.@)
*/ */
size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offset) size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offset)
{ {
...@@ -388,6 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs ...@@ -388,6 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs
alloc_ptr = SAVED_PTR(p); alloc_ptr = SAVED_PTR(p);
return _msize(*alloc_ptr)-alignment-sizeof(void*); return _msize(*alloc_ptr)-alignment-sizeof(void*);
} }
#endif
/********************************************************************* /*********************************************************************
* calloc (MSVCRT.@) * calloc (MSVCRT.@)
...@@ -405,6 +407,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) ...@@ -405,6 +407,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size)
return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, bytes); return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, bytes);
} }
#if _MSVCR_VER>=140
/********************************************************************* /*********************************************************************
* _calloc_base (UCRTBASE.@) * _calloc_base (UCRTBASE.@)
*/ */
...@@ -412,6 +415,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) ...@@ -412,6 +415,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size)
{ {
return MSVCRT_calloc(count, size); return MSVCRT_calloc(count, size);
} }
#endif
/********************************************************************* /*********************************************************************
* free (MSVCRT.@) * free (MSVCRT.@)
...@@ -421,6 +425,7 @@ void CDECL MSVCRT_free(void* ptr) ...@@ -421,6 +425,7 @@ void CDECL MSVCRT_free(void* ptr)
msvcrt_heap_free(ptr); msvcrt_heap_free(ptr);
} }
#if _MSVCR_VER>=140
/********************************************************************* /*********************************************************************
* _free_base (UCRTBASE.@) * _free_base (UCRTBASE.@)
*/ */
...@@ -428,6 +433,7 @@ void CDECL _free_base(void* ptr) ...@@ -428,6 +433,7 @@ void CDECL _free_base(void* ptr)
{ {
msvcrt_heap_free(ptr); msvcrt_heap_free(ptr);
} }
#endif
/********************************************************************* /*********************************************************************
* malloc (MSVCRT.@) * malloc (MSVCRT.@)
...@@ -440,6 +446,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) ...@@ -440,6 +446,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size)
return ret; return ret;
} }
#if _MSVCR_VER>=140
/********************************************************************* /*********************************************************************
* _malloc_base (UCRTBASE.@) * _malloc_base (UCRTBASE.@)
*/ */
...@@ -447,6 +454,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) ...@@ -447,6 +454,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size)
{ {
return MSVCRT_malloc(size); return MSVCRT_malloc(size);
} }
#endif
/********************************************************************* /*********************************************************************
* realloc (MSVCRT.@) * realloc (MSVCRT.@)
...@@ -459,6 +467,7 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) ...@@ -459,6 +467,7 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size)
return NULL; return NULL;
} }
#if _MSVCR_VER>=140
/********************************************************************* /*********************************************************************
* _realloc_base (UCRTBASE.@) * _realloc_base (UCRTBASE.@)
*/ */
...@@ -466,9 +475,11 @@ void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size) ...@@ -466,9 +475,11 @@ void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size)
{ {
return MSVCRT_realloc(ptr, size); return MSVCRT_realloc(ptr, size);
} }
#endif
#if _MSVCR_VER>=80
/********************************************************************* /*********************************************************************
* _recalloc (MSVCR100.@) * _recalloc (MSVCR80.@)
*/ */
void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size)
{ {
...@@ -491,6 +502,7 @@ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) ...@@ -491,6 +502,7 @@ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size)
memset((BYTE*)ret+old_size, 0, size-old_size); memset((BYTE*)ret+old_size, 0, size-old_size);
return ret; return ret;
} }
#endif
/********************************************************************* /*********************************************************************
* __p__amblksiz (MSVCRT.@) * __p__amblksiz (MSVCRT.@)
...@@ -739,6 +751,7 @@ int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const voi ...@@ -739,6 +751,7 @@ int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const voi
return 0; return 0;
} }
#if _MSVCR_VER>=100
/********************************************************************* /*********************************************************************
* wmemmove_s (MSVCR100.@) * wmemmove_s (MSVCR100.@)
*/ */
...@@ -761,6 +774,7 @@ int CDECL wmemmove_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, ...@@ -761,6 +774,7 @@ int CDECL wmemmove_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements,
memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); memmove(dest, src, sizeof(MSVCRT_wchar_t)*count);
return 0; return 0;
} }
#endif
/********************************************************************* /*********************************************************************
* memcpy_s (MSVCRT.@) * memcpy_s (MSVCRT.@)
...@@ -788,6 +802,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void ...@@ -788,6 +802,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void
return 0; return 0;
} }
#if _MSVCR_VER>=100
/********************************************************************* /*********************************************************************
* wmemcpy_s (MSVCR100.@) * wmemcpy_s (MSVCR100.@)
*/ */
...@@ -813,6 +828,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, ...@@ -813,6 +828,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements,
memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count);
return 0; return 0;
} }
#endif
/********************************************************************* /*********************************************************************
* strncpy_s (MSVCRT.@) * strncpy_s (MSVCRT.@)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment