From: Alex Henrie alexhenrie24@gmail.com
--- dlls/msvcp90/details.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/msvcp_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 984a277ed12..2bf2f052561 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -412,7 +412,7 @@ DEFINE_RTTI_DATA0(_Runtime_object, 0, ".?AV_Runtime_object@details@Concurrency@@
typedef struct __Concurrent_vector_base_v4 { - void* (__cdecl *allocator)(struct __Concurrent_vector_base_v4 *, size_t); + void* (__cdecl __WINE_ALLOC_SIZE(2) *allocator)(struct __Concurrent_vector_base_v4 *, size_t); void *storage[3]; size_t first_block; size_t early_size; diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 80e7694bd0f..cb3e7573283 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -296,7 +296,7 @@ typedef struct { char *endsave; char *seekhigh; int strmode; - void* (__cdecl *palloc)(size_t); + void* (__cdecl __WINE_ALLOC_SIZE(1) *palloc)(size_t); void (__cdecl *pfree)(void*); } strstreambuf;
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 23ce63947e5..925af2eda73 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -38,8 +38,8 @@ void __cdecl _invalid_parameter_noinfo(void); BOOL __cdecl __uncaught_exception(void); int __cdecl _callnewh(size_t);
-void* __cdecl operator_new(size_t); void __cdecl operator_delete(void*); +void* __cdecl operator_new(size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(operator_delete) __WINE_MALLOC; extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
#if _MSVCP_VER >= 110 @@ -160,8 +160,8 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*);
-char* __thiscall MSVCP_allocator_char_allocate(void*, size_t); void __thiscall MSVCP_allocator_char_deallocate(void*, char*, size_t); +char* __thiscall MSVCP_allocator_char_allocate(void*, size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(MSVCP_allocator_char_deallocate, 2) __WINE_MALLOC; size_t __thiscall MSVCP_allocator_char_max_size(const void*); wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, size_t); void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, size_t); diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 8717384c2c6..ad0137f4741 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -246,7 +246,7 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const _invalid_parameter_noinfo(); } #else -static void* (__cdecl *MSVCRT_operator_new)(size_t); +static void* (__cdecl __WINE_ALLOC_SIZE(1) *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*);
void* __cdecl operator_new(size_t size)