February 2022 - Wine-commits

Eric Pouech : mciseq: Removed useless casts to long.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 6a9ad836d14841d3314ca5205fe0c2a51ffe8558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9ad836d14841d3314ca520… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:06:03 2022 +0100 mciseq: Removed useless casts to long. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/mcimidi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 33f9fde42c7..f1a262e178c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -179,7 +179,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt) { DWORD ret = 0; - if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { + if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != sizeof(BYTE)) { WARN("Error reading wmm=%p\n", wmm); ret = MCIERR_INVALID_FILE; } @@ -319,8 +319,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) DWORD toberead; FOURCC fourcc; - if (mmioRead(wmm->hFile, (HPSTR)&fourcc, (long)sizeof(FOURCC)) != - (long)sizeof(FOURCC)) { + if (mmioRead(wmm->hFile, (HPSTR)&fourcc, sizeof(FOURCC)) != sizeof(FOURCC)) { return MCIERR_INVALID_FILE; } @@ -413,8 +412,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) WARN("Can't seek at %08X begin of 'MThd'\n", dwOffset); return MCIERR_INVALID_FILE; } - if (mmioRead(wmm->hFile, (HPSTR)&fourcc, - (long) sizeof(FOURCC)) != (long) sizeof(FOURCC)) + if (mmioRead(wmm->hFile, (HPSTR)&fourcc, sizeof(FOURCC)) != sizeof(FOURCC)) return MCIERR_INVALID_FILE; if (fourcc != mmioFOURCC('M', 'T', 'h', 'd')) {

1 0

Eric Pouech : bcrypt: In unixlib, don't use Windows long type.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: d963d056a75ab8f83403f619a73fca5a0372f6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d963d056a75ab8f83403f619… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:06:15 2022 +0100 bcrypt: In unixlib, don't use Windows long type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++----------- dlls/bcrypt/gnutls.c | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c0a53f9068b..6d115e10e54 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -155,7 +155,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - ULONG flags; + unsigned flags; }; struct key_symmetric @@ -165,7 +165,7 @@ struct key_symmetric UCHAR *vector; ULONG vector_len; UCHAR *secret; - ULONG secret_len; + unsigned secret_len; CRITICAL_SECTION cs; }; @@ -174,9 +174,9 @@ struct key_symmetric struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ - ULONG flags; + unsigned flags; UCHAR *pubkey; - ULONG pubkey_len; + unsigned pubkey_len; DSSSEED dss_seed; }; @@ -208,7 +208,7 @@ struct key_symmetric_encrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -217,7 +217,7 @@ struct key_symmetric_decrypt_params { struct key *key; const UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; }; @@ -233,7 +233,7 @@ struct key_asymmetric_decrypt_params { struct key *key; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; @@ -250,11 +250,11 @@ struct key_asymmetric_sign_params struct key *key; void *padding; UCHAR *input; - ULONG input_len; + unsigned input_len; UCHAR *output; ULONG output_len; ULONG *ret_len; - ULONG flags; + unsigned flags; }; struct key_asymmetric_verify_params @@ -262,10 +262,10 @@ struct key_asymmetric_verify_params struct key *key; void *padding; UCHAR *hash; - ULONG hash_len; + unsigned hash_len; UCHAR *signature; ULONG signature_len; - ULONG flags; + unsigned flags; }; struct key_export_params diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 26da55ee758..56479197bf5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -610,7 +610,7 @@ static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d } #define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) -static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; gnutls_datum_t m, e; @@ -649,7 +649,7 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit } static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey, - ULONG *pubkey_len ) + unsigned *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob = pubkey; gnutls_ecc_curve_t curve; @@ -709,7 +709,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ return STATUS_SUCCESS; } -static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) { BCRYPT_DSA_KEY_BLOB *dsa_blob = pubkey; gnutls_datum_t p, q, g, y; @@ -773,8 +773,8 @@ static void reverse_bytes( UCHAR *buf, ULONG len ) } #define Q_SIZE 20 -static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, - void *pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, unsigned bitlen, + void *pubkey, unsigned *pubkey_len ) { BLOBHEADER *hdr = pubkey; DSSPUBKEY *dsskey; @@ -1492,7 +1492,7 @@ static NTSTATUS key_asymmetric_verify( void *args ) { const struct key_asymmetric_verify_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; gnutls_digest_algorithm_t hash_alg; gnutls_sign_algorithm_t sign_alg; gnutls_datum_t gnutls_hash, gnutls_signature; @@ -1644,7 +1644,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) { const struct key_asymmetric_sign_params *params = args; struct key *key = params->key; - ULONG flags = params->flags; + unsigned flags = params->flags; BCRYPT_PKCS1_PADDING_INFO *pad = params->padding; gnutls_datum_t hash, signature; gnutls_digest_algorithm_t hash_alg;

