[PATCH 0/1] MR2461: wldap32: Annotate allocation functions with __WINE_(DEALLOC|MALLOC).
From: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wldap32/winldap_private.h | 53 +++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69dca519b0e..aeeffcfcc15 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -367,20 +367,26 @@ typedef struct ldapsearch #define MSG(entry) (entry->Request) #define BER(ber) ((BerElement *)((ber)->opaque)) -WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ); -BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ); void CDECL WLDAP32_ber_bvecfree( BERVAL ** ); void CDECL WLDAP32_ber_bvfree( BERVAL * ); +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); +WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ) __WINE_DEALLOC(WLDAP32_ber_free); +BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_bvfree); ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *, ULONG *, char ** ); int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *, BERVAL ** ); -void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); -WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ); +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_free); ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *, ULONG *, char * ); ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *, ULONG * ); ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *, ULONG * ); int WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *, char *, ... ); ULONG WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *, char *, ... ); +void CDECL ldap_memfreeA( char * ); +void CDECL ldap_memfreeW( WCHAR * ); +ULONG CDECL ldap_value_freeA( char ** ); +ULONG CDECL ldap_value_freeW( WCHAR ** ); +ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); +ULONG CDECL WLDAP32_ldap_value_free_len(struct WLDAP32_berval **); ULONG CDECL ldap_addA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_addW( LDAP *, WCHAR *, LDAPModW ** ); ULONG CDECL ldap_add_extA( LDAP *, char *, LDAPModA **, LDAPControlA **, LDAPControlA **, ULONG * ); @@ -429,16 +435,12 @@ ULONG CDECL ldap_delete_ext_sA( LDAP *, char *, LDAPControlA **, LDAPControlA ** ULONG CDECL ldap_delete_ext_sW( LDAP *, WCHAR *, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_delete_sA( LDAP *, char * ); ULONG CDECL ldap_delete_sW( LDAP *, WCHAR * ); -char * CDECL ldap_dn2ufnA( char * ); -WCHAR * CDECL ldap_dn2ufnW( WCHAR * ); -void CDECL ldap_memfreeA( char * ); -void CDECL ldap_memfreeW( WCHAR * ); -char ** CDECL ldap_explode_dnA( char *, ULONG ); -WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ); -ULONG CDECL ldap_value_freeA( char ** ); -ULONG CDECL ldap_value_freeW( WCHAR ** ); -char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ); -WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ); +char * CDECL ldap_dn2ufnA( char * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_dn2ufnW( WCHAR * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char ** CDECL ldap_explode_dnA( char *, ULONG ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ) __WINE_DEALLOC(ldap_value_freeW); +char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL ldap_ufn2dnA( char *, char ** ); ULONG CDECL ldap_ufn2dnW( WCHAR *, WCHAR ** ); ULONG CDECL ldap_extended_operationA( LDAP *, char *, struct WLDAP32_berval *, LDAPControlA **, LDAPControlA **, @@ -461,11 +463,14 @@ ULONG CDECL ldap_start_tls_sA( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPCont ULONG CDECL ldap_start_tls_sW( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_check_filterA( LDAP *, char * ); ULONG CDECL ldap_check_filterW( LDAP *, WCHAR * ); -char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); -char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); -WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); +char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL WLDAP32_ldap_result( LDAP *, ULONG, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_modifyA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_modifyW( LDAP *, WCHAR *, LDAPModW ** ); @@ -528,10 +533,12 @@ ULONG CDECL ldap_search_stA( LDAP *, const PCHAR, ULONG, const PCHAR, char **, U WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_search_stW( LDAP *, const PWCHAR, ULONG, const PWCHAR, WCHAR **, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); -char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ); -WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, char * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, WCHAR * ); +char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ) __WINE_DEALLOC(ldap_value_freeW); +struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, + char * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); +struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, + WCHAR * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); ULONG map_error( int ) DECLSPEC_HIDDEN; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2461
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2461
participants (3)
-
Alex Henrie -
Alex Henrie (＠alexhenrie)
-
Hans Leidekker (＠hans)