October 2020 - Wine-devel - list.winehq.org

[PATCH 4/5] bcrypt: Add support for exporting legacy DSA public keys.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 4 ++ dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/gnutls.c | 93 +++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5edc9e6c9c..13d6ba8d6c 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -27,6 +27,7 @@ #include "wincrypt.h" #include "bcrypt.h" +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) #define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) typedef struct @@ -164,9 +165,12 @@ struct key_symmetric ULONG secret_len; }; +#define KEY_FLAG_LEGACY_DSA_V2 0x00000001 + struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ + ULONG flags; UCHAR *pubkey; ULONG pubkey_len; DSSSEED dss_seed; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7f8b08869d..bc6ec69918 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -991,7 +991,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || - !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index ed632dfd4c..2d80b74aac 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -804,6 +804,89 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } +static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, + UCHAR **pubkey, ULONG *pubkey_len ) +{ + BLOBHEADER *hdr; + DSSPUBKEY *dsskey; + gnutls_datum_t p, q, g, y; + UCHAR *dst, *src; + int i, ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); + + if (bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + p.size + q.size + g.size + y.size ))) + { + pgnutls_perror( ret ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_NO_MEMORY; + } + + hdr->bType = PUBLICKEYBLOB; + hdr->bVersion = 2; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_DSS_SIGN; + + dsskey = (DSSPUBKEY *)(hdr + 1); + dsskey->magic = MAGIC_DSS1; + dsskey->bitlen = bitlen; + + dst = (UCHAR *)(dsskey + 1); + if (p.size % 2) + { + src = p.data + 1; + p.size--; + } + else src = p.data; + for (i = 0; i < p.size; i++) dst[i] = src[p.size - i - 1]; + + dst += p.size; + if (q.size % 2) + { + src = q.data + 1; + q.size--; + } + else src = q.data; + for (i = 0; i < q.size; i++) dst[i] = src[q.size - i - 1]; + + dst += q.size; + if (g.size % 2) + { + src = g.data + 1; + g.size--; + } + else src = g.data; + for (i = 0; i < g.size; i++) dst[i] = src[g.size - i - 1]; + + dst += g.size; + if (y.size % 2) + { + src = y.data + 1; + y.size--; + } + else src = y.data; + for (i = 0; i < y.size; i++) dst[i] = src[y.size - i - 1]; + + dst += y.size; + memcpy( dst, seed, sizeof(*seed) ); + + *pubkey = (UCHAR *)hdr; + *pubkey_len = size + p.size + q.size + g.size + y.size; + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + static NTSTATUS CDECL key_asymmetric_generate( struct key *key ) { gnutls_pk_algorithm_t pk_alg; @@ -1069,6 +1152,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le unsigned char dummy[128]; unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; int i, ret, size; + NTSTATUS status; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1118,9 +1202,18 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } + if ((status = export_gnutls_pubkey_dsa_capi( handle, &key->u.a.dss_seed, key->u.a.bitlen, &key->u.a.pubkey, + &key->u.a.pubkey_len ))) + { + pgnutls_privkey_deinit( handle ); + return status; + } + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; key_data(key)->privkey = handle; + return STATUS_SUCCESS; } -- 2.28.0

1 0

[PATCH 3/5] bcrypt: Convert legacy DSA key parameters to and from little-endian format.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 54 +++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index be1a28e472..ed632dfd4c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1003,7 +1003,7 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y, x; UCHAR *src, *dst; - int ret, size; + int i, ret, size; if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x ))) { @@ -1033,24 +1033,24 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - if (p.size == size + 1) src = p.data + 1; + if (p.size % 2) src = p.data + 1; else src = p.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (q.size == 21) src = q.data + 1; + if (q.size % 2) src = q.data + 1; else src = q.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; - if (g.size == size + 1) src = g.data + 1; + if (g.size % 2) src = g.data + 1; else src = g.data; - memcpy( dst, src, size ); + for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; dst += size; - if (x.size == 21) src = x.data + 1; + if (x.size % 2) src = x.data + 1; else src = x.data; - memcpy( dst, src, 20 ); + for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; dst += 20; memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) ); @@ -1067,7 +1067,8 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le gnutls_privkey_t handle; gnutls_datum_t p, q, g, y, x; unsigned char dummy[128]; - int ret, size; + unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20]; + int i, ret, size; if ((ret = pgnutls_privkey_init( &handle ))) { @@ -1077,16 +1078,33 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le hdr = (BLOBHEADER *)buf; pubkey = (DSSPUBKEY *)(hdr + 1); - size = pubkey->bitlen / 8; + if ((size = pubkey->bitlen / 8) > sizeof(p_data)) + { + FIXME( "size %u not supported\n", size ); + pgnutls_privkey_deinit( handle ); + return STATUS_NOT_SUPPORTED; + } + data = (unsigned char *)(pubkey + 1); - p.data = (unsigned char *)(pubkey + 1); + p.data = p_data; p.size = size; - q.data = p.data + size; - q.size = 20; - g.data = q.data + 20; + for (i = 0; i < p.size; i++) p.data[i] = data[p.size - i - 1]; + data += p.size; + + q.data = q_data; + q.size = sizeof(q_data); + for (i = 0; i < q.size; i++) q.data[i] = data[q.size - i - 1]; + data += q.size; + + g.data = g_data; g.size = size; - x.data = g.data + size; - x.size = 20; + for (i = 0; i < g.size; i++) g.data[i] = data[g.size - i - 1]; + data += g.size; + + x.data = x_data; + x.size = sizeof(x_data); + for (i = 0; i < x.size; i++) x.data[i] = data[x.size - i - 1]; + data += x.size; WARN( "using dummy public key\n" ); memset( dummy, 1, sizeof(dummy) ); @@ -1100,7 +1118,7 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } - memcpy( &key->u.a.dss_seed, x.data + x.size, sizeof(key->u.a.dss_seed) ); + memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); key_data(key)->privkey = handle; return STATUS_SUCCESS; -- 2.28.0

1 0

[PATCH 2/5] bcrypt: Fix buffer size query in BCryptExportKey.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 16c68ed691..7f8b08869d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,11 +968,13 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; - header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; - header->cbKeyData = key->u.s.secret_len; - memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + if (output) + { + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->u.s.secret_len; + memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB )) @@ -981,9 +983,11 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U *size = req_size; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; - - *(ULONG *)output = key->u.s.secret_len; - memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + if (output) + { + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + } return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || @@ -991,8 +995,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U { *size = key->u.a.pubkey_len; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; - - memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) -- 2.28.0

1 0

[PATCH 1/5] bcrypt: Fix buffer size query in BCryptSignHash.
by Hans Leidekker 06 Oct '20

06 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 21520bb4a8..be1a28e472 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1415,9 +1415,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_RSA: case ALG_ID_RSA_SIGN: { - if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; - memcpy( output, signature.data, signature.size ); *ret_len = signature.size; + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + if (output) memcpy( output, signature.data, signature.size ); return STATUS_SUCCESS; } case ALG_ID_ECDSA_P256: @@ -1435,6 +1435,7 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } + *ret_len = sig_len; if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; if (r.size % 2) /* remove prepended zero byte */ @@ -1457,14 +1458,16 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } - pad_size_r = (sig_len / 2) - r.size; - pad_size_s = (sig_len / 2) - s.size; - memset( output, 0, sig_len ); + if (output) + { + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); - memcpy( output + pad_size_r, r_data, r.size ); - memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + } - *ret_len = sig_len; free( r.data ); free( s.data ); return STATUS_SUCCESS; } -- 2.28.0

1 0

[PATCH 1/2] ucrtbase: Add wcstold()/_wcstold_l().
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index d662921d028..ab5128e5004 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -56,7 +56,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) ucrtbase._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @@ -109,7 +109,7 @@ @ cdecl wcstof(ptr ptr) ucrtbase.wcstof @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) ucrtbase.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 4dd07406db3..1a31ac536cc 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -799,7 +799,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) ucrtbase._o__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) ucrtbase._o__wcstold_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) ucrtbase._o__wcstoll_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) ucrtbase._o__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._o__wcstombs_s_l @@ -1163,7 +1163,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) ucrtbase._o_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) ucrtbase._o_wcstok_s @ cdecl _o_wcstol(wstr ptr long) ucrtbase._o_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) ucrtbase._o_wcstold @ cdecl -ret64 _o_wcstoll(wstr ptr long) ucrtbase._o_wcstoll @ cdecl _o_wcstombs(ptr ptr long) ucrtbase._o_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) ucrtbase._o_wcstombs_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c944a9d213..fda4bb69038 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1893,7 +1893,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2475,7 +2475,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9d292ccef5a..d0d5da63063 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1586,7 +1586,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) msvcr120._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @@ -2137,7 +2137,7 @@ @ cdecl wcstok(wstr wstr) msvcr120.wcstok @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) msvcr120.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 468d8dbb5ab..16409de9f73 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1463,7 +1463,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -1828,7 +1828,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl _o_wcstol(wstr ptr long) MSVCRT_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) MSVCRT_wcstod @ cdecl -ret64 _o_wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _o_wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @@ -2042,7 +2042,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2582,7 +2582,7 @@ @ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s -- 2.28.0