1 0

Eric Pouech : kerberos: In unixlib, don't use Windows long type.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 4d0c3f7bf166a35d053328529612e59ae0c10d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0c3f7bf166a35d05332852… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:06:21 2022 +0100 kerberos: In unixlib, don't use Windows long type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/unixlib.c | 6 +++--- dlls/kerberos/unixlib.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 2ee19d6fe69..d83dd37592d 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -825,7 +825,7 @@ static NTSTATUS query_context_attributes( void *args ) return SEC_E_UNSUPPORTED_FUNCTION; } -static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; @@ -874,7 +874,7 @@ static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG return status_gss_to_sspi( ret ); } -static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG qop ) +static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; @@ -902,7 +902,7 @@ static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, UL if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - DWORD len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; + unsigned len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; if (len_token < output.length - len_data) { TRACE( "buffer too small %lu > %u\n", (SIZE_T)output.length - len_data, len_token ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 05b24d6fadf..4a31712bfe8 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -66,7 +66,7 @@ struct make_signature_params struct query_context_attributes_params { LSA_SEC_HANDLE context; - ULONG attr; + unsigned attr; void *buf; }; @@ -80,7 +80,7 @@ struct seal_message_params { LSA_SEC_HANDLE context; SecBufferDesc *msg; - ULONG qop; + unsigned qop; }; struct unseal_message_params

1 0

Eric Pouech : netapi32: In unixlib, don't use Windows long type.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 6f73ac33835253135c7219ea980df2e642de4056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f73ac33835253135c7219ea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:06:27 2022 +0100 netapi32: In unixlib, don't use Windows long type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index c6b389950f7..19132791567 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -132,7 +132,7 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, void return NERR_Success; } -static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size ) +static NET_API_STATUS server_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size ) { switch (level) { @@ -438,9 +438,9 @@ static unsigned char ace_flags_to_samba( BYTE flags ) #define GENERIC_WRITE_ACCESS (1u << 30) #define GENERIC_READ_ACCESS (1u << 31) -static unsigned int access_mask_to_samba( DWORD mask ) +static unsigned int access_mask_to_samba( unsigned int mask ) { - static const DWORD known_rights = + static const unsigned int known_rights = GENERIC_ALL | GENERIC_EXECUTE | GENERIC_WRITE | GENERIC_READ; unsigned int ret = 0; @@ -692,7 +692,7 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char ** return NERR_Success; } -static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigned char **bufptr ) +static NET_API_STATUS share_info_to_samba( unsigned int level, const BYTE *buf, unsigned char **bufptr ) { switch (level) { @@ -793,7 +793,7 @@ static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, void return NERR_Success; } -static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size ) +static NET_API_STATUS wksta_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size ) { switch (level) { @@ -826,7 +826,7 @@ static NTSTATUS wksta_getinfo( void *args ) static NTSTATUS netapi_init( void *args ) { - DWORD status; + unsigned int status; void *ctx; if (!(libnetapi_handle = dlopen( SONAME_LIBNETAPI, RTLD_NOW )))

1 0

Eric Pouech : win32u: Change NtGdiPolyPolyDraw parameter to ULONG.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: b072f01e13fe3a6c1c3aaf0acffec3d3298eb069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b072f01e13fe3a6c1c3aaf0a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:04:57 2022 +0100 win32u: Change NtGdiPolyPolyDraw parameter to ULONG. As suggested by Nikolay Sivov. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/objects.c | 2 +- dlls/win32u/font.c | 6 +++--- dlls/win32u/painting.c | 6 +++--- dlls/win32u/wrappers.c | 2 +- include/ntgdi.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ea8047a4285..d609185be76 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1438,7 +1438,7 @@ BOOL WINAPI Polygon( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polygon( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polygon( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolygon ); } /********************************************************************** @@ -1453,7 +1453,7 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT *points, const INT *counts, UINT p if (is_meta_dc( hdc )) return METADC_PolyPolygon( hdc, points, counts, polygons ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_PolyPolygon( dc_attr, points, counts, polygons )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polygons, NtGdiPolyPolygon ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)counts, polygons, NtGdiPolyPolygon ); } /********************************************************************** @@ -1468,7 +1468,7 @@ BOOL WINAPI Polyline( HDC hdc, const POINT *points, INT count ) if (is_meta_dc( hdc )) return METADC_Polyline( hdc, points, count ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_Polyline( dc_attr, points, count )) return FALSE; - return NtGdiPolyPolyDraw( hdc, points, (const UINT *)&count, 1, NtGdiPolyPolyline ); + return NtGdiPolyPolyDraw( hdc, points, (const ULONG *)&count, 1, NtGdiPolyPolyline ); } /********************************************************************** diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 42d2c202e98..50240b7b29a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -674,7 +674,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat */ HRGN WINAPI CreatePolyPolygonRgn( const POINT *points, const INT *counts, INT count, INT mode ) { - ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const UINT *)counts, + ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const ULONG *)counts, count, NtGdiPolyPolygonRgn ); return ULongToHandle( ret ); } diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e7d2c3a13e3..b8213ac9e6a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -5248,7 +5248,7 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * dp_to_lp( dc, pts, count ); for (i = 0; i < count; i += 2) { - const UINT pts_count = 2; + const ULONG pts_count = 2; NtGdiPolyPolyDraw( dc->hSelf, pts + i, &pts_count, 1, NtGdiPolyPolyline ); } free( pts ); @@ -5745,7 +5745,7 @@ done: if (lf.lfUnderline) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; @@ -5762,7 +5762,7 @@ done: if (lf.lfStrikeOut) { - const UINT cnt = 5; + const ULONG cnt = 5; pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 5a080bb5a0b..87871e23ff0 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -117,7 +117,7 @@ BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) return ret; } -static BOOL polyline( HDC hdc, const POINT *points, UINT count ) +static BOOL polyline( HDC hdc, const POINT *points, ULONG count ) { return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyPolyline ); } @@ -147,7 +147,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) pts[0] = dc->attr->cur_pos; memcpy( pts + 1, points, sizeof(POINT) * count ); count++; - ret = NtGdiPolyPolyDraw( dev->hdc, pts, (UINT *)&count, 1, NtGdiPolyBezier ); + ret = NtGdiPolyPolyDraw( dev->hdc, pts, &count, 1, NtGdiPolyBezier ); free( pts ); } return ret; @@ -549,7 +549,7 @@ BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn ) /********************************************************************** * NtGdiPolyPolyDraw (win32u.@) */ -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { PHYSDEV physdev; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index fe56f5e0e3c..aaabf51a2f8 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -450,7 +450,7 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR return unix_funcs->pNtGdiPolyDraw( hdc, points, types, count ); } -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ) { if (!unix_funcs) return 0; diff --git a/include/ntgdi.h b/include/ntgdi.h index 4ea5549c223..d8103e3f995 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -364,7 +364,7 @@ BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); BOOL WINAPI NtGdiPolyDraw(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); -ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, +ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ); BOOL WINAPI NtGdiPtInRegion( HRGN hrgn, INT x, INT y ); BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y );

