February 2018 - Wine-devel - list.winehq.org

[PATCH 4/5] mshtml: Share more code between get_form implementations.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlform.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/htmlinput.c | 40 ++-------------------------------------- dlls/mshtml/htmloption.c | 28 +--------------------------- dlls/mshtml/htmlselect.c | 28 +--------------------------- dlls/mshtml/htmltextarea.c | 23 +---------------------- dlls/mshtml/mshtml_private.h | 1 + 6 files changed, 38 insertions(+), 114 deletions(-)

1 0

[PATCH 3/5] mshtml: Use get_element helper in IHTMLDocument3::get_documentElement implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

1 0

[PATCH 2/5] mshtml: Get rid of no longer needed document argument from create_collection_from_nodelist and create_collection_from_htmlcol.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 18 +++++++++--------- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 8 ++++---- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmltable.c | 4 ++-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-)

1 0

[PATCH 1/5] mshtml: Use get_element helper in IHTMLDocument2::elementFromPoint implementation.
by Jacek Caban 20 Feb '18

20 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH] wldap32: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/control.c | 3 +- dlls/wldap32/init.c | 19 +++--- dlls/wldap32/page.c | 8 +-- dlls/wldap32/value.c | 10 ++- dlls/wldap32/wldap32.h | 175 ++++++++++++++++++------------------------------- 5 files changed, 81 insertions(+), 134 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index b9d7b3b8f5..1ec8641847 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -276,8 +276,7 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst ) { - dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len ); - if (dst->bv_val) + if ((dst->bv_val = heap_alloc( src->bv_len ))) { memcpy( dst->bv_val, src->bv_val, src->bv_len ); dst->bv_len = src->bv_len; diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 6b413f8437..fdb79084b5 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -62,10 +62,9 @@ static char **split_hostnames( const char *hostnames ) p++; } - res = HeapAlloc( GetProcessHeap(), 0, (i + 1) * sizeof(char *) ); - if (!res) + if (!(res = heap_alloc( (i + 1) * sizeof(char *) ))) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); return NULL; } @@ -74,7 +73,7 @@ static char **split_hostnames( const char *hostnames ) q = p; i = 0; - + while (*p) { if (p[1] != '\0') @@ -85,7 +84,7 @@ static char **split_hostnames( const char *hostnames ) res[i] = strdupU( q ); if (!res[i]) goto oom; i++; - + while (isspace( *p )) p++; q = p; } @@ -100,14 +99,14 @@ static char **split_hostnames( const char *hostnames ) } res[i] = NULL; - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); return res; oom: while (i > 0) strfreeU( res[--i] ); - HeapFree( GetProcessHeap(), 0, res ); - HeapFree( GetProcessHeap(), 0, str ); + heap_free( res ); + heap_free( str ); return NULL; } @@ -154,9 +153,7 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum } size += (i - 1) * strlen( sep ); - - res = HeapAlloc( GetProcessHeap(), 0, size + 1 ); - if (!res) return NULL; + if (!(res = heap_alloc( size + 1 ))) return NULL; p = res; for (v = hostnames; *v; v++) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 15d5119902..7cf7d93245 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -99,17 +99,15 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, return WLDAP32_LDAP_NO_MEMORY; /* copy the berval so it can be properly freed by the caller */ - val = HeapAlloc( GetProcessHeap(), 0, berval->bv_len ); - if (!val) return WLDAP32_LDAP_NO_MEMORY; + if (!(val = heap_alloc( berval->bv_len ))) return WLDAP32_LDAP_NO_MEMORY; len = berval->bv_len; memcpy( val, berval->bv_val, len ); ber_bvfree( berval ); - ctrl = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!ctrl) + if (!(ctrl = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return WLDAP32_LDAP_NO_MEMORY; } diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index 69ab040072..bcfa9a2f6b 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -156,8 +156,7 @@ static char *bv2str( struct berval *bv ) char *str = NULL; unsigned int len = bv->bv_len; - str = HeapAlloc( GetProcessHeap(), 0, len + 1 ); - if (str) + if ((str = heap_alloc( len + 1 ))) { memcpy( str, bv->bv_val, len ); str[len] = '\0'; @@ -176,8 +175,7 @@ static char **bv2str_array( struct berval **bv ) len++; p++; } - str = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(char *) ); - if (!str) return NULL; + if (!(str = heap_alloc( (len + 1) * sizeof(char *) ))) return NULL; p = bv; while (*p) @@ -185,8 +183,8 @@ static char **bv2str_array( struct berval **bv ) str[i] = bv2str( *p ); if (!str[i]) { - while (i > 0) HeapFree( GetProcessHeap(), 0, str[--i] ); - HeapFree( GetProcessHeap(), 0, str ); + while (i > 0) heap_free( str[--i] ); + heap_free( str ); return NULL; } i++; diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 55852a6617..1d4052002a 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; @@ -31,22 +32,16 @@ ULONG map_error( int ) DECLSPEC_HIDDEN; static inline char *strdupU( const char *src ) { char *dst; - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (strlen( src ) + 1) * sizeof(char) ); - if (dst) - strcpy( dst, src ); + if ((dst = heap_alloc( (strlen( src ) + 1) * sizeof(char) ))) strcpy( dst, src ); return dst; } static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) - strcpyW( dst, src ); + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); return dst; } @@ -56,7 +51,7 @@ static inline LPWSTR strAtoW( LPCSTR str ) if (str) { DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); } return ret; @@ -68,7 +63,7 @@ static inline LPSTR strWtoA( LPCWSTR str ) if (str) { DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + if ((ret = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -80,7 +75,7 @@ static inline char *strWtoU( LPCWSTR str ) if (str) { DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + if ((ret = heap_alloc( len ))) WideCharToMultiByte( CP_UTF8, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -92,7 +87,7 @@ static inline LPWSTR strUtoW( char *str ) if (str) { DWORD len = MultiByteToWideChar( CP_UTF8, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_UTF8, 0, str, -1, ret, len ); } return ret; @@ -100,17 +95,17 @@ static inline LPWSTR strUtoW( char *str ) static inline void strfreeA( LPSTR str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline void strfreeW( LPWSTR str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline void strfreeU( char *str ) { - HeapFree( GetProcessHeap(), 0, str ); + heap_free( str ); } static inline DWORD strarraylenA( LPSTR *strarray ) @@ -142,9 +137,7 @@ static inline LPWSTR *strarrayAtoW( LPSTR *strarray ) if (strarray) { size = sizeof(WCHAR*) * (strarraylenA( strarray ) + 1); - strarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayW) + if ((strarrayW = heap_alloc( size ))) { LPSTR *p = strarray; LPWSTR *q = strarrayW; @@ -164,9 +157,7 @@ static inline LPSTR *strarrayWtoA( LPWSTR *strarray ) if (strarray) { size = sizeof(LPSTR) * (strarraylenW( strarray ) + 1); - strarrayA = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayA) + if ((strarrayA = heap_alloc( size ))) { LPWSTR *p = strarray; LPSTR *q = strarrayA; @@ -186,9 +177,7 @@ static inline char **strarrayWtoU( LPWSTR *strarray ) if (strarray) { size = sizeof(char*) * (strarraylenW( strarray ) + 1); - strarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayU) + if ((strarrayU = heap_alloc( size ))) { LPWSTR *p = strarray; char **q = strarrayU; @@ -208,9 +197,7 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) if (strarray) { size = sizeof(WCHAR*) * (strarraylenU( strarray ) + 1); - strarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (strarrayW) + if ((strarrayW = heap_alloc( size ))) { char **p = strarray; LPWSTR *q = strarrayW; @@ -228,7 +215,7 @@ static inline void strarrayfreeA( LPSTR *strarray ) { LPSTR *p = strarray; while (*p) strfreeA( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -238,7 +225,7 @@ static inline void strarrayfreeW( LPWSTR *strarray ) { LPWSTR *p = strarray; while (*p) strfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -248,7 +235,7 @@ static inline void strarrayfreeU( char **strarray ) { char **p = strarray; while (*p) strfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, strarray ); + heap_free( strarray ); } } @@ -259,8 +246,7 @@ static inline struct berval *bvdup( struct berval *bv ) struct berval *berval; DWORD size = sizeof(struct berval) + bv->bv_len; - berval = HeapAlloc( GetProcessHeap(), 0, size ); - if (berval) + if ((berval = heap_alloc( size ))) { char *val = (char *)berval + sizeof(struct berval); @@ -286,9 +272,7 @@ static inline struct berval **bvarraydup( struct berval **bv ) if (bv) { size = sizeof(struct berval *) * (bvarraylen( bv ) + 1); - berval = HeapAlloc( GetProcessHeap(), 0, size ); - - if (berval) + if ((berval = heap_alloc( size ))) { struct berval **p = bv; struct berval **q = berval; @@ -303,16 +287,15 @@ static inline struct berval **bvarraydup( struct berval **bv ) static inline void bvarrayfree( struct berval **bv ) { struct berval **p = bv; - while (*p) HeapFree( GetProcessHeap(), 0, *p++ ); - HeapFree( GetProcessHeap(), 0, bv ); + while (*p) heap_free( *p++ ); + heap_free( bv ); } static inline LDAPModW *modAtoW( LDAPModA *mod ) { LDAPModW *modW; - modW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPModW) ); - if (modW) + if ((modW = heap_alloc( sizeof(LDAPModW) ))) { modW->mod_op = mod->mod_op; modW->mod_type = strAtoW( mod->mod_type ); @@ -329,8 +312,7 @@ static inline LDAPMod *modWtoU( LDAPModW *mod ) { LDAPMod *modU; - modU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPMod) ); - if (modU) + if ((modU = heap_alloc( sizeof(LDAPMod) ))) { modU->mod_op = mod->mod_op; modU->mod_type = strWtoU( mod->mod_type ); @@ -349,7 +331,7 @@ static inline void modfreeW( LDAPModW *mod ) bvarrayfree( mod->mod_vals.modv_bvals ); else strarrayfreeW( mod->mod_vals.modv_strvals ); - HeapFree( GetProcessHeap(), 0, mod ); + heap_free( mod ); } static inline void modfreeU( LDAPMod *mod ) @@ -358,7 +340,7 @@ static inline void modfreeU( LDAPMod *mod ) bvarrayfree( mod->mod_vals.modv_bvals ); else strarrayfreeU( mod->mod_vals.modv_strvals ); - HeapFree( GetProcessHeap(), 0, mod ); + heap_free( mod ); } static inline DWORD modarraylenA( LDAPModA **modarray ) @@ -383,9 +365,7 @@ static inline LDAPModW **modarrayAtoW( LDAPModA **modarray ) if (modarray) { size = sizeof(LDAPModW*) * (modarraylenA( modarray ) + 1); - modarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (modarrayW) + if ((modarrayW = heap_alloc( size ))) { LDAPModA **p = modarray; LDAPModW **q = modarrayW; @@ -405,9 +385,7 @@ static inline LDAPMod **modarrayWtoU( LDAPModW **modarray ) if (modarray) { size = sizeof(LDAPMod*) * (modarraylenW( modarray ) + 1); - modarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (modarrayU) + if ((modarrayU = heap_alloc( size ))) { LDAPModW **p = modarray; LDAPMod **q = modarrayU; @@ -425,7 +403,7 @@ static inline void modarrayfreeW( LDAPModW **modarray ) { LDAPModW **p = modarray; while (*p) modfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, modarray ); + heap_free( modarray ); } } @@ -435,7 +413,7 @@ static inline void modarrayfreeU( LDAPMod **modarray ) { LDAPMod **p = modarray; while (*p) modfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, modarray ); + heap_free( modarray ); } } @@ -447,15 +425,13 @@ static inline LDAPControlW *controlAtoW( LDAPControlA *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!controlW) + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -475,15 +451,13 @@ static inline LDAPControlA *controlWtoA( LDAPControlW *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlA) ); - if (!controlA) + if (!(controlA = heap_alloc( sizeof(LDAPControlA) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -503,15 +477,13 @@ static inline LDAPControl *controlWtoU( LDAPControlW *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControl) ); - if (!controlU) + if (!(controlU = heap_alloc( sizeof(LDAPControl) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -531,15 +503,13 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) if (control->ldctl_value.bv_val) { - val = HeapAlloc( GetProcessHeap(), 0, len ); - if (!val) return NULL; + if (!(val = heap_alloc( len ))) return NULL; memcpy( val, control->ldctl_value.bv_val, len ); } - controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (!controlW) + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) { - HeapFree( GetProcessHeap(), 0, val ); + heap_free( val ); return NULL; } @@ -547,7 +517,7 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) controlW->ldctl_value.bv_len = len; controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; - + return controlW; } @@ -556,8 +526,8 @@ static inline void controlfreeA( LDAPControlA *control ) if (control) { strfreeA( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -566,8 +536,8 @@ static inline void controlfreeW( LDAPControlW *control ) if (control) { strfreeW( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -576,8 +546,8 @@ static inline void controlfreeU( LDAPControl *control ) if (control) { strfreeU( control->ldctl_oid ); - HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); - HeapFree( GetProcessHeap(), 0, control ); + heap_free( control->ldctl_value.bv_val ); + heap_free( control ); } } @@ -610,9 +580,7 @@ static inline LDAPControlW **controlarrayAtoW( LDAPControlA **controlarray ) if (controlarray) { size = sizeof(LDAPControlW*) * (controlarraylenA( controlarray ) + 1); - controlarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayW) + if ((controlarrayW = heap_alloc( size ))) { LDAPControlA **p = controlarray; LDAPControlW **q = controlarrayW; @@ -632,9 +600,7 @@ static inline LDAPControlA **controlarrayWtoA( LDAPControlW **controlarray ) if (controlarray) { size = sizeof(LDAPControl*) * (controlarraylenW( controlarray ) + 1); - controlarrayA = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayA) + if ((controlarrayA = heap_alloc( size ))) { LDAPControlW **p = controlarray; LDAPControlA **q = controlarrayA; @@ -654,9 +620,7 @@ static inline LDAPControl **controlarrayWtoU( LDAPControlW **controlarray ) if (controlarray) { size = sizeof(LDAPControl*) * (controlarraylenW( controlarray ) + 1); - controlarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayU) + if ((controlarrayU = heap_alloc( size ))) { LDAPControlW **p = controlarray; LDAPControl **q = controlarrayU; @@ -676,9 +640,7 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) if (controlarray) { size = sizeof(LDAPControlW*) * (controlarraylenU( controlarray ) + 1); - controlarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (controlarrayW) + if ((controlarrayW = heap_alloc( size ))) { LDAPControl **p = controlarray; LDAPControlW **q = controlarrayW; @@ -696,7 +658,7 @@ static inline void controlarrayfreeA( LDAPControlA **controlarray ) { LDAPControlA **p = controlarray; while (*p) controlfreeA( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -706,7 +668,7 @@ static inline void controlarrayfreeW( LDAPControlW **controlarray ) { LDAPControlW **p = controlarray; while (*p) controlfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -716,7 +678,7 @@ static inline void controlarrayfreeU( LDAPControl **controlarray ) { LDAPControl **p = controlarray; while (*p) controlfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, controlarray ); + heap_free( controlarray ); } } @@ -724,8 +686,7 @@ static inline LDAPSortKeyW *sortkeyAtoW( LDAPSortKeyA *sortkey ) { LDAPSortKeyW *sortkeyW; - sortkeyW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKeyW) ); - if (sortkeyW) + if ((sortkeyW = heap_alloc( sizeof(LDAPSortKeyW) ))) { sortkeyW->sk_attrtype = strAtoW( sortkey->sk_attrtype ); sortkeyW->sk_matchruleoid = strAtoW( sortkey->sk_matchruleoid ); @@ -738,8 +699,7 @@ static inline LDAPSortKeyA *sortkeyWtoA( LDAPSortKeyW *sortkey ) { LDAPSortKeyA *sortkeyA; - sortkeyA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKeyA) ); - if (sortkeyA) + if ((sortkeyA = heap_alloc( sizeof(LDAPSortKeyA) ))) { sortkeyA->sk_attrtype = strWtoA( sortkey->sk_attrtype ); sortkeyA->sk_matchruleoid = strWtoA( sortkey->sk_matchruleoid ); @@ -752,8 +712,7 @@ static inline LDAPSortKey *sortkeyWtoU( LDAPSortKeyW *sortkey ) { LDAPSortKey *sortkeyU; - sortkeyU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPSortKey) ); - if (sortkeyU) + if ((sortkeyU = heap_alloc( sizeof(LDAPSortKey) ))) { sortkeyU->attributeType = strWtoU( sortkey->sk_attrtype ); sortkeyU->orderingRule = strWtoU( sortkey->sk_matchruleoid ); @@ -768,7 +727,7 @@ static inline void sortkeyfreeA( LDAPSortKeyA *sortkey ) { strfreeA( sortkey->sk_attrtype ); strfreeA( sortkey->sk_matchruleoid ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -778,7 +737,7 @@ static inline void sortkeyfreeW( LDAPSortKeyW *sortkey ) { strfreeW( sortkey->sk_attrtype ); strfreeW( sortkey->sk_matchruleoid ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -788,7 +747,7 @@ static inline void sortkeyfreeU( LDAPSortKey *sortkey ) { strfreeU( sortkey->attributeType ); strfreeU( sortkey->orderingRule ); - HeapFree( GetProcessHeap(), 0, sortkey ); + heap_free( sortkey ); } } @@ -814,9 +773,7 @@ static inline LDAPSortKeyW **sortkeyarrayAtoW( LDAPSortKeyA **sortkeyarray ) if (sortkeyarray) { size = sizeof(LDAPSortKeyW*) * (sortkeyarraylenA( sortkeyarray ) + 1); - sortkeyarrayW = HeapAlloc( GetProcessHeap(), 0, size ); - - if (sortkeyarrayW) + if ((sortkeyarrayW = heap_alloc( size ))) { LDAPSortKeyA **p = sortkeyarray; LDAPSortKeyW **q = sortkeyarrayW; @@ -836,9 +793,7 @@ static inline LDAPSortKey **sortkeyarrayWtoU( LDAPSortKeyW **sortkeyarray ) if (sortkeyarray) { size = sizeof(LDAPSortKey*) * (sortkeyarraylenW( sortkeyarray ) + 1); - sortkeyarrayU = HeapAlloc( GetProcessHeap(), 0, size ); - - if (sortkeyarrayU) + if ((sortkeyarrayU = heap_alloc( size ))) { LDAPSortKeyW **p = sortkeyarray; LDAPSortKey **q = sortkeyarrayU; @@ -856,7 +811,7 @@ static inline void sortkeyarrayfreeW( LDAPSortKeyW **sortkeyarray ) { LDAPSortKeyW **p = sortkeyarray; while (*p) sortkeyfreeW( *p++ ); - HeapFree( GetProcessHeap(), 0, sortkeyarray ); + heap_free( sortkeyarray ); } } @@ -866,7 +821,7 @@ static inline void sortkeyarrayfreeU( LDAPSortKey **sortkeyarray ) { LDAPSortKey **p = sortkeyarray; while (*p) sortkeyfreeU( *p++ ); - HeapFree( GetProcessHeap(), 0, sortkeyarray ); + heap_free( sortkeyarray ); } } #endif /* HAVE_LDAP */ -- 2.11.0

1 0

[PATCH] fusion: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/fusion/asmcache.c | 50 +++++++++++++++++++++--------------------------- dlls/fusion/asmenum.c | 17 +++++++--------- dlls/fusion/asmname.c | 34 ++++++++++++++++---------------- dlls/fusion/assembly.c | 39 +++++++++++++++---------------------- dlls/fusion/fusionpriv.h | 4 ++-- 5 files changed, 62 insertions(+), 82 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 6cc6602dcc..668aa8777e 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -63,9 +63,7 @@ static BOOL create_full_path(LPCWSTR path) BOOL ret = TRUE; int len; - new_path = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 1) * sizeof(WCHAR)); - if (!new_path) - return FALSE; + if (!(new_path = heap_alloc((strlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; strcpyW(new_path, path); @@ -103,7 +101,7 @@ static BOOL create_full_path(LPCWSTR path) new_path[len] = '\\'; } - HeapFree(GetProcessHeap(), 0, new_path); + heap_free(new_path); return ret; } @@ -200,7 +198,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) if (!refCount) { CloseHandle( cache->lock ); - HeapFree( GetProcessHeap(), 0, cache ); + heap_free( cache ); } return refCount; } @@ -258,7 +256,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) goto done; - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -293,7 +291,7 @@ done: IAssemblyName_Release( asmname ); if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path ); cache_unlock( cache ); return hr; } @@ -375,9 +373,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *ppAsmItem = NULL; - item = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheItemImpl)); - if (!item) - return E_OUTOFMEMORY; + if (!(item = heap_alloc(sizeof(*item)))) return E_OUTOFMEMORY; item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; item->ref = 1; @@ -400,22 +396,22 @@ static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_ DWORD len = strlenW( filename ); HRESULT hr = S_OK; - if (!(src_file = HeapAlloc( GetProcessHeap(), 0, (src_len + len + 1) * sizeof(WCHAR) ))) + if (!(src_file = heap_alloc( (src_len + len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); strcpyW( src_file + src_len, filename ); - if (!(dst_file = HeapAlloc( GetProcessHeap(), 0, (dst_len + len + 1) * sizeof(WCHAR) ))) + if (!(dst_file = heap_alloc( (dst_len + len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, src_file ); + heap_free( src_file ); return E_OUTOFMEMORY; } memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); strcpyW( dst_file + dst_len, filename ); if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); - HeapFree( GetProcessHeap(), 0, src_file ); - HeapFree( GetProcessHeap(), 0, dst_file ); + heap_free( src_file ); + heap_free( dst_file ); return hr; } @@ -488,7 +484,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); dst_len += strlenW(asmdir) + strlenW(name) + strlenW(version) + strlenW(token); - if (!(dst_dir = HeapAlloc(GetProcessHeap(), 0, dst_len * sizeof(WCHAR)))) + if (!(dst_dir = heap_alloc(dst_len * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -528,13 +524,13 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, } done: - HeapFree(GetProcessHeap(), 0, name); - HeapFree(GetProcessHeap(), 0, token); - HeapFree(GetProcessHeap(), 0, version); - HeapFree(GetProcessHeap(), 0, asmpath); - HeapFree(GetProcessHeap(), 0, dst_dir); - for (i = 0; i < count; i++) HeapFree(GetProcessHeap(), 0, external_files[i]); - HeapFree(GetProcessHeap(), 0, external_files); + heap_free(name); + heap_free(token); + heap_free(version); + heap_free(asmpath); + heap_free(dst_dir); + for (i = 0; i < count; i++) heap_free(external_files[i]); + heap_free(external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -565,16 +561,14 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved *ppAsmCache = NULL; - cache = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheImpl)); - if (!cache) - return E_OUTOFMEMORY; + if (!(cache = heap_alloc(sizeof(*cache)))) return E_OUTOFMEMORY; cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - HeapFree( GetProcessHeap(), 0, cache ); + heap_free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *ppAsmCache = &cache->IAssemblyCache_iface; @@ -627,7 +621,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); if (!refCount) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return refCount; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 4a5dadd994..ba86818a2c 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -106,10 +106,10 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) list_remove(&asmname->entry); IAssemblyName_Release(asmname->name); - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refCount; @@ -355,8 +355,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } sprintfW(disp, name_fmt, parent, version, token); - asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); - if (!asmname) + if (!(asmname = heap_alloc(sizeof(*asmname)))) { hr = E_OUTOFMEMORY; break; @@ -366,7 +365,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, CANOF_PARSE_DISPLAY_NAME, NULL); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); break; } @@ -374,7 +373,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, if (FAILED(hr)) { IAssemblyName_Release(asmname->name); - HeapFree(GetProcessHeap(), 0, asmname); + heap_free(asmname); break; } @@ -477,9 +476,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) return E_INVALIDARG; - asmenum = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyEnumImpl)); - if (!asmenum) - return E_OUTOFMEMORY; + if (!(asmenum = heap_alloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; @@ -490,7 +487,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, hr = enumerate_gac(asmenum, pName); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, asmenum); + heap_free(asmenum); return hr; } } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index ea104349b3..c5d07009a3 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -115,12 +115,12 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) if (!refCount) { - HeapFree(GetProcessHeap(), 0, This->path); - HeapFree(GetProcessHeap(), 0, This->displayname); - HeapFree(GetProcessHeap(), 0, This->name); - HeapFree(GetProcessHeap(), 0, This->culture); - HeapFree(GetProcessHeap(), 0, This->procarch); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->path); + heap_free(This->displayname); + heap_free(This->name); + heap_free(This->culture); + heap_free(This->procarch); + heap_free(This); } return refCount; @@ -663,7 +663,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) BOOL quoted = FALSE; unsigned int i = 0; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (*p == '\"') { quoted = TRUE; @@ -672,7 +672,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) while (*p && *p != '\"') ret[i++] = *p++; if ((quoted && *p != '\"') || (!quoted && *p == '\"')) { - HeapFree( GetProcessHeap(), 0, ret ); + heap_free( ret ); return NULL; } ret[i] = 0; @@ -769,7 +769,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam hr = parse_procarch( name, name->procarch ); } - HeapFree( GetProcessHeap(), 0, value ); + heap_free( value ); if (FAILED(hr)) goto done; @@ -778,13 +778,13 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } done: - HeapFree(GetProcessHeap(), 0, save); + heap_free(save); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, name->displayname); - HeapFree(GetProcessHeap(), 0, name->name); - HeapFree(GetProcessHeap(), 0, name->culture); - HeapFree(GetProcessHeap(), 0, name->procarch); + heap_free(name->displayname); + heap_free(name->name); + heap_free(name->culture); + heap_free(name->procarch); } return hr; } @@ -809,9 +809,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, (!szAssemblyName || !*szAssemblyName)) return E_INVALIDARG; - name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAssemblyNameImpl)); - if (!name) - return E_OUTOFMEMORY; + if (!(name = heap_alloc_zero(sizeof(*name)))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; @@ -819,7 +817,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, hr = parse_display_name(name, szAssemblyName); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, name); + heap_free(name); return hr; } diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index c2f98ecf72..ec380ef442 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -539,9 +539,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); - if (!assembly->metadatahdr) - return E_OUTOFMEMORY; + if (!(assembly->metadatahdr = heap_alloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); @@ -646,9 +644,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); - if (!assembly) - return E_OUTOFMEMORY; + if (!(assembly = heap_alloc_zero(sizeof(*assembly)))) return E_OUTOFMEMORY; assembly->path = strdupW(file); if (!assembly->path) @@ -699,12 +695,12 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; - HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); - HeapFree(GetProcessHeap(), 0, assembly->path); + heap_free(assembly->metadatahdr); + heap_free(assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); - HeapFree(GetProcessHeap(), 0, assembly); + heap_free(assembly); return S_OK; } @@ -717,8 +713,8 @@ static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((cpy = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); + if ((cpy = heap_alloc(len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); return cpy; } @@ -752,7 +748,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { - LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); + WCHAR *cpy = heap_alloc((strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) strcpyW(cpy, assembly->path); @@ -779,8 +775,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) if (!asmtbl) return E_FAIL; - *version = HeapAlloc(GetProcessHeap(), 0, sizeof(format) + 4 * strlen("65535") * sizeof(WCHAR)); - if (!*version) + if (!(*version = heap_alloc(sizeof(format) + 4 * strlen("65535") * sizeof(WCHAR)))) return E_OUTOFMEMORY; sprintfW(*version, format, asmtbl->MajorVersion, asmtbl->MinorVersion, @@ -852,8 +847,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0)) return E_FAIL; - hashdata = HeapAlloc(GetProcessHeap(), 0, size); - if (!hashdata) + if (!(hashdata = heap_alloc(size))) { hr = E_OUTOFMEMORY; goto done; @@ -865,8 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - tok = HeapAlloc(GetProcessHeap(), 0, (TOKEN_LENGTH + 1) * sizeof(WCHAR)); - if (!tok) + if (!(tok = heap_alloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -878,7 +871,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) hr = S_OK; done: - HeapFree(GetProcessHeap(), 0, hashdata); + heap_free(hashdata); CryptDestroyHash(hash); CryptReleaseContext(crypt, 0); @@ -913,9 +906,7 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c if (num_rows <= 0) return S_OK; - ret = HeapAlloc(GetProcessHeap(), 0, num_rows * sizeof(WCHAR *)); - if (!ret) - return E_OUTOFMEMORY; + if (!(ret = heap_alloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; for (i = 0; i < num_rows; i++) { @@ -928,8 +919,8 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c ret[i] = assembly_dup_str(assembly, idx); if (!ret[i]) { - for (; i >= 0; i--) HeapFree(GetProcessHeap(), 0, ret[i]); - HeapFree(GetProcessHeap(), 0, ret); + for (; i >= 0; i--) heap_free(ret[i]); + heap_free(ret); return E_OUTOFMEMORY; } ptr += assembly->stringsz; /* skip Name field */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 95b1282050..22de4ca784 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winver.h" +#include "wine/heap.h" #include <pshpack1.h> @@ -448,8 +449,7 @@ static inline LPWSTR strdupW(LPCWSTR src) if (!src) return NULL; - dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dest) + if ((dest = heap_alloc((lstrlenW(src) + 1) * sizeof(WCHAR)))) lstrcpyW(dest, src); return dest; -- 2.11.0

1 0

[PATCH] bcrypt: Use the global memory allocation helpers.
by Hans Leidekker 20 Feb '18

20 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c064b63752..72b5df225a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -39,6 +39,7 @@ #include "bcrypt_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/unicode.h" @@ -294,7 +295,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR return STATUS_NOT_IMPLEMENTED; } - if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY; + if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY; alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; @@ -310,7 +311,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl TRACE( "%p, %08x\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, alg ); + heap_free( alg ); return STATUS_SUCCESS; } @@ -630,7 +631,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash) ))) return STATUS_NO_MEMORY; + if (!(hash = heap_alloc( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; hash->hmac = alg->hmac; @@ -662,7 +663,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return status; } @@ -682,7 +683,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND if (!handle_copy) return STATUS_INVALID_PARAMETER; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) ))) + if (!(hash_copy = heap_alloc( sizeof(*hash_copy) ))) return STATUS_NO_MEMORY; memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); @@ -698,7 +699,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return STATUS_SUCCESS; } @@ -804,7 +805,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -892,8 +893,8 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 @@ -923,7 +924,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -1000,8 +1001,8 @@ static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #else @@ -1057,12 +1058,12 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) return STATUS_NO_MEMORY; + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; if ((status = key_init( key, alg->id, secret, secret_len ))) { - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key ); return status; } @@ -1128,11 +1129,11 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; memcpy( buf, src, bytes_left ); memset( buf + bytes_left, key->block_size - bytes_left, key->block_size - bytes_left ); status = key_encrypt( key, buf, key->block_size, dst, key->block_size ); - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status; @@ -1189,7 +1190,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; status = key_decrypt( key, src, key->block_size, buf, key->block_size ); if (!status && buf[ key->block_size - 1 ] <= key->block_size) { @@ -1199,7 +1200,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp } else status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status; -- 2.11.0

1 0

[website] German translation for release 3.2
by Julian Rüger 20 Feb '18

20 Feb '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.1
by Julian Rüger 20 Feb '18

20 Feb '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] shell32/tests: Increase 6 buffers to avoid potential overflows via sprintf (GCC).
by Gerald Pfeifer 20 Feb '18

20 Feb '18

This sheds off 10 warnings from builds with current versions of GCC. The pattern is printing a pathname plus some additional text into a buffer the size of a pathname. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/shell32/tests/shlexec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9db12ce42a..4f00db44e6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1654,7 +1654,7 @@ static void test_argify(void) static void test_filename(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH+16]; const filename_tests_t* test; char* c; INT_PTR rc; @@ -1920,7 +1920,7 @@ static void test_fileurls(void) static void test_urls(void) { - char url[MAX_PATH]; + char url[MAX_PATH+15]; INT_PTR rc; if (!create_test_class("fakeproto", FALSE)) @@ -2015,7 +2015,7 @@ static void test_urls(void) static void test_find_executable(void) { char notepad_path[MAX_PATH]; - char filename[MAX_PATH]; + char filename[MAX_PATH+17]; char command[MAX_PATH]; const filename_tests_t* test; INT_PTR rc; @@ -2433,7 +2433,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) static void test_dde(void) { - char filename[MAX_PATH], defApplication[MAX_PATH]; + char filename[MAX_PATH+14], defApplication[MAX_PATH]; const dde_tests_t* test; char params[1024]; INT_PTR rc; @@ -2600,7 +2600,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) static void test_dde_default_app(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH+15]; HSZ hszApplication; dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; @@ -2702,7 +2702,7 @@ static void init_test(void) { HMODULE hdll; HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); - char filename[MAX_PATH]; + char filename[MAX_PATH+26]; WCHAR lnkfile[MAX_PATH]; char params[1024]; const char* const * testfile; -- 2.15.1

2 1