2 3

[PATCH] include: Add more SCARD defines
by Alistair Leslie-Hughes 06 Oct '20

06 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winscard.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winscard.h b/include/winscard.h index fc729e274cd..5aee1b3e548 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -66,6 +66,24 @@ DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) +#define SCARD_AUTOALLOCATE (DWORD)(-1) + +#define SCARD_SCOPE_USER 0 +#define SCARD_SCOPE_TERMINAL 1 +#define SCARD_SCOPE_SYSTEM 2 + +#define SCARD_STATE_UNAWARE 0x00000000 +#define SCARD_STATE_IGNORE 0x00000001 +#define SCARD_STATE_CHANGED 0x00000002 +#define SCARD_STATE_UNKNOWN 0x00000004 +#define SCARD_STATE_UNAVAILABLE 0x00000008 +#define SCARD_STATE_EMPTY 0x00000010 +#define SCARD_STATE_PRESENT 0x00000020 +#define SCARD_STATE_ATRMATCH 0x00000040 +#define SCARD_STATE_EXCLUSIVE 0x00000080 +#define SCARD_STATE_INUSE 0x00000100 +#define SCARD_STATE_MUTE 0x00000200 +#define SCARD_STATE_UNPOWERED 0x00000400 #ifdef __cplusplus extern "C" { -- 2.28.0

1 0

[PATCH] comctl32/tests: Remove skips from DPA tests.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/dpa.c | 42 ++------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 2a5eb503d9f..cbe3ab7fb2b 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -356,12 +356,6 @@ static void test_DPA_Merge(void) DWORD dw; BOOL rc; - if(!pDPA_Merge) - { - win_skip("DPA_Merge() not available\n"); - return; - } - dpa = pDPA_Create(0); dpa2 = pDPA_Create(0); dpa3 = pDPA_Create(0); @@ -485,12 +479,6 @@ static void test_DPA_EnumCallback(void) DWORD dw; INT i, ret; - if(!pDPA_EnumCallback) - { - win_skip("DPA_EnumCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 6; i++) @@ -517,12 +505,6 @@ static void test_DPA_DestroyCallback(void) HDPA dpa; INT i, ret; - if(!pDPA_DestroyCallback) - { - win_skip("DPA_DestroyCallback() not available\n"); - return; - } - dpa = pDPA_Create(0); for (i = 0; i < 3; i++) @@ -548,18 +530,8 @@ static void test_DPA_LoadStream(void) ULONG written, ret; HDPA dpa; - if(!pDPA_LoadStream) - { - win_skip("DPA_LoadStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); @@ -666,18 +638,8 @@ static void test_DPA_SaveStream(void) BOOL rc; LARGE_INTEGER liZero; - if(!pDPA_SaveStream) - { - win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); - return; - } - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } + ok(hRes == S_OK, "Failed to initialize COM, hr %#x.\n", hRes); dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); -- 2.28.0

1 0