1 0

Hans Leidekker : webservices: Use CRT allocation functions.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 105d16774432a6ab206896404ca644d9ee7e2b7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=105d16774432a6ab20689640… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:57:00 2022 +0100 webservices: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 111 +++++++++++++++-------------- dlls/webservices/error.c | 6 +- dlls/webservices/heap.c | 6 +- dlls/webservices/listener.c | 19 +++-- dlls/webservices/msg.c | 69 +++++++++--------- dlls/webservices/proxy.c | 6 +- dlls/webservices/reader.c | 150 ++++++++++++++++++++-------------------- dlls/webservices/string.c | 46 ++++++------ dlls/webservices/tests/writer.c | 28 ++++---- dlls/webservices/url.c | 12 ++-- dlls/webservices/writer.c | 46 ++++++------ 11 files changed, 248 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=105d16774432a6ab2068…

1 0

Hans Leidekker : msi: Use CRT allocation functions.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 0d5f28457e8eced81677509f5129a20f10df526c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5f28457e8eced81677509f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:57:01 2022 +0100 msi: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 5 ++--- dlls/msi/handle.c | 6 +++--- dlls/msi/install.c | 17 ++++++++--------- dlls/msi/msipriv.h | 16 +++++----------- dlls/msi/package.c | 15 +++++++-------- dlls/msi/streams.c | 3 ++- dlls/msi/string.c | 10 ++++------ dlls/msi/where.c | 3 ++- 8 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ee4f59b5faa..94c159c6a2a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -36,7 +36,6 @@ #include "msipriv.h" #include "winemsi.h" #include "wine/asm.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -68,12 +67,12 @@ static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_ac void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { - return heap_alloc(len); + return malloc(len); } void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) { - heap_free(ptr); + free(ptr); } LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 0881833ff68..26d8e7d7f85 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -92,13 +92,13 @@ static MSIHANDLE alloc_handle_table_entry(void) if (msihandletable_size == 0) { newsize = 256; - p = msi_alloc_zero(newsize*sizeof(msi_handle_info)); + p = msi_alloc_zero(newsize * sizeof(*p)); } else { newsize = msihandletable_size * 2; - p = msi_realloc_zero(msihandletable, - newsize*sizeof(msi_handle_info)); + p = msi_realloc(msihandletable, newsize * sizeof(*p)); + if (p) memset(p + msihandletable_size, 0, (newsize - msihandletable_size) * sizeof(*p)); } if (!p) return 0; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a3bfb53cfff..4d909b67682 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -34,7 +34,6 @@ #include "msipriv.h" #include "winemsi.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -273,7 +272,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW if (!(remote = msi_get_remote(hinst))) { - heap_free(folderW); + free(folderW); return ERROR_INVALID_HANDLE; } @@ -291,7 +290,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); midl_user_free(path); - heap_free(folderW); + free(folderW); return r; } @@ -301,7 +300,7 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW else r = ERROR_DIRECTORY; - heap_free(folderW); + free(folderW); msiobj_release(&package->hdr); return r; } @@ -429,7 +428,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW if (!(remote = msi_get_remote(hinst))) { - heap_free(folderW); + free(folderW); return ERROR_INVALID_HANDLE; } @@ -447,7 +446,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); midl_user_free(path); - heap_free(folderW); + free(folderW); return r; } @@ -457,8 +456,8 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW else r = ERROR_DIRECTORY; - heap_free(path); - heap_free(folderW); + free(path); + free(folderW); msiobj_release(&package->hdr); return r; } @@ -509,7 +508,7 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, else r = ERROR_DIRECTORY; - heap_free(path); + free(path); msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 15130446b04..b5838bad6fe 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1141,30 +1141,24 @@ extern void msi_ui_progress(MSIPACKAGE *, int, int, int, int) DECLSPEC_HIDDEN; static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *msi_alloc( size_t len ) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return malloc( len ); } static void *msi_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *msi_alloc_zero( size_t len ) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return calloc( 1, len ); } static void *msi_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); static inline void *msi_realloc( void *mem, size_t len ) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return realloc( mem, len ); } -static void *msi_realloc_zero( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *msi_realloc_zero( void *mem, size_t len ) +static inline void msi_free( void *mem ) { - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL msi_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); + free( mem ); } static inline char *strdupWtoA( LPCWSTR str ) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..349d7c0ffa3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -43,7 +43,6 @@ #include "msidefs.h" #include "sddl.h" -#include "wine/heap.h" #include "wine/debug.h" #include "wine/exception.h" @@ -2272,7 +2271,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD if (!(remote = msi_get_remote(hinst))) { - heap_free(nameW); + free(nameW); return ERROR_INVALID_HANDLE; } @@ -2286,13 +2285,13 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD } __ENDTRY - heap_free(nameW); + free(nameW); if (!r) { /* String might contain embedded nulls. * Native returns the correct size but truncates the string. */ - tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + tmp = calloc(1, (len + 1) * sizeof(WCHAR)); if (!tmp) { midl_user_free(value); @@ -2302,7 +2301,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD r = msi_strncpyWtoA(tmp, len, buf, sz, TRUE); - heap_free(tmp); + free(tmp); } midl_user_free(value); return r; @@ -2314,7 +2313,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD r = msi_strncpyWtoA(value, len, buf, sz, FALSE); - heap_free(nameW); + free(nameW); if (row) msiobj_release(&row->hdr); msiobj_release(&package->hdr); return r; @@ -2355,7 +2354,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR { /* String might contain embedded nulls. * Native returns the correct size but truncates the string. */ - tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + tmp = calloc(1, (len + 1) * sizeof(WCHAR)); if (!tmp) { midl_user_free(value); @@ -2365,7 +2364,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR r = msi_strncpyW(tmp, len, buf, sz); - heap_free(tmp); + free(tmp); } midl_user_free(value); return r; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 1ef99c2ab05..8f6986039a9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -57,7 +57,8 @@ static BOOL streams_resize_table( MSIDATABASE *db, UINT size ) { MSISTREAM *tmp; UINT new_size = db->num_streams_allocated * 2; - if (!(tmp = msi_realloc_zero( db->streams, new_size * sizeof(MSISTREAM) ))) return FALSE; + if (!(tmp = msi_realloc( db->streams, new_size * sizeof(*tmp) ))) return FALSE; + memset( tmp + db->num_streams_allocated, 0, (new_size - db->num_streams_allocated) * sizeof(*tmp) ); db->streams = tmp; db->num_streams_allocated = new_size; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 0e250ff4527..fb0134810b9 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -139,13 +139,11 @@ static int st_find_free_entry( string_table *st ) return i; /* dynamically resize */ - sz = st->maxcount + 1 + st->maxcount/2; - p = msi_realloc_zero( st->strings, sz * sizeof(struct msistring) ); - if( !p ) - return -1; + sz = st->maxcount + 1 + st->maxcount / 2; + if (!(p = msi_realloc( st->strings, sz * sizeof(*p) ))) return -1; + memset( p + st->maxcount, 0, (sz - st->maxcount) * sizeof(*p) ); - s = msi_realloc( st->sorted, sz*sizeof(UINT) ); - if( !s ) + if (!(s = msi_realloc( st->sorted, sz * sizeof(*s) ))) { msi_free( p ); return -1; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 2a64de8cd9d..684d9d5fb98 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -131,9 +131,10 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) MSIROWENTRY **new_reorder; UINT newsize = wv->reorder_size * 2; - new_reorder = msi_realloc_zero(wv->reorder, sizeof(MSIROWENTRY *) * newsize); + new_reorder = msi_realloc(wv->reorder, newsize * sizeof(*new_reorder)); if (!new_reorder) return ERROR_OUTOFMEMORY; + memset(new_reorder + wv->reorder_size, 0, (newsize - wv->reorder_size) * sizeof(*new_reorder)); wv->reorder = new_reorder; wv->reorder_size = newsize;

