August 2021 - Wine-Devel - list.winehq.org

[PATCH] wldap32: Make the wrap_*() functions static.
by Francois Gouget Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wldap32/libldap.c | 126 ++++++++++++++++++++--------------------- dlls/wldap32/libldap.h | 82 --------------------------- 2 files changed, 63 insertions(+), 145 deletions(-) diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 5cea944729d..495ea609059 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -61,22 +61,22 @@ static LDAPMod *nullmods[] = { NULL }; static const struct ldap_callbacks *callbacks; -void * CDECL wrap_ber_alloc_t( int options ) +static void * CDECL wrap_ber_alloc_t( int options ) { return ber_alloc_t( options ); } -void CDECL wrap_ber_bvecfree( struct bervalU **berval ) +static void CDECL wrap_ber_bvecfree( struct bervalU **berval ) { ber_bvecfree( (struct berval **)berval ); } -void CDECL wrap_ber_bvfree( struct bervalU *berval ) +static void CDECL wrap_ber_bvfree( struct bervalU *berval ) { ber_bvfree( (struct berval *)berval ); } -unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last ) +static unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last ) { ber_len_t len; ber_tag_t ret; @@ -97,22 +97,22 @@ unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **las return ret; } -int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval ) +static int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval ) { return ber_flatten( ber, (struct berval **)berval ); } -void CDECL wrap_ber_free( void *ber, int freebuf ) +static void CDECL wrap_ber_free( void *ber, int freebuf ) { ber_free( ber, freebuf ); } -void * CDECL wrap_ber_init( struct bervalU *berval ) +static void * CDECL wrap_ber_init( struct bervalU *berval ) { return ber_init( (struct berval *)berval ); } -unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last ) +static unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last ) { ber_len_t len; ber_tag_t ret; @@ -133,7 +133,7 @@ unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char return ret; } -unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) +static unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) { ber_len_t len; ber_tag_t ret; @@ -149,7 +149,7 @@ unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) return ret; } -unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) +static unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) { ber_len_t len; ber_tag_t ret; @@ -165,7 +165,7 @@ unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) return ret; } -int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) +static int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) { int ret; __ms_va_list args; @@ -230,7 +230,7 @@ int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) return ret; } -int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) +static int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) { int ret; __ms_va_list args; @@ -301,12 +301,12 @@ int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) return ret; } -int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_abandon_ext( ld, msgid, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -314,14 +314,14 @@ int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPCon (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_add_ext_s( ld, dn ? dn : "", attrs ? (LDAPMod **)attrs : nullmods, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value, +static int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -329,49 +329,49 @@ int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, st (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value, +static int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_compare_ext_s( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -void CDECL wrap_ldap_control_free( LDAPControlU *control ) +static void CDECL wrap_ldap_control_free( LDAPControlU *control ) { ldap_control_free( (LDAPControl *)control ); } -void CDECL wrap_ldap_controls_free( LDAPControlU **control ) +static void CDECL wrap_ldap_controls_free( LDAPControlU **control ) { ldap_controls_free( (LDAPControl **)control ); } -int CDECL wrap_ldap_count_entries( void *ld, void *chain ) +static int CDECL wrap_ldap_count_entries( void *ld, void *chain ) { return ldap_count_entries( ld, chain ); } -int CDECL wrap_ldap_count_references( void *ld, void *chain ) +static int CDECL wrap_ldap_count_references( void *ld, void *chain ) { return ldap_count_references( ld, chain ); } -int CDECL wrap_ldap_count_values_len( struct bervalU **values ) +static int CDECL wrap_ldap_count_values_len( struct bervalU **values ) { return ldap_count_values_len( (struct berval **)values ); } -int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control ) +static int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control ) { return ldap_create_sort_control( ld, (LDAPSortKey **)keylist, critical, (LDAPControl **)control ); } -int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control ) +static int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control ) { return ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, (LDAPControl **)control ); } -int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls, +static int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -379,22 +379,22 @@ int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverc msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_delete_ext_s( ld, dn ? dn : "", (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -char * CDECL wrap_ldap_dn2ufn( const char *dn ) +static char * CDECL wrap_ldap_dn2ufn( const char *dn ) { return ldap_dn2ufn( dn ); } -char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes ) +static char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes ) { return ldap_explode_dn( dn, notypes ); } -int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -402,59 +402,59 @@ int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct berval (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, LDAPControlU **clientctrls, char **retoid, struct bervalU **retdata ) { return ldap_extended_operation_s( ld, oid ? oid : "", (struct berval *)data, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, retoid, (struct berval **)retdata ); } -char * CDECL wrap_ldap_get_dn( void *ld, void *entry ) +static char * CDECL wrap_ldap_get_dn( void *ld, void *entry ) { return ldap_get_dn( ld, entry ); } -char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber ) +static char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber ) { return ldap_first_attribute( ld, entry, (BerElement **)ber ); } -void * CDECL wrap_ldap_first_entry( void *ld, void *chain ) +static void * CDECL wrap_ldap_first_entry( void *ld, void *chain ) { return ldap_first_entry( ld, chain ); } -void * CDECL wrap_ldap_first_reference( void *ld, void *chain ) +static void * CDECL wrap_ldap_first_reference( void *ld, void *chain ) { return ldap_first_reference( ld, chain ); } -int CDECL wrap_ldap_get_option( void *ld, int option, void *value ) +static int CDECL wrap_ldap_get_option( void *ld, int option, void *value ) { return ldap_get_option( ld, option, value ); } -struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr ) +static struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr ) { return (struct bervalU **)ldap_get_values_len( ld, entry, attr ); } -int CDECL wrap_ldap_initialize( void **ld, const char *url ) +static int CDECL wrap_ldap_initialize( void **ld, const char *url ) { return ldap_initialize( (LDAP **)ld, url ); } -void CDECL wrap_ldap_memfree( void *ptr ) +static void CDECL wrap_ldap_memfree( void *ptr ) { return ldap_memfree( ptr ); } -void CDECL wrap_ldap_memvfree( void **ptr ) +static void CDECL wrap_ldap_memvfree( void **ptr ) { ldap_memvfree( ptr ); } -int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -462,88 +462,88 @@ int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPC (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_modify_ext_s( ld, dn ? dn : "", mods ? (LDAPMod **)mods : nullmods, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_msgfree( void *msg ) +static int CDECL wrap_ldap_msgfree( void *msg ) { return ldap_msgfree( msg ); } -char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber ) +static char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber ) { return ldap_next_attribute( ld, entry, ber ); } -void * CDECL wrap_ldap_next_entry( void *ld, void *entry ) +static void * CDECL wrap_ldap_next_entry( void *ld, void *entry ) { return ldap_next_entry( ld, entry ); } -void * CDECL wrap_ldap_next_reference( void *ld, void *entry ) +static void * CDECL wrap_ldap_next_reference( void *ld, void *entry ) { return ldap_next_reference( ld, entry ); } -int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free ) +static int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free ) { return ldap_parse_extended_result( ld, result, retoid, (struct berval **)retdata, free ); } -int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free ) +static int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free ) { return ldap_parse_reference( ld, ref, referrals, (LDAPControl ***)serverctrls, free ); } -int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, +static int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, char ***referrals, LDAPControlU ***serverctrls, int free ) { return ldap_parse_result( ld, res, errcode, matcheddn, errmsg, referrals, (LDAPControl ***)serverctrls, free ); } -int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr ) +static int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr ) { return ldap_parse_sortresponse_control( ld, (LDAPControl *)ctrl, result, attr ); } -int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count, +static int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count, struct bervalU **ctx, int *errcode ) { return ldap_parse_vlvresponse_control( ld, (LDAPControl *)ctrls, target_pos, list_count, (struct berval **)ctx, errcode ); } -int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, +static int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, LDAPControlU **clientctrls, LDAPControlU **serverctrls, ULONG *msg ) { return ldap_rename( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, (LDAPControl **)serverctrls, (int *)msg ); } -int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, +static int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, LDAPControlU **clientctrls, LDAPControlU **serverctrls ) { return ldap_rename_s( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, (LDAPControl **)serverctrls ); } -int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result ) +static int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result ) { return ldap_result( ld, msgid, all, (struct timeval *)timeout, (LDAPMessage **)result ); } -int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, +static int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, LDAPControlU **serverctrls, LDAPControlU **clientctrls, int *msgid ) { return ldap_sasl_bind( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msgid ); } -int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred, +static int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct bervalU **servercred ) { return ldap_sasl_bind_s( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, @@ -559,14 +559,14 @@ static int wrap_sasl_interact( LDAP *ld, unsigned int flags, void *defaults, voi return -1; } -int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls, LDAPControlU **clientctrls, unsigned int flags, void *defaults ) { return ldap_sasl_interactive_bind_s( ld, dn, mech, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, flags, wrap_sasl_interact, defaults ); } -int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, +static int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout, int sizelimit, ULONG *msg ) { @@ -574,7 +574,7 @@ int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const cha (LDAPControl **)clientctrls, (struct timeval *)timeout, sizelimit, (int *)msg ); } -int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs, +static int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout, int sizelimit, void **result ) { @@ -583,27 +583,27 @@ int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const c (LDAPMessage **)result ); } -int CDECL wrap_ldap_set_option( void *ld, int option, const void *value ) +static int CDECL wrap_ldap_set_option( void *ld, int option, const void *value ) { return ldap_set_option( ld, option, value ); } -int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_start_tls_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_unbind_ext( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_unbind_ext_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -void CDECL wrap_ldap_value_free_len( struct bervalU **values ) +static void CDECL wrap_ldap_value_free_len( struct bervalU **values ) { ldap_value_free_len( (struct berval **)values ); } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index 3d2719452c4..d0c37ab498d 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -100,88 +100,6 @@ typedef struct sasl_interactU unsigned int len; } sasl_interact_tU; -extern void * CDECL wrap_ber_alloc_t(int) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_bvecfree(struct bervalU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_bvfree(struct bervalU *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_first_element(void *, unsigned int *, char **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ber_flatten(void *, struct bervalU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_free(void *, int) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ber_init(struct bervalU *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_next_element(void *, unsigned int *, char *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_peek_tag(void *, unsigned int *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_skip_tag(void *, unsigned int *) DECLSPEC_HIDDEN; -extern int WINAPIV wrap_ber_printf(void *, char *, ...) DECLSPEC_HIDDEN; -extern int WINAPIV wrap_ber_scanf(void *, char *, ...) DECLSPEC_HIDDEN; - -extern int CDECL wrap_ldap_abandon_ext(void *, int, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_add_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, - ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_add_ext_s(void *, const char *, LDAPModU **, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_compare_ext(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_compare_ext_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_control_free(LDAPControlU *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_controls_free(LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_entries(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_references(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_values_len(struct bervalU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_create_sort_control(void *, LDAPSortKeyU **, int, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_create_vlv_control(void *, LDAPVLVInfoU *, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_delete_ext(void *, const char *, LDAPControlU **, LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_delete_ext_s(void *, const char *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_dn2ufn(const char *) DECLSPEC_HIDDEN; -extern char ** CDECL wrap_ldap_explode_dn(const char *, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_extended_operation(void *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_extended_operation_s(void *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, char **, struct bervalU **) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_get_dn(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_get_option(void *, int, void *) DECLSPEC_HIDDEN; -extern struct bervalU ** CDECL wrap_ldap_get_values_len(void *, void *, const char *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_initialize(void **, const char *) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_first_attribute(void *, void *, void **) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_first_entry(void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_first_reference(void *, void *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_memfree(void *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_memvfree(void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_modify_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, - ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_modify_ext_s(void *, const char *, LDAPModU **, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_msgfree(void *) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_next_attribute(void *, void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_next_entry(void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_next_reference(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_extended_result(void *, void *, char **, struct bervalU **, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_reference(void *, void *, char ***, LDAPControlU ***, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_result(void *, void *, int *, char **, char **, char ***, LDAPControlU ***, - int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_sortresponse_control(void *, LDAPControlU *, int *, char **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_vlvresponse_control(void *, LDAPControlU *, int *, int *, struct bervalU **, - int *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_rename(void *, const char *, const char *, const char *, int, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_rename_s(void *, const char *, const char *, const char *, int, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_result(void *, int, int, struct timevalU *, void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_bind(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, int *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_bind_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, struct bervalU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_interactive_bind_s(void *, const char *, const char *, LDAPControlU **, - LDAPControlU **, unsigned int, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_search_ext(void *, const char *, int, const char *, char **, int, LDAPControlU **, - LDAPControlU **, struct timevalU *, int, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_search_ext_s(void *, const char *, int, const char *, char **, int, LDAPControlU **, - LDAPControlU **, struct timevalU *, int, void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_set_option(void *, int, const void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_start_tls_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_unbind_ext(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_unbind_ext_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_value_free_len(struct bervalU **) DECLSPEC_HIDDEN; - struct ldap_funcs { void * (CDECL *fn_ber_alloc_t)(int); -- 2.20.1

1 0

[PATCH] wined3d: Fix the spelling of a comment.
by Francois Gouget Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 53a6b0ffca0..9abea2cb1f5 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1682,9 +1682,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query need to either begin and end inside a single render pass, - * or begin and end ouside of a render pass. Occlusion queries, if issued - * ouside of a render pass, are queued up and only begun when a render + /* A query needs to either begin and end inside a single render pass, + * or begin and end outside of a render pass. Occlusion queries, if issued + * outside of a render pass, are queued up and only begun when a render * pass is started, to avoid interrupting it when the query ends. */ if (context_vk->vk_render_pass) { -- 2.20.1

1 0

[PATCH] include: Fix the spelling of a comment.
by Francois Gouget Aug. 26, 2021

Aug. 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/ntgdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntgdi.h b/include/ntgdi.h index 66611b38fb0..845f85601fd 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -131,7 +131,7 @@ enum typedef struct DC_ATTR { HDC hdc; /* handle to self */ - LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ + LONG disabled; /* disabled flag, controlled by DCHF_(DISABLE|ENABLE)DC */ int save_level; COLORREF background_color; COLORREF brush_color; -- 2.20.1

1 0

[PATCH 4/7] gdi32: Support passing an array of chars to NtGdiGetCharWidthW.
by Jacek Caban Aug. 26, 2021

Aug. 26, 2021

And use it for GetCharWidthA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/font.c | 29 ++++++++++++++++------------- dlls/gdi32/text.c | 38 ++++++++++++-------------------------- dlls/wineps.drv/builtin.c | 24 +++++++++++++----------- dlls/wineps.drv/psdrv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 46 insertions(+), 54 deletions(-)

2 1

[PATCH v2 7/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthI.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 67 ++++++++++++++++------------------------------- dlls/gdi32/text.c | 10 +++++++ 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4faaaacdfce..e80143066b5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4872,9 +4872,30 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, UINT i, count = last; BOOL ret; PHYSDEV dev; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) return FALSE; + if (flags & NTGDI_GETCHARWIDTH_INDICES) + { + ABC *abc; + unsigned int i; + + if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) + return FALSE; + + if (!GetCharABCWidthsI( hdc, first, last, chars, abc )) + { + HeapFree( GetProcessHeap(), 0, abc ); + return FALSE; + } + + for (i = 0; i < count; i++) + ((INT *)buf)[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; + + HeapFree(GetProcessHeap(), 0, abc); + return TRUE; + } + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); @@ -7114,48 +7135,6 @@ BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) return FALSE; } -/*********************************************************************** - * GetCharWidthI (GDI32.@) - * - * Retrieve widths of characters. - * - * PARAMS - * hdc [I] Handle to a device context. - * first [I] First glyph in range to query. - * count [I] Number of glyph indices to query. - * glyphs [I] Array of glyphs to query. - * buffer [O] Buffer to receive character widths. - * - * NOTES - * Only works with TrueType fonts. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT buffer) -{ - ABC *abc; - unsigned int i; - - TRACE("(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer); - - if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) - return FALSE; - - if (!GetCharABCWidthsI(hdc, first, count, glyphs, abc)) - { - HeapFree(GetProcessHeap(), 0, abc); - return FALSE; - } - - for (i = 0; i < count; i++) - buffer[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; - - HeapFree(GetProcessHeap(), 0, abc); - return TRUE; -} - /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b31196252ad..c3d72938eba 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1672,3 +1672,13 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthI (GDI32.@) + */ +BOOL WINAPI GetCharWidthI( HDC hdc, UINT first, UINT count, WORD *glyphs, INT *buffer ) +{ + TRACE( "(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer ); + return NtGdiGetCharWidthW( hdc, first, count, glyphs, + NTGDI_GETCHARWIDTH_INT | NTGDI_GETCHARWIDTH_INDICES, buffer ); +} -- 2.23.0

1 0

[PATCH v2 6/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 26 -------------------------- dlls/gdi32/text.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cbf3f6fb555..4faaaacdfce 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6443,32 +6443,6 @@ done: return ret; } -/************************************************************************* - * GetCharWidthFloatA [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) -{ - WCHAR *wstr; - int i, wlen; - char *str; - - if (!(str = FONT_GetCharsByRangeA( hdc, first, last, &i ))) - return FALSE; - wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); - heap_free(str); - - for (i = 0; i < wlen; ++i) - { - if (!GetCharWidthFloatW( hdc, wstr[i], wstr[i], &buffer[i] )) - { - heap_free(wstr); - return FALSE; - } - } - heap_free(wstr); - return TRUE; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b753dac7052..b31196252ad 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1657,3 +1657,18 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) { return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); } + +/*********************************************************************** + * GetCharWidthFloatA (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) +{ + WCHAR *chars; + INT count; + BOOL ret; + + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, 0, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); + return ret; +} -- 2.23.0

1 0

[PATCH v2 5/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 50 ++++++++++++----------------------------------- dlls/gdi32/text.c | 8 ++++++++ 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7e4d67af8ae..cbf3f6fb555 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4882,10 +4882,19 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, if (ret) { - INT *buffer = buf; - /* convert device units to logical */ - for (i = 0; i < count; i++) - buffer[i] = width_to_LP( dc, buffer[i] ); + if (flags & NTGDI_GETCHARWIDTH_INT) + { + INT *buffer = buf; + /* convert device units to logical */ + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); + } + else + { + float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; + for (i = 0; i < count; i++) + ((float *)buf)[i] = ((int *)buf)[i] * scale; + } } release_dc_ptr( dc ); return ret; @@ -6460,39 +6469,6 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) return TRUE; } -/************************************************************************* - * GetCharWidthFloatW [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) -{ - DC *dc = get_dc_ptr( hdc ); - int *ibuffer; - PHYSDEV dev; - BOOL ret; - UINT i; - - TRACE("dc %p, first %#x, last %#x, buffer %p\n", dc, first, last, buffer); - - if (!dc) return FALSE; - - if (!(ibuffer = heap_alloc( (last - first + 1) * sizeof(int) ))) - { - release_dc_ptr( dc ); - return FALSE; - } - - dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) - { - float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; - for (i = first; i <= last; ++i) - buffer[i - first] = ibuffer[i - first] * scale; - } - - heap_free(ibuffer); - return ret; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 0bb47f00c24..b753dac7052 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1649,3 +1649,11 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthFloatW (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); +} -- 2.23.0

1 0

[PATCH v2 4/7] gdi32: Support passing an array of chars to NtGdiGetCharWidthW.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> And use it for GetCharWidthA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/font.c | 29 ++++++++++++++++------------- dlls/gdi32/text.c | 38 ++++++++++++-------------------------- dlls/wineps.drv/builtin.c | 24 +++++++++++++----------- dlls/wineps.drv/psdrv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f370d088585..3d64eedc638 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -380,7 +380,8 @@ static BOOL CDECL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count return FALSE; } -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { return FALSE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c88e69ef013..7e4d67af8ae 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3089,27 +3089,29 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W /************************************************************* * font_GetCharWidth */ -static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); + UINT c, i; ABC abc; - UINT c; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, first, last, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE( "%p, %d, %d, %p\n", physdev->font, first, last, buffer ); + TRACE( "%p, %d, %d, %p\n", physdev->font, first, count, buffer ); EnterCriticalSection( &font_cs ); - for (c = first; c <= last; c++) + for (i = 0; i < count; i++) { + c = chars ? chars[i] : i + first; if (get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &abc, 0, NULL, NULL ) == GDI_ERROR) - buffer[c - first] = 0; + buffer[i] = 0; else - buffer[c - first] = abc.abcA + abc.abcB + abc.abcC; + buffer[i] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &font_cs ); return TRUE; @@ -4864,25 +4866,26 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT /*********************************************************************** * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, ULONG flags, void *buf ) { - UINT i; + UINT i, count = last; BOOL ret; PHYSDEV dev; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; + if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); + ret = dev->funcs->pGetCharWidth( dev, first, count, chars, buf ); if (ret) { INT *buffer = buf; /* convert device units to logical */ - for( i = firstChar; i <= lastChar; i++, buffer++ ) - *buffer = width_to_LP( dc, *buffer ); + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); } release_dc_ptr( dc ); return ret; @@ -6479,7 +6482,7 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) } dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last, ibuffer ))) + if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) { float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; for (i = first; i <= last; ++i) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 167aa5cc07d..0bb47f00c24 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1580,12 +1580,13 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); } -static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +static WCHAR *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *ret_len ) { INT i, count = last - first + 1; + WCHAR *wstr; + char *str; UINT mbcp; UINT c; - LPSTR str; if (count <= 0) return NULL; @@ -1628,8 +1629,9 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) } str[i] = '\0'; - *byte_len = i; - return str; + wstr = text_mbtowc( hdc, str, i, ret_len, NULL ); + HeapFree( GetProcessHeap(), 0, str ); + return wstr; } /*********************************************************************** @@ -1638,28 +1640,12 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) */ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) { - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = get_chars_by_range( hdc, first, last, &i ); - if (str == NULL) - return FALSE; - - wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) - { - ret = FALSE; - break; - } - buffer++; - } + WCHAR *chars; + INT count; + BOOL ret; - HeapFree( GetProcessHeap(), 0, str ); - HeapFree( GetProcessHeap(), 0, wstr ); + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, NTGDI_GETCHARWIDTH_INT, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); return ret; } diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 22397567aa4..11ba2154148 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -343,28 +343,30 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT /*********************************************************************** * PSDRV_GetCharWidth */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) +BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - UINT i; + UINT i, c; if (physDev->font.fontloc == Download) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE("U+%.4X U+%.4X\n", firstChar, lastChar); + TRACE("U+%.4X +%u\n", first, count); - if (lastChar > 0xffff || firstChar > lastChar) + for (i = 0; i < count; ++i) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + c = chars ? chars[i] : first + i; - for (i = firstChar; i <= lastChar; ++i) - { - *buffer = floor( PSDRV_UVMetrics(i, physDev->font.fontinfo.Builtin.afm)->WX + if (c > 0xffff) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *buffer = floor( PSDRV_UVMetrics(c, physDev->font.fontinfo.Builtin.afm)->WX * physDev->font.fontinfo.Builtin.scale + 0.5 ); TRACE("U+%.4X: %i\n", i, *buffer); ++buffer; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 84828a5c9ce..db7c6e37f7c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -439,7 +439,7 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; +extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ca84ccf56c..6db6cf94b70 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -99,7 +99,7 @@ struct gdi_dc_funcs UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); - BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); BOOL (CDECL *pGetCharWidthInfo)(PHYSDEV,void*); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); @@ -169,7 +169,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 64 +#define WINE_GDI_DRIVER_VERSION 65 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

1 0

[PATCH v2 3/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidth.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 45 +++-------------------- dlls/gdi32/text.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 6 ++- 3 files changed, 103 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cdd3ca24034..c88e69ef013 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4862,11 +4862,10 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT } /*********************************************************************** - * GetCharWidthW (GDI32.@) - * GetCharWidth32W (GDI32.@) + * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, + ULONG flags, void *buf ) { UINT i; BOOL ret; @@ -4876,10 +4875,11 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, if (!dc) return FALSE; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); if (ret) { + INT *buffer = buf; /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) *buffer = width_to_LP( dc, *buffer ); @@ -4889,41 +4889,6 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, } -/*********************************************************************** - * GetCharWidthA (GDI32.@) - * GetCharWidth32A (GDI32.@) - */ -BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) -{ - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i); - if(str == NULL) - return FALSE; - - wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W(hdc, wstr[i], wstr[i], buffer)) - { - ret = FALSE; - break; - } - buffer++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; -} - - /* helper for nulldrv_ExtTextOut */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, GLYPHMETRICS *metrics, struct gdi_image_bits *image ) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index acc796fce30..167aa5cc07d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1570,3 +1570,96 @@ UINT WINAPI GetOutlineTextMetricsW( HDC hdc, UINT size, OUTLINETEXTMETRICW *otm { return NtGdiGetOutlineTextMetricsInternalW( hdc, size, otm, 0 ); } + +/*********************************************************************** + * GetCharWidthW (GDI32.@) + * GetCharWidth32W (GDI32.@) + */ +BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); +} + +static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +{ + INT i, count = last - first + 1; + UINT mbcp; + UINT c; + LPSTR str; + + if (count <= 0) + return NULL; + + mbcp = GdiGetCodePage( hdc ); + switch (mbcp) + { + case 932: + case 936: + case 949: + case 950: + case 1361: + if (last > 0xffff) + return NULL; + if ((first ^ last) > 0xff) + return NULL; + break; + default: + if (last > 0xff) + return NULL; + mbcp = 0; + break; + } + + if (!(str = HeapAlloc( GetProcessHeap(), 0, count * 2 + 1 ))) + return NULL; + + for (i = 0, c = first; c <= last; i++, c++) + { + if (mbcp) { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + if (c <= 0xff && IsDBCSLeadByteEx( mbcp, c )) + str[i] = 0x1f; /* FIXME: use default character */ + else + str[i] = (BYTE)c; + } + else + str[i] = (BYTE)c; + } + str[i] = '\0'; + + *byte_len = i; + return str; +} + +/*********************************************************************** + * GetCharWidthA (GDI32.@) + * GetCharWidth32A (GDI32.@) + */ +BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + INT i, wlen; + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + str = get_chars_by_range( hdc, first, last, &i ); + if (str == NULL) + return FALSE; + + wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); + + for(i = 0; i < wlen; i++) + { + if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) + { + ret = FALSE; + break; + } + buffer++; + } + + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, wstr ); + return ret; +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 66611b38fb0..7e75b944e85 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -123,6 +123,9 @@ enum NtGdiSetDIBColorTable, }; +#define NTGDI_GETCHARWIDTH_INT 0x02 +#define NTGDI_GETCHARWIDTH_INDICES 0x08 + #define MWT_SET 4 /* structs not compatible with native Windows */ @@ -227,7 +230,8 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ); BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP bitmap, SIZE *size ); UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ); BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first_char, UINT last_char, ABC *abc ); -BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, INT *buffer ); +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars, + ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); -- 2.23.0

1 0

[PATCH v2 2/7] gdi32/tests: Use winetest_debug to silence noisy traces.
by Huw Davies Aug. 26, 2021

Aug. 26, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 04fe6afd875..f93e5e5e5d0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5493,9 +5493,9 @@ static INT CALLBACK enum_ms_shell_dlg_proc(const LOGFONTA *lf, const TEXTMETRICA { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; @@ -5514,9 +5514,9 @@ static INT CALLBACK enum_ms_shell_dlg2_proc(const LOGFONTA *lf, const TEXTMETRIC { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; -- 2.23.0

1 0