[PATCH] msxml3/tests: Use wide string literals in tests.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 263 +++++++++++++------------------------ 1 file changed, 90 insertions(+), 173 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 304c08acf6a..c19dd6c430e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,21 +733,11 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szEmpty[] = { 0 }; -static const WCHAR szIncomplete[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n',0 -}; static const WCHAR szComplete1[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; -static const WCHAR szComplete2[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','a','>','<','/','a','>','\n',0 -}; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -765,25 +755,9 @@ static const char complete4A[] = "</fo>\n" "</lc>\n"; -static const WCHAR szComplete5[] = { - '<','S',':','s','e','a','r','c','h',' ','x','m','l','n','s',':','D','=','"','D','A','V',':','"',' ', - 'x','m','l','n','s',':','C','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y','"', - ' ','x','m','l','n','s',':','S','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y',':','s','e','a','r','c','h','"','>', - '<','S',':','s','c','o','p','e','>', - '<','S',':','d','e','e','p','>','/','<','/','S',':','d','e','e','p','>', - '<','/','S',':','s','c','o','p','e','>', - '<','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', - '<','C',':','t','e','x','t','o','r','p','r','o','p','e','r','t','y','/','>', - 'c','o','m','p','u','t','e','r', - '<','/','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', - '<','/','S',':','s','e','a','r','c','h','>',0 -}; - -static const WCHAR szComplete6[] = { - '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'',' ', - 'e','n','c','o','d','i','n','g','=','\'','W','i','n','d','o','w','s','-','1','2','5','2','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete5[] = + L"<S:search xmlns:D=\"DAV:\" xmlns:C=\"urn:schemas-microsoft-com:office:clipgallery\" xmlns:S=\"urn:schemas-microsoft-com:office:clipgallery:search\">" + "<S:scope><S:deep>/</S:deep></S:scope><S:contentfreetext><C:textorproperty/>computer</S:contentfreetext></S:search>"; static const char complete7[] = { "<?xml version=\"1.0\"?>\n\t" @@ -1172,51 +1146,11 @@ static const char attributes_map[] = { "<a attr1=\"value1\" attr2=\"value2\" attr3=\"value3\" attr4=\"value4\" />" }; -static const WCHAR nonexistent_fileW[] = { - 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 -}; -static const WCHAR nonexistent_attrW[] = { - 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 -}; -static const WCHAR szDocument[] = { - '#', 'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', 0 -}; +static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szOpen[] = { 'o','p','e','n',0 }; -static const WCHAR szdl[] = { 'd','l',0 }; -static const WCHAR szvr[] = { 'v','r',0 }; -static const WCHAR szlc[] = { 'l','c',0 }; -static const WCHAR szbs[] = { 'b','s',0 }; -static const WCHAR szstr1[] = { 's','t','r','1',0 }; -static const WCHAR szstr2[] = { 's','t','r','2',0 }; -static const WCHAR szstar[] = { '*',0 }; -static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; - -static const WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; -static const WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 }; -static const WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; - -static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; -static const WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; -static const WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; -static const WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; -static const WCHAR szAttribute[] = {'A','t','t','r',0 }; -static const WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; - -static const WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s', - ' ','n','o','t',' ','r','i','g','h','t','!', 0}; -static const WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&', - 'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t', - '!',']',']','>',0}; -static const WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 }; -static const WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 }; - -static const WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; -static const WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; #define expect_bstr_eq_and_free(bstr, expect) { \ @@ -1585,7 +1519,7 @@ if (0) /* try load an empty document */ b = VARIANT_TRUE; - str = SysAllocString( szEmpty ); + str = SysAllocString( L"" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -1602,13 +1536,13 @@ if (0) /* try finding a node */ node = NULL; - str = SysAllocString( szstr1 ); + str = SysAllocString( L"str1" ); r = IXMLDOMDocument_selectSingleNode( doc, str, &node ); ok( r == S_FALSE, "ret %08x\n", r ); SysFreeString( str ); b = VARIANT_TRUE; - str = SysAllocString( szIncomplete ); + str = SysAllocString( L"<?xml version='1.0'?>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -1631,7 +1565,7 @@ if (0) /* loadXML ignores the encoding attribute and always expects Unicode */ b = VARIANT_FALSE; - str = SysAllocString( szComplete6 ); + str = SysAllocString( L"<?xml version='1.0' encoding='Windows-1252'?>\n<open></open>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); @@ -1667,7 +1601,7 @@ if (0) r = IXMLDOMDocument_get_nodeName( doc, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n"); + ok( !lstrcmpW( str, L"#document" ), "incorrect nodeName\n"); SysFreeString( str ); /* test put_text */ @@ -1699,7 +1633,7 @@ if (0) /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete2 ); + str = SysAllocString( L"<?xml version='1.0'?>\n<a></a>\n" ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); @@ -1724,7 +1658,7 @@ if (0) ok( r == S_OK, "returns %08x\n", r ); IXMLDOMText_Release(nodetext); - str = SysAllocString( szOpen ); + str = SysAllocString( L"open" ); r = IXMLDOMDocument_createTextNode(doc, str, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createTextNode(doc, str, &nodetext); @@ -1948,14 +1882,14 @@ if (0) /* test put_data */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szstr1); + V_BSTR(&var) = SysAllocString(L"str1"); r = IXMLDOMText_put_nodeValue(nodetext, var); ok(r == S_OK, "ret %08x\n", r ); VariantClear(&var); r = IXMLDOMText_get_text(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, szstr1 ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); + ok( !lstrcmpW( str, L"str1" ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) ); SysFreeString(str); /* test put_data */ @@ -1972,7 +1906,7 @@ if (0) /* ::replaceData() */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szstr1); + V_BSTR(&var) = SysAllocString(L"str1"); r = IXMLDOMText_put_nodeValue(nodetext, var); ok(r == S_OK, "ret %08x\n", r ); VariantClear(&var); @@ -2068,7 +2002,7 @@ if (0) IXMLDOMComment_Release(node_comment); SysFreeString(str); - str = SysAllocString(szComment); + str = SysAllocString(L"A Comment"); r = IXMLDOMDocument_createComment(doc, str, &node_comment); SysFreeString(str); ok( r == S_OK, "returns %08x\n", r ); @@ -2093,7 +2027,7 @@ if (0) } /* test Create Attribute */ - str = SysAllocString(szAttribute); + str = SysAllocString(L"Attr"); r = IXMLDOMDocument_createAttribute(doc, NULL, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createAttribute(doc, str, &node_attr); @@ -2155,7 +2089,7 @@ if (0) /* test put_data */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(szOpen); /* Doesn't matter what the string is, cannot set an xml node. */ + V_BSTR(&var) = SysAllocString(L"open"); /* Doesn't matter what the string is, cannot set an xml node. */ r = IXMLDOMProcessingInstruction_put_nodeValue(nodePI, var); ok(r == E_FAIL, "ret %08x\n", r ); VariantClear(&var); @@ -2290,7 +2224,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMElement_get_baseName( element, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szlc) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"lc"), "Unexpected basename.\n"); SysFreeString(str); /* check if nodename is correct */ @@ -2302,7 +2236,7 @@ static void test_domnode( void ) r = IXMLDOMElement_get_nodeName( element, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); + ok( !lstrcmpW( str, L"lc" ), "Unexpected nodeName\n"); SysFreeString( str ); str = SysAllocString( nonexistent_fileW ); @@ -2314,13 +2248,13 @@ static void test_domnode( void ) VariantClear(&var); SysFreeString(str); - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); ok( r == S_OK, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); + ok( !lstrcmpW(V_BSTR(&var), L"str1"), "wrong attr value\n"); VariantClear( &var ); r = IXMLDOMElement_getAttribute( element, NULL, &var ); @@ -2360,20 +2294,20 @@ static void test_domnode( void ) if (map) { - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( node != NULL, "should be attributes\n"); IXMLDOMNode_Release(node); SysFreeString( str ); - str = SysAllocString( szdl ); + str = SysAllocString( L"dl" ); r = IXMLDOMNamedNodeMap_getNamedItem( map, str, NULL ); ok( r == E_INVALIDARG, "getNamedItem should return E_INVALIDARG\n"); SysFreeString( str ); /* something that isn't in complete4A */ - str = SysAllocString( szOpen ); + str = SysAllocString( L"open" ); node = (IXMLDOMNode *) 1; r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); ok( r == S_FALSE, "getNamedItem found a node that wasn't there\n"); @@ -2411,7 +2345,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_nodeName( node, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); - ok( !lstrcmpW( str, szdl ), "incorrect node name\n"); + ok( !lstrcmpW( str, L"dl" ), "incorrect node name\n"); SysFreeString( str ); IXMLDOMNode_Release( node ); @@ -2450,7 +2384,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"dl"), "Unexpected basename.\n"); SysFreeString( str ); r = IXMLDOMNode_get_childNodes( node, NULL ); @@ -2521,13 +2455,13 @@ static void test_domnode( void ) ole_check(IXMLDOMNodeList_reset(list)); node = (void*)0xdeadbeef; - str = SysAllocString(szdl); + str = SysAllocString(L"dl"); r = IXMLDOMElement_selectSingleNode( element, str, &node ); SysFreeString(str); ok( r == S_FALSE, "ret %08x\n", r ); ok( node == NULL, "node %p\n", node ); - str = SysAllocString(szbs); + str = SysAllocString(L"bs"); r = IXMLDOMElement_selectSingleNode( element, str, &node ); SysFreeString(str); ok( r == S_OK, "ret %08x\n", r ); @@ -2573,7 +2507,7 @@ static void test_domnode( void ) str = NULL; r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); - ok( lstrcmpW(str,szbs) == 0, "basename was wrong\n"); + ok( !lstrcmpW(str, L"bs"), "Unexpected basename.\n"); SysFreeString(str); } else @@ -2601,14 +2535,13 @@ static void test_domnode( void ) if (element) { - static const WCHAR szSSearch[] = {'S',':','s','e','a','r','c','h',0}; BSTR tag = NULL; /* check if the tag is correct */ r = IXMLDOMElement_get_tagName( element, &tag ); ok( r == S_OK, "couldn't get tag name\n"); ok( tag != NULL, "tag was null\n"); - ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); + ok( !lstrcmpW( tag, L"S:search" ), "incorrect tag name\n"); SysFreeString( tag ); IXMLDOMElement_Release( element ); @@ -2935,8 +2868,6 @@ todo_wine { static void test_create(void) { - static const WCHAR szOne[] = {'1',0}; - static const WCHAR szOneGarbage[] = {'1','G','a','r','b','a','g','e',0}; HRESULT r; VARIANT var; BSTR str, name; @@ -3148,7 +3079,7 @@ static void test_create(void) V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szlc ); + str = SysAllocString( L"lc" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3157,7 +3088,7 @@ static void test_create(void) /* a name is required for attribute, try a BSTR with first null wchar */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szstr1 ); + str = SysAllocString( L"str1" ); str[0] = 0; node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); @@ -3217,7 +3148,7 @@ static void test_create(void) V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); + str = SysAllocString( L"lc" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3234,14 +3165,14 @@ static void test_create(void) if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szOne ); + V_BSTR(&var) = SysAllocString( L"1" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szOneGarbage ); + V_BSTR(&var) = SysAllocString( L"1Garbage" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == E_INVALIDARG, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -3266,7 +3197,7 @@ static void test_create(void) V_VT(&var) = VT_I4; V_I4(&var) = NODE_ELEMENT; - str = SysAllocString( szbs ); + str = SysAllocString( L"bs" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); SysFreeString( str ); @@ -3313,8 +3244,8 @@ static void test_create(void) IXMLDOMNamedNodeMap_Release( attr_map ); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr1 ); - name = SysAllocString( szdl ); + V_BSTR(&var) = SysAllocString( L"str1" ); + name = SysAllocString( L"dl" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3326,7 +3257,7 @@ static void test_create(void) VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr2 ); + V_BSTR(&var) = SysAllocString( L"str2" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3338,13 +3269,13 @@ static void test_create(void) VariantClear(&var); r = IXMLDOMElement_getAttribute( element, name, &var ); ok( r == S_OK, "returns %08x\n", r ); - ok( !lstrcmpW(V_BSTR(&var), szstr2), "wrong attr value\n"); + ok( !lstrcmpW(V_BSTR(&var), L"str2"), "wrong attr value\n"); VariantClear(&var); SysFreeString(name); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString( szstr1 ); - name = SysAllocString( szlc ); + V_BSTR(&var) = SysAllocString( L"str1" ); + name = SysAllocString( L"lc" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMElement_get_attributes( element, &attr_map ); @@ -3358,7 +3289,7 @@ static void test_create(void) V_VT(&var) = VT_I4; V_I4(&var) = 10; - name = SysAllocString( szbs ); + name = SysAllocString( L"bs" ); r = IXMLDOMElement_setAttribute( element, name, var ); ok( r == S_OK, "returns %08x\n", r ); VariantClear(&var); @@ -3371,7 +3302,7 @@ static void test_create(void) /* Create an Attribute */ V_VT(&var) = VT_I4; V_I4(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szAttribute ); + str = SysAllocString( L"Attr" ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); ok( node != NULL, "node was null\n"); @@ -3435,7 +3366,7 @@ static void test_getElementsByTagName(void) } /* broken query BSTR */ - memcpy(&buff[2], szstar, sizeof(szstar)); + memcpy(&buff[2], L"*", 2 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; r = IXMLDOMDocument_getElementsByTagName(doc, &buff[2], &node_list); @@ -3449,7 +3380,7 @@ static void test_getElementsByTagName(void) r = IXMLDOMDocument_get_documentElement(doc, &elem); ok( r == S_OK, "ret %08x\n", r ); - str = SysAllocString( szstar ); + str = SysAllocString( L"*" ); /* null arguments cases */ r = IXMLDOMElement_getElementsByTagName(elem, NULL, &node_list); @@ -3466,7 +3397,7 @@ static void test_getElementsByTagName(void) SysFreeString( str ); /* broken query BSTR */ - memcpy(&buff[2], szstar, sizeof(szstar)); + memcpy(&buff[2], L"*", 2 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; r = IXMLDOMElement_getElementsByTagName(elem, &buff[2], &node_list); @@ -3501,7 +3432,7 @@ static void test_get_text(void) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szbs ); + str = SysAllocString( L"bs" ); r = IXMLDOMDocument_getElementsByTagName( doc, str, &node_list ); ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); @@ -3541,20 +3472,20 @@ static void test_get_text(void) r = IXMLDOMNode_get_text( node, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szfn1_txt, lstrlenW(szfn1_txt) ), "wrong string\n" ); + ok( !lstrcmpW(str, L"fn1.txt"), "wrong string\n" ); SysFreeString(str); r = IXMLDOMNode_get_attributes( node, &node_map ); ok( r == S_OK, "ret %08x\n", r ); - str = SysAllocString( szvr ); + str = SysAllocString( L"vr" ); r = IXMLDOMNamedNodeMap_getNamedItem( node_map, str, &node2 ); ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); r = IXMLDOMNode_get_text( node2, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + ok( !lstrcmpW(str, L"str2"), "Unexpected string.\n" ); SysFreeString(str); r = IXMLDOMNode_get_firstChild( node2, &node3 ); @@ -3562,7 +3493,7 @@ static void test_get_text(void) r = IXMLDOMNode_get_text( node3, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + ok( !lstrcmpW(str, L"str2"), "Unexpected string.\n" ); SysFreeString(str); @@ -3780,7 +3711,6 @@ static void test_get_childNodes(void) static void test_get_firstChild(void) { - static const WCHAR xmlW[] = {'x','m','l',0}; IXMLDOMDocument *doc; IXMLDOMNode *node; VARIANT_BOOL b; @@ -3799,7 +3729,7 @@ static void test_get_firstChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(!lstrcmpW(str, xmlW), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"xml"), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release( node ); @@ -3810,8 +3740,6 @@ static void test_get_firstChild(void) static void test_get_lastChild(void) { - static const WCHAR lcW[] = {'l','c',0}; - static const WCHAR foW[] = {'f','o',0}; IXMLDOMDocument *doc; IXMLDOMNode *node, *child; VARIANT_BOOL b; @@ -3830,7 +3758,7 @@ static void test_get_lastChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, lcW, sizeof(lcW)) == 0, "expected \"lc\" node name\n"); + ok(!lstrcmpW(str, L"lc"), "Unexpected node name.\n"); SysFreeString(str); r = IXMLDOMNode_get_lastChild( node, &child ); @@ -3839,7 +3767,7 @@ static void test_get_lastChild(void) r = IXMLDOMNode_get_nodeName( child, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, foW, sizeof(foW)) == 0, "expected \"fo\" node name\n"); + ok(!lstrcmpW(str, L"fo"), "Unexpected node name.\n"); SysFreeString(str); IXMLDOMNode_Release( child ); @@ -4100,7 +4028,7 @@ static void test_removeNamedItem(void) ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; - str = SysAllocString(szvr); + str = SysAllocString(L"vr"); r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node ); ok ( r == S_OK, "ret %08x\n", r); @@ -4318,7 +4246,6 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) static void test_IXMLDOMDocument2(void) { - static const WCHAR emptyW[] = {0}; IXMLDOMDocument2 *doc2, *dtddoc2; IXMLDOMDocument *doc; IXMLDOMParseError* err; @@ -4410,7 +4337,7 @@ static void test_IXMLDOMDocument2(void) ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(emptyW); + V_BSTR(&var) = SysAllocString(L""); r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var); ok(r == S_OK, "got 0x%08x\n", r); VariantClear(&var); @@ -4688,10 +4615,6 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) { - static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0}; - static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0}; - static const WCHAR b2_p[] = {'A','B',' ','C',' ',0}; - static const WCHAR b2_i[] = {'A','B',' ','C',0}; IXMLDOMNodeList *list; IXMLDOMElement *root; IXMLDOMNode *node; @@ -4713,7 +4636,7 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) ok(hr == S_OK, "got 0x%08x\n", hr); IXMLDOMElement_Release(root); - text = preserve == VARIANT_TRUE ? b1_p : b1_i; + text = preserve == VARIANT_TRUE ? L" Text A end " : L"Text A end"; hr = IXMLDOMNodeList_get_item(list, 0, &node); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_text(node, &s); @@ -4722,7 +4645,7 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) SysFreeString(s); IXMLDOMNode_Release(node); - text = preserve == VARIANT_TRUE ? b2_p : b2_i; + text = preserve == VARIANT_TRUE ? L"AB C " : L"AB C"; hr = IXMLDOMNodeList_get_item(list, 1, &node); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_text(node, &s); @@ -5540,7 +5463,7 @@ static void test_xmlTypes(void) if(hr == S_OK) { /* Comment */ - str = SysAllocString(szComment); + str = SysAllocString(L"A Comment"); hr = IXMLDOMDocument_createComment(doc, str, &pComment); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5551,12 +5474,12 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_get_nodeName(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCommentNodeText ), "incorrect comment node Name\n"); + ok( !lstrcmpW( str, L"#comment" ), "incorrect comment node Name\n"); SysFreeString(str); hr = IXMLDOMComment_get_xml(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCommentXML ), "incorrect comment xml\n"); + ok( !lstrcmpW( str, L"" ), "incorrect comment xml\n"); SysFreeString(str); /* put data Tests */ @@ -5760,7 +5683,7 @@ static void test_xmlTypes(void) /* ::replaceData() */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(szstr1); + V_BSTR(&v) = SysAllocString(L"str1"); hr = IXMLDOMComment_put_nodeValue(pComment, v); ok(hr == S_OK, "ret %08x\n", hr ); VariantClear(&v); @@ -5833,7 +5756,7 @@ static void test_xmlTypes(void) } /* Element */ - str = SysAllocString(szElement); + str = SysAllocString(L"EleTest"); hr = IXMLDOMDocument_createElement(doc, str, &pElement); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5844,12 +5767,12 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_nodeName(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElement ), "incorrect element node Name\n"); + ok( !lstrcmpW( str, L"EleTest" ), "incorrect element node Name\n"); SysFreeString(str); hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest/>" ), "incorrect element xml\n"); SysFreeString(str); /* Attribute */ @@ -5863,7 +5786,7 @@ static void test_xmlTypes(void) ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pAttribute == (void*)0x1, "Expect same ptr, got %p\n", pAttribute); - str = SysAllocString(szAttribute); + str = SysAllocString(L"Attr"); hr = IXMLDOMDocument_createAttribute(doc, str, &pAttribute); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -5904,24 +5827,24 @@ static void test_xmlTypes(void) hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect attribute node Name\n"); SysFreeString(str); /* test nodeName */ hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect nodeName string\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect nodeName string\n"); SysFreeString(str); /* test name property */ hr = IXMLDOMAttribute_get_name(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttribute ), "incorrect name string\n"); + ok( !lstrcmpW( str, L"Attr" ), "incorrect name string\n"); SysFreeString(str); hr = IXMLDOMAttribute_get_xml(pAttribute, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); + ok( !lstrcmpW( str, L"Attr=\"\"" ), "incorrect attribute xml\n"); SysFreeString(str); IXMLDOMAttribute_Release(pAttribute); @@ -5929,7 +5852,7 @@ static void test_xmlTypes(void) /* Check Element again with the Add Attribute*/ hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML2 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\"/>" ), "incorrect element xml\n"); SysFreeString(str); } @@ -5938,7 +5861,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">TestingNode</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); /* Test for reversible escaping */ @@ -5961,7 +5884,7 @@ static void test_xmlTypes(void) } /* CData Section */ - str = SysAllocString(szCData); + str = SysAllocString(L"[1]*2=3; &gee thats not right!"); hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -5983,12 +5906,12 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_nodeName(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCDataNodeText ), "incorrect cdata node Name\n"); + ok( !lstrcmpW( str, L"#cdata-section" ), "incorrect cdata node Name\n"); SysFreeString(str); hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szCDataXML ), "incorrect cdata xml\n"); + ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee thats not right!]]>" ), "incorrect cdata xml\n"); SysFreeString(str); /* test lastChild */ @@ -6199,7 +6122,7 @@ static void test_xmlTypes(void) /* ::replaceData() */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(szstr1); + V_BSTR(&v) = SysAllocString(L"str1"); hr = IXMLDOMCDATASection_put_nodeValue(pCDataSec, v); ok(hr == S_OK, "ret %08x\n", hr ); VariantClear(&v); @@ -6294,7 +6217,7 @@ static void test_xmlTypes(void) hr = IXMLDOMDocumentFragment_get_nodeName(pDocFrag, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szDocFragmentText ), "incorrect docfragment node Name\n"); + ok( !lstrcmpW( str, L"#document-fragment" ), "incorrect docfragment node Name\n"); SysFreeString(str); /* test next Sibling*/ @@ -6324,7 +6247,7 @@ static void test_xmlTypes(void) hr = IXMLDOMDocument_createEntityReference(doc, _bstr_(""), &pEntityRef); ok(hr == E_FAIL, "ret %08x\n", hr ); - str = SysAllocString(szEntityRef); + str = SysAllocString(L"entityref"); hr = IXMLDOMDocument_createEntityReference(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -6339,7 +6262,7 @@ static void test_xmlTypes(void) /* test get_xml*/ hr = IXMLDOMEntityReference_get_xml(pEntityRef, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szEntityRefXML ), "incorrect xml string\n"); + ok( !lstrcmpW( str, L"&entityref;" ), "incorrect xml string\n"); SysFreeString(str); IXMLDOMEntityReference_Release(pEntityRef); @@ -7204,7 +7127,6 @@ static void test_TransformWithLoadingLocalFile(void) static void test_put_nodeValue(void) { - static const WCHAR jeevesW[] = {'J','e','e','v','e','s',' ','&',' ','W','o','o','s','t','e','r',0}; IXMLDOMDocument *doc; IXMLDOMText *text; IXMLDOMEntityReference *entityref; @@ -7282,8 +7204,7 @@ static void test_put_nodeValue(void) ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMAttribute_get_nodeValue(attr, &data); ok(hr == S_OK, "ret %08x\n", hr ); - ok(memcmp(V_BSTR(&data), jeevesW, sizeof(jeevesW)) == 0, "got %s\n", - wine_dbgstr_w(V_BSTR(&data))); + ok(!lstrcmpW(V_BSTR(&data), L"Jeeves & Wooster"), "got %s\n", wine_dbgstr_w(V_BSTR(&data))); VariantClear(&data); IXMLDOMAttribute_Release(attr); @@ -8608,7 +8529,6 @@ static void test_events(void) static void test_createProcessingInstruction(void) { - static const WCHAR bodyW[] = {'t','e','s','t',0}; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; WCHAR buff[10]; @@ -8617,7 +8537,7 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); /* test for BSTR handling, pass broken BSTR */ - memcpy(&buff[2], bodyW, sizeof(bodyW)); + memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("test"), &buff[2], &pi); @@ -9593,7 +9513,6 @@ static void test_appendChild(void) static void test_get_doctype(void) { - static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; VARIANT_BOOL b; @@ -9624,12 +9543,12 @@ static void test_get_doctype(void) hr = IXMLDOMDocumentType_get_name(doctype, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(L"email", s), "got name %s\n", wine_dbgstr_w(s)); SysFreeString(s); hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + ok(!lstrcmpW(L"email", s), "got name %s\n", wine_dbgstr_w(s)); SysFreeString(s); IXMLDOMDocumentType_Release(doctype); @@ -10651,7 +10570,6 @@ static void test_load(void) static void test_domobj_dispex(IUnknown *obj) { - static const WCHAR testW[] = {'t','e','s','t','p','r','o','p',0}; DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; IDispatchEx *dispex; IUnknown *unk; @@ -10669,7 +10587,7 @@ static void test_domobj_dispex(IUnknown *obj) EXPECT_HR(hr, S_OK); ok(ticnt == 1, "ticnt=%u\n", ticnt); - name = SysAllocString(szstar); + name = SysAllocString(L"*"); hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); EXPECT_HR(hr, E_NOTIMPL); SysFreeString(name); @@ -10694,7 +10612,7 @@ static void test_domobj_dispex(IUnknown *obj) EXPECT_HR(hr, E_NOTIMPL); ok(unk == (IUnknown*)0xdeadbeef, "got %p\n", unk); - name = SysAllocString(testW); + name = SysAllocString(L"testprop"); hr = IDispatchEx_GetDispID(dispex, name, fdexNameEnsure, &dispid); ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); SysFreeString(name); @@ -11677,7 +11595,7 @@ static void test_getAttributeNode(void) ok(attr == NULL, "got %p\n", attr); SysFreeString(str); - str = SysAllocString(nonexistent_attrW); + str = SysAllocString(L"nonExistingAttribute"); hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); EXPECT_HR(hr, S_FALSE); @@ -12355,7 +12273,6 @@ static const DOMNodeType put_data_types[] = { static void test_put_data(void) { - static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0}; WCHAR buff[100], *data; IXMLDOMDocument *doc; const DOMNodeType *type; @@ -12367,7 +12284,7 @@ static void test_put_data(void) doc = create_document(&IID_IXMLDOMDocument); - memcpy(&buff[2], test_data, sizeof(test_data)); + memcpy(&buff[2], L"test node data", 15 * sizeof(WCHAR)); /* just a big length */ *(DWORD*)buff = 0xf0f0; data = &buff[2]; @@ -13042,7 +12959,7 @@ static void test_merging_text(void) /* test xmlAddChild */ for (i = 0; i < 10; i++) { - str = SysAllocString(szstr1); + str = SysAllocString(L"str1"); hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); SysFreeString(str); EXPECT_HR(hr, S_OK); @@ -13063,7 +12980,7 @@ static void test_merging_text(void) V_UNKNOWN(&v) = (IUnknown*)first; for (i = 0; i < 10; i++) { - str = SysAllocString(szstr2); + str = SysAllocString(L"str2"); hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); SysFreeString(str); EXPECT_HR(hr, S_OK); -- 2.28.0

1 0

[PATCH] oleaut32: Do not forward IErrorInfo functions.
by Nikolay Sivov 06 Oct '20

06 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49946 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These are not forwards on Windows. dlls/oleaut32/oleaut32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04befe..21b52f1f06e 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -194,9 +194,9 @@ 197 stdcall VarDecFromStr(wstr long long ptr) 198 stdcall VarDecFromDisp(ptr long ptr) 199 stdcall VarDecFromBool(long ptr) -200 stdcall GetErrorInfo(long ptr) ole32.GetErrorInfo -201 stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo -202 stdcall CreateErrorInfo(ptr) ole32.CreateErrorInfo +200 stdcall -import GetErrorInfo(long ptr) +201 stdcall -import SetErrorInfo(long ptr) +202 stdcall -import CreateErrorInfo(ptr) 203 stdcall VarDecRound(ptr long ptr) 204 stdcall VarDecCmp(ptr ptr) 205 stdcall VarI2FromI1(long ptr) -- 2.28.0

1 0

[PATCH 1/4] ws2_32/tests: Avoid using skip() or trace() for tests that should not fail.
by Zebediah Figura 06 Oct '20

06 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 805 ++++++++------------------------------- 1 file changed, 154 insertions(+), 651 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7f3c6a9fb35..1e0d3ff24de 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -230,105 +230,75 @@ static int client_id; static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); -static int tcp_socketpair(SOCKET *src, SOCKET *dst) +static void tcp_socketpair(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len; int ret; - *src = INVALID_SOCKET; - *dst = INVALID_SOCKET; - *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (*src == INVALID_SOCKET) - goto end; + ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (server == INVALID_SOCKET) - goto end; + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); len = sizeof(addr); ret = getsockname(server, (struct sockaddr*)&addr, &len); - if (ret != 0) - goto end; + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server, 1); - if (ret != 0) - goto end; + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); ret = connect(*src, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); *dst = accept(server, (struct sockaddr*)&addr, &len); + ok(*dst != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); -end: - if (server != INVALID_SOCKET) - closesocket(server); - if (*src != INVALID_SOCKET && *dst != INVALID_SOCKET) - return 0; - closesocket(*src); - closesocket(*dst); - return -1; + closesocket(server); } -static int tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) +static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len, ret; - *src = INVALID_SOCKET; - *dst = INVALID_SOCKET; - *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (*src == INVALID_SOCKET) - goto end; + ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); - if (server == INVALID_SOCKET) - goto end; + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); ret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); len = sizeof(addr); ret = getsockname(server, (struct sockaddr *)&addr, &len); - if (ret != 0) - goto end; + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server, 1); - if (ret != 0) - goto end; + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); ret = connect(*src, (struct sockaddr *)&addr, sizeof(addr)); - if (ret != 0) - goto end; + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); *dst = accept(server, (struct sockaddr *)&addr, &len); + ok(*dst != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); -end: - if (server != INVALID_SOCKET) - closesocket(server); - if (*src != INVALID_SOCKET && *dst != INVALID_SOCKET) - return 0; - closesocket(*src); - closesocket(*dst); - return -1; + closesocket(server); } static void set_so_opentype ( BOOL overlapped ) @@ -1197,7 +1167,7 @@ static void test_WithWSAStartup(void) for (socks = 0; socks < ARRAY_SIZE(pairs); socks++) { WSAPROTOCOL_INFOA info; - if (tcp_socketpair(&pairs[socks].src, &pairs[socks].dst)) break; + tcp_socketpair(&pairs[socks].src, &pairs[socks].dst); memset(&info, 0, sizeof(info)); ok(!WSADuplicateSocketA(pairs[socks].src, GetCurrentProcessId(), &info), @@ -1364,20 +1334,8 @@ static void do_test( test_setup *test ) WaitForSingleObject ( server_ready, INFINITE ); wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT ); - ok ( wait <= WAIT_OBJECT_0 + n , - "some threads have not completed: %x\n", wait ); + ok(!wait, "wait failed, error %u\n", wait); - if ( ! ( wait <= WAIT_OBJECT_0 + n ) ) - { - for (i = 0; i <= n; i++) - { - if ( WaitForSingleObject ( thread[i], 0 ) != WAIT_OBJECT_0 ) - { - trace ("terminating thread %08x\n", thread_id[i]); - TerminateThread ( thread [i], 0 ); - } - } - } CloseHandle ( server_ready ); for (i = 0; i <= n; i++) CloseHandle ( client_ready[i] ); @@ -1910,11 +1868,6 @@ todo_wine closesocket(s); s = socket(family, SOCK_STREAM, 0); - if (s == INVALID_SOCKET && i) - { - skip("IPv6 is not supported\n"); - break; - } ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); size = sizeof(value); @@ -2063,11 +2016,6 @@ static void test_ip_pktinfo(void) memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - return; - } memset(&hdr, 0x00, sizeof(hdr)); s1addr.sin_family = AF_INET; @@ -2089,21 +2037,12 @@ static void test_ip_pktinfo(void) /* Build "server" side socket */ s1=socket(AF_INET, SOCK_DGRAM, 0); - if (s1 == INVALID_SOCKET) - { - skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); - goto cleanup; - } + ok(s1 != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* Obtain the WSARecvMsg function */ - WSAIoctl(s1, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + rc = WSAIoctl(s1, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), &pWSARecvMsg, sizeof(pWSARecvMsg), &dwBytes, NULL, NULL); - if (!pWSARecvMsg) - { - win_skip("WSARecvMsg is unsupported, some tests will be skipped.\n"); - closesocket(s1); - goto cleanup; - } + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); /* Setup the server side socket */ rc=bind(s1, (struct sockaddr*)&s1addr, sizeof(s1addr)); @@ -2111,20 +2050,11 @@ static void test_ip_pktinfo(void) /* Build "client" side socket */ addrlen = sizeof(s2addr); - if (getsockname(s1, (struct sockaddr *) &s2addr, &addrlen) != 0) - { - skip("Failed to call getsockname, some tests skipped: %d\n", WSAGetLastError()); - closesocket(s1); - goto cleanup; - } + rc = getsockname(s1, (struct sockaddr *) &s2addr, &addrlen); + ok(!rc, "failed to get address, error %u\n", WSAGetLastError()); s2addr.sin_addr.s_addr = addresses[0]; /* Always target the local adapter address */ s2=socket(AF_INET, SOCK_DGRAM, 0); - if (s2 == INVALID_SOCKET) - { - skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); - closesocket(s1); - goto cleanup; - } + ok(s2 != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* Test an empty message header */ rc=pWSARecvMsg(s1, NULL, NULL, NULL, NULL); @@ -2170,13 +2100,7 @@ static void test_ip_pktinfo(void) rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) - { - skip("Server side did not receive packet, some tests skipped.\n"); - closesocket(s2); - closesocket(s1); - continue; - } + ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); dwFlags = 0; WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); ok(dwFlags == 0, @@ -2197,13 +2121,7 @@ static void test_ip_pktinfo(void) "WSARecvMsg() control length mismatch (%d != sizeof pktbuf).\n", hdr.Control.len); rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); - if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) - { - skip("Server side did not receive packet, some tests skipped.\n"); - closesocket(s2); - closesocket(s1); - continue; - } + ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); dwSize = 0; WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, NULL); ok(dwSize == sizeof(msg), @@ -2231,7 +2149,6 @@ static void test_ip_pktinfo(void) closesocket(s1); } -cleanup: CloseHandle(ov.hEvent); } @@ -2555,10 +2472,6 @@ static void test_WSASocket(void) pi = HeapAlloc(GetProcessHeap(), 0, pi_size); ok(pi != NULL, "Failed to allocate memory\n"); - if (pi == NULL) { - skip("Can't continue without memory.\n"); - return; - } items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", @@ -2637,10 +2550,6 @@ static void test_WSASocket(void) pi = HeapAlloc(GetProcessHeap(), 0, pi_size); ok(pi != NULL, "Failed to allocate memory\n"); - if (pi == NULL) { - skip("Can't continue without memory.\n"); - return; - } items = WSAEnumProtocolsA(NULL, pi, &pi_size); ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", @@ -2995,7 +2904,7 @@ static void test_WSAEnumNetworkEvents(void) for (i = 0; i < ARRAY_SIZE(sock_type); i++) { if (i == 2) - ok(!tcp_socketpair(&s, &s2), "Test[%d]: creating socket pair failed\n", i); + tcp_socketpair(&s, &s2); else { s = socket(AF_INET, sock_type[i], 0); @@ -3603,7 +3512,7 @@ static void test_select(void) ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); maxfd = fdRead; if(fdWrite > maxfd) maxfd = fdWrite; @@ -3809,7 +3718,7 @@ static void test_select(void) closesocket(fdWrite); /* Try select() on a closed socket after connection */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); FD_ZERO_ALL(); FD_SET_ALL(fdWrite); @@ -3824,7 +3733,7 @@ static void test_select(void) closesocket(fdWrite); /* Close the socket currently being selected in a thread - bug 38399 */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); FD_ZERO_ALL(); @@ -3835,7 +3744,7 @@ static void test_select(void) WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); /* test again with only the except descriptor */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); FD_ZERO_ALL(); @@ -3892,42 +3801,20 @@ static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) SOCKET server_socket; server_socket = socket(AF_INET, SOCK_STREAM, 0); - if (server_socket == INVALID_SOCKET) - { - trace("error creating server socket: %d\n", WSAGetLastError()); - return INVALID_SOCKET; - } + ok(server_socket != INVALID_SOCKET, "failed to bind socket, error %u\n", WSAGetLastError()); val = 1; ret = setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val)); - if (ret) - { - trace("error setting SO_REUSEADDR: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to set SO_REUSEADDR, error %u\n", WSAGetLastError()); ret = bind(server_socket, (struct sockaddr *)addr, *len); - if (ret) - { - trace("error binding server socket: %d\n", WSAGetLastError()); - } + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockname(server_socket, (struct sockaddr *)addr, len); - if (ret) - { - skip("failed to lookup bind address: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = listen(server_socket, 5); - if (ret) - { - trace("error making server socket listen: %d\n", WSAGetLastError()); - closesocket(server_socket); - return INVALID_SOCKET; - } + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); return server_socket; } @@ -3973,11 +3860,6 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); - if (server_socket == INVALID_SOCKET) - { - trace("error creating server socket: %d\n", WSAGetLastError()); - return; - } connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; @@ -3991,29 +3873,15 @@ static void test_accept(void) ok(accepted != INVALID_SOCKET, "Failed to accept deferred connection, error %d\n", WSAGetLastError()); server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); - if (server_ready == INVALID_HANDLE_VALUE) - { - trace("error creating event: %d\n", GetLastError()); - goto done; - } thread_params.s = server_socket; thread_params.ReadKilled = FALSE; thread_handle = CreateThread(NULL, 0, AcceptKillThread, &thread_params, 0, &id); - if (thread_handle == NULL) - { - trace("error creating thread: %d\n", GetLastError()); - goto done; - } WaitForSingleObject(server_ready, INFINITE); Sleep(200); ret = closesocket(server_socket); - if (ret != 0) - { - trace("closesocket failed: %d\n", WSAGetLastError()); - goto done; - } + ok(!ret, "failed to close socket, error %u\n", WSAGetLastError()); WaitForSingleObject(thread_handle, 1000); ok(thread_params.ReadKilled, "closesocket did not wake up accept\n"); @@ -4024,7 +3892,6 @@ static void test_accept(void) socklen = sizeof(address); server_socket = setup_server_socket(&address, &socklen); - if (server_socket == INVALID_SOCKET) goto done; connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; @@ -4128,10 +3995,8 @@ static void test_extendedSocketOptions(void) BOOL bool_opt_val; LINGER linger_val; - if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); - return; - } + ret = WSAStartup(MAKEWORD(2,0), &wsa); + ok(!ret, "failed to startup, error %u\n", WSAGetLastError()); memset(&sa, 0, sa_len); @@ -4139,18 +4004,11 @@ static void test_extendedSocketOptions(void) sa.sin_port = htons(0); sa.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa, sa_len); + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockopt(sock, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); @@ -4208,18 +4066,11 @@ static void test_extendedSocketOptions(void) ret, WSAGetLastError()); closesocket(sock); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa, sa_len); + ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen); ok(ret == 0, "getsockopt failed to query SO_LINGER, return value is 0x%08x\n", ret); @@ -4246,10 +4097,8 @@ static void test_getsockname(void) int ret; struct hostent *h; - if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); - return; - } + ret = WSAStartup(MAKEWORD(2,0), &wsa); + ok(!ret, "failed to startup, error %u\n", WSAGetLastError()); memset(&sa_set, 0, sa_set_len); @@ -4257,11 +4106,8 @@ static void test_getsockname(void) sa_set.sin_port = htons(0); sa_set.sin_addr.s_addr = htonl(INADDR_ANY); - if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) { - trace("Creating the socket failed: %d\n", WSAGetLastError()); - WSACleanup(); - return; - } + sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) @@ -4273,19 +4119,11 @@ static void test_getsockname(void) "failed getsockname modified sockaddr when it shouldn't\n"); } - if(bind(sock, (struct sockaddr *) &sa_set, sa_set_len) < 0){ - trace("Failed to bind socket: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); - if(getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len) != 0){ - trace("Failed to call getsockname: %d\n", WSAGetLastError()); - closesocket(sock); - WSACleanup(); - return; - } + ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); @@ -4868,11 +4706,6 @@ static void test_ioctlsocket(void) sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); - if(sock == INVALID_SOCKET) - { - skip("Can't continue without a socket.\n"); - return; - } for(i = 0; i < ARRAY_SIZE(cmds); i++) { @@ -4946,11 +4779,6 @@ static void test_ioctlsocket(void) sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); - if(sock == INVALID_SOCKET) - { - skip("Can't continue without a socket.\n"); - return; - } /* test FIONREAD with a fresh and non-connected socket */ arg = 0xdeadbeef; @@ -4976,11 +4804,7 @@ static void test_ioctlsocket(void) closesocket(sock); - if (tcp_socketpair(&src, &dst) != 0) - { - ok(0, "creating socket pair failed, skipping test\n"); - return; - } + tcp_socketpair(&src, &dst); /* test FIONREAD on TCP sockets */ optval = 0xdeadbeef; @@ -5075,11 +4899,7 @@ static void test_send(void) memset(&ov, 0, sizeof(ov)); - if (tcp_socketpair(&src, &dst) != 0) - { - ok(0, "creating socket pair failed, skipping test\n"); - return; - } + tcp_socketpair(&src, &dst); set_blocking(dst, FALSE); /* force disable buffering so we can get a pending overlapped request */ @@ -6062,11 +5882,7 @@ static void test_ipv6only(void) ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); - if (ret) - { - skip("Could not bind IPv6 address (LastError: %d)\n", WSAGetLastError()); - goto end; - } + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(v4 != INVALID_SOCKET, "Could not create IPv4 socket (LastError: %d)\n", WSAGetLastError()); @@ -6447,11 +6263,6 @@ static void test_WSARecv(void) HANDLE thread, event = NULL, io_port; tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } memset(&ov, 0, sizeof(ov)); flags = 0; @@ -6682,11 +6493,6 @@ static void test_write_watch(void) } tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - return; - } memset(&ov, 0, sizeof(ov)); ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -6822,7 +6628,7 @@ static void test_WSAPoll(void) if (!pWSAPoll) /* >= Vista */ { - skip("WSAPoll is unsupported, some tests will be skipped.\n"); + win_skip("WSAPoll is unsupported, some tests will be skipped.\n"); return; } @@ -6975,7 +6781,7 @@ todo_wine closesocket(fdWrite); /* Try poll() on a closed socket after connection */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); @@ -6993,7 +6799,7 @@ todo_wine closesocket(fdWrite); /* Close the socket currently being polled in a thread */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); @@ -7004,7 +6810,7 @@ todo_wine WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); /* test again with less flags - behavior changes */ - ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + tcp_socketpair(&fdRead, &fdWrite); thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); @@ -7771,45 +7577,28 @@ static void test_ConnectEx(void) memset(&overlapped, 0, sizeof(overlapped)); listener = socket(AF_INET, SOCK_STREAM, 0); - if (listener == INVALID_SOCKET) { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&address, 0, sizeof(address)); address.sin_family = AF_INET; address.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(listener, (struct sockaddr*)&address, sizeof(address)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); addrlen = sizeof(address); iret = getsockname(listener, (struct sockaddr*)&address, &addrlen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(listener, TRUE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(listener, TRUE); + ok(!iret, "failed to set nonblocking, error %u\n", WSAGetLastError()); bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); - if (iret) { - win_skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get ConnectEx, error %u\n", WSAGetLastError()); ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); @@ -7820,47 +7609,22 @@ static void test_ConnectEx(void) bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); - if (bret == TRUE || WSAGetLastError() != WSAEINVAL) - { - acceptor = accept(listener, NULL, NULL); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - acceptor = INVALID_SOCKET; - } - - closesocket(connector); - connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } - } /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, NULL); ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "ConnectEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (overlapped.hEvent == NULL) { - skip("could not create event object, errno = %d\n", GetLastError()); - goto end; - } iret = listen(listener, 1); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " @@ -7874,24 +7638,16 @@ static void test_ConnectEx(void) closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); acceptor = accept(listener, NULL, NULL); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - } + ok(acceptor != INVALID_SOCKET, "failed to accept socket, error %u\n", WSAGetLastError()); buffer[0] = '1'; buffer[1] = '2'; @@ -7917,28 +7673,18 @@ static void test_ConnectEx(void) closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); /* ConnectEx needs a bound socket */ memset(&conaddress, 0, sizeof(conaddress)); conaddress.sin_family = AF_INET; conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); - if (acceptor != INVALID_SOCKET) { - closesocket(acceptor); - acceptor = INVALID_SOCKET; - } + closesocket(acceptor); + closesocket(listener); /* Connect with error */ - closesocket(listener); - listener = INVALID_SOCKET; address.sin_port = htons(1); @@ -7952,15 +7698,8 @@ static void test_ConnectEx(void) ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); -end: - if (overlapped.hEvent) - WSACloseEvent(overlapped.hEvent); - if (listener != INVALID_SOCKET) - closesocket(listener); - if (acceptor != INVALID_SOCKET) - closesocket(acceptor); - if (connector != INVALID_SOCKET) - closesocket(connector); + WSACloseEvent(overlapped.hEvent); + closesocket(connector); } static void test_AcceptEx(void) @@ -7987,57 +7726,34 @@ static void test_AcceptEx(void) memset(&overlapped, 0, sizeof(overlapped)); listener = socket(AF_INET, SOCK_STREAM, 0); - if (listener == INVALID_SOCKET) { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&bindAddress, 0, sizeof(bindAddress)); bindAddress.sin_family = AF_INET; bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(listener, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); socklen = sizeof(bindAddress); iret = getsockname(listener, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(listener, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(listener, FALSE); + ok(!iret, "Failed to set nonblocking, error %u\n", WSAGetLastError()); iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &bytesReturned, NULL, NULL); - if (iret) { - skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "Failed to get AcceptEx, error %u\n", WSAGetLastError()); iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &getAcceptExGuid, sizeof(getAcceptExGuid), &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &bytesReturned, NULL, NULL); - if (iret) { - skip("WSAIoctl failed to get GetAcceptExSockaddrs with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "Failed to get GetAcceptExSockaddrs, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -8057,10 +7773,7 @@ todo_wine ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); iret = listen(listener, 5); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", GetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -8125,10 +7838,6 @@ todo_wine "returned %d + errno %d\n", bret, WSAGetLastError()); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - if (overlapped.hEvent == NULL) { - skip("could not create event object, errno = %d\n", GetLastError()); - goto end; - } overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, @@ -8166,10 +7875,7 @@ todo_wine /* We need to cancel this call, otherwise things fail */ closesocket(acceptor); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel failed test. Bailing...\n"); @@ -8202,15 +7908,9 @@ todo_wine /* Test short reads */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -8279,30 +7979,16 @@ todo_wine /* Test CF_DEFER & AcceptEx interaction */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector2 = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector2 != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); - if (set_blocking(connector, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(connector2, FALSE)) { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(connector, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); + iret = set_blocking(connector2, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); /* Connect socket #1 */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); @@ -8383,7 +8069,7 @@ todo_wine ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); - connector = INVALID_SOCKET; + closesocket(connector2); closesocket(acceptor); /* clean up in case of failures */ @@ -8393,15 +8079,9 @@ todo_wine /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8426,10 +8106,7 @@ todo_wine /* Test closing with pending requests */ acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8453,10 +8130,7 @@ todo_wine } acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -8470,17 +8144,13 @@ todo_wine closesocket(acceptor); acceptor = socket(AF_INET, SOCK_STREAM, 0); - if (acceptor == INVALID_SOCKET) { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); closesocket(listener); - listener = INVALID_SOCKET; dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -8488,17 +8158,9 @@ todo_wine bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); -end: - if (overlapped.hEvent) - WSACloseEvent(overlapped.hEvent); - if (listener != INVALID_SOCKET) - closesocket(listener); - if (acceptor != INVALID_SOCKET) - closesocket(acceptor); - if (connector != INVALID_SOCKET) - closesocket(connector); - if (connector2 != INVALID_SOCKET) - closesocket(connector2); + WSACloseEvent(overlapped.hEvent); + closesocket(acceptor); + closesocket(connector2); } static void test_DisconnectEx(void) @@ -8644,27 +8306,16 @@ static void test_TransmitFile(void) /* Setup sockets for testing TransmitFile */ client = socket(AF_INET, SOCK_STREAM, 0); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); server = socket(AF_INET, SOCK_STREAM, 0); - if (client == INVALID_SOCKET || server == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); iret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &transmitFileGuid, sizeof(transmitFileGuid), &pTransmitFile, sizeof(pTransmitFile), &num_bytes, NULL, NULL); - if (iret) - { - skip("WSAIoctl failed to get TransmitFile with ret %d + errno %d\n", iret, WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to get TransmitFile, error %u\n", GetLastError()); GetSystemWindowsDirectoryA(system_ini_path, MAX_PATH ); strcat(system_ini_path, "\\system.ini"); file = CreateFileA(system_ini_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); - if (file == INVALID_HANDLE_VALUE) - { - skip("Unable to open a file to transmit.\n"); - goto cleanup; - } + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); file_size = GetFileSize(file, NULL); /* Test TransmitFile with an invalid socket */ @@ -8685,35 +8336,16 @@ static void test_TransmitFile(void) bindAddress.sin_port = htons(SERVERPORT+1); bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to bind socket, error %u\n", GetLastError()); iret = listen(server, 1); - if (iret != 0) - { - skip("failed to listen(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to listen, error %u\n", GetLastError()); iret = connect(client, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to connect(), error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(!iret, "failed to connect, error %u\n", GetLastError()); len = sizeof(bindAddress); dest = accept(server, (struct sockaddr*)&bindAddress, &len); - if (dest == INVALID_SOCKET) - { - skip("failed to accept(), error %d\n", WSAGetLastError()); - goto cleanup; - } - if (set_blocking(dest, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto cleanup; - } + ok(dest != INVALID_SOCKET, "failed to accept, error %u\n", GetLastError()); + iret = set_blocking(dest, FALSE); + ok(!iret, "failed to set nonblocking, error %u\n", GetLastError()); /* Test TransmitFile with no possible buffer */ bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); @@ -8759,12 +8391,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", - GetLastError()); - goto cleanup; - } SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, &ov, NULL, 0); err = WSAGetLastError(); @@ -8781,11 +8407,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile w/ start offset */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - goto cleanup; - } SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 10; bret = pTransmitFile(client, file, 0, 0, &ov, NULL, 0); @@ -8802,11 +8423,6 @@ static void test_TransmitFile(void) /* Test overlapped TransmitFile w/ file and buffer data */ ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (ov.hEvent == INVALID_HANDLE_VALUE) - { - skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); - goto cleanup; - } buffers.Head = &header_msg[0]; buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; @@ -8839,7 +8455,6 @@ static void test_TransmitFile(void) ok(!bret, "TransmitFile succeeded unexpectedly.\n"); ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); -cleanup: CloseHandle(file); CloseHandle(ov.hEvent); closesocket(client); @@ -8863,11 +8478,6 @@ static void test_getpeername(void) sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Socket creation failed with %d\n", WSAGetLastError()); - return; - } ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); @@ -8945,11 +8555,6 @@ static void test_sioRoutingInterfaceQuery(void) sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Socket creation failed with %d\n", WSAGetLastError()); - return; - } ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -9001,12 +8606,7 @@ static void test_sioAddressListChange(void) /* Use gethostbyname to find the list of local network interfaces */ h = gethostbyname(""); - if (!h) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, gethostbyname failed with %u\n", - WSAGetLastError()); - return; - } + ok(!!h, "failed to get interface list, error %u\n", WSAGetLastError()); for (acount = 0; h->h_addr_list[acount]; acount++); if (acount == 0) { @@ -9369,51 +8969,29 @@ static void test_WSAAsyncGetServByName(void) */ static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) { - SOCKET src, ret = INVALID_SOCKET; + SOCKET src; int iret, socklen; src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(bindAddress, 0, sizeof(*bindAddress)); bindAddress->sin_family = AF_INET; bindAddress->sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(src, (struct sockaddr*)bindAddress, sizeof(*bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); socklen = sizeof(*bindAddress); iret = getsockname(src, (struct sockaddr*)bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + iret = set_blocking(src, FALSE); + ok(!iret, "failed to make socket non-blocking, error %u\n", WSAGetLastError()); iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); - ret = src; -end: - if (src != ret && ret == INVALID_SOCKET) - closesocket(src); - return ret; + return src; } static void test_completion_port(void) @@ -9441,11 +9019,6 @@ static void test_completion_port(void) memset(&ov, 0, sizeof(ov)); tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9500,11 +9073,6 @@ static void test_completion_port(void) memset(&ov, 0, sizeof(ov)); tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9550,11 +9118,6 @@ static void test_completion_port(void) /* Test IOCP response on successful immediate read. */ tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9627,11 +9190,6 @@ static void test_completion_port(void) /* Test IOCP response on hard shutdown. This was the condition that triggered * a crash in an actual app (bug 38980). */ tcp_socketpair(&src, &dest); - if (src == INVALID_SOCKET || dest == INVALID_SOCKET) - { - skip("failed to create sockets\n"); - goto end; - } bufs.len = sizeof(buf); bufs.buf = buf; @@ -9710,24 +9268,15 @@ static void test_completion_port(void) closesocket(dest); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); iret = WSAIoctl(dest, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &num_bytes, NULL, NULL); - if (iret) - { - skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); - goto end; - } + ok(!iret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); /* Test IOCP response on socket close (IOCP created after AcceptEx) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9769,8 +9318,7 @@ static void test_completion_port(void) /* Test IOCP response on socket close (IOCP created before AcceptEx) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9812,8 +9360,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9871,8 +9418,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle (closing duplicated handle) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9938,8 +9484,7 @@ static void test_completion_port(void) /* Test IOCP with duplicated handle (closing original handle) */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -9994,8 +9539,7 @@ static void test_completion_port(void) /* Test IOCP without AcceptEx */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); SetLastError(0xdeadbeef); @@ -10018,14 +9562,10 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10076,21 +9616,13 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10146,21 +9678,13 @@ static void test_completion_port(void) /* */ - if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) - goto end; + src = setup_iocp_src(&bindAddress); dest = socket(AF_INET, SOCK_STREAM, 0); - if (dest == INVALID_SOCKET) - { - skip("could not create acceptor socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(dest != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); connector = socket(AF_INET, SOCK_STREAM, 0); - if (connector == INVALID_SOCKET) { - skip("could not create connector socket, error %d\n", WSAGetLastError()); - goto end; - } + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); @@ -10178,7 +9702,6 @@ static void test_completion_port(void) ok(iret == 0, "connecting to accepting socket failed, error %d\n", GetLastError()); closesocket(dest); - dest = INVALID_SOCKET; SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -10213,13 +9736,8 @@ static void test_completion_port(void) ok(!olp, "Overlapped structure is at %p\n", olp); - end: - if (dest != INVALID_SOCKET) - closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); - if (connector != INVALID_SOCKET) - closesocket(connector); + closesocket(src); + closesocket(connector); CloseHandle(previous_port); } @@ -10530,11 +10048,6 @@ todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, blen); - if (!name) - { - skip("Failed to alloc memory\n"); - return; - } ret = pWSAEnumNameSpaceProvidersA(&blen, name); todo_wine @@ -10607,11 +10120,6 @@ todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, blen); - if (!name) - { - skip("Failed to alloc memory\n"); - return; - } ret = pWSAEnumNameSpaceProvidersW(&blen, name); todo_wine @@ -11243,36 +10751,31 @@ static void iocp_async_read_thread(SOCKET src, SOCKET dst) static void test_iocp(void) { SOCKET src, dst; - int i, ret; + int i; - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); sync_read(src, dst); iocp_async_read(src, dst); closesocket(src); closesocket(dst); - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_thread(src, dst); closesocket(src); closesocket(dst); for (i = 0; i <= 2; i++) { - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_closesocket(src, i); closesocket(dst); } - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_closesocket(src); closesocket(dst); - ret = tcp_socketpair_ovl(&src, &dst); - ok(!ret, "creating socket pair failed\n"); + tcp_socketpair_ovl(&src, &dst); iocp_async_read_thread_closesocket(src); closesocket(dst); } -- 2.28.0

2 6