1 0

Hans Leidekker : msi/tests: Use CRT allocation functions.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 11ddaf067f80749fa1a40b28dba3aa3f88a70623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ddaf067f80749fa1a40b28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:57:02 2022 +0100 msi/tests: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 20 ++++++++++---------- dlls/msi/tests/automation.c | 20 ++++++++++---------- dlls/msi/tests/db.c | 9 ++++----- dlls/msi/tests/format.c | 5 ++--- dlls/msi/tests/install.c | 28 +++++++++++++--------------- dlls/msi/tests/msi.c | 29 +++++++++++++---------------- dlls/msi/tests/package.c | 39 ++++++++++++++++++--------------------- dlls/msi/tests/patch.c | 8 ++++---- dlls/msi/tests/source.c | 10 +++++----- 9 files changed, 79 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11ddaf067f80749fa1a4…

1 0

Nikolay Sivov : evr: Fix long types warnings.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: e091d5e87c4443a22994ba84179468560f0353e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e091d5e87c4443a22994ba84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 18:59:06 2022 +0300 evr: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 1 - dlls/evr/evr.c | 2 +- dlls/evr/mixer.c | 72 ++++++++++++++++++++++++++-------------------------- dlls/evr/presenter.c | 40 ++++++++++++++--------------- dlls/evr/sample.c | 30 +++++++++++----------- 5 files changed, 72 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e091d5e87c4443a22994…

