niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup.

Browse source
This commit is contained in:
Brendan Shanks 2022-12-05 11:36:31 -08:00 • committed by Alexandre Julliard
parent 8e942f9e41
commit 3a688e81a6
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/msvcrt/corecrt.h
View file

@ -342,4 +342,16 @@ typedef struct threadlocaleinfostruct {
#define __WINE_CRT_SCANF_ATTR(fmt,args)
#endif
#if defined(__GNUC__) && (__GNUC__ > 10)
#define __WINE_DEALLOC(...) __attribute__((malloc (__VA_ARGS__)))
#else
#define __WINE_DEALLOC(...)
#endif
#if defined(__GNUC__) && (__GNUC__ > 2)
#define __WINE_MALLOC __attribute__((malloc))
#else
#define __WINE_MALLOC
#endif
#endif /* __WINE_CORECRT_H */

3
include/msvcrt/corecrt_wstring.h
View file

@ -7,6 +7,7 @@
#define _WSTRING_DEFINED
#include <corecrt.h>
#include <corecrt_malloc.h>
#ifdef __cplusplus
extern "C" {
@ -29,7 +30,7 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return
_ACRTIMP void* __cdecl memmove(void*,const void*,size_t);
_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*);
_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*) __WINE_DEALLOC(free) __WINE_MALLOC;
_ACRTIMP int __cdecl _wcsicmp(const wchar_t*,const wchar_t*);
_ACRTIMP int __cdecl _wcsicoll(const wchar_t*,const wchar_t*);
_ACRTIMP int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t);

3
include/msvcrt/string.h
View file

@ -8,6 +8,7 @@
#ifndef __WINE_STRING_H
#define __WINE_STRING_H
#include <corecrt_malloc.h>
#include <corecrt_wstring.h>
#ifndef _NLSCMP_DEFINED
@ -22,7 +23,7 @@ extern "C" {
_ACRTIMP size_t __cdecl __strncnt(const char*,size_t);
_ACRTIMP int __cdecl _strcmpi(const char*,const char*);
_ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t);
_ACRTIMP char* __cdecl _strdup(const char*);
_ACRTIMP char* __cdecl _strdup(const char*) __WINE_DEALLOC(free) __WINE_MALLOC;
_ACRTIMP char* __cdecl _strerror(const char*);
_ACRTIMP errno_t __cdecl strerror_s(char*,size_t,int);
_ACRTIMP int __cdecl _stricmp(const char*,const char*);