1 0

Nikolay Sivov : evr/presenter: Initial implementation of GetCurrentImage().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 22fda5990ffc9b22258e914192d23fedf7d75dd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fda5990ffc9b22258e9141… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 18:59:07 2022 +0300 evr/presenter: Initial implementation of GetCurrentImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 910af2891e3..7e14cb2f720 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -65,6 +65,7 @@ struct sample_queue unsigned int used; unsigned int front; unsigned int back; + IMFSample *last_presented; }; struct streaming_thread @@ -120,6 +121,7 @@ struct video_presenter struct { int presented; + LONGLONG sampletime; } frame_stats; CRITICAL_SECTION cs; @@ -507,6 +509,13 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); presenter->frame_stats.presented++; + EnterCriticalSection(&presenter->cs); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); + presenter->thread.queue.last_presented = sample; + IMFSample_AddRef(presenter->thread.queue.last_presented); + LeaveCriticalSection(&presenter->cs); + IDirect3DDevice9_Release(device); IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(surface); @@ -739,6 +748,8 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1461,9 +1472,88 @@ static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayContro static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { - FIXME("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + IDirect3DSurface9 *readback = NULL, *surface; + D3DSURFACE_DESC surface_desc; + D3DLOCKED_RECT mapped_rect; + IDirect3DDevice9 *device; + IMFSample *sample; + LONG stride; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + + EnterCriticalSection(&presenter->cs); + + sample = presenter->thread.queue.last_presented; + presenter->thread.queue.last_presented = NULL; + + if (!presenter->swapchain || !sample) + { + hr = MF_E_INVALIDREQUEST; + } + else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface))) + { + IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DSurface9_GetDesc(surface, &surface_desc); + + if (surface_desc.Format != D3DFMT_X8R8G8B8) + { + FIXME("Unexpected surface format %d.\n", surface_desc.Format); + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, surface_desc.Width, + surface_desc.Height, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL))) + { + WARN("Failed to create readback surface, hr %#lx.\n", hr); + } + } + + if (SUCCEEDED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, readback); + + if (SUCCEEDED(hr)) + { + MFGetStrideForBitmapInfoHeader(D3DFMT_X8R8G8B8, surface_desc.Width, &stride); + *dib_size = abs(stride) * surface_desc.Height; + if (!(*dib = CoTaskMemAlloc(*dib_size))) + hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(readback, &mapped_rect, NULL, D3DLOCK_READONLY))) + { + memcpy(*dib, mapped_rect.pBits, *dib_size); + IDirect3DSurface9_UnlockRect(readback); + } + } + + memset(header, 0, sizeof(*header)); + header->biSize = sizeof(*header); + header->biWidth = surface_desc.Width; + header->biHeight = surface_desc.Height; + header->biPlanes = 1; + header->biBitCount = 32; + header->biSizeImage = *dib_size; + IMFSample_GetSampleTime(sample, timestamp); + + if (readback) + IDirect3DSurface9_Release(readback); + IDirect3DSurface9_Release(surface); + + IDirect3DDevice9_Release(device); + } + + if (sample) + IMFSample_Release(sample); + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color)

1 0