March 2022 - Wine-devel - list.winehq.org

[PATCH 5/6] bcrypt: Store a public key handle instead of a blob.
by Hans Leidekker 21 Mar '22

21 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 2 - dlls/bcrypt/bcrypt_main.c | 68 +---- dlls/bcrypt/gnutls.c | 481 ++++++++-------------------------- 3 files changed, 125 insertions(+), 426 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 7342b66479a..d57819f2ec6 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -175,8 +175,6 @@ struct key_asymmetric { ULONG bitlen; /* ignored for ECC keys */ unsigned flags; - UCHAR *pubkey; - unsigned pubkey_len; DSSSEED dss_seed; }; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 23f30833235..2ffeff66d7b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,8 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return status; } -static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen, - const UCHAR *pubkey, ULONG pubkey_len ) +static NTSTATUS key_asymmetric_create( enum alg_id alg_id, ULONG bitlen, struct key **ret_key ) { struct key *key; @@ -983,14 +982,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, key->hdr.magic = MAGIC_KEY; key->alg_id = alg_id; key->u.a.bitlen = bitlen; - key->u.a.pubkey_len = pubkey_len; - - if (!(key->u.a.pubkey = malloc( pubkey_len ))) - { - free( key ); - return STATUS_NO_MEMORY; - } - if (pubkey) memcpy( key->u.a.pubkey, pubkey, pubkey_len ); *ret_key = key; return STATUS_SUCCESS; @@ -1377,8 +1368,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) return STATUS_INVALID_PARAMETER; - size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ))) return status; + if ((status = key_asymmetric_create( alg->id, key_size * 8, &key ))) return status; params.key = key; params.flags = KEY_IMPORT_FLAG_PUBLIC; params.buf = input; @@ -1419,8 +1409,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) return STATUS_INVALID_PARAMETER; - size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status; + if ((status = key_asymmetric_create( alg->id, key_size * 8, &key ))) return status; params.key = key; params.flags = 0; params.buf = input; @@ -1445,7 +1434,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; if (size != input_len) return NTE_BAD_DATA; - if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; + if ((status = key_asymmetric_create( alg->id, rsa_blob->BitLength, &key ))) return status; params.key = key; params.flags = KEY_IMPORT_FLAG_PUBLIC; params.buf = input; @@ -1467,8 +1456,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC && rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; + if ((status = key_asymmetric_create( alg->id, rsa_blob->BitLength, &key ))) return status; params.key = key; params.flags = 0; params.buf = input; @@ -1490,8 +1478,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC) return STATUS_NOT_SUPPORTED; - size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - if ((status = key_asymmetric_create( &key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ))) return status; + if ((status = key_asymmetric_create( alg->id, dsa_blob->cbKey * 8, &key ))) return status; params.key = key; params.flags = KEY_IMPORT_FLAG_PUBLIC; params.buf = input; @@ -1530,8 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED)) return STATUS_INVALID_PARAMETER; - size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status; + if ((status = key_asymmetric_create( alg->id, pubkey->bitlen, &key ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; params.key = key; params.flags = 0; @@ -1567,7 +1553,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); if (input_len < size) return STATUS_INVALID_PARAMETER; - if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + if ((status = key_asymmetric_create( alg->id, pubkey->bitlen, &key ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; params.key = key; params.flags = KEY_IMPORT_FLAG_PUBLIC; @@ -1660,36 +1646,15 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H struct algorithm *alg = algorithm; struct key *key; NTSTATUS status; - ULONG size; TRACE( "%p, %p, %lu, %#lx\n", algorithm, handle, key_len, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (!handle) return STATUS_INVALID_PARAMETER; - switch (alg->id) - { - case ALG_ID_ECDH_P256: - case ALG_ID_ECDSA_P256: - size = sizeof(BCRYPT_ECCKEY_BLOB) + 2 * 256 / 8; - break; - case ALG_ID_ECDSA_P384: - size = sizeof(BCRYPT_ECCKEY_BLOB) + 2 * 384 / 8; - break; - case ALG_ID_RSA: - case ALG_ID_RSA_SIGN: - size = sizeof(BCRYPT_RSAKEY_BLOB) + 2 * key_len / 8; - break; - case ALG_ID_DSA: - size = sizeof(BCRYPT_DSA_KEY_BLOB) + 3 * key_len / 8; - break; - default: - FIXME( "algorithm %u not supported\n", alg->id ); - return STATUS_NOT_SUPPORTED; - } - - if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key; - return status; + if ((status = key_asymmetric_create( alg->id, key_len, &key ))) return status; + *handle = key; + return STATUS_SUCCESS; } NTSTATUS WINAPI BCryptFinalizeKeyPair( BCRYPT_KEY_HANDLE handle, ULONG flags ) @@ -1766,14 +1731,9 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) { struct key_asymmetric_duplicate_params params; - if (!(buffer = malloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; - memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); - - key_copy->u.a.bitlen = key_orig->u.a.bitlen; - key_copy->u.a.flags = key_orig->u.a.flags; - key_copy->u.a.pubkey = buffer; - key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; - key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; + key_copy->u.a.bitlen = key_orig->u.a.bitlen; + key_copy->u.a.flags = key_orig->u.a.flags; + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; params.key_orig = key_orig; params.key_copy = key_copy; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 28119fc9e78..6a55c84efef 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -72,7 +72,11 @@ typedef enum union key_data { gnutls_cipher_hd_t cipher; - gnutls_privkey_t privkey; + struct + { + gnutls_privkey_t privkey; + gnutls_pubkey_t pubkey; + } a; }; C_ASSERT( sizeof(union key_data) <= sizeof(((struct key *)0)->private) ); @@ -98,6 +102,7 @@ static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t, const gnutls_datum_ /* Not present in gnutls version < 2.12.0 */ static int (*pgnutls_pubkey_import_dsa_raw)(gnutls_pubkey_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_pubkey_import_privkey)(gnutls_pubkey_t, gnutls_privkey_t, unsigned int, unsigned int); /* Not present in gnutls version < 3.3.0 */ static int (*pgnutls_privkey_export_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t *, @@ -133,6 +138,7 @@ MAKE_FUNCPTR(gnutls_privkey_import_dsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_privkey_sign_hash); MAKE_FUNCPTR(gnutls_pubkey_deinit); +MAKE_FUNCPTR(gnutls_pubkey_import_privkey); MAKE_FUNCPTR(gnutls_pubkey_init); #undef MAKE_FUNCPTR @@ -272,6 +278,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR(gnutls_privkey_init); LOAD_FUNCPTR(gnutls_privkey_sign_hash); LOAD_FUNCPTR(gnutls_pubkey_deinit); + LOAD_FUNCPTR(gnutls_pubkey_import_privkey); LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR @@ -609,234 +616,6 @@ static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d return size; } -#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) -static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) -{ - BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; - gnutls_datum_t m, e; - UCHAR *dst; - int ret; - - if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) - { - pgnutls_perror( ret ); - return STATUS_INTERNAL_ERROR; - } - - if (*pubkey_len < sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1)) - { - FIXME( "wrong pubkey len %u\n", *pubkey_len ); - pgnutls_perror( ret ); - free( e.data ); free( m.data ); - return STATUS_BUFFER_TOO_SMALL; - } - - dst = (UCHAR *)(rsa_blob + 1); - rsa_blob->cbPublicExp = export_gnutls_datum( dst, bitlen / 8, &e, 0 ); - - dst += rsa_blob->cbPublicExp; - rsa_blob->cbModulus = export_gnutls_datum( dst, bitlen / 8, &m, 1 ); - - rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; - rsa_blob->BitLength = bitlen; - rsa_blob->cbPrime1 = 0; - rsa_blob->cbPrime2 = 0; - - *pubkey_len = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - - free( e.data ); free( m.data ); - return STATUS_SUCCESS; -} -#undef EXPORT_SIZE - -static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey, - unsigned *pubkey_len ) -{ - BCRYPT_ECCKEY_BLOB *ecc_blob = pubkey; - gnutls_ecc_curve_t curve; - gnutls_datum_t x, y; - DWORD magic, size; - UCHAR *dst; - int ret; - - switch (alg_id) - { - case ALG_ID_ECDH_P256: - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - size = 32; - break; - case ALG_ID_ECDSA_P256: - magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; - size = 32; - break; - default: - FIXME( "algorithm %u not supported\n", alg_id ); - return STATUS_NOT_IMPLEMENTED; - } - - if ((ret = pgnutls_privkey_export_ecc_raw( gnutls_key, &curve, &x, &y, NULL ))) - { - pgnutls_perror( ret ); - return STATUS_INTERNAL_ERROR; - } - - if (curve != GNUTLS_ECC_CURVE_SECP256R1) - { - FIXME( "curve %u not supported\n", curve ); - free( x.data ); free( y.data ); - return STATUS_NOT_IMPLEMENTED; - } - - if (*pubkey_len < sizeof(*ecc_blob) + size * 2) - { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); - pgnutls_perror( ret ); - free( x.data ); free( y.data ); - return STATUS_BUFFER_TOO_SMALL; - } - - ecc_blob->dwMagic = magic; - ecc_blob->cbKey = size; - - dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, 1 ); - - dst += size; - export_gnutls_datum( dst, size, &y, 1 ); - - *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - - free( x.data ); free( y.data ); - return STATUS_SUCCESS; -} - -static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len ) -{ - BCRYPT_DSA_KEY_BLOB *dsa_blob = pubkey; - gnutls_datum_t p, q, g, y; - UCHAR *dst; - int ret; - - if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) - { - pgnutls_perror( ret ); - return STATUS_INTERNAL_ERROR; - } - - if (bitlen > 1024) - { - FIXME( "bitlen > 1024 not supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } - - if (*pubkey_len < sizeof(*dsa_blob) + bitlen / 8 * 3) - { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); - pgnutls_perror( ret ); - free( p.data ); free( q.data ); free( g.data ); free( y.data ); - return STATUS_NO_MEMORY; - } - - dst = (UCHAR *)(dsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &p, 1 ); - - dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &g, 1 ); - - dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, 1 ); - - dst = dsa_blob->q; - export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 ); - - dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; - dsa_blob->cbKey = bitlen / 8; - memset( dsa_blob->Count, 0, sizeof(dsa_blob->Count) ); /* FIXME */ - memset( dsa_blob->Seed, 0, sizeof(dsa_blob->Seed) ); /* FIXME */ - - *pubkey_len = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - - free( p.data ); free( q.data ); free( g.data ); free( y.data ); - return STATUS_SUCCESS; -} - -static void reverse_bytes( UCHAR *buf, ULONG len ) -{ - unsigned int i; - UCHAR tmp; - - for (i = 0; i < len / 2; ++i) - { - tmp = buf[i]; - buf[i] = buf[len - i - 1]; - buf[len - i - 1] = tmp; - } -} - -#define Q_SIZE 20 -static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, unsigned bitlen, - void *pubkey, unsigned *pubkey_len ) -{ - BLOBHEADER *hdr = pubkey; - DSSPUBKEY *dsskey; - gnutls_datum_t p, q, g, y; - UCHAR *dst; - int 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 (*pubkey_len < size + bitlen / 8 * 3 + Q_SIZE) - { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, size + bitlen / 8 * 3 + Q_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); - export_gnutls_datum( dst, bitlen / 8, &p, 1 ); - reverse_bytes( dst, bitlen / 8 ); - dst += bitlen / 8; - - export_gnutls_datum( dst, Q_SIZE, &q, 1 ); - reverse_bytes( dst, Q_SIZE ); - dst += Q_SIZE; - - export_gnutls_datum( dst, bitlen / 8, &g, 1 ); - reverse_bytes( dst, bitlen / 8 ); - dst += bitlen / 8; - - export_gnutls_datum( dst, bitlen / 8, &y, 1 ); - reverse_bytes( dst, bitlen / 8 ); - dst += bitlen / 8; - - memcpy( dst, seed, sizeof(*seed) ); - - *pubkey_len = size + bitlen / 8 * 3 + Q_SIZE; - - free( p.data ); free( q.data ); free( g.data ); free( y.data ); - return STATUS_SUCCESS; -} - #define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, key->u.a.bitlen / f, &d, p ) static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) { @@ -845,7 +624,7 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U UCHAR *dst; int ret; - if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -894,7 +673,7 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->privkey, &curve, &x, &y, NULL ))) + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -931,7 +710,7 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U UCHAR *dst; int ret; - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL ))) + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -968,6 +747,19 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_SUCCESS; } +static void reverse_bytes( UCHAR *buf, ULONG len ) +{ + unsigned int i; + UCHAR tmp; + + for (i = 0; i < len / 2; ++i) + { + tmp = buf[i]; + buf[i] = buf[len - i - 1]; + buf[len - i - 1] = tmp; + } +} + #define Q_SIZE 20 static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) { @@ -983,7 +775,7 @@ static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG l return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL ))) + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1029,13 +821,13 @@ static NTSTATUS key_asymmetric_generate( void *args ) { struct key *key = args; gnutls_pk_algorithm_t pk_alg; - gnutls_privkey_t handle; + gnutls_privkey_t privkey; + gnutls_pubkey_t pubkey; unsigned int bitlen; - NTSTATUS status; int ret; if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - if (key_data(key)->privkey) return STATUS_INVALID_HANDLE; + if (key_data(key)->a.privkey) return STATUS_INVALID_HANDLE; switch (key->alg_id) { @@ -1061,45 +853,35 @@ static NTSTATUS key_asymmetric_generate( void *args ) return STATUS_NOT_SUPPORTED; } - if ((ret = pgnutls_privkey_init( &handle ))) + if ((ret = pgnutls_privkey_init( &privkey ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - - if ((ret = pgnutls_privkey_generate( handle, pk_alg, bitlen, 0 ))) + if ((ret = pgnutls_pubkey_init( &pubkey ))) { pgnutls_perror( ret ); - pgnutls_privkey_deinit( handle ); + pgnutls_privkey_deinit( privkey ); return STATUS_INTERNAL_ERROR; } - switch (pk_alg) + if ((ret = pgnutls_privkey_generate( privkey, pk_alg, bitlen, 0 ))) { - case GNUTLS_PK_RSA: - status = export_gnutls_pubkey_rsa( handle, key->u.a.bitlen, key->u.a.pubkey, &key->u.a.pubkey_len ); - break; - - case GNUTLS_PK_ECC: - status = export_gnutls_pubkey_ecc( handle, key->alg_id, key->u.a.pubkey, &key->u.a.pubkey_len ); - break; - - case GNUTLS_PK_DSA: - status = export_gnutls_pubkey_dsa( handle, key->u.a.bitlen, key->u.a.pubkey, &key->u.a.pubkey_len ); - break; - - default: - ERR( "unhandled algorithm %u\n", pk_alg ); + pgnutls_perror( ret ); + pgnutls_privkey_deinit( privkey ); + pgnutls_pubkey_deinit( pubkey ); return STATUS_INTERNAL_ERROR; } - - if (status) + if ((ret = pgnutls_pubkey_import_privkey( pubkey, privkey, 0, 0 ))) { - pgnutls_privkey_deinit( handle ); - return status; + pgnutls_perror( ret ); + pgnutls_privkey_deinit( privkey ); + pgnutls_pubkey_deinit( pubkey ); + return STATUS_INTERNAL_ERROR; } - key_data(key)->privkey = handle; + key_data(key)->a.privkey = privkey; + key_data(key)->a.pubkey = pubkey; return STATUS_SUCCESS; } @@ -1128,7 +910,7 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->privkey, &curve, &x, &y, &d ))) + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1168,7 +950,6 @@ static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) gnutls_ecc_curve_t curve; gnutls_privkey_t handle; gnutls_datum_t x, y, k; - NTSTATUS status; int ret; switch (key->alg_id) @@ -1204,14 +985,8 @@ static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - if ((status = export_gnutls_pubkey_ecc( handle, key->alg_id, key->u.a.pubkey, &key->u.a.pubkey_len ))) - { - pgnutls_privkey_deinit( handle ); - return status; - } - - if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); - key_data(key)->privkey = handle; + if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey ); + key_data(key)->a.privkey = handle; return STATUS_SUCCESS; } @@ -1224,7 +999,7 @@ static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG UCHAR *dst; int ret; - if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1301,8 +1076,8 @@ static NTSTATUS key_import_rsa( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); - key_data(key)->privkey = handle; + if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey ); + key_data(key)->a.privkey = handle; return STATUS_SUCCESS; } @@ -1314,7 +1089,7 @@ static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULO UCHAR *dst; int ret, size; - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x ))) + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, &x ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -1374,7 +1149,6 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) 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 ))) { @@ -1423,29 +1197,24 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) 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) ); - if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); - key_data(key)->privkey = handle; + if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey ); + key_data(key)->a.privkey = handle; return STATUS_SUCCESS; } -static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) +static NTSTATUS key_import_ecc_public( struct key *key, UCHAR *buf, ULONG len ) { BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; gnutls_datum_t x, y; + gnutls_pubkey_t handle; int ret; switch (key->alg_id) { + case ALG_ID_ECDH_P256: case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; case ALG_ID_ECDSA_P384: curve = GNUTLS_ECC_CURVE_SECP384R1; break; @@ -1454,103 +1223,112 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_pubkey_init( gnutls_key ))) + if ((ret = pgnutls_pubkey_init( &handle ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ecc_blob = (BCRYPT_ECCKEY_BLOB *)key->u.a.pubkey; - x.data = key->u.a.pubkey + sizeof(*ecc_blob); + ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf; + x.data = buf + sizeof(*ecc_blob); x.size = ecc_blob->cbKey; - y.data = key->u.a.pubkey + sizeof(*ecc_blob) + ecc_blob->cbKey; + y.data = buf + sizeof(*ecc_blob) + ecc_blob->cbKey; y.size = ecc_blob->cbKey; - if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y ))) + if ((ret = pgnutls_pubkey_import_ecc_raw( handle, curve, &x, &y ))) { pgnutls_perror( ret ); - pgnutls_pubkey_deinit( *gnutls_key ); + pgnutls_pubkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = handle; return STATUS_SUCCESS; } -static NTSTATUS import_gnutls_pubkey_rsa( struct key *key, gnutls_pubkey_t *gnutls_key ) +static NTSTATUS key_import_rsa_public( struct key *key, UCHAR *buf, ULONG len ) { BCRYPT_RSAKEY_BLOB *rsa_blob; + gnutls_pubkey_t handle; gnutls_datum_t m, e; int ret; - if ((ret = pgnutls_pubkey_init( gnutls_key ))) + if ((ret = pgnutls_pubkey_init( &handle ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - rsa_blob = (BCRYPT_RSAKEY_BLOB *)key->u.a.pubkey; - e.data = key->u.a.pubkey + sizeof(*rsa_blob); + rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf; + e.data = buf + sizeof(*rsa_blob); e.size = rsa_blob->cbPublicExp; - m.data = key->u.a.pubkey + sizeof(*rsa_blob) + rsa_blob->cbPublicExp; + m.data = buf + sizeof(*rsa_blob) + rsa_blob->cbPublicExp; m.size = rsa_blob->cbModulus; - if ((ret = pgnutls_pubkey_import_rsa_raw( *gnutls_key, &m, &e ))) + if ((ret = pgnutls_pubkey_import_rsa_raw( handle, &m, &e ))) { pgnutls_perror( ret ); - pgnutls_pubkey_deinit( *gnutls_key ); + pgnutls_pubkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = handle; return STATUS_SUCCESS; } -static NTSTATUS import_gnutls_pubkey_dsa( struct key *key, gnutls_pubkey_t *gnutls_key ) +static NTSTATUS key_import_dsa_public( struct key *key, UCHAR *buf, ULONG len ) { BCRYPT_DSA_KEY_BLOB *dsa_blob; gnutls_datum_t p, q, g, y; + gnutls_pubkey_t handle; int ret; - if ((ret = pgnutls_pubkey_init( gnutls_key ))) + if ((ret = pgnutls_pubkey_init( &handle ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - dsa_blob = (BCRYPT_DSA_KEY_BLOB *)key->u.a.pubkey; - p.data = key->u.a.pubkey + sizeof(*dsa_blob); + dsa_blob = (BCRYPT_DSA_KEY_BLOB *)buf; + p.data = buf + sizeof(*dsa_blob); p.size = dsa_blob->cbKey; q.data = dsa_blob->q; q.size = sizeof(dsa_blob->q); - g.data = key->u.a.pubkey + sizeof(*dsa_blob) + dsa_blob->cbKey; + g.data = buf + sizeof(*dsa_blob) + dsa_blob->cbKey; g.size = dsa_blob->cbKey; - y.data = key->u.a.pubkey + sizeof(*dsa_blob) + dsa_blob->cbKey * 2; + y.data = buf + sizeof(*dsa_blob) + dsa_blob->cbKey * 2; y.size = dsa_blob->cbKey; - if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y ))) + if ((ret = pgnutls_pubkey_import_dsa_raw( handle, &p, &q, &g, &y ))) { pgnutls_perror( ret ); - pgnutls_pubkey_deinit( *gnutls_key ); + pgnutls_pubkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = handle; return STATUS_SUCCESS; } -static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t *gnutls_key ) +static NTSTATUS key_import_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len ) { BLOBHEADER *hdr; DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y; + gnutls_pubkey_t handle; unsigned char *data, p_data[128], q_data[20], g_data[128], y_data[128]; int i, ret, size; - if ((ret = pgnutls_pubkey_init( gnutls_key ))) + if ((ret = pgnutls_pubkey_init( &handle ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - hdr = (BLOBHEADER *)key->u.a.pubkey; + hdr = (BLOBHEADER *)buf; pubkey = (DSSPUBKEY *)(hdr + 1); size = pubkey->bitlen / 8; data = (unsigned char *)(pubkey + 1); @@ -1574,40 +1352,18 @@ static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t y.size = sizeof(y_data); for (i = 0; i < y.size; i++) y.data[i] = data[y.size - i - 1]; - if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y ))) + if ((ret = pgnutls_pubkey_import_dsa_raw( handle, &p, &q, &g, &y ))) { pgnutls_perror( ret ); - pgnutls_pubkey_deinit( *gnutls_key ); + pgnutls_pubkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = handle; return STATUS_SUCCESS; } -static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key ) -{ - switch (key->alg_id) - { - case ALG_ID_ECDSA_P256: - case ALG_ID_ECDSA_P384: - return import_gnutls_pubkey_ecc( key, gnutls_key ); - - case ALG_ID_RSA: - case ALG_ID_RSA_SIGN: - return import_gnutls_pubkey_rsa( key, gnutls_key ); - - case ALG_ID_DSA: - if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) - return import_gnutls_pubkey_dsa_capi( key, gnutls_key ); - else - return import_gnutls_pubkey_dsa( key, gnutls_key ); - - default: - FIXME("algorithm %u not yet supported\n", key->alg_id ); - return STATUS_NOT_IMPLEMENTED; - } -} - static NTSTATUS key_asymmetric_export( void *args ) { const struct key_asymmetric_export_params *params = args; @@ -1658,26 +1414,21 @@ static NTSTATUS key_asymmetric_import( void *args ) case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: if (flags & KEY_IMPORT_FLAG_PUBLIC) - { - FIXME("\n"); - return STATUS_SUCCESS; - } + return key_import_ecc_public( key, params->buf, params->len ); return key_import_ecc( key, params->buf, params->len ); case ALG_ID_RSA: case ALG_ID_RSA_SIGN: if (flags & KEY_IMPORT_FLAG_PUBLIC) - { - FIXME("\n"); - return STATUS_SUCCESS; - } + return key_import_rsa_public( key, params->buf, params->len ); return key_import_rsa( key, params->buf, params->len ); case ALG_ID_DSA: if (flags & KEY_IMPORT_FLAG_PUBLIC) { - FIXME("\n"); - return STATUS_SUCCESS; + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return key_import_dsa_capi_public( key, params->buf, params->len ); + return key_import_dsa_public( key, params->buf, params->len ); } if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) return key_import_dsa_capi( key, params->buf, params->len ); @@ -1760,7 +1511,6 @@ static NTSTATUS key_asymmetric_verify( void *args ) gnutls_sign_algorithm_t sign_alg; gnutls_datum_t gnutls_hash, gnutls_signature; gnutls_pk_algorithm_t pk_alg; - gnutls_pubkey_t gnutls_key; NTSTATUS status; int ret; @@ -1824,19 +1574,14 @@ static NTSTATUS key_asymmetric_verify( void *args ) return STATUS_NOT_IMPLEMENTED; } - if ((status = import_gnutls_pubkey( key, &gnutls_key ))) return status; if ((status = prepare_gnutls_signature( key, params->signature, params->signature_len, &gnutls_signature ))) - { - pgnutls_pubkey_deinit( gnutls_key ); return status; - } gnutls_hash.data = params->hash; gnutls_hash.size = params->hash_len; - ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_alg, 0, &gnutls_hash, &gnutls_signature ); + ret = pgnutls_pubkey_verify_hash2( key_data(key)->a.pubkey, sign_alg, 0, &gnutls_hash, &gnutls_signature ); if (gnutls_signature.data != params->signature) free( gnutls_signature.data ); - pgnutls_pubkey_deinit( gnutls_key ); return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } @@ -1975,7 +1720,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) *params->ret_len = key->u.a.bitlen / 8; return STATUS_SUCCESS; } - if (!key_data(key)->privkey) return STATUS_INVALID_PARAMETER; + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; hash.data = params->input; hash.size = params->input_len; @@ -1983,15 +1728,13 @@ static NTSTATUS key_asymmetric_sign( void *args ) signature.data = NULL; signature.size = 0; - if ((ret = pgnutls_privkey_sign_hash( key_data(key)->privkey, hash_alg, 0, &hash, &signature ))) + if ((ret = pgnutls_privkey_sign_hash( key_data(key)->a.privkey, hash_alg, 0, &hash, &signature ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - status = format_gnutls_signature( key->alg_id, signature, params->output, - params->output_len, params->ret_len ); - + status = format_gnutls_signature( key->alg_id, signature, params->output, params->output_len, params->ret_len ); free( signature.data ); return status; } @@ -2000,7 +1743,8 @@ static NTSTATUS key_asymmetric_destroy( void *args ) { struct key *key = args; - if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); + if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey ); + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); return STATUS_SUCCESS; } @@ -2011,9 +1755,9 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) struct key *key_copy = params->key_copy; int ret; - if (!key_data(key_orig)->privkey) return STATUS_SUCCESS; + if (!key_data(key_orig)->a.privkey) return STATUS_SUCCESS; - if ((ret = pgnutls_privkey_init( &key_data(key_copy)->privkey ))) + if ((ret = pgnutls_privkey_init( &key_data(key_copy)->a.privkey ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -2025,12 +1769,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) case ALG_ID_RSA_SIGN: { gnutls_datum_t m, e, d, p, q, u, e1, e2; - if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key_orig)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key_orig)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ); + ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 ); free( m.data ); free( e.data ); free( d.data ); free( p.data ); free( q.data ); free( u.data ); free( e1.data ); free( e2.data ); if (ret) @@ -2043,12 +1787,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) case ALG_ID_DSA: { gnutls_datum_t p, q, g, y, x; - if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key_orig)->privkey, &p, &q, &g, &y, &x ))) + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key_orig)->a.privkey, &p, &q, &g, &y, &x ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->privkey, &p, &q, &g, &y, &x ); + ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->a.privkey, &p, &q, &g, &y, &x ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); free( x.data ); if (ret) { @@ -2063,12 +1807,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) { gnutls_ecc_curve_t curve; gnutls_datum_t x, y, k; - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key_orig)->privkey, &curve, &x, &y, &k ))) + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key_orig)->a.privkey, &curve, &x, &y, &k ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->privkey, curve, &x, &y, &k ); + ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->a.privkey, curve, &x, &y, &k ); free( x.data ); free( y.data ); free( k.data ); if (ret) { @@ -2094,7 +1838,7 @@ static NTSTATUS key_asymmetric_decrypt( void *args ) e.data = params->input; e.size = params->input_len; - if ((ret = pgnutls_privkey_decrypt_data( key_data(params->key)->privkey, 0, &e, &d ))) + if ((ret = pgnutls_privkey_decrypt_data( key_data(params->key)->a.privkey, 0, &e, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -2187,8 +1931,6 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key ) key->private[1] = key32->private[1]; key->u.a.bitlen = key32->u.a.bitlen; key->u.a.flags = key32->u.a.flags; - key->u.a.pubkey = ULongToPtr(key32->u.a.pubkey); - key->u.a.pubkey_len = key32->u.a.pubkey_len; key->u.a.dss_seed = key32->u.a.dss_seed; return key; } @@ -2204,7 +1946,6 @@ static void put_asymmetric_key32( struct key *key, struct key32 *key32 ) key32->private[0] = key->private[0]; key32->private[1] = key->private[1]; key32->u.a.flags = key->u.a.flags; - key32->u.a.pubkey_len = key->u.a.pubkey_len; key32->u.a.dss_seed = key->u.a.dss_seed; } -- 2.30.2

1 0

[PATCH 4/6] bcrypt: Merge the various key import Unix calls into one.
by Hans Leidekker 21 Mar '22

21 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 8 +-- dlls/bcrypt/bcrypt_main.c | 87 ++++++++++++++++------ dlls/bcrypt/gnutls.c | 132 ++++++++++++++++------------------ 3 files changed, 132 insertions(+), 95 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index d299def6e11..7342b66479a 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -279,9 +279,11 @@ struct key_asymmetric_export_params ULONG *ret_len; }; -struct key_import_params +#define KEY_IMPORT_FLAG_PUBLIC 0x00000001 +struct key_asymmetric_import_params { struct key *key; + ULONG flags; UCHAR *buf; ULONG len; }; @@ -303,9 +305,7 @@ enum key_funcs unix_key_asymmetric_verify, unix_key_asymmetric_destroy, unix_key_asymmetric_export, - unix_key_import_dsa_capi, - unix_key_import_ecc, - unix_key_import_rsa, + unix_key_asymmetric_import, }; #endif /* __BCRYPT_INTERNAL_H */ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 408c477b92f..23f30833235 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1339,7 +1339,7 @@ static void key_destroy( struct key *key ) static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { - struct key_import_params params; + struct key_asymmetric_import_params params; struct key *key; NTSTATUS status; ULONG size; @@ -1378,7 +1378,19 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ); + if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ))) return status; + params.key = key; + params.flags = KEY_IMPORT_FLAG_PUBLIC; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) + { + key_destroy( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) { @@ -1409,11 +1421,11 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*ecc_blob) + key_size * 2; if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status; - - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_ecc, &params ))) + params.key = key; + params.flags = 0; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) { key_destroy( key ); return status; @@ -1432,7 +1444,20 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; if (size != input_len) return NTE_BAD_DATA; - return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); + + if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; + params.key = key; + params.flags = KEY_IMPORT_FLAG_PUBLIC; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) + { + key_destroy( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) { @@ -1443,12 +1468,12 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) - return status; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_rsa, &params ))) + if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; + params.key = key; + params.flags = 0; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) { key_destroy( key ); return status; @@ -1466,7 +1491,19 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); + if ((status = key_asymmetric_create( &key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ))) return status; + params.key = key; + params.flags = KEY_IMPORT_FLAG_PUBLIC; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) + { + key_destroy( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; } else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) { @@ -1495,11 +1532,12 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status; - - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + params.key = key; + params.flags = 0; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) { key_destroy( key ); return status; @@ -1531,6 +1569,15 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + params.key = key; + params.flags = KEY_IMPORT_FLAG_PUBLIC; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_asymmetric_import, &params ))) + { + key_destroy( key ); + return status; + } *ret_key = key; return STATUS_SUCCESS; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 01e1fe72092..28119fc9e78 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1162,10 +1162,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_SUCCESS; } -static NTSTATUS key_import_ecc( void *args ) +static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) { - const struct key_import_params *params = args; - struct key *key = params->key; BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; gnutls_privkey_t handle; @@ -1191,7 +1189,7 @@ static NTSTATUS key_import_ecc( void *args ) return STATUS_INTERNAL_ERROR; } - ecc_blob = (BCRYPT_ECCKEY_BLOB *)params->buf; + ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf; x.data = (unsigned char *)(ecc_blob + 1); x.size = ecc_blob->cbKey; y.data = x.data + ecc_blob->cbKey; @@ -1212,6 +1210,7 @@ static NTSTATUS key_import_ecc( void *args ) return status; } + if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); key_data(key)->privkey = handle; return STATUS_SUCCESS; } @@ -1273,10 +1272,9 @@ static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG return STATUS_SUCCESS; } -static NTSTATUS key_import_rsa( void *args ) +static NTSTATUS key_import_rsa( struct key *key, UCHAR *buf, ULONG len ) { - const struct key_import_params *params = args; - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)params->buf; + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf; gnutls_datum_t m, e, p, q; gnutls_privkey_t handle; int ret; @@ -1303,7 +1301,8 @@ static NTSTATUS key_import_rsa( void *args ) return STATUS_INTERNAL_ERROR; } - key_data(params->key)->privkey = handle; + if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); + key_data(key)->privkey = handle; return STATUS_SUCCESS; } @@ -1366,11 +1365,9 @@ static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULO return STATUS_SUCCESS; } -static NTSTATUS key_import_dsa_capi( void *args ) +static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) { - const struct key_import_params *params = args; - struct key *key = params->key; - BLOBHEADER *hdr = (BLOBHEADER *)params->buf; + BLOBHEADER *hdr = (BLOBHEADER *)buf; DSSPUBKEY *pubkey; gnutls_privkey_t handle; gnutls_datum_t p, q, g, y, x; @@ -1435,9 +1432,8 @@ static NTSTATUS key_import_dsa_capi( void *args ) memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) ); - key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; + if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey ); key_data(key)->privkey = handle; - return STATUS_SUCCESS; } @@ -1650,6 +1646,50 @@ static NTSTATUS key_asymmetric_export( void *args ) } } +static NTSTATUS key_asymmetric_import( void *args ) +{ + const struct key_asymmetric_import_params *params = args; + struct key *key = params->key; + unsigned flags = params->flags; + + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + if (flags & KEY_IMPORT_FLAG_PUBLIC) + { + FIXME("\n"); + return STATUS_SUCCESS; + } + return key_import_ecc( key, params->buf, params->len ); + + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + if (flags & KEY_IMPORT_FLAG_PUBLIC) + { + FIXME("\n"); + return STATUS_SUCCESS; + } + return key_import_rsa( key, params->buf, params->len ); + + case ALG_ID_DSA: + if (flags & KEY_IMPORT_FLAG_PUBLIC) + { + FIXME("\n"); + return STATUS_SUCCESS; + } + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return key_import_dsa_capi( key, params->buf, params->len ); + FIXME( "DSA private key not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len, gnutls_datum_t *gnutls_signature ) { @@ -2085,9 +2125,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = key_asymmetric_verify, key_asymmetric_destroy, key_asymmetric_export, - key_import_dsa_capi, - key_import_ecc, - key_import_rsa + key_asymmetric_import }; #ifdef _WIN64 @@ -2477,59 +2515,12 @@ static NTSTATUS wow64_key_asymmetric_export( void *args ) return ret; } -static NTSTATUS wow64_key_import_dsa_capi( void *args ) -{ - struct - { - PTR32 key; - PTR32 buf; - ULONG len; - } const *params32 = args; - - NTSTATUS ret; - struct key key; - struct key32 *key32 = ULongToPtr( params32->key ); - struct key_import_params params = - { - get_asymmetric_key( key32, &key ), - ULongToPtr(params32->buf), - params32->len - }; - - ret = key_import_dsa_capi( &params ); - put_asymmetric_key32( &key, key32 ); - return ret; -} - -static NTSTATUS wow64_key_import_ecc( void *args ) -{ - struct - { - PTR32 key; - PTR32 buf; - ULONG len; - } const *params32 = args; - - NTSTATUS ret; - struct key key; - struct key32 *key32 = ULongToPtr( params32->key ); - struct key_import_params params = - { - get_asymmetric_key( key32, &key ), - ULongToPtr(params32->buf), - params32->len - }; - - ret = key_import_ecc( &params ); - put_asymmetric_key32( &key, key32 ); - return ret; -} - -static NTSTATUS wow64_key_import_rsa( void *args ) +static NTSTATUS wow64_key_asymmetric_import( void *args ) { struct { PTR32 key; + ULONG flags; PTR32 buf; ULONG len; } const *params32 = args; @@ -2537,14 +2528,15 @@ static NTSTATUS wow64_key_import_rsa( void *args ) NTSTATUS ret; struct key key; struct key32 *key32 = ULongToPtr( params32->key ); - struct key_import_params params = + struct key_asymmetric_import_params params = { get_asymmetric_key( key32, &key ), + params32->flags, ULongToPtr(params32->buf), params32->len }; - ret = key_import_rsa( &params ); + ret = key_asymmetric_import( &params ); put_asymmetric_key32( &key, key32 ); return ret; } @@ -2566,9 +2558,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_key_asymmetric_verify, wow64_key_asymmetric_destroy, wow64_key_asymmetric_export, - wow64_key_import_dsa_capi, - wow64_key_import_ecc, - wow64_key_import_rsa + wow64_key_asymmetric_import }; #endif /* _WIN64 */ -- 2.30.2

1 0

[PATCH 3/6] bcrypt: Merge the various key export Unix calls into one.
by Hans Leidekker 21 Mar '22

21 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 10 +- dlls/bcrypt/bcrypt_main.c | 46 +++-- dlls/bcrypt/gnutls.c | 336 +++++++++++++++++++++++++--------- 3 files changed, 277 insertions(+), 115 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 6d115e10e54..d299def6e11 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -268,13 +268,15 @@ struct key_asymmetric_verify_params unsigned flags; }; -struct key_export_params +#define KEY_EXPORT_FLAG_PUBLIC 0x00000001 +#define KEY_EXPORT_FLAG_RSA_FULL 0x00000002 +struct key_asymmetric_export_params { struct key *key; + ULONG flags; UCHAR *buf; ULONG len; ULONG *ret_len; - BOOL full; }; struct key_import_params @@ -300,9 +302,7 @@ enum key_funcs unix_key_asymmetric_sign, unix_key_asymmetric_verify, unix_key_asymmetric_destroy, - unix_key_export_dsa_capi, - unix_key_export_ecc, - unix_key_export_rsa, + unix_key_asymmetric_export, unix_key_import_dsa_capi, unix_key_import_ecc, unix_key_import_rsa, diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ab9cf67923d..408c477b92f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1070,7 +1070,7 @@ static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRY static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { - struct key_export_params params; + struct key_asymmetric_export_params params; if (!wcscmp( type, BCRYPT_KEY_DATA_BLOB )) { @@ -1101,38 +1101,34 @@ 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, LEGACY_DSA_V2_PUBLIC_BLOB )) + else if (!wcscmp( type, BCRYPT_DSA_PRIVATE_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB ) || + !wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) { - *size = key->u.a.pubkey_len; - if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; - if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); - return STATUS_SUCCESS; - } - else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) - { - params.key = key; - params.buf = output; - params.len = output_len; + params.key = key; + params.flags = 0; + params.buf = output; + params.len = output_len; params.ret_len = size; - params.full = wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ); - return UNIX_CALL( key_export_rsa, &params ); + return UNIX_CALL( key_asymmetric_export, &params ); } - else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) + else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) { - params.key = key; - params.buf = output; - params.len = output_len; + params.key = key; + params.flags = (wcscmp( type, BCRYPT_RSAPRIVATE_BLOB )) ? KEY_EXPORT_FLAG_RSA_FULL : 0; + params.buf = output; + params.len = output_len; params.ret_len = size; - return UNIX_CALL( key_export_ecc, &params ); + return UNIX_CALL( key_asymmetric_export, &params ); } - else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) + else if (!wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB ) || + !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_RSAPUBLIC_BLOB )) { - params.key = key; - params.buf = output; - params.len = output_len; + params.key = key; + params.flags = KEY_EXPORT_FLAG_PUBLIC; + params.buf = output; + params.len = output_len; params.ret_len = size; - return UNIX_CALL( key_export_dsa_capi, &params ); + return UNIX_CALL( key_asymmetric_export, &params ); } FIXME( "unsupported key type %s\n", debugstr_w(type) ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 6862c5cdcf2..01e1fe72092 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -647,6 +647,7 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit free( e.data ); free( m.data ); return STATUS_SUCCESS; } +#undef EXPORT_SIZE static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey, unsigned *pubkey_len ) @@ -836,6 +837,194 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons return STATUS_SUCCESS; } +#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, key->u.a.bitlen / f, &d, p ) +static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf; + gnutls_datum_t m, e; + UCHAR *dst; + int ret; + + if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + *ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1); + if (len >= *ret_len && buf) + { + dst = (UCHAR *)(rsa_blob + 1); + rsa_blob->cbPublicExp = export_gnutls_datum( dst, key->u.a.bitlen / 8, &e, 0 ); + + dst += rsa_blob->cbPublicExp; + rsa_blob->cbModulus = export_gnutls_datum( dst, key->u.a.bitlen / 8, &m, 1 ); + + rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; + rsa_blob->BitLength = key->u.a.bitlen; + rsa_blob->cbPrime1 = 0; + rsa_blob->cbPrime2 = 0; + } + + free( e.data ); free( m.data ); + return STATUS_SUCCESS; +} + +static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf; + gnutls_ecc_curve_t curve; + gnutls_datum_t x, y; + DWORD magic, size; + UCHAR *dst; + int ret; + + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + size = 32; + break; + default: + FIXME( "algorithm %u not supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->privkey, &curve, &x, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (curve != GNUTLS_ECC_CURVE_SECP256R1) + { + FIXME( "curve %u not supported\n", curve ); + free( x.data ); free( y.data ); + return STATUS_NOT_IMPLEMENTED; + } + + *ret_len = sizeof(*ecc_blob) + size * 2; + if (len >= *ret_len && buf) + { + ecc_blob->dwMagic = magic; + ecc_blob->cbKey = size; + + dst = (UCHAR *)(ecc_blob + 1); + export_gnutls_datum( dst, size, &x, 1 ); + + dst += size; + export_gnutls_datum( dst, size, &y, 1 ); + } + + free( x.data ); free( y.data ); + return STATUS_SUCCESS; +} + +static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)buf; + gnutls_datum_t p, q, g, y; + UCHAR *dst; + int ret; + + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (key->u.a.bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + *ret_len = sizeof(*dsa_blob) + key->u.a.bitlen / 8 * 3; + if (len >= *ret_len && buf) + { + dst = (UCHAR *)(dsa_blob + 1); + export_gnutls_datum( dst, key->u.a.bitlen / 8, &p, 1 ); + + dst += key->u.a.bitlen / 8; + export_gnutls_datum( dst, key->u.a.bitlen / 8, &g, 1 ); + + dst += key->u.a.bitlen / 8; + export_gnutls_datum( dst, key->u.a.bitlen / 8, &y, 1 ); + + dst = dsa_blob->q; + export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 ); + + dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; + dsa_blob->cbKey = key->u.a.bitlen / 8; + memset( dsa_blob->Count, 0, sizeof(dsa_blob->Count) ); /* FIXME */ + memset( dsa_blob->Seed, 0, sizeof(dsa_blob->Seed) ); /* FIXME */ + } + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + +#define Q_SIZE 20 +static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + BLOBHEADER *hdr = (BLOBHEADER *)buf; + DSSPUBKEY *dsskey; + gnutls_datum_t p, q, g, y; + UCHAR *dst; + int ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(key->u.a.dss_seed); + + if (key->u.a.bitlen > 1024) + { + FIXME( "bitlen > 1024 not supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + *ret_len = size + key->u.a.bitlen / 8 * 3 + Q_SIZE; + if (len >= *ret_len && buf) + { + hdr->bType = PUBLICKEYBLOB; + hdr->bVersion = 2; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_DSS_SIGN; + + dsskey = (DSSPUBKEY *)(hdr + 1); + dsskey->magic = MAGIC_DSS1; + dsskey->bitlen = key->u.a.bitlen; + + dst = (UCHAR *)(dsskey + 1); + export_gnutls_datum( dst, key->u.a.bitlen / 8, &p, 1 ); + reverse_bytes( dst, key->u.a.bitlen / 8 ); + dst += key->u.a.bitlen / 8; + + export_gnutls_datum( dst, Q_SIZE, &q, 1 ); + reverse_bytes( dst, Q_SIZE ); + dst += Q_SIZE; + + export_gnutls_datum( dst, key->u.a.bitlen / 8, &g, 1 ); + reverse_bytes( dst, key->u.a.bitlen / 8 ); + dst += key->u.a.bitlen / 8; + + export_gnutls_datum( dst, key->u.a.bitlen / 8, &y, 1 ); + reverse_bytes( dst, key->u.a.bitlen / 8 ); + dst += key->u.a.bitlen / 8; + + memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) ); + } + + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + return STATUS_SUCCESS; +} + static NTSTATUS key_asymmetric_generate( void *args ) { struct key *key = args; @@ -914,10 +1103,8 @@ static NTSTATUS key_asymmetric_generate( void *args ) return STATUS_SUCCESS; } -static NTSTATUS key_export_ecc( void *args ) +static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) { - const struct key_export_params *params = args; - struct key *key = params->key; BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; gnutls_datum_t x, y, d; @@ -954,10 +1141,10 @@ static NTSTATUS key_export_ecc( void *args ) return STATUS_NOT_IMPLEMENTED; } - *params->ret_len = sizeof(*ecc_blob) + size * 3; - if (params->len >= *params->ret_len && params->buf) + *ret_len = sizeof(*ecc_blob) + size * 3; + if (len >= *ret_len && buf) { - ecc_blob = (BCRYPT_ECCKEY_BLOB *)params->buf; + ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf; ecc_blob->dwMagic = magic; ecc_blob->cbKey = size; @@ -1029,13 +1216,12 @@ static NTSTATUS key_import_ecc( void *args ) return STATUS_SUCCESS; } -static NTSTATUS key_export_rsa( void *args ) +static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG len, ULONG *ret_len ) { - const struct key_export_params *params = args; - struct key *key = params->key; BCRYPT_RSAKEY_BLOB *rsa_blob; gnutls_datum_t m, e, d, p, q, u, e1, e2; ULONG bitlen = key->u.a.bitlen; + BOOL full = (flags & KEY_EXPORT_FLAG_RSA_FULL); UCHAR *dst; int ret; @@ -1045,13 +1231,13 @@ static NTSTATUS key_export_rsa( void *args ) return STATUS_INTERNAL_ERROR; } - *params->ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1) + EXPORT_SIZE(p,16,1) + EXPORT_SIZE(q,16,1); - if (params->full) *params->ret_len += EXPORT_SIZE(e1,16,1) + EXPORT_SIZE(e2,16,1) + EXPORT_SIZE(u,16,1) + EXPORT_SIZE(d,8,1); + *ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1) + EXPORT_SIZE(p,16,1) + EXPORT_SIZE(q,16,1); + if (full) *ret_len += EXPORT_SIZE(e1,16,1) + EXPORT_SIZE(e2,16,1) + EXPORT_SIZE(u,16,1) + EXPORT_SIZE(d,8,1); - if (params->len >= *params->ret_len && params->buf) + if (len >= *ret_len && buf) { - rsa_blob = (BCRYPT_RSAKEY_BLOB *)params->buf; - rsa_blob->Magic = params->full ? BCRYPT_RSAFULLPRIVATE_MAGIC : BCRYPT_RSAPRIVATE_MAGIC; + rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf; + rsa_blob->Magic = full ? BCRYPT_RSAFULLPRIVATE_MAGIC : BCRYPT_RSAPRIVATE_MAGIC; rsa_blob->BitLength = bitlen; dst = (UCHAR *)(rsa_blob + 1); @@ -1066,7 +1252,7 @@ static NTSTATUS key_export_rsa( void *args ) dst += rsa_blob->cbPrime1; rsa_blob->cbPrime2 = export_gnutls_datum( dst, bitlen / 16, &q, 1 ); - if (params->full) + if (full) { dst += rsa_blob->cbPrime2; export_gnutls_datum( dst, bitlen / 16, &e1, 1 ); @@ -1121,10 +1307,8 @@ static NTSTATUS key_import_rsa( void *args ) return STATUS_SUCCESS; } -static NTSTATUS key_export_dsa_capi( void *args ) +static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) { - const struct key_export_params *params = args; - struct key *key = params->key; BLOBHEADER *hdr; DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y, x; @@ -1145,10 +1329,10 @@ static NTSTATUS key_export_dsa_capi( void *args ) } size = key->u.a.bitlen / 8; - *params->ret_len = sizeof(*hdr) + sizeof(*pubkey) + size * 2 + 40 + sizeof(key->u.a.dss_seed); - if (params->len >= *params->ret_len && params->buf) + *ret_len = sizeof(*hdr) + sizeof(*pubkey) + size * 2 + 40 + sizeof(key->u.a.dss_seed); + if (len >= *ret_len && buf) { - hdr = (BLOBHEADER *)params->buf; + hdr = (BLOBHEADER *)buf; hdr->bType = PRIVATEKEYBLOB; hdr->bVersion = 2; hdr->reserved = 0; @@ -1428,6 +1612,44 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k } } +static NTSTATUS key_asymmetric_export( void *args ) +{ + const struct key_asymmetric_export_params *params = args; + struct key *key = params->key; + unsigned flags = params->flags; + + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + if (flags & KEY_EXPORT_FLAG_PUBLIC) + return key_export_ecc_public( key, params->buf, params->len, params->ret_len ); + return key_export_ecc( key, params->buf, params->len, params->ret_len ); + + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + if (flags & KEY_EXPORT_FLAG_PUBLIC) + return key_export_rsa_public( key, params->buf, params->len, params->ret_len ); + return key_export_rsa( key, flags, params->buf, params->len, params->ret_len ); + + case ALG_ID_DSA: + if (flags & KEY_EXPORT_FLAG_PUBLIC) + { + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return key_export_dsa_capi_public( key, params->buf, params->len, params->ret_len ); + return key_export_dsa_public( key, params->buf, params->len, params->ret_len ); + } + if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) + return key_export_dsa_capi( key, params->buf, params->len, params->ret_len ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "algorithm %u not yet supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len, gnutls_datum_t *gnutls_signature ) { @@ -1862,9 +2084,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = key_asymmetric_sign, key_asymmetric_verify, key_asymmetric_destroy, - key_export_dsa_capi, - key_export_ecc, - key_export_rsa, + key_asymmetric_export, key_import_dsa_capi, key_import_ecc, key_import_rsa @@ -2229,37 +2449,12 @@ static NTSTATUS wow64_key_asymmetric_destroy( void *args ) return key_asymmetric_destroy( get_asymmetric_key( key32, &key )); } -static NTSTATUS wow64_key_export_dsa_capi( void *args ) -{ - struct - { - PTR32 key; - PTR32 buf; - ULONG len; - PTR32 ret_len; - } const *params32 = args; - - NTSTATUS ret; - struct key key; - struct key32 *key32 = ULongToPtr( params32->key ); - struct key_export_params params = - { - get_asymmetric_key( key32, &key ), - ULongToPtr(params32->buf), - params32->len, - ULongToPtr(params32->ret_len) - }; - - ret = key_export_dsa_capi( &params ); - put_asymmetric_key32( &key, key32 ); - return ret; -} - -static NTSTATUS wow64_key_export_ecc( void *args ) +static NTSTATUS wow64_key_asymmetric_export( void *args ) { struct { PTR32 key; + ULONG flags; PTR32 buf; ULONG len; PTR32 ret_len; @@ -2268,15 +2463,16 @@ static NTSTATUS wow64_key_export_ecc( void *args ) NTSTATUS ret; struct key key; struct key32 *key32 = ULongToPtr( params32->key ); - struct key_export_params params = + struct key_asymmetric_export_params params = { get_asymmetric_key( key32, &key ), + params32->flags, ULongToPtr(params32->buf), params32->len, - ULongToPtr(params32->ret_len) + ULongToPtr(params32->ret_len), }; - ret = key_export_ecc( &params ); + ret = key_asymmetric_export( &params ); put_asymmetric_key32( &key, key32 ); return ret; } @@ -2329,34 +2525,6 @@ static NTSTATUS wow64_key_import_ecc( void *args ) return ret; } -static NTSTATUS wow64_key_export_rsa( void *args ) -{ - struct - { - PTR32 key; - PTR32 buf; - ULONG len; - PTR32 ret_len; - BOOL full; - } const *params32 = args; - - NTSTATUS ret; - struct key key; - struct key32 *key32 = ULongToPtr( params32->key ); - struct key_export_params params = - { - get_asymmetric_key( key32, &key ), - ULongToPtr(params32->buf), - params32->len, - ULongToPtr(params32->ret_len), - params32->full - }; - - ret = key_export_rsa( &params ); - put_asymmetric_key32( &key, key32 ); - return ret; -} - static NTSTATUS wow64_key_import_rsa( void *args ) { struct @@ -2397,9 +2565,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_key_asymmetric_sign, wow64_key_asymmetric_verify, wow64_key_asymmetric_destroy, - wow64_key_export_dsa_capi, - wow64_key_export_ecc, - wow64_key_export_rsa, + wow64_key_asymmetric_export, wow64_key_import_dsa_capi, wow64_key_import_ecc, wow64_key_import_rsa -- 2.30.2

1 0

[PATCH 2/6] bcrypt: Call key_destoy() instead of BCryptDestroyKey().
by Hans Leidekker 21 Mar '22

21 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fe16f9269c9..ab9cf67923d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1324,6 +1324,22 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } +static void key_destroy( struct key *key ) +{ + if (key_is_symmetric( key )) + { + UNIX_CALL( key_symmetric_destroy, key ); + free( key->u.s.vector ); + free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); + } + else + UNIX_CALL( key_asymmetric_destroy, key ); + + key->hdr.magic = 0; + free( key ); +} + static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1403,7 +1419,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_ecc, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1438,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_rsa, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1489,7 +1505,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1724,24 +1740,6 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_SUCCESS; } -static void key_destroy( struct key *key ) -{ - if (key_is_symmetric( key )) - { - UNIX_CALL( key_symmetric_destroy, key ); - free( key->u.s.vector ); - free( key->u.s.secret ); - DeleteCriticalSection( &key->u.s.cs ); - } - else - { - UNIX_CALL( key_asymmetric_destroy, key ); - free( key->u.a.pubkey ); - } - key->hdr.magic = 0; - free( key ); -} - NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, UCHAR *object, ULONG object_len, ULONG flags ) { -- 2.30.2

1 0

[PATCH 1/6] bcrypt: Pass the algorithm ID to key_asymmetric_create().
by Hans Leidekker 21 Mar '22

21 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5df4da009a4..fe16f9269c9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,7 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return status; } -static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *alg, ULONG bitlen, +static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen, const UCHAR *pubkey, ULONG pubkey_len ) { struct key *key; @@ -981,7 +981,7 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a if (!(key = calloc( 1, sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - key->alg_id = alg->id; + key->alg_id = alg_id; key->u.a.bitlen = bitlen; key->u.a.pubkey_len = pubkey_len; @@ -1366,7 +1366,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ); } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) { @@ -1396,7 +1396,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1420,7 +1420,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; if (size != input_len) return NTE_BAD_DATA; - return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) { @@ -1431,7 +1431,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) + if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; params.key = key; params.buf = input; @@ -1454,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); } else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) { @@ -1482,7 +1482,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1517,7 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); if (input_len < size) return STATUS_INVALID_PARAMETER; - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; *ret_key = key; @@ -1629,7 +1629,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H return STATUS_NOT_SUPPORTED; } - if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, size ))) *handle = key; + if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key; return status; } -- 2.30.2

1 0

[PATCH v2] dlls: Flush CompositionString after X11DRV_XIMLookupChars.
by Alex Kwak 20 Mar '22

20 Mar '22

There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for this reason, the characters of the GUI are not updated. In addition, in IME_SetResultString on wine11xdrv, the bInComposition flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that the WM_IME_STARTCOMPOSITION message is not generated in the next composition. Also, when WM_IME_COMPOSITION is processed in editor_handle_message on riched20, the existing selection is removed and the characters being entered disappear. WM_IME_STARTCOMPOSITION occurs when attempting to input after full selection, and ME_DeleteSelection is called, which causes the exact location of the cursor to be lost. Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Fix comment style --- dlls/riched20/editor.c | 3 +-- dlls/winex11.drv/ime.c | 5 ++--- dlls/winex11.drv/xim.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..33437a6d6e3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; @@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = style_get_insert_style( editor, editor->pCursors ); hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..db2ff5d85cc 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; - if (!inComp) - ImmSetOpenStatus(imc, FALSE); - + ImmSetOpenStatus(imc, FALSE); ImmUnlockIMC(imc); } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..66c56c177ac 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -117,6 +117,16 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) IME_SetResultString(wcOutput, dwOutput); HeapFree(GetProcessHeap(), 0, wcOutput); + + /* + * After then if `CompositionString` is remaining, flushing it. + * i.e., Korean + */ + if (CompositionString) + { + IME_SetCompositionString(SCS_SETSTR, CompositionString, + dwCompStringLength, NULL, 0); + } } static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) -- 2.32.0

3 4

[PATCH] dlls/ntdll/tests/info.c: enable compilation with long types
by Eric Pouech 19 Mar '22

19 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/info.c | 1289 ++++++++++++++++++++++++----------------------- 1 file changed, 645 insertions(+), 644 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index d6b323dd9d7..d3e70842b00 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" #include <winnls.h> @@ -124,30 +125,30 @@ static void test_query_basic(void) /* Use a nonexistent info class */ status = pNtQuerySystemInformation(-1, NULL, 0, NULL); ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, - "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); + "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status); /* Use an existing class but with a zero-length buffer */ status = pNtQuerySystemInformation(SystemBasicInformation, NULL, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); /* Use an existing class, correct length but no SystemInformation buffer */ status = pNtQuerySystemInformation(SystemBasicInformation, NULL, sizeof(sbi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* vista */, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08lx\n", status); /* Use an existing class, correct length, a pointer to a buffer but no ReturnLength pointer */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); /* Check a too large buffer size */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi) * 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); /* Finally some correct calls */ memset(&sbi, 0xcc, sizeof(sbi)); status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(sbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ if (winetest_debug > 1) trace("Number of Processors : %d\n", sbi.NumberOfProcessors); @@ -155,28 +156,28 @@ static void test_query_basic(void) memset(&sbi2, 0xcc, sizeof(sbi2)); status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); - ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); + ok( sizeof(sbi2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); - ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown); - ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n", + ok( sbi.unknown == sbi2.unknown, "Expected unknown %#lx, got %#lx.\n", sbi.unknown, sbi2.unknown); + ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %lu, got %lu.\n", sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement); - ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize); + ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %lu, %lu.\n", sbi.PageSize, sbi2.PageSize); ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages, - "Expected MmNumberOfPhysicalPages %u, got %u.\n", + "Expected MmNumberOfPhysicalPages %lu, got %lu.\n", sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages); - ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n", + ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %lu, got %lu.\n", sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage); - ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n", + ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %lu, got %lu.\n", sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage); /* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */ ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity, - "Expected AllocationGranularity %#lx, got %#lx.\n", + "Expected AllocationGranularity %#Ix, got %#Ix.\n", sbi.AllocationGranularity, sbi2.AllocationGranularity); ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n", sbi.LowestUserAddress, sbi2.LowestUserAddress); ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask, - "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n", + "Expected ActiveProcessorsAffinityMask %#Ix, got %#Ix.\n", sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask); ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n", sbi.NumberOfProcessors, sbi2.NumberOfProcessors); @@ -193,26 +194,26 @@ static void test_query_basic(void) memset(&sbi3, 0xcc, sizeof(sbi3)); status = pNtQuerySystemInformation(SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength); #ifdef _WIN64 - ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08x\n", status); + ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08lx\n", status); if (!status) { - ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), "info is different\n" ); } #else ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */ - "got %08x\n", status); + "got %08lx\n", status); status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength ); ok( !status || status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) || broken(status == STATUS_NOT_IMPLEMENTED), - "failed %x\n", status ); + "failed %lx\n", status ); if (!status || status == STATUS_INFO_LENGTH_MISMATCH) todo_wine_if( is_wow64 ) - ok( !status == !is_wow64, "got wrong status %x wow64 %u\n", status, is_wow64 ); + ok( !status == !is_wow64, "got wrong status %lx wow64 %u\n", status, is_wow64 ); if (!status) { - ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), "info is different\n" ); } @@ -234,23 +235,23 @@ static void test_query_basic(void) BYTE NumberOfProcessors; } sbi64; - ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength ); + ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength ); memset( &sbi64, 0xcc, sizeof(sbi64) ); ReturnLength = 0; status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi64, sizeof(sbi64), &ReturnLength ); - ok( !status, "failed %x\n", status ); - ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength ); + ok( !status, "failed %lx\n", status ); + ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength ); - ok( sbi.unknown == sbi64.unknown, "unknown %#x / %#x\n", sbi.unknown, sbi64.unknown); - ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %u / %u\n", + ok( sbi.unknown == sbi64.unknown, "unknown %#lx / %#lx\n", sbi.unknown, sbi64.unknown); + ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %lu / %lu\n", sbi.KeMaximumIncrement, sbi64.KeMaximumIncrement); - ok( sbi.PageSize == sbi64.PageSize, "PageSize %u / %u\n", sbi.PageSize, sbi64.PageSize); + ok( sbi.PageSize == sbi64.PageSize, "PageSize %lu / %lu\n", sbi.PageSize, sbi64.PageSize); ok( sbi.MmNumberOfPhysicalPages == sbi64.MmNumberOfPhysicalPages, - "MmNumberOfPhysicalPages %u / %u\n", + "MmNumberOfPhysicalPages %lu / %lu\n", sbi.MmNumberOfPhysicalPages, sbi64.MmNumberOfPhysicalPages); - ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %u / %u\n", + ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %lu / %lu\n", sbi.MmLowestPhysicalPage, sbi64.MmLowestPhysicalPage); - ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %u / %u\n", + ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %lu / %lu\n", sbi.MmHighestPhysicalPage, sbi64.MmHighestPhysicalPage); ok( sbi.AllocationGranularity == (ULONG_PTR)sbi64.AllocationGranularity, "AllocationGranularity %#lx / %#lx\n", sbi.AllocationGranularity, @@ -269,8 +270,8 @@ static void test_query_basic(void) memset(&sbi3, 0xcc, sizeof(sbi3)); status = pNtQuerySystemInformation(SystemEmulationBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); - ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); + ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); ok( !memcmp( &sbi, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), "info is different\n" ); @@ -282,22 +283,22 @@ static void test_query_basic(void) { case SystemNativeBasicInformation: ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_INFO_LENGTH_MISMATCH || - broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%u: %x / %x\n", i, status, expect ); + broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%lu: %lx / %lx\n", i, status, expect ); break; case SystemBasicInformation: case SystemCpuInformation: case SystemEmulationBasicInformation: case SystemEmulationProcessorInformation: - ok( status == expect, "%u: %x / %x\n", i, status, expect ); + ok( status == expect, "%lu: %lx / %lx\n", i, status, expect ); break; default: if (is_wow64) /* only a few info classes are supported on Wow64 */ todo_wine_if (is_wow64 && status != STATUS_INVALID_INFO_CLASS) ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* vista */ - "%u: %x\n", i, status ); + "%lu: %lx\n", i, status ); else - ok( status == expect, "%u: %x / %x\n", i, status, expect ); + ok( status == expect, "%lu: %lx / %lx\n", i, status, expect ); break; } } @@ -311,18 +312,18 @@ static void test_query_cpu(void) memset(&sci, 0xcc, sizeof(sci)); status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(sci) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ - if (winetest_debug > 1) trace("Processor FeatureSet : %08x\n", sci.ProcessorFeatureBits); - ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08x\n", + if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); + ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", sci.ProcessorFeatureBits); memset(&sci2, 0xcc, sizeof(sci2)); status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); + ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); if (is_wow64) { @@ -343,13 +344,13 @@ static void test_query_cpu(void) sci.ProcessorRevision, sci2.ProcessorRevision ); ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n", + ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); memset(&sci2, 0xcc, sizeof(sci2)); status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci2, sizeof(sci2), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); + ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); #ifdef _WIN64 ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", @@ -365,7 +366,7 @@ static void test_query_cpu(void) sci.ProcessorRevision, sci2.ProcessorRevision ); ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n", + ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); } @@ -377,7 +378,7 @@ static void test_query_performance(void) DWORD size = sizeof(SYSTEM_PERFORMANCE_INFORMATION); status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength); if (status == STATUS_INFO_LENGTH_MISMATCH && is_wow64) @@ -386,13 +387,13 @@ static void test_query_performance(void) size += 16; status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength); } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == size, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( ReturnLength == size, "Inconsistent length %ld\n", ReturnLength); status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( ReturnLength == size || ReturnLength == size + 2 /* win8+ */, - "Inconsistent length %d\n", ReturnLength); + "Inconsistent length %ld\n", ReturnLength); /* Not return values yet, as struct members are unknown */ } @@ -414,32 +415,32 @@ static void test_query_timeofday(void) SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti; status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 0, &ReturnLength ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%ld)\n", ReturnLength); sti.uCurrentTimeZoneId = 0xdeadbeef; status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 24, &ReturnLength ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%d)\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%ld)\n", ReturnLength); ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n"); sti.uCurrentTimeZoneId = 0xdeadbeef; status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 32, &ReturnLength ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%d)\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%ld)\n", ReturnLength); ok( 0xdeadbeef != sti.uCurrentTimeZoneId, "Buffer should have been partially filled\n"); status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 49, &ReturnLength ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */, - "ReturnLength should be 0, it is (%d)\n", ReturnLength); + "ReturnLength should be 0, it is (%ld)\n", ReturnLength); status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(sti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ - if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId); + if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%ld)\n", sti.uCurrentTimeZoneId); } static void test_query_process( BOOL extended ) @@ -498,7 +499,7 @@ static void test_query_process( BOOL extended ) /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation( info_class, NULL, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08lx\n", status); ok( ReturnLength > 0, "got 0 length\n" ); /* W2K3 and later returns the needed length, the rest returns 0. */ @@ -516,7 +517,7 @@ static void test_query_process( BOOL extended ) /* Sometimes new process or threads appear between the call and increase the size, * otherwise the previously returned buffer size should be sufficient. */ ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH, - "Expected STATUS_SUCCESS, got %08x\n", status ); + "Expected STATUS_SUCCESS, got %08lx\n", status ); spi = spi_buf; @@ -542,14 +543,14 @@ static void test_query_process( BOOL extended ) cid.UniqueThread = 0; status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, - "Got unexpected status %#x, pid %p.\n", status, spi->UniqueProcessId ); + "Got unexpected status %#lx, pid %p.\n", status, spi->UniqueProcessId ); if (!status) { ULONG_PTR info; status = NtQueryInformationProcess( handle, ProcessWow64Information, &info, sizeof(info), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); is_process_wow64 = !!info; NtClose( handle ); } @@ -583,12 +584,12 @@ static void test_query_process( BOOL extended ) THREAD_BASIC_INFORMATION tbi; status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); expected_address = tbi.TebBaseAddress; if (is_wow64 && is_process_wow64) expected_address = (BYTE *)expected_address - 0x2000; if (!is_wow64 && !is_process_wow64 && !tbi.TebBaseAddress) - win_skip( "Could not get TebBaseAddress, thread %u.\n", j ); + win_skip( "Could not get TebBaseAddress, thread %lu.\n", j ); else ok( ti->TebBase == expected_address || (is_wow64 && !expected_address && !!ti->TebBase), "Got unexpected TebBase %p, expected %p.\n", ti->TebBase, expected_address ); @@ -623,11 +624,11 @@ static void test_query_process( BOOL extended ) status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, - "NtOpenProcess returned:%x\n", status ); + "NtOpenProcess returned:%lx\n", status ); if (status != STATUS_SUCCESS) continue; status = pNtQueryInformationProcess( handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%lx\n", status ); ok( pbi.UniqueProcessId == GetCurrentProcessId(), "Expected pid %p, got %p\n", ULongToHandle(GetCurrentProcessId()), ULongToHandle(pbi.UniqueProcessId) ); @@ -642,11 +643,11 @@ static void test_query_process( BOOL extended ) status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid ); ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, - "NtOpenThread returned:%x\n", status ); + "NtOpenThread returned:%lx\n", status ); if (status != STATUS_SUCCESS) continue; status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%lx\n", status ); ok( tbi.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), "Expected tid %p, got %p\n", ULongToHandle(GetCurrentThreadId()), tbi.ClientId.UniqueThread ); @@ -665,13 +666,13 @@ static void test_query_procperf(void) /* Find out the number of processors */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); sppi = HeapAlloc(GetProcessHeap(), 0, NeededLength); status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); /* Try it for 1 processor */ sppi->KernelTime.QuadPart = 0xdeaddead; @@ -679,9 +680,9 @@ static void test_query_procperf(void) sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) == ReturnLength, - "Inconsistent length %d\n", ReturnLength); + "Inconsistent length %ld\n", ReturnLength); ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); @@ -691,8 +692,8 @@ static void test_query_procperf(void) sppi->UserTime.QuadPart = 0xdeaddead; sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength); ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n"); ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n"); @@ -704,8 +705,8 @@ static void test_query_procperf(void) sppi->IdleTime.QuadPart = 0xdeaddead; status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength + 2, &ReturnLength); ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */, - "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength); + "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength); if (status == STATUS_SUCCESS) { ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n"); @@ -731,12 +732,12 @@ static void test_query_module(void) char *buffer; status = pNtQuerySystemInformation(SystemModuleInformation, NULL, 0, &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); ok(size > 0, "expected nonzero size\n"); info = malloc(size); status = pNtQuerySystemInformation(SystemModuleInformation, info, size, &size); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); ok(info->ModulesCount > 0, "Expected some modules to be loaded\n"); @@ -744,10 +745,10 @@ static void test_query_module(void) { RTL_PROCESS_MODULE_INFORMATION *module = &info->Modules[i]; - ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); - ok(module->ImageSize, "%u: got 0 size\n", i); - ok(module->LoadCount, "%u: got 0 load count\n", i); + ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex); + ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name); + ok(module->ImageSize, "%lu: got 0 size\n", i); + ok(module->LoadCount, "%lu: got 0 load count\n", i); } free(info); @@ -758,27 +759,27 @@ static void test_query_module(void) win_skip("SystemModuleInformationEx is not supported.\n"); return; } - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); ok(size > 0, "expected nonzero size\n"); buffer = malloc(size); status = pNtQuerySystemInformation(SystemModuleInformationEx, buffer, size, &size); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); infoex = (const void *)buffer; for (i = 0; infoex->NextOffset; i++) { const RTL_PROCESS_MODULE_INFORMATION *module = &infoex->BaseInfo; - ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); - ok(module->ImageSize, "%u: got 0 size\n", i); - ok(module->LoadCount, "%u: got 0 load count\n", i); + ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex); + ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name); + ok(module->ImageSize, "%lu: got 0 size\n", i); + ok(module->LoadCount, "%lu: got 0 load count\n", i); infoex = (const void *)((const char *)infoex + infoex->NextOffset); } ok(((char *)infoex - buffer) + sizeof(infoex->NextOffset) == size, - "got size %u, null terminator %u\n", size, (char *)infoex - buffer); + "got size %lu, null terminator %Iu\n", size, (char *)infoex - buffer); free(buffer); @@ -795,15 +796,15 @@ static void test_query_handle(void) INT i; EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); - ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() ); + ok( EventHandle != NULL, "CreateEventA failed %lu\n", GetLastError() ); ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); ok( ReturnLength != 0xdeadbeef, "Expected valid ReturnLength\n" ); SystemInformationLength = ReturnLength; @@ -819,11 +820,11 @@ static void test_query_handle(void) memset(shi, 0x55, SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]); ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */ - "Expected length %u, got %u\n", ExpectedLength, ReturnLength ); - ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count ); + "Expected length %lu, got %lu\n", ExpectedLength, ReturnLength ); + ok( shi->Count > 1, "Expected more than 1 handle, got %lu\n", shi->Count ); ok( shi->Handle[1].HandleValue != 0x5555 || broken( shi->Handle[1].HandleValue == 0x5555 ), /* Vista / 2008 */ "Uninitialized second handle\n" ); if (shi->Handle[1].HandleValue == 0x5555) @@ -845,10 +846,10 @@ static void test_query_handle(void) break; } } - ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() ); + ok( found, "Expected to find event handle %p (pid %lx) in handle list\n", EventHandle, GetCurrentProcessId() ); ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); CloseHandle(EventHandle); ReturnLength = 0xdeadbeef; @@ -859,14 +860,14 @@ static void test_query_handle(void) shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); for (i = 0, found = FALSE; i < shi->Count && !found; i++) found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); ok( !found, "Unexpectedly found event handle in handle list\n" ); status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status ); done: HeapFree( GetProcessHeap(), 0, shi); @@ -882,24 +883,24 @@ static void test_query_handle_ex(void) BOOL found, ret; event = CreateEventA(NULL, FALSE, FALSE, NULL); - ok(event != NULL, "failed to create event, error %u\n", GetLastError()); + ok(event != NULL, "failed to create event, error %lu\n", GetLastError()); ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); size = 0; status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); - ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %lu\n", size); while (status == STATUS_INFO_LENGTH_MISMATCH) { info = realloc(info, size); status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); } - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); - ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size); ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); found = FALSE; @@ -909,8 +910,8 @@ static void test_query_handle_ex(void) && (HANDLE)info->Handles[i].HandleValue == event) { ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), - "got flags %#x\n", info->Handles[i].HandleAttributes); - ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); + "got flags %#lx\n", info->Handles[i].HandleAttributes); + ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#lx\n", info->Handles[i].GrantedAccess); found = TRUE; } ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex); @@ -918,7 +919,7 @@ static void test_query_handle_ex(void) ok(found, "event handle not found\n"); ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); CloseHandle(event); status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); @@ -927,9 +928,9 @@ static void test_query_handle_ex(void) info = realloc(info, size); status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); } - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); - ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size); ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); found = FALSE; @@ -945,7 +946,7 @@ static void test_query_handle_ex(void) ok(!found, "event handle found\n"); status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status ); free(info); } @@ -965,7 +966,7 @@ static void test_query_cache(void) ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength); ok(!status && (ReturnLength == expected), - "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected); } /* buffer too small for the full result. @@ -979,7 +980,7 @@ static void test_query_cache(void) ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength); ok(!status && (ReturnLength == expected), - "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected); } } @@ -988,7 +989,7 @@ static void test_query_cache(void) status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH && ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), - "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected); + "%d: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", i, status, ReturnLength, expected); if (0) { /* this crashes on some vista / win7 machines */ @@ -996,7 +997,7 @@ static void test_query_cache(void) status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH && ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), - "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected); + "0: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", status, ReturnLength, expected); } } @@ -1010,18 +1011,18 @@ static void test_query_interrupt(void) /* Find out the number of processors */ status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION); sii = HeapAlloc(GetProcessHeap(), 0, NeededLength); status = pNtQuerySystemInformation(SystemInterruptInformation, sii, 0, &ReturnLength); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok(ReturnLength == NeededLength, "got %u\n", ReturnLength); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok(ReturnLength == NeededLength, "got %lu\n", ReturnLength); /* Try it for all processors */ status = pNtQuerySystemInformation(SystemInterruptInformation, sii, NeededLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); /* Windows XP and W2K3 (and others?) always return 0 for the ReturnLength * No test added for this as it's highly unlikely that an app depends on this @@ -1039,29 +1040,29 @@ static void test_time_adjustment(void) memset( &query, 0xcc, sizeof(query) ); status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query), &len ); - ok( status == STATUS_SUCCESS, "got %08x\n", status ); - ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + ok( status == STATUS_SUCCESS, "got %08lx\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len ); ok( query.TimeAdjustmentDisabled == TRUE || query.TimeAdjustmentDisabled == FALSE, "wrong value %x\n", query.TimeAdjustmentDisabled ); status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)-1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); - ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len ); status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)+1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); - ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len ); adjust.TimeAdjustment = query.TimeAdjustment; adjust.TimeAdjustmentDisabled = query.TimeAdjustmentDisabled; status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust) ); - ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08lx\n", status ); status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)-1 ); todo_wine - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status ); status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)+1 ); todo_wine - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status ); } static void test_query_kerndebug(void) @@ -1072,21 +1073,21 @@ static void test_query_kerndebug(void) SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_NOT_IMPLEMENTED /* before win7 */ || status == STATUS_INVALID_INFO_CLASS /* wow64 on Win10 */, - "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); if (status != STATUS_INFO_LENGTH_MISMATCH) { @@ -1096,13 +1097,13 @@ static void test_query_kerndebug(void) { status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, sizeof(skdi_ex), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, sizeof(skdi_ex) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); } } @@ -1113,15 +1114,15 @@ static void test_query_regquota(void) SYSTEM_REGISTRY_QUOTA_INFORMATION srqi; status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); } static void test_query_logicalproc(void) @@ -1139,12 +1140,12 @@ static void test_query_logicalproc(void) win_skip("SystemLogicalProcessorInformation is not supported\n"); return; } - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok(len%sizeof(*slpi) == 0, "Incorrect length %ld\n", len); slpi = HeapAlloc(GetProcessHeap(), 0, len); status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); proc_no = 0; for(i=0; i<len/sizeof(*slpi); i++) { @@ -1160,7 +1161,7 @@ static void test_query_logicalproc(void) } ok(proc_no > 0, "No processors were found\n"); if(si.dwNumberOfProcessors <= 32) - ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n", + ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %ld, expected %ld\n", proc_no, si.dwNumberOfProcessors); HeapFree(GetProcessHeap(), 0, slpi); @@ -1181,43 +1182,43 @@ static void test_query_logicalprocex(void) len = 0; relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len > 0, "got %u\n", len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len > 0, "got %lu\n", len); len_core = 0; relationship = RelationProcessorCore; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_core); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len_core > 0, "got %u\n", len_core); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len_core > 0, "got %lu\n", len_core); len_numa = 0; relationship = RelationNumaNode; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_numa); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len_numa > 0, "got %u\n", len_numa); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len_numa > 0, "got %lu\n", len_numa); len_cache = 0; relationship = RelationCache; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_cache); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len_cache > 0, "got %u\n", len_cache); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len_cache > 0, "got %lu\n", len_cache); len_package = 0; relationship = RelationProcessorPackage; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_package); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len_package > 0, "got %u\n", len_package); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len_package > 0, "got %lu\n", len_package); len_group = 0; relationship = RelationGroup; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_group); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len_group > 0, "got %u\n", len_group); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); + ok(len_group > 0, "got %lu\n", len_group); len_public = 0; ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len_public); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); - ok(len == len_public, "got %u, expected %u\n", len_public, len); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %ld\n", ret, GetLastError()); + ok(len == len_public, "got %lu, expected %lu\n", len_public, len); infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public); @@ -1229,10 +1230,10 @@ static void test_query_logicalprocex(void) relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public); - ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(ret, "got %d, error %ld\n", ret, GetLastError()); ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n"); /* Test for RelationAll. */ @@ -1247,7 +1248,7 @@ static void test_query_logicalprocex(void) continue; } - trace("infoex[%u].Size: %u\n", i, ex->Size); + trace("infoex[%u].Size: %lu\n", i, ex->Size); switch (ex->Relationship) { case RelationProcessorCore: @@ -1258,14 +1259,14 @@ static void test_query_logicalprocex(void) trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount); for (j = 0; j < ex->Processor.GroupCount; ++j) { - trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%lx\n", i, j, ex->Processor.GroupMask[j].Mask); + trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%Ix\n", i, j, ex->Processor.GroupMask[j].Mask); trace("infoex[%u].Processor.GroupMask[%u].Group: 0x%x\n", i, j, ex->Processor.GroupMask[j].Group); } break; case RelationNumaNode: trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship); - trace("infoex[%u].NumaNode.NodeNumber: 0x%x\n", i, ex->NumaNode.NodeNumber); - trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%lx\n", i, ex->NumaNode.GroupMask.Mask); + trace("infoex[%u].NumaNode.NodeNumber: 0x%lx\n", i, ex->NumaNode.NodeNumber); + trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%Ix\n", i, ex->NumaNode.GroupMask.Mask); trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group); break; case RelationCache: @@ -1273,9 +1274,9 @@ static void test_query_logicalprocex(void) trace("infoex[%u].Cache.Level: 0x%x\n", i, ex->Cache.Level); trace("infoex[%u].Cache.Associativity: 0x%x\n", i, ex->Cache.Associativity); trace("infoex[%u].Cache.LineSize: 0x%x\n", i, ex->Cache.LineSize); - trace("infoex[%u].Cache.CacheSize: 0x%x\n", i, ex->Cache.CacheSize); + trace("infoex[%u].Cache.CacheSize: 0x%lx\n", i, ex->Cache.CacheSize); trace("infoex[%u].Cache.Type: 0x%x\n", i, ex->Cache.Type); - trace("infoex[%u].Cache.GroupMask.Mask: 0x%lx\n", i, ex->Cache.GroupMask.Mask); + trace("infoex[%u].Cache.GroupMask.Mask: 0x%Ix\n", i, ex->Cache.GroupMask.Mask); trace("infoex[%u].Cache.GroupMask.Group: 0x%x\n", i, ex->Cache.GroupMask.Group); break; case RelationGroup: @@ -1286,7 +1287,7 @@ static void test_query_logicalprocex(void) { trace("infoex[%u].Group.GroupInfo[%u].MaximumProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].MaximumProcessorCount); trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorCount); - trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%lx\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask); + trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%Ix\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask); } break; default: @@ -1301,7 +1302,7 @@ static void test_query_logicalprocex(void) relationship = RelationProcessorCore; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); for (i = 0; status == STATUS_SUCCESS && i < len_core;) { @@ -1313,7 +1314,7 @@ static void test_query_logicalprocex(void) relationship = RelationNumaNode; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); for (i = 0; status == STATUS_SUCCESS && i < len_numa;) { @@ -1325,7 +1326,7 @@ static void test_query_logicalprocex(void) relationship = RelationCache; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); for (i = 0; status == STATUS_SUCCESS && i < len_cache;) { @@ -1337,7 +1338,7 @@ static void test_query_logicalprocex(void) relationship = RelationProcessorPackage; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); for (i = 0; status == STATUS_SUCCESS && i < len_package;) { @@ -1349,7 +1350,7 @@ static void test_query_logicalprocex(void) relationship = RelationGroup; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); for (i = 0; status == STATUS_SUCCESS && i < len_group;) { @@ -1360,7 +1361,7 @@ static void test_query_logicalprocex(void) } len_union = len_core + len_numa + len_cache + len_package + len_group; - ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union); + ok(len == len_union, "Expected 0x%lx, got 0x%0lx\n", len, len_union); HeapFree(GetProcessHeap(), 0, infoex); HeapFree(GetProcessHeap(), 0, infoex_public); @@ -1396,56 +1397,56 @@ static void test_query_cpusetinfo(void) return; } - ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); - ok(len == expected_len, "Got unexpected length %u.\n", len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status); + ok(len == expected_len, "Got unexpected length %lu.\n", len); len = 0xdeadbeef; status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len); ok(status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_INFO_CLASS, - "Got unexpected status %#x.\n", status); - ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len); + "Got unexpected status %#lx.\n", status); + ok(len == 0xdeadbeef, "Got unexpected len %lu.\n", len); len = 0xdeadbeef; process = (HANDLE)0xdeadbeef; status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); - ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); - ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len); len = 0xdeadbeef; process = NULL; status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len); ok((status == STATUS_INVALID_PARAMETER && len == 0xdeadbeef) || (status == STATUS_BUFFER_TOO_SMALL && len == expected_len), - "Got unexpected status %#x, length %u.\n", status, len); + "Got unexpected status %#lx, length %lu.\n", status, len); len = 0xdeadbeef; status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len); - ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); - ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len); status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); - ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); - ok(len == expected_len, "Got unexpected length %u.\n", len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status); + ok(len == expected_len, "Got unexpected length %lu.\n", len); len = 0xdeadbeef; status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, expected_len, &len); - ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); - ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len); info = malloc(expected_len); len = 0; status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); - ok(len == expected_len, "Got unexpected length %u.\n", len); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + ok(len == expected_len, "Got unexpected length %lu.\n", len); for (i = 0; i < cpu_count; ++i) { SYSTEM_CPU_SET_INFORMATION *d = &info[i]; - ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i); + ok(d->Size == sizeof(*d), "Got unexpected size %lu, i %u.\n", d->Size, i); ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i); - ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i); + ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#lx, i %u.\n", d->CpuSet.Id, i); ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i); ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n", d->CpuSet.LogicalProcessorIndex, i); @@ -1470,36 +1471,36 @@ static void test_query_firmware(void) status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1); ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */, - "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); if (len1 == 0) /* xp, 2003 */ { win_skip("SystemFirmwareTableInformation is not available\n"); HeapFree(GetProcessHeap(), 0, sfti); return; } - ok(len1 == min_sfti_len, "Expected length %u, got %u\n", min_sfti_len, len1); + ok(len1 == min_sfti_len, "Expected length %lu, got %lu\n", min_sfti_len, len1); status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); - ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08x\n", status); - ok(len1 == 0, "Expected length 0, got %u\n", len1); + ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08lx\n", status); + ok(len1 == 0, "Expected length 0, got %lu\n", len1); sfti->ProviderSignature = RSMB; sfti->Action = SystemFirmwareTable_Get; status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); - ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); - ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status); + ok(len1 >= min_sfti_len, "Expected length >= %lu, got %lu\n", min_sfti_len, len1); ok(sfti->TableBufferLength == len1 - min_sfti_len, - "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength); sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, len1); ok(!!sfti, "Failed to allocate memory\n"); status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok(len2 == len1, "Expected length %u, got %u\n", len1, len2); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok(len2 == len1, "Expected length %lu, got %lu\n", len1, len2); ok(sfti->TableBufferLength == len1 - min_sfti_len, - "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength); HeapFree(GetProcessHeap(), 0, sfti); } @@ -1527,16 +1528,16 @@ static void test_query_battery(void) trace("Charging : %u\n", bs.Charging); trace("Discharging : %u\n", bs.Discharging); trace("Tag : %u\n", bs.Tag); - trace("MaxCapacity : %u\n", bs.MaxCapacity); - trace("RemainingCapacity : %u\n", bs.RemainingCapacity); - trace("Rate : %d\n", (LONG)bs.Rate); - trace("EstimatedTime : %u\n", bs.EstimatedTime); - trace("DefaultAlert1 : %u\n", bs.DefaultAlert1); - trace("DefaultAlert2 : %u\n", bs.DefaultAlert2); + trace("MaxCapacity : %lu\n", bs.MaxCapacity); + trace("RemainingCapacity : %lu\n", bs.RemainingCapacity); + trace("Rate : %ld\n", (LONG)bs.Rate); + trace("EstimatedTime : %lu\n", bs.EstimatedTime); + trace("DefaultAlert1 : %lu\n", bs.DefaultAlert1); + trace("DefaultAlert2 : %lu\n", bs.DefaultAlert2); } ok(bs.MaxCapacity >= bs.RemainingCapacity, - "expected MaxCapacity %u to be greater than or equal to RemainingCapacity %u\n", + "expected MaxCapacity %lu to be greater than or equal to RemainingCapacity %lu\n", bs.MaxCapacity, bs.RemainingCapacity); if (!bs.BatteryPresent) @@ -1546,7 +1547,7 @@ static void test_query_battery(void) else time_left = ~0u; ok(bs.EstimatedTime == time_left, - "expected %u minutes remaining got %u minutes\n", time_left, bs.EstimatedTime); + "expected %lu minutes remaining got %lu minutes\n", time_left, bs.EstimatedTime); } static void test_query_processor_power_info(void) @@ -1588,12 +1589,12 @@ static void test_query_processor_power_info(void) "Expected all but the last record to be overwritten.\n"); status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); for(i = 0; i < si.dwNumberOfProcessors; i++) ppi[i].Number = 0xDEADBEEF; status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) - 1); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); for(i = 0; i < si.dwNumberOfProcessors; i++) if (ppi[i].Number != 0xDEADBEEF) break; ok( i == si.dwNumberOfProcessors, "Expected untouched buffer\n"); @@ -1602,13 +1603,13 @@ static void test_query_processor_power_info(void) { /* picky version found on newer Windows like Win7 */ ok( ppi[1].Number == 0xDEADBEEF, "Expected untouched buffer.\n"); - ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status); status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); - ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status); status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0); - ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); + ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status); } } else @@ -1617,7 +1618,7 @@ static void test_query_processor_power_info(void) } status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); HeapFree(GetProcessHeap(), 0, ppi); } @@ -1632,38 +1633,38 @@ static void test_query_process_wow64(void) /* Do not give a handle and buffer */ status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); /* Use a correct info class and buffer size, but still no handle and buffer */ status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08lx\n", status); /* Use a correct info class, buffer size and handle, but no buffer */ status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); - ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); /* Use a correct info class, buffer and buffer size, but no handle */ pbi[0] = pbi[1] = dummy; status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); /* Use a greater buffer size */ pbi[0] = pbi[1] = dummy; status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); /* Use no ReturnLength */ pbi[0] = pbi[1] = dummy; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); - ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]); + ok( pbi[0] != dummy, "pbi[0] %Ix\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); /* Test written size on 64 bit by checking high 32 bit buffer */ if (sizeof(ULONG_PTR) > sizeof(DWORD)) { @@ -1675,28 +1676,28 @@ static void test_query_process_wow64(void) pbi[0] = pbi[1] = dummy; ReturnLength = 0xdeadbeef; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); - ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); + ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %ld\n", ReturnLength); /* Everything is correct except a too small buffer size */ pbi[0] = pbi[1] = dummy; ReturnLength = 0xdeadbeef; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); - todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength); /* Everything is correct except a too large buffer size */ pbi[0] = pbi[1] = dummy; ReturnLength = 0xdeadbeef; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); - ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); - todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength); } static void test_query_process_basic(void) @@ -1721,50 +1722,50 @@ static void test_query_process_basic(void) status = pNtQueryInformationProcess(NULL, -1, NULL, 0, NULL); ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, - "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); + "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, 0, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, sizeof(pbi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi) * 2, NULL); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi) * 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); - if (winetest_debug > 1) trace("ProcessID : %lx\n", pbi.UniqueProcessId); + if (winetest_debug > 1) trace("ProcessID : %Ix\n", pbi.UniqueProcessId); ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); - trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); - trace("VirtualSize : %lu\n", pvi->VirtualSize); - trace("PageFaultCount : %u\n", pvi->PageFaultCount); - trace("PeakWorkingSetSize : %lu\n", pvi->PeakWorkingSetSize); - trace("WorkingSetSize : %lu\n", pvi->WorkingSetSize); - trace("QuotaPeakPagedPoolUsage : %lu\n", pvi->QuotaPeakPagedPoolUsage); - trace("QuotaPagedPoolUsage : %lu\n", pvi->QuotaPagedPoolUsage); - trace("QuotaPeakNonPagePoolUsage : %lu\n", pvi->QuotaPeakNonPagedPoolUsage); - trace("QuotaNonPagePoolUsage : %lu\n", pvi->QuotaNonPagedPoolUsage); - trace("PagefileUsage : %lu\n", pvi->PagefileUsage); - trace("PeakPagefileUsage : %lu\n", pvi->PeakPagefileUsage); + trace("PeakVirtualSize : %Iu\n", pvi->PeakVirtualSize); + trace("VirtualSize : %Iu\n", pvi->VirtualSize); + trace("PageFaultCount : %lu\n", pvi->PageFaultCount); + trace("PeakWorkingSetSize : %Iu\n", pvi->PeakWorkingSetSize); + trace("WorkingSetSize : %Iu\n", pvi->WorkingSetSize); + trace("QuotaPeakPagedPoolUsage : %Iu\n", pvi->QuotaPeakPagedPoolUsage); + trace("QuotaPagedPoolUsage : %Iu\n", pvi->QuotaPagedPoolUsage); + trace("QuotaPeakNonPagePoolUsage : %Iu\n", pvi->QuotaPeakNonPagedPoolUsage); + trace("QuotaNonPagePoolUsage : %Iu\n", pvi->QuotaNonPagedPoolUsage); + trace("PagefileUsage : %Iu\n", pvi->PagefileUsage); + trace("PeakPagefileUsage : %Iu\n", pvi->PeakPagefileUsage); } static void test_query_process_vm(void) @@ -1779,21 +1780,21 @@ static void test_query_process_vm(void) status = pNtQueryInformationProcess(NULL, ProcessVmCounters, NULL, sizeof(pvi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %ld\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %d\n", ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %ld\n", ReturnLength); /* Check if we have some return values */ if (winetest_debug > 1) @@ -1803,19 +1804,19 @@ static void test_query_process_vm(void) process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId()); status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08x\n", status); + ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08lx\n", status); CloseHandle(process); process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08lx\n", status); CloseHandle(process); memset(&pvi, 0, sizeof(pvi)); process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); /* Check if we have some return values */ if (winetest_debug > 1) @@ -1827,48 +1828,48 @@ static void test_query_process_vm(void) /* Check if we have real counters */ status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); prev_size = pvi.VirtualSize; if (winetest_debug > 1) dump_vm_counters("VM counters before VirtualAlloc", &pvi); ptr = VirtualAlloc(NULL, alloc_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); - ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc", &pvi); todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize); + "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); VirtualFree( ptr, 0, MEM_RELEASE); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); prev_size = pvi.VirtualSize; if (winetest_debug > 1) dump_vm_counters("VM counters before VirtualAlloc", &pvi); ptr = VirtualAlloc(NULL, alloc_size, MEM_RESERVE, PAGE_READWRITE); - ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize); + "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); prev_size = pvi.VirtualSize; ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE); - ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_COMMIT)", &pvi); ok( pvi.VirtualSize == prev_size, - "Expected to equal to %lu, got %lu\n", prev_size, pvi.VirtualSize); + "Expected to equal to %Iu, got %Iu\n", prev_size, pvi.VirtualSize); VirtualFree( ptr, 0, MEM_RELEASE); } @@ -1880,21 +1881,21 @@ static void test_query_process_io(void) status = pNtQueryInformationProcess(NULL, ProcessIoCounters, NULL, sizeof(pii), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessIoCounters, &pii, sizeof(pii), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, 24, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii) * 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); + ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ if (winetest_debug > 1) trace("OtherOperationCount : 0x%s\n", wine_dbgstr_longlong(pii.OtherOperationCount)); @@ -1914,26 +1915,26 @@ static void test_query_process_times(void) status = pNtQueryInformationProcess(NULL, ProcessTimes, NULL, sizeof(spti), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessTimes, &spti, sizeof(spti), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, 24, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); if (!process) { - if (winetest_debug > 1) trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); + if (winetest_debug > 1) trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); } else - trace("ProcessTimes for process with ID : %d\n", one_before_last_pid); + trace("ProcessTimes for process with ID : %ld\n", one_before_last_pid); status = pNtQueryInformationProcess( process, ProcessTimes, &spti, sizeof(spti), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(spti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(spti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); CloseHandle(process); FileTimeToSystemTime((const FILETIME *)&spti.CreateTime, &UTC); @@ -1953,11 +1954,11 @@ static void test_query_process_times(void) if (winetest_debug > 1) trace("UserTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); ok( sizeof(spti) == ReturnLength || ReturnLength == 0 /* vista */ || broken(is_wow64), /* returns garbage on wow64 */ - "Inconsistent length %d\n", ReturnLength); + "Inconsistent length %ld\n", ReturnLength); } static void test_query_process_debug_port(int argc, char **argv) @@ -1973,62 +1974,62 @@ static void test_query_process_debug_port(int argc, char **argv) si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); if (!ret) return; status = pNtQueryInformationProcess(NULL, ProcessDebugPort, NULL, 0, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugPort, NULL, sizeof(debug_port), NULL); - ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#x\n", status); + ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, NULL, sizeof(debug_port), NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugPort, &debug_port, sizeof(debug_port), NULL); - ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) - 1, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) + 1, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_port == 0, "Expected port 0, got %#lx.\n", debug_port); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_port == 0, "Expected port 0, got %#Ix.\n", debug_port); status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugPort, &debug_port, sizeof(debug_port), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port); for (;;) { DEBUG_EVENT ev; ret = WaitForDebugEvent(&ev, INFINITE); - ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; } ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); } static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, ACCESS_MASK access, PSID sid) @@ -2056,37 +2057,37 @@ static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd); status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE); - ok(SUCCEEDED(status), "Failed to create debug object: %#010x\n", status); + ok(SUCCEEDED(status), "Failed to create debug object: %#010lx\n", status); if (!SUCCEEDED(status)) return; old_debug_obj = pDbgUiGetThreadDebugObject(); pDbgUiSetThreadDebugObject(debug_obj); - sprintf(cmdline, "%s %s %s %u", argv[0], argv[1], "debuggee:dbgport", access); + sprintf(cmdline, "%s %s %s %lu", argv[0], argv[1], "debuggee:dbgport", access); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); if (!ret) goto close_debug_obj; do { ret = WaitForDebugEvent(&ev, INFINITE); - ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; } while (ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); wait_child_process(pi.hProcess); ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); close_debug_obj: pDbgUiSetThreadDebugObject(old_debug_obj); @@ -2101,16 +2102,16 @@ static TOKEN_OWNER *get_current_owner(void) BOOL ret; ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token); - ok(ret, "Failed to get process token: %u\n", GetLastError()); + ok(ret, "Failed to get process token: %lu\n", GetLastError()); ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "GetTokenInformation failed: %u\n", GetLastError()); - ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError()); + "GetTokenInformation failed: %lu\n", GetLastError()); + ok(length != 0, "Failed to get token owner information length: %lu\n", GetLastError()); owner = HeapAlloc(GetProcessHeap(), 0, length); ret = GetTokenInformation(token, TokenOwner, owner, length, &length); - ok(ret, "Failed to get token owner information: %u)\n", GetLastError()); + ok(ret, "Failed to get token owner information: %lu)\n", GetLastError()); CloseHandle(token); return owner; @@ -2144,7 +2145,7 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv) { ACCESS_MASK access = all_access_masks[i]; - winetest_push_context("debug object access %08x", access); + winetest_push_context("debug object access %08lx", access); subtest_query_process_debug_port_custom_dacl(argc, argv, access, owner->Owner); winetest_pop_context(); } @@ -2162,28 +2163,28 @@ static void test_query_process_priority(void) status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, NULL, sizeof(priority[0]), NULL); ok(status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_HANDLE) /* w2k3 */, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, &priority, sizeof(priority[0]), NULL); - ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, 1, &ReturnLength); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority), &ReturnLength); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); orig_priority = GetPriorityClass(GetCurrentProcess()); ret = SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); - ok(ret, "Failed to set priority class: %u\n", GetLastError()); + ok(ret, "Failed to set priority class: %lu\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority[0]), &ReturnLength); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok(priority[0].PriorityClass == PROCESS_PRIOCLASS_BELOW_NORMAL, "Expected PROCESS_PRIOCLASS_BELOW_NORMAL, got %u\n", priority[0].PriorityClass); ret = SetPriorityClass(GetCurrentProcess(), orig_priority); - ok(ret, "Failed to reset priority class: %u\n", GetLastError()); + ok(ret, "Failed to reset priority class: %lu\n", GetLastError()); } static void test_query_process_handlecount(void) @@ -2196,35 +2197,35 @@ static void test_query_process_handlecount(void) status = pNtQueryInformationProcess(NULL, ProcessHandleCount, NULL, sizeof(handlecount), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessHandleCount, &handlecount, sizeof(handlecount), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, &handlecount, 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); if (!process) { - trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); + trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); } else - if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %d\n", one_before_last_pid); + if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %ld\n", one_before_last_pid); status = pNtQueryInformationProcess( process, ProcessHandleCount, &handlecount, sizeof(handlecount), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); CloseHandle(process); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, buffer, sizeof(buffer), &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_SUCCESS, - "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08lx\n", status); + ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ - if (winetest_debug > 1) trace("HandleCount : %d\n", handlecount); + if (winetest_debug > 1) trace("HandleCount : %ld\n", handlecount); todo_wine { ok( handlecount > 0, "Expected some handles, got 0\n"); @@ -2240,17 +2241,17 @@ static void test_query_process_image_file_name(void) UNICODE_STRING *buffer = NULL; status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); buffer = heap_alloc(ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); todo_wine ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)), "Expected image name to begin with \\Device\\, got %s\n", @@ -2263,17 +2264,17 @@ static void test_query_process_image_file_name(void) win_skip("ProcessImageFileNameWin32 is not supported\n"); return; } - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, 2, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, sizeof(image_file_name), &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); buffer = heap_alloc(ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, buffer, ReturnLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok(memcmp(buffer->Buffer, deviceW, sizeof(deviceW)), "Expected image name not to begin with \\Device\\, got %s\n", wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR))); @@ -2289,18 +2290,18 @@ static void test_query_process_image_info(void) status = pNtQueryInformationProcess( NULL, ProcessImageInformation, &info, sizeof(info), &len ); ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_PARAMETER), /* winxp */ - "got %08x\n", status); + "got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)-1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)+1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status); memset( &info, 0xcc, sizeof(info) ); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info), &len ); - ok( status == STATUS_SUCCESS, "got %08x\n", status); - ok( len == sizeof(info), "wrong len %u\n", len ); + ok( status == STATUS_SUCCESS, "got %08lx\n", status); + ok( len == sizeof(info), "wrong len %lu\n", len ); ok( info.MajorSubsystemVersion == nt->OptionalHeader.MajorSubsystemVersion, "wrong major version %x/%x\n", @@ -2331,49 +2332,49 @@ static void test_query_process_debug_object_handle(int argc, char **argv) si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed with last error %u\n", GetLastError()); + ok(ret, "CreateProcess failed with last error %lu\n", GetLastError()); if (!ret) return; status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, 0, NULL); ok(status == STATUS_INFO_LENGTH_MISMATCH, - "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL); ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION, /* XP */ - "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL); ok(status == STATUS_ACCESS_VIOLATION, - "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, &debug_object, sizeof(debug_object), NULL); ok(status == STATUS_INVALID_HANDLE, - "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugObjectHandle, &debug_object, sizeof(debug_object) - 1, NULL); ok(status == STATUS_INFO_LENGTH_MISMATCH, - "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugObjectHandle, &debug_object, sizeof(debug_object) + 1, NULL); ok(status == STATUS_INFO_LENGTH_MISMATCH, - "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status); debug_object = (HANDLE)0xdeadbeef; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugObjectHandle, &debug_object, sizeof(debug_object), NULL); ok(status == STATUS_PORT_NOT_SET, - "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08lx\n", status); ok(debug_object == NULL || broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */ "Expected debug object handle to be NULL, got %p\n", debug_object); @@ -2382,31 +2383,31 @@ static void test_query_process_debug_object_handle(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle, &debug_object, sizeof(debug_object), NULL); ok(status == STATUS_SUCCESS, - "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08x\n", status); + "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08lx\n", status); ok(debug_object != NULL, "Expected debug object handle to be non-NULL, got %p\n", debug_object); status = NtClose( debug_object ); - ok( !status, "NtClose failed %x\n", status ); + ok( !status, "NtClose failed %lx\n", status ); for (;;) { DEBUG_EVENT ev; ret = WaitForDebugEvent(&ev, INFINITE); - ok(ret, "WaitForDebugEvent failed with last error %u\n", GetLastError()); + ok(ret, "WaitForDebugEvent failed with last error %lu\n", GetLastError()); if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed with last error %u\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed with last error %lu\n", GetLastError()); if (!ret) break; } ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); + ok(ret, "CloseHandle failed with last error %lu\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); + ok(ret, "CloseHandle failed with last error %lu\n", GetLastError()); } static void test_query_process_debug_flags(int argc, char **argv) @@ -2428,34 +2429,34 @@ static void test_query_process_debug_flags(int argc, char **argv) /* test invalid arguments */ status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, 0, NULL); ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */, - "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, sizeof(debug_flags), NULL); ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */, - "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, NULL, sizeof(debug_flags), NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status); status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */, - "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags) - 1, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags) + 1, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status); /* test ProcessDebugFlags of current process */ status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags); for (i = 0; i < ARRAY_SIZE(test_flags); i++) { @@ -2464,26 +2465,26 @@ static void test_query_process_debug_flags(int argc, char **argv) si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, test_flags[i], NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); if (!(test_flags[i] & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS))) { /* test ProcessDebugFlags before attaching with debugger */ status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags); ret = DebugActiveProcess(pi.dwProcessId); - ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError()); expected_flags = FALSE; } /* test ProcessDebugFlags after attaching with debugger */ status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags); if (!(test_flags[i] & CREATE_SUSPENDED)) { @@ -2492,40 +2493,40 @@ static void test_query_process_debug_flags(int argc, char **argv) for (;;) { ret = WaitForDebugEvent(&ev, 1000); - ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; if (ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) break; ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; } result = SuspendThread(pi.hThread); - ok(result == 0, "Expected 0, got %u.\n", result); + ok(result == 0, "Expected 0, got %lu.\n", result); } ret = DebugActiveProcessStop(pi.dwProcessId); - ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); + ok(ret, "DebugActiveProcessStop failed, last error %#lx.\n", GetLastError()); /* test ProcessDebugFlags after detaching debugger */ status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags); ret = DebugActiveProcess(pi.dwProcessId); - ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError()); /* test ProcessDebugFlags after re-attaching debugger */ status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags); result = ResumeThread(pi.hThread); - todo_wine ok(result == 2, "Expected 2, got %u.\n", result); + todo_wine ok(result == 2, "Expected 2, got %lu.\n", result); /* Wait until the process is terminated. On Windows XP the process randomly * gets stuck in a non-continuable exception, so stop after 100 iterations. @@ -2535,13 +2536,13 @@ static void test_query_process_debug_flags(int argc, char **argv) { ret = WaitForDebugEvent(&ev, 1000); ok(ret || broken(GetLastError() == ERROR_SEM_TIMEOUT), - "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + "WaitForDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; } ok(j < 100 || broken(j >= 100) /* Win XP */, "Expected less than 100 debug events.\n"); @@ -2549,13 +2550,13 @@ static void test_query_process_debug_flags(int argc, char **argv) /* test ProcessDebugFlags after process has terminated */ status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags); + ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status); + ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags); ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); } } @@ -2572,42 +2573,42 @@ static void test_readvirtualmemory(void) /* normal operation */ status = pNtReadVirtualMemory(process, teststring, buffer, 12, &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount); ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* no number of bytes */ memset(buffer, 0, 12); status = pNtReadVirtualMemory(process, teststring, buffer, 12, NULL); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* illegal remote address */ todo_wine{ status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount); - ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status); + ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08lx\n", status); if (status == STATUS_PARTIAL_COPY) - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount); } /* 0 handle */ status = pNtReadVirtualMemory(0, teststring, buffer, 12, &readcount); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); + ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount); /* pseudo handle for current process*/ memset(buffer, 0, 12); status = pNtReadVirtualMemory((HANDLE)-1, teststring, buffer, 12, &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount); ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* illegal local address */ status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); ok( status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_PARTIAL_COPY) /* Win10 */, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); if (status == STATUS_ACCESS_VIOLATION) - ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount); CloseHandle(process); } @@ -2631,8 +2632,8 @@ static void test_mapprotection(void) skip("Unable to query process execute flags on this platform\n"); return; } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - if (winetest_debug > 1) trace("Process execute flags %08x\n", oldflags); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); + if (winetest_debug > 1) trace("Process execute flags %08lx\n", oldflags); if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE)) { @@ -2649,7 +2650,7 @@ static void test_mapprotection(void) } status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); reset_flags = TRUE; } @@ -2663,14 +2664,14 @@ static void test_mapprotection(void) SEC_COMMIT | SEC_NOCACHE, 0 ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); offset.u.LowPart = 0; offset.u.HighPart = 0; count = 0x2000; addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); #if defined(__x86_64__) || defined(__i386__) *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ @@ -2686,12 +2687,12 @@ static void test_mapprotection(void) if (winetest_debug > 1) trace("...done.\n"); status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); - ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08lx\n", status); + ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%lx\n", info.Protect); status = pNtUnmapViewOfSection( GetCurrentProcess(), (char *)addr + 0x1050 ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); pNtClose (h); if (reset_flags) @@ -2709,52 +2710,52 @@ static void test_threadstack(void) info.ReserveSize = 0x100000; info.StackBase = (void *)0xdeadbeef; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) ); - ok( !status, "NtSetInformationProcess failed %08x\n", status ); + ok( !status, "NtSetInformationProcess failed %08lx\n", status ); ok( info.StackBase != (void *)0xdeadbeef, "stackbase not set\n" ); status = pNtQueryVirtualMemory( GetCurrentProcess(), info.StackBase, MemoryBasicInformation, &meminfo, sizeof(meminfo), &retlen ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status); ok( meminfo.AllocationBase == info.StackBase, "wrong base %p/%p\n", meminfo.AllocationBase, info.StackBase ); - ok( meminfo.RegionSize == info.ReserveSize, "wrong size %lx/%lx\n", + ok( meminfo.RegionSize == info.ReserveSize, "wrong size %Ix/%Ix\n", meminfo.RegionSize, info.ReserveSize ); - ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State ); - ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect ); - ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type ); + ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State ); + ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect ); + ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type ); info_ex.AllocInfo = info; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info_ex, sizeof(info_ex) ); if (status != STATUS_INVALID_PARAMETER) { - ok( !status, "NtSetInformationProcess failed %08x\n", status ); + ok( !status, "NtSetInformationProcess failed %08lx\n", status ); ok( info_ex.AllocInfo.StackBase != info.StackBase, "stackbase not set\n" ); status = pNtQueryVirtualMemory( GetCurrentProcess(), info_ex.AllocInfo.StackBase, MemoryBasicInformation, &meminfo, sizeof(meminfo), &retlen ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status); ok( meminfo.AllocationBase == info_ex.AllocInfo.StackBase, "wrong base %p/%p\n", meminfo.AllocationBase, info_ex.AllocInfo.StackBase ); - ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %lx/%lx\n", + ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %Ix/%Ix\n", meminfo.RegionSize, info_ex.AllocInfo.ReserveSize ); - ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State ); - ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect ); - ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type ); + ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State ); + ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect ); + ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type ); VirtualFree( info_ex.AllocInfo.StackBase, 0, MEM_FREE ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) - 1 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) + 1 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info_ex, sizeof(info_ex) - 1 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info_ex, sizeof(info_ex) + 1 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status ); } else win_skip( "ProcessThreadStackAllocation ex not supported\n" ); @@ -2777,161 +2778,161 @@ static void test_queryvirtualmemory(void) module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READONLY); - ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_IMAGE); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READONLY); + ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_IMAGE); module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_READWRITE || mbi.AllocationProtect == PAGE_EXECUTE_READWRITE, - "mbi.AllocationProtect is 0x%x\n", mbi.AllocationProtect); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); + "mbi.AllocationProtect is 0x%lx\n", mbi.AllocationProtect); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE, - "mbi.Protect is 0x%x\n", mbi.Protect); + "mbi.Protect is 0x%lx\n", mbi.Protect); status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); - ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); module = GetModuleHandleA( NULL ); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%X\n", mbi.Protect, PAGE_READONLY); status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, - "mbi.Protect is 0x%x\n", mbi.Protect); + "mbi.Protect is 0x%lx\n", mbi.Protect); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); if (mbi.AllocationBase == module) { - ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); - ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, - "mbi.Protect is 0x%x\n", mbi.Protect); + "mbi.Protect is 0x%lx\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ status = pNtQueryVirtualMemory(NtCurrentProcess(), user_shared_data, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok(mbi.AllocationBase == user_shared_data, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, user_shared_data); - ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY); - ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x\n", mbi.Protect); - ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_PRIVATE); - ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%lx, expected 0x%x\n", mbi.RegionSize, 0x1000); + ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY); + ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT); + ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx\n", mbi.Protect); + ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_PRIVATE); + ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%Ix, expected 0x%x\n", mbi.RegionSize, 0x1000); /* check error code when addr is higher than working set limit */ status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); - ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); module = GetModuleHandleA( "ntdll.dll" ); memset(buffer, 0xcc, sizeof(buffer)); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryMappedFilenameInformation, name, sizeof(*name) + 16, &readcount); - ok(status == STATUS_BUFFER_OVERFLOW, "got %08x\n", status); + ok(status == STATUS_BUFFER_OVERFLOW, "got %08lx\n", status); ok(name->SectionFileName.Length == 0xcccc || broken(!name->SectionFileName.Length), /* vista64 */ "Wrong len %u\n", name->SectionFileName.Length); - ok(readcount > sizeof(*name), "Wrong count %lu\n", readcount); + ok(readcount > sizeof(*name), "Wrong count %Iu\n", readcount); memset(buffer, 0xcc, sizeof(buffer)); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation, name, sizeof(buffer), &readcount); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %08lx\n", status); ok(name->SectionFileName.Buffer == (WCHAR *)(name + 1), "Wrong ptr %p/%p\n", name->SectionFileName.Buffer, name + 1 ); ok(name->SectionFileName.Length != 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); ok(name->SectionFileName.MaximumLength == name->SectionFileName.Length + sizeof(WCHAR), "Wrong maxlen %u/%u\n", name->SectionFileName.MaximumLength, name->SectionFileName.Length); ok(readcount == sizeof(name->SectionFileName) + name->SectionFileName.MaximumLength, - "Wrong count %lu/%u\n", readcount, name->SectionFileName.MaximumLength); + "Wrong count %Iu/%u\n", readcount, name->SectionFileName.MaximumLength); ok( !name->SectionFileName.Buffer[name->SectionFileName.Length / sizeof(WCHAR)], "buffer not null-terminated\n" ); memset(buffer, 0xcc, sizeof(buffer)); status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation, name, sizeof(buffer), NULL); - ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(status == STATUS_SUCCESS, "got %08lx\n", status); status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation, NULL, sizeof(buffer), NULL); - ok(status == STATUS_ACCESS_VIOLATION, "got %08x\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "got %08lx\n", status); memset(buffer, 0xcc, sizeof(buffer)); prev = readcount; readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 321, MemoryMappedFilenameInformation, name, sizeof(*name) - 1, &readcount); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status); ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); - ok(readcount == prev, "Wrong count %lu\n", readcount); + ok(readcount == prev, "Wrong count %Iu\n", readcount); memset(buffer, 0xcc, sizeof(buffer)); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory((HANDLE)0xdead, (char *)module + 1234, MemoryMappedFilenameInformation, name, sizeof(buffer), &readcount); - ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(status == STATUS_INVALID_HANDLE, "got %08lx\n", status); ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ - "Wrong count %lu\n", readcount); + "Wrong count %Iu\n", readcount); memset(buffer, 0xcc, sizeof(buffer)); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), buffer, MemoryMappedFilenameInformation, name, sizeof(buffer), &readcount); - ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status); ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ - "Wrong count %lu\n", readcount); + "Wrong count %Iu\n", readcount); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation, name, sizeof(buffer), &readcount); - ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status); ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ - "Wrong count %lu\n", readcount); + "Wrong count %Iu\n", readcount); readcount = 0xdeadbeef; status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation, name, sizeof(*name) - 1, &readcount); - ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status); ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); ok(readcount == 0xdeadbeef || broken(readcount == 15), /* wow64 */ - "Wrong count %lu\n", readcount); + "Wrong count %Iu\n", readcount); } static void test_affinity(void) @@ -2944,64 +2945,64 @@ static void test_affinity(void) GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); proc_affinity = pbi.AffinityMask; ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); thread_affinity = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); thread_affinity = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); /* NOTE: Pre-Vista does not allow bits to be set that are higher than the highest set bit in process affinity mask */ thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status ); if (status == STATUS_SUCCESS) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); + ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask, tbi.AffinityMask ); } thread_affinity = ~(DWORD_PTR)0 - 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status ); if (status == STATUS_SUCCESS) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); + ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask ); } /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ thread_affinity = ~(DWORD_PTR)0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS, - "Expected STATUS_SUCCESS, got %08x\n", status); + "Expected STATUS_SUCCESS, got %08lx\n", status); if (si.dwNumberOfProcessors <= 1) { @@ -3013,35 +3014,35 @@ static void test_affinity(void) if (status == STATUS_SUCCESS) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#lx\n", tbi.AffinityMask ); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#Ix\n", tbi.AffinityMask ); } else skip("Cannot test thread affinity mask for 'all processors' flag\n"); proc_affinity = 2; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); proc_affinity = pbi.AffinityMask; ok( proc_affinity == 2, "Unexpected process affinity\n" ); /* Setting the process affinity changes the thread affinity to match */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); /* The thread affinity is restricted to the process affinity */ thread_affinity = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, - "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); proc_affinity = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); } @@ -3061,14 +3062,14 @@ static void test_HideFromDebugger(void) dummy = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); dummy = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 ); - ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status ); status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); if (status == STATUS_INVALID_INFO_CLASS) @@ -3077,32 +3078,32 @@ static void test_HideFromDebugger(void) return; } - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); dummy = 0; status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); + ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy ); stop_event = CreateEventA( NULL, FALSE, FALSE, NULL ); ok( stop_event != NULL, "CreateEvent failed\n" ); thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL ); - ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError() ); + ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError() ); dummy = 0; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); - ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( dummy == 0, "Expected dummy == 0, got %08lx\n", dummy ); status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); dummy = 0; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); - ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy ); SetEvent( stop_event ); WaitForSingleObject( thread, INFINITE ); @@ -3129,41 +3130,41 @@ static void test_NtGetCurrentProcessorNumber(void) GetSystemInfo(&si); current_cpu = pNtGetCurrentProcessorNumber(); - if (winetest_debug > 1) trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu); + if (winetest_debug > 1) trace("dwNumberOfProcessors: %ld, current processor: %ld\n", si.dwNumberOfProcessors, current_cpu); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); old_process_mask = pbi.AffinityMask; - ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status); status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); old_thread_mask = tbi.AffinityMask; - ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status); /* allow the test to run on all processors */ new_mask = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask)); - ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status); for (i = 0; i < si.dwNumberOfProcessors; i++) { new_mask = (DWORD_PTR)1 << i; status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask)); - ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status); status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); - ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status); current_cpu = pNtGetCurrentProcessorNumber(); - ok((current_cpu == i), "%d (new_mask 0x%lx): running on processor %d (AffinityMask: 0x%lx)\n", + ok((current_cpu == i), "%ld (new_mask 0x%Ix): running on processor %ld (AffinityMask: 0x%Ix)\n", i, new_mask, current_cpu, tbi.AffinityMask); } /* restore old values */ status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &old_process_mask, sizeof(old_process_mask)); - ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status); status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &old_thread_mask, sizeof(old_thread_mask)); - ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status); } static void test_ThreadEnableAlignmentFaultFixup(void) @@ -3173,28 +3174,28 @@ static void test_ThreadEnableAlignmentFaultFixup(void) dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); dummy = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 ); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status ); status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 ); - todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status ); status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); - todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status ); + todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08lx\n", status ); dummy = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status ); dummy = 0; status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); } static DWORD WINAPI start_address_thread(void *arg) @@ -3207,8 +3208,8 @@ static DWORD WINAPI start_address_thread(void *arg) ret = 0xdeadbeef; status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry), &ret); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret); ok(entry == (void *)start_address_thread, "expected %p, got %p\n", start_address_thread, entry); return 0; } @@ -3231,8 +3232,8 @@ static void test_thread_start_address(void) ret = 0xdeadbeef; status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry), &ret); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret); expected_entry = (void *)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); ok(entry == expected_entry, "expected %p, got %p\n", expected_entry, entry); @@ -3240,7 +3241,7 @@ static void test_thread_start_address(void) status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry)); ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, /* >= Vista */ - "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08x\n", status); + "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08lx\n", status); if (status == STATUS_SUCCESS) { @@ -3248,15 +3249,15 @@ static void test_thread_start_address(void) ret = 0xdeadbeef; status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry), &ret); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); + ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret); ok(entry == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", entry); } thread = CreateThread(NULL, 0, start_address_thread, NULL, 0, NULL); - ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError()); ret = WaitForSingleObject(thread, 1000); - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %lu\n", ret); CloseHandle(thread); } @@ -3268,12 +3269,12 @@ static void test_query_data_alignment(void) value = 0xdeadbeef; status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok(sizeof(value) == ReturnLength, "Inconsistent length %lu\n", ReturnLength); #ifdef __arm__ ok(value == 32, "Expected 32, got %u\n", value); #else - ok(value == 64, "Expected 64, got %u\n", value); + ok(value == 64, "Expected 64, got %lu\n", value); #endif } @@ -3290,34 +3291,34 @@ static void test_thread_lookup(void) cid.UniqueProcess = ULongToHandle(GetCurrentProcessId()); cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); - ok(!status, "NtOpenThread returned %#x\n", status); + ok(!status, "NtOpenThread returned %#lx\n", status); status = pNtOpenThread((HANDLE *)0xdeadbee0, THREAD_QUERY_INFORMATION, &attr, &cid); - ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#x\n", status); + ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#lx\n", status); status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL); - ok(!status, "NtQueryObject returned: %#x\n", status); + ok(!status, "NtQueryObject returned: %#lx\n", status); ok(obj_info.GrantedAccess == (THREAD_QUERY_LIMITED_INFORMATION | THREAD_QUERY_INFORMATION) || broken(obj_info.GrantedAccess == THREAD_QUERY_INFORMATION), /* winxp */ - "GrantedAccess = %x\n", obj_info.GrantedAccess); + "GrantedAccess = %lx\n", obj_info.GrantedAccess); status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); - ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(!status, "NtQueryInformationThread returned %#lx\n", status); ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), - "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), - "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId()); pNtClose(handle); cid.UniqueProcess = 0; cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); - ok(!status, "NtOpenThread returned %#x\n", status); + ok(!status, "NtOpenThread returned %#lx\n", status); status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); - ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(!status, "NtQueryInformationThread returned %#lx\n", status); ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), - "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), - "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId()); pNtClose(handle); cid.UniqueProcess = ULongToHandle(0xdeadbeef); @@ -3325,7 +3326,7 @@ static void test_thread_lookup(void) handle = (HANDLE)0xdeadbeef; status = NtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); todo_wine - ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#x\n", status); + ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#lx\n", status); todo_wine ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle ); if (!status) pNtClose(handle); @@ -3335,7 +3336,7 @@ static void test_thread_lookup(void) handle = (HANDLE)0xdeadbeef; status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */, - "NtOpenThread returned %#x\n", status); + "NtOpenThread returned %#lx\n", status); ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle ); } @@ -3348,25 +3349,25 @@ static void test_thread_info(void) data = 0xcccccccc; status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &data, sizeof(data), &len ); - ok( !status, "failed %x\n", status ); - ok( data == 0 || data == 1, "wrong data %x\n", data ); - ok( len == sizeof(data), "wrong len %u\n", len ); + ok( !status, "failed %lx\n", status ); + ok( data == 0 || data == 1, "wrong data %lx\n", data ); + ok( len == sizeof(data), "wrong len %lu\n", len ); len = 0xdeadbeef; data = 0xcccccccc; status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &data, sizeof(data) - 1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); - ok( data == 0xcccccccc, "wrong data %x\n", data ); - ok( len == 0xdeadbeef, "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status ); + ok( data == 0xcccccccc, "wrong data %lx\n", data ); + ok( len == 0xdeadbeef, "wrong len %lu\n", len ); len = 0xdeadbeef; data = 0xcccccccc; status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &data, sizeof(data) + 1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status ); - ok( data == 0xcccccccc, "wrong data %x\n", data ); - ok( len == 0xdeadbeef, "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status ); + ok( data == 0xcccccccc, "wrong data %lx\n", data ); + ok( len == 0xdeadbeef, "wrong len %lu\n", len ); } static void test_debug_object(void) @@ -3379,44 +3380,44 @@ static void test_debug_object(void) DEBUG_EVENT event; status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); status = pNtSetInformationDebugObject( handle, 0, &flag, sizeof(ULONG), &len ); - ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status ); status = pNtSetInformationDebugObject( handle, 2, &flag, sizeof(ULONG), &len ); - ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status ); status = pNtSetInformationDebugObject( (HANDLE)0xdead, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG), &len ); - ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %lx\n", status ); len = 0xdead; status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG) + 1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status ); - ok( len == sizeof(ULONG), "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status ); + ok( len == sizeof(ULONG), "wrong len %lu\n", len ); len = 0xdead; status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG) - 1, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status ); - ok( len == sizeof(ULONG), "wrong len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status ); + ok( len == sizeof(ULONG), "wrong len %lu\n", len ); len = 0xdead; status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG), &len ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); - ok( !len, "wrong len %u\n", len ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); + ok( !len, "wrong len %lu\n", len ); flag = DEBUG_KILL_ON_CLOSE; status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG), &len ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); - ok( !len, "wrong len %u\n", len ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); + ok( !len, "wrong len %lu\n", len ); for (flag = 2; flag; flag <<= 1) { status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation, &flag, sizeof(ULONG), &len ); - ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status ); } pNtClose( handle ); @@ -3425,39 +3426,39 @@ static void test_debug_object(void) state.NewState = DbgIdle; memset( &event, 0xcc, sizeof(event) ); status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); + ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); state.NewState = DbgReplyPending; memset( &event, 0xcc, sizeof(event) ); status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); + ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); state.NewState = 11; memset( &event, 0xcc, sizeof(event) ); status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); + ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); state.NewState = DbgExitProcessStateChange; state.StateInfo.ExitProcess.ExitStatus = 0x123456; status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); - ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %x\n", event.u.ExitProcess.dwExitCode ); + ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); + ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %lx\n", event.u.ExitProcess.dwExitCode ); memset( &state, 0xdd, sizeof(state) ); state.NewState = DbgCreateProcessStateChange; status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); - ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.CreateProcessInfo.nDebugInfoSize ); + ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); + ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.CreateProcessInfo.nDebugInfoSize ); ok( event.u.CreateProcessInfo.lpThreadLocalBase == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpThreadLocalBase ); ok( event.u.CreateProcessInfo.lpImageName == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpImageName ); ok( event.u.CreateProcessInfo.fUnicode == TRUE, "event not updated %x\n", event.u.CreateProcessInfo.fUnicode ); @@ -3465,10 +3466,10 @@ static void test_debug_object(void) memset( &state, 0xdd, sizeof(state) ); state.NewState = DbgLoadDllStateChange; status = pDbgUiConvertStateChangeStructure( &state, &event ); - ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status ); - ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId ); - ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId ); - ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.LoadDll.nDebugInfoSize ); + ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status ); + ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId ); + ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId ); + ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.LoadDll.nDebugInfoSize ); ok( PtrToUlong(event.u.LoadDll.lpImageName) == 0xdddddddd, "event not updated %p\n", event.u.LoadDll.lpImageName ); ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode ); } @@ -3480,7 +3481,7 @@ static void test_process_instrumentation_callback(void) status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 ); ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS - || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status ); + || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#lx.\n", status ); if (status != STATUS_INFO_LENGTH_MISMATCH) { win_skip( "ProcessInstrumentationCallback is not supported.\n" ); @@ -3490,13 +3491,13 @@ static void test_process_instrumentation_callback(void) memset(&info, 0, sizeof(info)); status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) ); ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD ) - || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status ); + || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#lx.\n", status ); memset(&info, 0, sizeof(info)); status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) ); ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH || broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */, - "Got unexpected status %#x.\n", status ); + "Got unexpected status %#lx.\n", status ); } static void test_debuggee_dbgport(int argc, char **argv) @@ -3514,21 +3515,21 @@ static void test_debuggee_dbgport(int argc, char **argv) } access = strtoul(argv[1], NULL, 0); - winetest_push_context("debug object access %08x", access); + winetest_push_context("debug object access %08lx", access); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port), NULL ); - ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status ); - ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port ); + ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#lx.\n", status ); + ok( debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port ); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL ); - ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status ); + ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#lx.\n", status ); expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle, &handle, sizeof(handle), NULL ); - ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status ); + ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#lx, actual %#lx.\n", expect_status, status ); if (SUCCEEDED( status )) NtClose( handle ); winetest_pop_context();

2 1

[PATCH] dlls/ntdll/tests/om.c: enable compilation with long types
by Eric Pouech 19 Mar '22

19 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/om.c | 789 +++++++++++++++++++++++++------------------------ 1 file changed, 395 insertions(+), 394 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index f872d6709a1..946f54523b3 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" #include "winternl.h" @@ -88,37 +89,37 @@ static void test_case_sensitive (void) pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status); status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#lx\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Test"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); - ok(status == STATUS_SUCCESS, "Failed to create Event(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create Event(%08lx)\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\TEst"); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenMutant(&h, GENERIC_ALL, &attr); ok(status == STATUS_OBJECT_TYPE_MISMATCH, - "NtOpenMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); + "NtOpenMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); pNtClose(Mutant); pRtlInitUnicodeString(&str, L"\\BASENamedObjects\\test"); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#lx\n", status); status = pNtCreateEvent(&h, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, - "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); + "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08lx)\n", status); attr.Attributes = 0; status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); pNtClose(Event); } @@ -138,17 +139,17 @@ static void test_namespace_pipe(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateNamedPipeFile((HANDLE *)0xdeadbee0, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); - ok(status == STATUS_ACCESS_VIOLATION, "Failed to create NamedPipe(%08x)\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Failed to create NamedPipe(%08lx)\n", status); status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); - ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08lx)\n", status); h = (HANDLE)0xdeadbeef; status = pNtCreateNamedPipeFile(&h, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); ok(status == STATUS_INSTANCE_NOT_AVAILABLE, - "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08x)\n", status); + "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h ); pRtlInitUnicodeString(&str, L"\\??\\PIPE\\TEST\\PIPE"); @@ -157,12 +158,12 @@ static void test_namespace_pipe(void) status = pNtCreateNamedPipeFile(&h, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); ok(status == STATUS_INSTANCE_NOT_AVAILABLE, - "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08x)\n", status); + "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h ); h = CreateFileA("\\\\.\\pipe\\test\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%lu)\n", GetLastError()); pNtClose(h); pRtlInitUnicodeString(&str, L"\\??\\pipe\\test\\pipe"); @@ -173,7 +174,7 @@ static void test_namespace_pipe(void) status == STATUS_PIPE_NOT_AVAILABLE || status == STATUS_OBJECT_NAME_INVALID || /* vista */ status == STATUS_OBJECT_NAME_NOT_FOUND, /* win8 */ - "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); + "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h ); pRtlInitUnicodeString(&str, L"\\??\\pipe\\test"); @@ -182,17 +183,17 @@ static void test_namespace_pipe(void) status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); ok(status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID, /* vista */ - "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); + "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08lx)\n", status); ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h ); str.Length -= 4 * sizeof(WCHAR); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); - ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08lx\n", status); pNtClose( h ); str.Length -= sizeof(WCHAR); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); - ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status); + ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08lx\n", status); pNtClose( h ); pNtClose(pipe); @@ -209,11 +210,11 @@ static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name, RtlInitUnicodeString( &str, name ); InitializeObjectAttributes( &attr, &str, 0, parent, NULL ); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08x\n", debugstr_w(name), status ); + ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08lx\n", debugstr_w(name), status ); if (!status) pNtClose( h ); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08x\n", debugstr_w(name), status ); + ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08lx\n", debugstr_w(name), status ); if (!status) pNtClose( h ); } @@ -242,13 +243,13 @@ static HANDLE get_base_dir(void) WCHAR name[40]; h = CreateMutexW( NULL, FALSE, objname ); - ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateMutexA failed got ret=%p (%ld)\n", h, GetLastError()); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); swprintf( name, ARRAY_SIZE(name), L"\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); RtlInitUnicodeString( &str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); ok(is_correct_dir( dir, objname ), "wrong dir\n"); pNtClose( h ); @@ -267,86 +268,86 @@ static void test_name_collisions(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L"\\"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateDirectoryObject got %08lx\n", status ); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_EXISTS, "NtCreateDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_EXISTS, "NtCreateDirectoryObject got %08lx\n", status ); pNtClose(h); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); + "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); RtlInitUnicodeString(&str, L"\\??\\PIPE\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status); dir = get_base_dir(); RtlInitUnicodeString(&str, L"om.c-test"); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); h = CreateMutexA(NULL, FALSE, "om.c-test"); - ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateMutexA failed got ret=%p (%ld)\n", h, GetLastError()); status = pNtCreateMutant(&h1, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, - "NtCreateMutant should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); + "NtCreateMutant should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); h2 = CreateMutexA(NULL, FALSE, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, - "CreateMutexA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); + "CreateMutexA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); pNtClose(h); pNtClose(h1); pNtClose(h2); h = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); - ok(h != 0, "CreateEventA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateEventA failed got ret=%p (%ld)\n", h, GetLastError()); status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, - "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); + "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, - "CreateEventA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); + "CreateEventA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); pNtClose(h); pNtClose(h1); pNtClose(h2); h = CreateSemaphoreA(NULL, 1, 2, "om.c-test"); - ok(h != 0, "CreateSemaphoreA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateSemaphoreA failed got ret=%p (%ld)\n", h, GetLastError()); status = pNtCreateSemaphore(&h1, GENERIC_ALL, &attr, 1, 2); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, - "NtCreateSemaphore should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); + "NtCreateSemaphore should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); h2 = CreateSemaphoreA(NULL, 1, 2, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, - "CreateSemaphoreA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); + "CreateSemaphoreA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); pNtClose(h); pNtClose(h1); pNtClose(h2); h = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); - ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%ld)\n", h, GetLastError()); status = pNtCreateTimer(&h1, GENERIC_ALL, &attr, NotificationTimer); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, - "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); + "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); h2 = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, - "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); + "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); pNtClose(h); pNtClose(h1); pNtClose(h2); h = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test"); - ok(h != 0, "CreateFileMappingA failed got ret=%p (%d)\n", h, GetLastError()); + ok(h != 0, "CreateFileMappingA failed got ret=%p (%ld)\n", h, GetLastError()); size.u.LowPart = 256; size.u.HighPart = 0; status = pNtCreateSection(&h1, SECTION_MAP_WRITE, &attr, &size, PAGE_READWRITE, SEC_COMMIT, 0); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, - "NtCreateSection should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); + "NtCreateSection should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); h2 = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, - "CreateFileMappingA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); + "CreateFileMappingA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); pNtClose(h); pNtClose(h1); pNtClose(h2); @@ -367,9 +368,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateMutant( &ret, GENERIC_ALL, attr, FALSE ); - ok( status == create_expect, "%u: NtCreateMutant failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateMutant failed %lx\n", line, status ); status2 = pNtOpenMutant( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenMutant failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenMutant failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateMutant handle %p\n", line, ret ); @@ -379,9 +380,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateSemaphore( &ret, GENERIC_ALL, attr, 1, 2 ); - ok( status == create_expect, "%u: NtCreateSemaphore failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateSemaphore failed %lx\n", line, status ); status2 = pNtOpenSemaphore( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenSemaphore failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenSemaphore failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSemaphore handle %p\n", line, ret ); @@ -392,15 +393,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, status = pNtCreateSemaphore( &ret, GENERIC_ALL, attr, 2, 1 ); ok( status == STATUS_INVALID_PARAMETER || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateSemaphore failed %x\n", line, status ); + "%u: NtCreateSemaphore failed %lx\n", line, status ); ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSemaphore handle %p\n", line, ret ); ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateEvent( &ret, GENERIC_ALL, attr, SynchronizationEvent, 0 ); - ok( status == create_expect, "%u: NtCreateEvent failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateEvent failed %lx\n", line, status ); status2 = pNtOpenEvent( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenEvent failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenEvent failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateEvent handle %p\n", line, ret ); @@ -411,15 +412,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, status = pNtCreateEvent( &ret, GENERIC_ALL, attr, 2, 0 ); ok( status == STATUS_INVALID_PARAMETER || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateEvent failed %x\n", line, status ); + "%u: NtCreateEvent failed %lx\n", line, status ); ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateEvent handle %p\n", line, ret ); ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, attr, 0 ); - ok( status == create_expect, "%u: NtCreateKeyedEvent failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateKeyedEvent failed %lx\n", line, status ); status2 = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenKeyedEvent failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenKeyedEvent failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateKeyedEvent handle %p\n", line, ret ); @@ -429,9 +430,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateTimer( &ret, GENERIC_ALL, attr, NotificationTimer ); - ok( status == create_expect, "%u: NtCreateTimer failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateTimer failed %lx\n", line, status ); status2 = pNtOpenTimer( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenTimer failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenTimer failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateTimer handle %p\n", line, ret ); @@ -442,15 +443,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, status = pNtCreateTimer( &ret, GENERIC_ALL, attr, 2 ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_4 || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateTimer failed %x\n", line, status ); + "%u: NtCreateTimer failed %lx\n", line, status ); ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateTimer handle %p\n", line, ret ); ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateIoCompletion( &ret, GENERIC_ALL, attr, 0 ); - ok( status == create_expect, "%u: NtCreateIoCompletion failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateIoCompletion failed %lx\n", line, status ); status2 = pNtOpenIoCompletion( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenIoCompletion failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenIoCompletion failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateIoCompletion handle %p\n", line, ret ); @@ -460,9 +461,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateJobObject( &ret, GENERIC_ALL, attr ); - ok( status == create_expect, "%u: NtCreateJobObject failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateJobObject failed %lx\n", line, status ); status2 = pNtOpenJobObject( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenJobObject failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenJobObject failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateJobObject handle %p\n", line, ret ); @@ -472,9 +473,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, attr ); - ok( status == create_expect, "%u: NtCreateDirectoryObject failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateDirectoryObject failed %lx\n", line, status ); status2 = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenDirectoryObject failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenDirectoryObject failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateDirectoryObject handle %p\n", line, ret ); @@ -484,9 +485,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, attr, &target ); - ok( status == create_expect, "%u: NtCreateSymbolicLinkObject failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateSymbolicLinkObject failed %lx\n", line, status ); status2 = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, attr ); - ok( status2 == open_expect, "%u: NtOpenSymbolicLinkObject failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenSymbolicLinkObject failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSymbolicLinkObject handle %p\n", line, ret ); @@ -498,15 +499,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, attr, &target ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_4 || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateSymbolicLinkObject failed %x\n", line, status ); + "%u: NtCreateSymbolicLinkObject failed %lx\n", line, status ); ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSymbolicLinkObject handle %p\n", line, ret ); ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateSection( &ret, SECTION_MAP_WRITE, attr, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); - ok( status == create_expect, "%u: NtCreateSection failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateSection failed %lx\n", line, status ); status2 = pNtOpenSection( &ret2, SECTION_MAP_WRITE, attr ); - ok( status2 == open_expect, "%u: NtOpenSection failed %x\n", line, status2 ); + ok( status2 == open_expect, "%u: NtOpenSection failed %lx\n", line, status2 ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSection handle %p\n", line, ret ); @@ -517,20 +518,20 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, status = pNtCreateSection( &ret, SECTION_MAP_WRITE, attr, &size, 0x1234, SEC_COMMIT, 0 ); ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PAGE_PROTECTION || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateSection failed %x\n", line, status ); + "%u: NtCreateSection failed %lx\n", line, status ); ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateSection handle %p\n", line, ret ); ret = ret2 = (HANDLE)0xdeadbeef; status = pNtCreateDebugObject( &ret, DEBUG_ALL_ACCESS, attr, 0 ); - ok( status == create_expect, "%u: NtCreateDebugObject failed %x\n", line, status ); + ok( status == create_expect, "%u: NtCreateDebugObject failed %lx\n", line, status ); if (!status) pNtClose( ret ); else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateDebugObject handle %p\n", line, ret ); status = pNtCreateDebugObject( &ret2, DEBUG_ALL_ACCESS, attr, 0xdead ); ok( status == STATUS_INVALID_PARAMETER || (status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION), - "%u: NtCreateDebugObject failed %x\n", line, status ); + "%u: NtCreateDebugObject failed %lx\n", line, status ); ok( !ret2 || broken( ret2 == (HANDLE)0xdeadbeef ) /* vista */, "%u: NtCreateDebugObject handle %p\n", line, ret ); } @@ -560,96 +561,96 @@ static void test_name_limits(void) attr.RootDirectory = get_base_dir(); str.Length = 0; status = pNtCreateMutant( &ret, GENERIC_ALL, &attr2, FALSE ); - ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %lx\n", str.Length, status ); status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenMutant failed %x\n", str.Length, status ); + "%u: NtOpenMutant failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateSemaphore( &ret, GENERIC_ALL, &attr2, 1, 2 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateSemaphore failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateSemaphore failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %lx\n", str.Length, status ); status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenSemaphore failed %x\n", str.Length, status ); + "%u: NtOpenSemaphore failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, SynchronizationEvent, 0 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %lx\n", str.Length, status ); status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenEvent failed %x\n", str.Length, status ); + "%u: NtOpenEvent failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, &attr2, 0 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateKeyedEvent failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateKeyedEvent failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %lx\n", str.Length, status ); status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); + "%u: NtOpenKeyedEvent failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateTimer( &ret, GENERIC_ALL, &attr2, NotificationTimer ); - ok( status == STATUS_SUCCESS, "%u: NtCreateTimer failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateTimer failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %lx\n", str.Length, status ); status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenTimer failed %x\n", str.Length, status ); + "%u: NtOpenTimer failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateIoCompletion( &ret, GENERIC_ALL, &attr2, 0 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateCompletion failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateCompletion failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %lx\n", str.Length, status ); status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenCompletion failed %x\n", str.Length, status ); + "%u: NtOpenCompletion failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateJobObject( &ret, GENERIC_ALL, &attr2 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateJobObject failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateJobObject failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %lx\n", str.Length, status ); status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenJobObject failed %x\n", str.Length, status ); + "%u: NtOpenJobObject failed %lx\n", str.Length, status ); pNtClose( ret ); status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, &attr2 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateDirectoryObject failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateDirectoryObject failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_SUCCESS || broken(status == STATUS_ACCESS_DENIED), /* winxp */ - "%u: NtOpenDirectoryObject failed %x\n", str.Length, status ); + "%u: NtOpenDirectoryObject failed %lx\n", str.Length, status ); if (!status) pNtClose( ret2 ); status = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_SUCCESS, "%u: NtOpenDirectoryObject failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtOpenDirectoryObject failed %lx\n", str.Length, status ); pNtClose( ret2 ); pNtClose( ret ); status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, &attr2, &target ); - ok( status == STATUS_SUCCESS, "%u: NtCreateSymbolicLinkObject failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateSymbolicLinkObject failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %lx\n", str.Length, status ); status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %lx\n", str.Length, status ); pNtClose( ret2 ); pNtClose( ret ); status = pNtCreateSection( &ret, SECTION_MAP_WRITE, &attr2, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); - ok( status == STATUS_SUCCESS, "%u: NtCreateSection failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateSection failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %lx\n", str.Length, status ); status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr3 ); ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, - "%u: NtOpenSection failed %x\n", str.Length, status ); + "%u: NtOpenSection failed %lx\n", str.Length, status ); pNtClose( ret ); str.Length = 67; @@ -692,132 +693,132 @@ static void test_name_limits(void) attr3.ObjectName = &str2; pRtlInitUnicodeString( &str2, L"\\BaseNamedObjects\\Local" ); status = pNtOpenSymbolicLinkObject( &ret, SYMBOLIC_LINK_QUERY, &attr3 ); - ok( status == STATUS_SUCCESS, "can't open BaseNamedObjects\\Local %x\n", status ); + ok( status == STATUS_SUCCESS, "can't open BaseNamedObjects\\Local %lx\n", status ); attr3.ObjectName = &str; attr3.RootDirectory = ret; test_all_kernel_objects( __LINE__, &attr3, STATUS_OBJECT_TYPE_MISMATCH, STATUS_OBJECT_TYPE_MISMATCH ); pNtClose( attr3.RootDirectory ); status = pNtCreateMutant( &ret, GENERIC_ALL, NULL, FALSE ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateMutant failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateMutant failed %lx\n", status ); pNtClose( ret ); status = pNtCreateMutant( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, FALSE ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateMutant failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateMutant failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenMutant( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenMutant failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenMutant failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenMutant( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenMutant failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenMutant failed %lx\n", status ); status = pNtCreateSemaphore( &ret, GENERIC_ALL, NULL, 1, 2 ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateSemaphore failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateSemaphore failed %lx\n", status ); pNtClose( ret ); status = pNtCreateSemaphore( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 1, 2 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSemaphore failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSemaphore failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenSemaphore( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenSemaphore( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSemaphore failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSemaphore failed %lx\n", status ); status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, SynchronizationEvent, 0 ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %lx\n", status ); pNtClose( ret ); status = pNtCreateEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, SynchronizationEvent, 0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateEvent failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateEvent failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenEvent( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenEvent failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenEvent failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenEvent failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenEvent failed %lx\n", status ); status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, NULL, 0 ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateKeyedEvent failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateKeyedEvent failed %lx\n", status ); pNtClose( ret ); status = pNtCreateKeyedEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKeyedEvent failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKeyedEvent failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenKeyedEvent( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenKeyedEvent failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenKeyedEvent failed %lx\n", status ); ok( !ret, "handle set %p\n", ret ); status = pNtOpenKeyedEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKeyedEvent failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKeyedEvent failed %lx\n", status ); status = pNtCreateTimer( &ret, GENERIC_ALL, NULL, NotificationTimer ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateTimer failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateTimer failed %lx\n", status ); pNtClose( ret ); status = pNtCreateTimer( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, NotificationTimer ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateTimer failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateTimer failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenTimer( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenTimer failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenTimer failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenTimer( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenTimer failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenTimer failed %lx\n", status ); status = pNtCreateIoCompletion( &ret, GENERIC_ALL, NULL, 0 ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateCompletion failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateCompletion failed %lx\n", status ); pNtClose( ret ); status = pNtCreateIoCompletion( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateCompletion failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateCompletion failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenIoCompletion( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenCompletion failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenCompletion failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenIoCompletion( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenCompletion failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenCompletion failed %lx\n", status ); status = pNtCreateJobObject( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateJobObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateJobObject failed %lx\n", status ); pNtClose( ret ); status = pNtCreateJobObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateJobObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateJobObject failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenJobObject( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenJobObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenJobObject failed %lx\n", status ); ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret ); status = pNtOpenJobObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenJobObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenJobObject failed %lx\n", status ); status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateDirectoryObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateDirectoryObject failed %lx\n", status ); pNtClose( ret ); status = pNtCreateDirectoryObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateDirectoryObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateDirectoryObject failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenDirectoryObject( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenDirectoryObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenDirectoryObject failed %lx\n", status ); ok( !ret, "handle set %p\n", ret ); status = pNtOpenDirectoryObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenDirectoryObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenDirectoryObject failed %lx\n", status ); status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, NULL, &target ); ok( status == STATUS_ACCESS_VIOLATION || broken( status == STATUS_SUCCESS), /* winxp */ - "NULL: NtCreateSymbolicLinkObject failed %x\n", status ); + "NULL: NtCreateSymbolicLinkObject failed %lx\n", status ); if (!status) pNtClose( ret ); status = pNtCreateSymbolicLinkObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, &target ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSymbolicLinkObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSymbolicLinkObject failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenSymbolicLinkObject( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSymbolicLinkObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSymbolicLinkObject failed %lx\n", status ); ok( !ret, "handle set %p\n", ret ); status = pNtOpenSymbolicLinkObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSymbolicLinkObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSymbolicLinkObject failed %lx\n", status ); status = pNtCreateSection( &ret, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); - ok( status == STATUS_SUCCESS, "NULL: NtCreateSection failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NULL: NtCreateSection failed %lx\n", status ); pNtClose( ret ); status = pNtCreateSection( (HANDLE *)0xdeadbee0, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSection failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSection failed %lx\n", status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenSection( &ret, SECTION_MAP_WRITE, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSection failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSection failed %lx\n", status ); ok( !ret, "handle set %p\n", ret ); status = pNtOpenSection( (HANDLE *)0xdeadbee0, SECTION_MAP_WRITE, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSection failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSection failed %lx\n", status ); attr2.ObjectName = attr3.ObjectName = &str; /* named pipes */ @@ -829,14 +830,14 @@ static void test_name_limits(void) timeout.QuadPart = -10000; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); str.Length = 67; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); str.Length = 128; for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) { @@ -844,33 +845,33 @@ static void test_name_limits(void) FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); if (attr.Length == sizeof(attr)) { - ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); pNtClose( ret ); } else ok( status == STATUS_INVALID_PARAMETER, - "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); } attr.Length = sizeof(attr); str.Length = 65532; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); pNtClose( ret ); str.Length = 65534; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status ); attr3.RootDirectory = 0; attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateNamedPipeFile failed %x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateNamedPipeFile failed %lx\n", status ); status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr3, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateNamedPipeFile failed %x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateNamedPipeFile failed %lx\n", status ); status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, NULL, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateNamedPipeFile failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateNamedPipeFile failed %lx\n", status ); attr2.ObjectName = attr3.ObjectName = &str; /* mailslots */ @@ -878,40 +879,40 @@ static void test_name_limits(void) for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + wcslen( mailslotW )] = 'a'; str.Length = 0; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); str.Length = 67; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); str.Length = 128; for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) { status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); if (attr.Length == sizeof(attr)) { - ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); pNtClose( ret ); } else ok( status == STATUS_INVALID_PARAMETER, - "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); } attr.Length = sizeof(attr); str.Length = 65532; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); pNtClose( ret ); str.Length = 65534; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status ); attr3.RootDirectory = 0; attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateMailslotFile failed %x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateMailslotFile failed %lx\n", status ); status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr3, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateMailslotFile failed %x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateMailslotFile failed %lx\n", status ); status = pNtCreateMailslotFile( &ret, GENERIC_ALL, NULL, &iosb, 0, 0, 0, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateMailslotFile failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateMailslotFile failed %lx\n", status ); attr2.ObjectName = attr3.ObjectName = &str; /* registry keys */ @@ -920,17 +921,17 @@ static void test_name_limits(void) str.Length = 0; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); todo_wine - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); - ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 ); - ok( status == STATUS_INVALID_HANDLE, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_HANDLE, "%u: NtOpenKey failed %lx\n", str.Length, status ); str.Length = (wcslen( registryW ) + 250) * sizeof(WCHAR) + 1; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_INVALID_PARAMETER || broken( status == STATUS_SUCCESS ), /* wow64 */ - "%u: NtCreateKey failed %x\n", str.Length, status ); + "%u: NtCreateKey failed %lx\n", str.Length, status ); if (!status) { pNtDeleteKey( ret ); @@ -939,20 +940,20 @@ static void test_name_limits(void) str.Length = (wcslen( registryW ) + 256) * sizeof(WCHAR); status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, - "%u: NtCreateKey failed %x\n", str.Length, status ); + "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtCreateKey( (HANDLE *)0xdeadbee0, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_ACCESS_VIOLATION, "%u: NtCreateKey failed %lx\n", str.Length, status ); if (!status) { status = pNtOpenKey( &ret2, KEY_READ, &attr ); - ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status ); pNtClose( ret2 ); status = pNtOpenKey( (HANDLE *)0xdeadbee0, KEY_READ, &attr ); - ok( status == STATUS_ACCESS_VIOLATION, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_ACCESS_VIOLATION, "%u: NtOpenKey failed %lx\n", str.Length, status ); attr3.RootDirectory = ret; str.Length = 0; status = pNtOpenKey( &ret2, KEY_READ, &attr3 ); - ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status ); pNtClose( ret2 ); pNtDeleteKey( ret ); pNtClose( ret ); @@ -963,9 +964,9 @@ static void test_name_limits(void) if (attr.Length == sizeof(attr)) { status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtOpenKey( &ret2, KEY_READ, &attr ); - ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status ); pNtClose( ret2 ); pNtDeleteKey( ret ); pNtClose( ret ); @@ -973,9 +974,9 @@ static void test_name_limits(void) else { status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtOpenKey( &ret2, KEY_READ, &attr ); - ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status ); } } attr.Length = sizeof(attr); @@ -985,7 +986,7 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_INVALID_PARAMETER || broken( status == STATUS_SUCCESS ), /* win7 */ - "%u: NtCreateKey failed %x\n", str.Length, status ); + "%u: NtCreateKey failed %lx\n", str.Length, status ); if (!status) { pNtDeleteKey( ret ); @@ -995,33 +996,33 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_INVALID_PARAMETER || broken( status == STATUS_OBJECT_NAME_NOT_FOUND ), /* wow64 */ - "%u: NtOpenKey failed %x\n", str.Length, status ); + "%u: NtOpenKey failed %lx\n", str.Length, status ); str.Length++; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr ); todo_wine - ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status ); str.Length = 2000; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr ); todo_wine - ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status ); /* some Windows versions change the error past 2050 chars, others past 4066 chars, some don't */ str.Length = 5000; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); ok( status == STATUS_BUFFER_OVERFLOW || status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, - "%u: NtCreateKey failed %x\n", str.Length, status ); + "%u: NtCreateKey failed %lx\n", str.Length, status ); ret = (HANDLE)0xdeadbeef; status = pNtOpenKey( &ret, GENERIC_ALL, &attr ); todo_wine ok( status == STATUS_BUFFER_OVERFLOW || status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, - "%u: NtOpenKey failed %x\n", str.Length, status ); + "%u: NtOpenKey failed %lx\n", str.Length, status ); ok( !ret, "handle set %p\n", ret ); str.Length = 65534; ret = (HANDLE)0xdeadbeef; @@ -1029,7 +1030,7 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_BUFFER_OVERFLOW || status == STATUS_BUFFER_TOO_SMALL, - "%u: NtCreateKey failed %x\n", str.Length, status ); + "%u: NtCreateKey failed %lx\n", str.Length, status ); ok( !ret, "handle set %p\n", ret ); ret = (HANDLE)0xdeadbeef; status = pNtOpenKey( &ret, GENERIC_ALL, &attr ); @@ -1037,26 +1038,26 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_BUFFER_OVERFLOW || status == STATUS_BUFFER_TOO_SMALL, - "%u: NtOpenKey failed %x\n", str.Length, status ); + "%u: NtOpenKey failed %lx\n", str.Length, status ); ok( !ret, "handle set %p\n", ret ); attr3.RootDirectory = 0; attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); todo_wine ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, - "NULL: NtCreateKey failed %x\n", status ); + "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL ); todo_wine - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 ); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, - "NULL: NtOpenKey failed %x\n", status ); + "NULL: NtOpenKey failed %lx\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr3 ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %lx\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %lx\n", status ); attr2.ObjectName = attr3.ObjectName = &str; HeapFree( GetProcessHeap(), 0, str.Buffer ); @@ -1073,32 +1074,32 @@ static void test_directory(void) /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#lx\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#lx\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); - ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08lx)\n", status); pNtClose(h); status = pNtOpenDirectoryObject(&h, DIRECTORY_QUERY, NULL); ok(status == STATUS_INVALID_PARAMETER, - "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); + "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status ); /* Bad name */ InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L""); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); pNtClose(h); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status ); pNtClose(dir); check_create_open_dir( NULL, L"BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD ); @@ -1109,9 +1110,9 @@ static void test_directory(void) RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); status = pNtOpenDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status ); pNtClose(h); pNtClose(dir1); @@ -1123,36 +1124,36 @@ static void test_directory(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); - ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"one more level"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08lx\n", status ); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\Local\\om.c-test" ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); RtlInitUnicodeString( &str, L"om.c-test" ); InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08lx\n", status ); RtlInitUnicodeString( &str, L"om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); status = pNtCreateEvent( &h, GENERIC_ALL, &attr, SynchronizationEvent, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %lx\n", status ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %lx\n", status ); pNtClose( h2 ); RtlInitUnicodeString( &str, L"om.c-test\\om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %lx\n", status ); RtlInitUnicodeString( &str, L"\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %lx\n", status ); pNtClose( h ); pNtClose( dir1 ); @@ -1161,33 +1162,33 @@ static void test_directory(void) len = 0xdeadbeef; memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status ); full_len = str.Length + sizeof(WCHAR); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( len == full_len, "bad length %lu/%lu\n", len, full_len ); ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); str.MaximumLength = str.Length; str.Length = 0x4444; len = 0xdeadbeef; status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08lx\n", status ); + ok( len == full_len, "bad length %lu/%lu\n", len, full_len ); ok( str.Length == 0x4444, "len set to %x\n", str.Length ); str.MaximumLength = 0; str.Length = 0x4444; len = 0xdeadbeef; status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08lx\n", status ); + ok( len == full_len, "bad length %lu/%lu\n", len, full_len ); ok( str.Length == 0x4444, "len set to %x\n", str.Length ); str.MaximumLength = full_len; str.Length = 0x4444; len = 0xdeadbeef; status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status ); + ok( len == full_len, "bad length %lu/%lu\n", len, full_len ); ok( str.Length == full_len - sizeof(WCHAR), "len set to %x\n", str.Length ); pNtClose(dir); @@ -1195,11 +1196,11 @@ static void test_directory(void) RtlInitUnicodeString(&str, L"\\BaseNamedObjects"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status ); InitializeObjectAttributes(&attr, NULL, 0, dir, NULL); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08lx\n", status ); check_create_open_dir( dir, L"", STATUS_SUCCESS ); check_create_open_dir( dir, L"\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); @@ -1210,9 +1211,9 @@ static void test_directory(void) InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"om.c-test"); status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status ); pNtClose(h); pNtClose(dir1); @@ -1222,24 +1223,24 @@ static void test_directory(void) RtlInitUnicodeString(&str, L"\\"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status ); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status ); pNtClose(dir); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test"); status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test\\one more level"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); pNtClose(h); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"one more level"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); pNtClose(h); pNtClose(dir); @@ -1247,15 +1248,15 @@ static void test_directory(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Global\\om.c-test"); status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Local\\om.c-test\\one more level"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); pNtClose(h); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"one more level"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status ); pNtClose(h); pNtClose(dir); @@ -1264,27 +1265,27 @@ static void test_directory(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L"\\BaseNamedObjects"); status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status ); + ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status ); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); /* Test invalid paths */ RtlInitUnicodeString(&str, L"\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, - "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); RtlInitUnicodeString(&str, L"\\om.c-mutant\\"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, - "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); RtlInitUnicodeString(&str, L"om.c\\-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); RtlInitUnicodeString(&str, L"om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status); pNtClose(h); pNtClose(dir); @@ -1302,29 +1303,29 @@ static void test_symboliclink(void) InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); RtlInitUnicodeString(&target, L"\\DosDevices"); status = pNtCreateSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status); status = pNtOpenSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr ); - ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status); status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION, - "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); + "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL); ok(status == STATUS_INVALID_PARAMETER, - "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); + "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); /* No attributes */ status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, &target); ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_VIOLATION, /* nt4 */ - "NtCreateSymbolicLinkObject failed(%08x)\n", status); + "NtCreateSymbolicLinkObject failed(%08lx)\n", status); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); memset(&target, 0, sizeof(target)); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, - "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); + "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); /* Bad name */ RtlInitUnicodeString(&target, L"anywhere"); @@ -1332,48 +1333,48 @@ static void test_symboliclink(void) RtlInitUnicodeString(&str, L""); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08lx)\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, - "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); + "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); pNtClose(link); RtlInitUnicodeString(&str, L"\\"); status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr, &target); todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); + "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); RtlInitUnicodeString( &target, L"->Somewhere"); RtlInitUnicodeString( &str, L"BaseNamedObjects" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateSymbolicLinkObject got %08lx\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject got %08lx\n", status ); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status ); RtlInitUnicodeString( &str, L"\\\\BaseNamedObjects" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status ); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\\\om.c-test" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status ); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status ); /* Compound test */ dir = get_base_dir(); @@ -1381,13 +1382,13 @@ static void test_symboliclink(void) RtlInitUnicodeString(&str, L"test-link"); RtlInitUnicodeString(&target, L"\\DosDevices"); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08lx)\n", status); RtlInitUnicodeString(&str, L"test-link\\NUL"); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); - ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08lx)\n", status); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE); - ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08lx)\n", status); pNtClose(h); pNtClose(link); @@ -1396,59 +1397,59 @@ static void test_symboliclink(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test"); status = pNtCreateDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); RtlInitUnicodeString(&str, L"\\DosDevices\\test_link"); RtlInitUnicodeString(&target, L"\\BaseNamedObjects"); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_SUCCESS && !!link, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS && !!link, "Got unexpected status %#lx.\n", status); status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); - ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); pNtClose(h); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); - ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status); InitializeObjectAttributes(&attr, &str, 0, link, NULL); RtlInitUnicodeString( &str, L"om.c-test\\test_object" ); status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); - ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString( &str, L"\\DosDevices\\test_link\\om.c-test\\test_object" ); status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); pNtClose(h2); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\test_object" ); status = pNtCreateMutant( &h2, GENERIC_ALL, &attr, FALSE ); - ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#lx.\n", status); InitializeObjectAttributes(&attr, &str, 0, link, NULL); RtlInitUnicodeString( &str, L"om.c-test\\test_object" ); status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); - ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status); pNtClose(h); status = pNtOpenMutant( &h, GENERIC_ALL, &attr ); - ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString( &str, L"test_object" ); status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); pNtClose(h); pNtClose(h2); @@ -1465,15 +1466,15 @@ static void _test_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, - "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + "expected STATUS_NOT_IMPLEMENTED, got %lx\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %lx\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, - "FileIoCompletionNotificationInformation returned %x\n", status); + "FileIoCompletionNotificationInformation returned %lx\n", status); } #define test_no_file_info(a) _test_no_file_info(__LINE__,a) @@ -1485,16 +1486,16 @@ static void _test_no_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, - "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + "expected STATUS_NOT_IMPLEMENTED, got %lx\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH, - "FileAccessInformation returned %x\n", status); + "FileAccessInformation returned %lx\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, - "FileIoCompletionNotificationInformation returned %x\n", status); + "FileIoCompletionNotificationInformation returned %lx\n", status); } static OBJECT_TYPE_INFORMATION all_types[256]; @@ -1513,13 +1514,13 @@ static void add_object_type( OBJECT_TYPE_INFORMATION *info ) if (all_types[i].TypeName.Buffer) /* existing type */ { ok( !memcmp( &all_types[i].GenericMapping, &info->GenericMapping, sizeof(GENERIC_MAPPING) ), - "%u: mismatched mappings %08x,%08x,%08x,%08x / %08x,%08x,%08x,%08x\n", i, + "%u: mismatched mappings %08lx,%08lx,%08lx,%08lx / %08lx,%08lx,%08lx,%08lx\n", i, all_types[i].GenericMapping.GenericRead, all_types[i].GenericMapping.GenericWrite, all_types[i].GenericMapping.GenericExecute, all_types[i].GenericMapping.GenericAll, info->GenericMapping.GenericRead, info->GenericMapping.GenericWrite, info->GenericMapping.GenericExecute, info->GenericMapping.GenericAll ); ok( all_types[i].ValidAccessMask == info->ValidAccessMask, - "%u: mismatched access mask %08x / %08x\n", i, + "%u: mismatched access mask %08lx / %08lx\n", i, all_types[i].ValidAccessMask, info->ValidAccessMask ); } else /* add it */ @@ -1527,10 +1528,10 @@ static void add_object_type( OBJECT_TYPE_INFORMATION *info ) all_types[i] = *info; RtlDuplicateUnicodeString( 1, &info->TypeName, &all_types[i].TypeName ); } - ok( info->TotalNumberOfObjects <= info->HighWaterNumberOfObjects, "%s: wrong object counts %u/%u\n", + ok( info->TotalNumberOfObjects <= info->HighWaterNumberOfObjects, "%s: wrong object counts %lu/%lu\n", debugstr_w( all_types[i].TypeName.Buffer ), info->TotalNumberOfObjects, info->HighWaterNumberOfObjects ); - ok( info->TotalNumberOfHandles <= info->HighWaterNumberOfHandles, "%s: wrong handle counts %u/%u\n", + ok( info->TotalNumberOfHandles <= info->HighWaterNumberOfHandles, "%s: wrong handle counts %lu/%lu\n", debugstr_w( all_types[i].TypeName.Buffer ), info->TotalNumberOfHandles, info->HighWaterNumberOfHandles ); } @@ -1554,9 +1555,9 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); - ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - ok_(__FILE__,line)( len >= sizeof(*type) + type->TypeName.Length, "unexpected len %u\n", len ); + ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len ); + ok_(__FILE__,line)( len >= sizeof(*type) + type->TypeName.Length, "unexpected len %lu\n", len ); ok_(__FILE__,line)(compare_unicode_string( &type->TypeName, expected_name ), "wrong name %s\n", debugstr_w( type->TypeName.Buffer )); add_object_type( type ); @@ -1574,8 +1575,8 @@ static void _test_object_name( unsigned line, HANDLE handle, const WCHAR *expect memset( buffer, 0, sizeof(buffer) ); status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok_(__FILE__,line)( len >= sizeof(OBJECT_NAME_INFORMATION) + str->Length, "unexpected len %u\n", len ); + ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok_(__FILE__,line)( len >= sizeof(OBJECT_NAME_INFORMATION) + str->Length, "unexpected len %lu\n", len ); todo_wine_if (todo) ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); } @@ -1599,45 +1600,45 @@ static void test_query_object(void) handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, NULL ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); status = pNtQueryObject( handle, ObjectBasicInformation, &info, 0, NULL ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); len = 0; status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(OBJECT_BASIC_INFORMATION), &len ); - ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectTypeInformation, buffer, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(OBJECT_TYPE_INFORMATION), &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len ); str = (UNICODE_STRING *)buffer; - ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %u\n", len ); + ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %lu\n", len ); ok( str->Length >= sizeof(name) - sizeof(WCHAR), "unexpected len %u\n", str->Length ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); @@ -1646,19 +1647,19 @@ static void test_query_object(void) ok( (str->Length == wcslen( expect ) * sizeof(WCHAR) && !wcscmp( str->Buffer, expect )) || broken( !wcscmp( str->Buffer, name )), /* winxp */ "wrong name %s\n", wine_dbgstr_w(str->Buffer) ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + trace( "got %s len %lu\n", wine_dbgstr_w(str->Buffer), len ); len -= sizeof(WCHAR); status = pNtQueryObject( handle, ObjectNameInformation, buffer, len, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len ); test_object_type( handle, L"Event" ); len -= sizeof(WCHAR); status = pNtQueryObject( handle, ObjectTypeInformation, buffer, len, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); - ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len ); test_no_file_info( handle ); pNtClose( handle ); @@ -1666,10 +1667,10 @@ static void test_query_object(void) handle = CreateEventA( NULL, FALSE, FALSE, NULL ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok( len == sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok( len == sizeof(UNICODE_STRING), "unexpected len %lu\n", len ); str = (UNICODE_STRING *)buffer; - ok( str->Length == 0, "unexpected len %u\n", len ); + ok( str->Length == 0, "unexpected len %lu\n", len ); ok( str->Buffer == NULL, "unexpected ptr %p\n", str->Buffer ); test_no_file_info( handle ); pNtClose( handle ); @@ -1679,23 +1680,23 @@ static void test_query_object(void) FILE_FLAG_BACKUP_SEMANTICS, 0 ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); + ok( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - ok( len == expected_len, "unexpected len %u\n", len ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + ok( len == expected_len, "unexpected len %lu\n", len ); + trace( "got %s len %lu\n", wine_dbgstr_w(str->Buffer), len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status ); ok( len == expected_len || broken(!len /* XP */ || len == sizeof(UNICODE_STRING) /* 2003 */), - "unexpected len %u\n", len ); + "unexpected len %lu\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); - ok( status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); - ok( len == expected_len, "unexpected len %u\n", len ); + ok( status == STATUS_BUFFER_OVERFLOW, "got %#lx\n", status); + ok( len == expected_len, "unexpected len %lu\n", len ); test_object_type( handle, L"File" ); @@ -1710,7 +1711,7 @@ static void test_query_object(void) DeleteFileA( file1 ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status); + ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %lx\n", status); test_object_type( handle, L"IoCompletion" ); test_no_file_info( handle ); @@ -1719,7 +1720,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_debug" ); status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); - ok(!status, "NtCreateDebugObject failed: %x\n", status); + ok(!status, "NtCreateDebugObject failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_debug", FALSE ); test_object_type( handle, L"DebugObject" ); test_no_file_info( handle ); @@ -1727,7 +1728,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_mutant" ); status = pNtCreateMutant( &handle, MUTANT_ALL_ACCESS, &attr, 0 ); - ok(!status, "NtCreateMutant failed: %x\n", status); + ok(!status, "NtCreateMutant failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_mutant", FALSE ); test_object_type( handle, L"Mutant" ); test_no_file_info( handle ); @@ -1735,7 +1736,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_sem" ); status = pNtCreateSemaphore( &handle, SEMAPHORE_ALL_ACCESS, &attr, 1, 2 ); - ok(!status, "NtCreateSemaphore failed: %x\n", status); + ok(!status, "NtCreateSemaphore failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_sem", FALSE ); test_object_type( handle, L"Semaphore" ); test_no_file_info( handle ); @@ -1743,7 +1744,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_keyed" ); status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); - ok(!status, "NtCreateKeyedEvent failed: %x\n", status); + ok(!status, "NtCreateKeyedEvent failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_keyed", FALSE ); test_object_type( handle, L"KeyedEvent" ); test_no_file_info( handle ); @@ -1751,7 +1752,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_compl" ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, &attr, 0 ); - ok(!status, "NtCreateIoCompletion failed: %x\n", status); + ok(!status, "NtCreateIoCompletion failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_compl", FALSE ); test_object_type( handle, L"IoCompletion" ); test_no_file_info( handle ); @@ -1759,7 +1760,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_job" ); status = pNtCreateJobObject( &handle, JOB_OBJECT_ALL_ACCESS, &attr ); - ok(!status, "NtCreateJobObject failed: %x\n", status); + ok(!status, "NtCreateJobObject failed: %lx\n", status); test_object_name( handle, L"\\BaseNamedObjects\\test_job", FALSE ); test_object_type( handle, L"Job" ); test_no_file_info( handle ); @@ -1767,7 +1768,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_timer" ); status = pNtCreateTimer( &handle, TIMER_ALL_ACCESS, &attr, NotificationTimer ); - ok(!status, "NtCreateTimer failed: %x\n", status); + ok(!status, "NtCreateTimer failed: %lx\n", status); test_object_type( handle, L"Timer" ); test_no_file_info( handle ); pNtClose(handle); @@ -1775,7 +1776,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\DosDevices\\test_link" ); RtlInitUnicodeString( &target, L"\\DosDevices" ); status = pNtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &target ); - ok(!status, "NtCreateSymbolicLinkObject failed: %x\n", status); + ok(!status, "NtCreateSymbolicLinkObject failed: %lx\n", status); test_object_type( handle, L"SymbolicLink" ); test_no_file_info( handle ); pNtClose(handle); @@ -1792,7 +1793,7 @@ static void test_query_object(void) test_no_file_info( handle ); status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); - ok(status == STATUS_SUCCESS, "Failed to create Directory %08x\n", status); + ok(status == STATUS_SUCCESS, "Failed to create Directory %08lx\n", status); test_object_type( handle, L"Directory" ); test_no_file_info( handle ); @@ -1802,7 +1803,7 @@ static void test_query_object(void) size.u.LowPart = 256; size.u.HighPart = 0; status = pNtCreateSection( &handle, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 ); - ok( status == STATUS_SUCCESS , "NtCreateSection returned %x\n", status ); + ok( status == STATUS_SUCCESS , "NtCreateSection returned %lx\n", status ); test_object_type( handle, L"Section" ); test_no_file_info( handle ); @@ -1810,20 +1811,20 @@ static void test_query_object(void) pNtClose( handle ); handle = CreateMailslotA( "\\\\.\\mailslot\\test_mailslot", 100, 1000, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "CreateMailslot failed err %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "CreateMailslot failed err %lu\n", GetLastError() ); test_object_name( handle, L"\\Device\\Mailslot\\test_mailslot", FALSE ); test_object_type( handle, L"File" ); test_file_info( handle ); client = CreateFileA( "\\\\.\\mailslot\\test_mailslot", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); len = 0; status = pNtQueryObject( client, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status ); str = (UNICODE_STRING *)buffer; - ok( len == sizeof(UNICODE_STRING) + str->MaximumLength, "unexpected len %u\n", len ); + ok( len == sizeof(UNICODE_STRING) + str->MaximumLength, "unexpected len %lu\n", len ); todo_wine ok( compare_unicode_string( str, L"\\Device\\Mailslot" ) || compare_unicode_string( str, L"\\Device\\Mailslot\\test_mailslot" ) /* win8+ */, @@ -1836,7 +1837,7 @@ static void test_query_object(void) pNtClose( handle ); handle = CreateFileA( "\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); test_object_name( handle, L"\\Device\\Mailslot", FALSE ); test_object_type( handle, L"File" ); @@ -1846,7 +1847,7 @@ static void test_query_object(void) handle = CreateNamedPipeA( "\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, 1, 1000, 1000, 1000, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %lu\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe\\test_pipe", FALSE ); test_object_type( handle, L"File" ); @@ -1854,7 +1855,7 @@ static void test_query_object(void) client = CreateFileA( "\\\\.\\pipe\\test_pipe", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); test_object_type( client, L"File" ); test_file_info( client ); @@ -1863,7 +1864,7 @@ static void test_query_object(void) pNtClose( handle ); handle = CreateFileA( "\\\\.\\pipe", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe", FALSE ); test_object_type( handle, L"File" ); @@ -1873,7 +1874,7 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed status %lx\n", status ); test_object_name( handle, L"\\REGISTRY\\MACHINE", FALSE ); test_object_type( handle, L"Key" ); @@ -1889,7 +1890,7 @@ static void test_query_object(void) test_no_file_info( GetCurrentThread() ); status = pNtOpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &handle); - ok(!status, "OpenProcessToken failed: %x\n", status); + ok(!status, "OpenProcessToken failed: %lx\n", status); test_object_name( handle, L"", FALSE ); test_object_type( handle, L"Token" ); @@ -1898,7 +1899,7 @@ static void test_query_object(void) pNtClose(handle); handle = CreateFileA( "nul", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); test_object_name( handle, L"\\Device\\Null", TRUE ); test_object_type( handle, L"File" ); test_file_info( handle ); @@ -1919,10 +1920,10 @@ static void test_type_mismatch(void) attr.SecurityQualityOfService = NULL; res = pNtCreateEvent( &h, 0, &attr, NotificationEvent, 0 ); - ok(!res, "can't create event: %x\n", res); + ok(!res, "can't create event: %lx\n", res); res = pNtReleaseSemaphore( h, 30, NULL ); - ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %x\n", res); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %lx\n", res); pNtClose( h ); } @@ -1947,12 +1948,12 @@ static void test_null_device(void) InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_OBJECT_TYPE_MISMATCH, - "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status); + "expected STATUS_OBJECT_TYPE_MISMATCH, got %08lx\n", status); status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); ok(status == STATUS_SUCCESS, - "expected STATUS_SUCCESS, got %08x\n", status); + "expected STATUS_SUCCESS, got %08lx\n", status); test_object_type(null, L"File"); @@ -1960,26 +1961,26 @@ static void test_null_device(void) ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); - ok(ret, "got error %u\n", GetLastError()); - ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", + ok(ret, "got error %lu\n", GetLastError()); + ok(num_bytes == sizeof(buf), "expected num_bytes = %lu, got %lu\n", (DWORD)sizeof(buf), num_bytes); num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %lu\n", GetLastError()); pNtClose(null); @@ -1988,14 +1989,14 @@ static void test_null_device(void) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + "expected ERROR_FILE_NOT_FOUND, got %lu\n", GetLastError()); null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_PATH_NOT_FOUND, - "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError()); + "expected ERROR_PATH_NOT_FOUND, got %lu\n", GetLastError()); CloseHandle(ov.hEvent); } @@ -2018,42 +2019,42 @@ static void test_process(void) cid.UniqueProcess = 0; cid.UniqueThread = 0; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ); - todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status ); + todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %lx\n", status ); status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, NULL ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %x\n", status ); + todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %lx\n", status ); cid.UniqueProcess = 0; cid.UniqueThread = 0; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status ); cid.UniqueProcess = ULongToHandle( 0xdeadbeef ); cid.UniqueThread = ULongToHandle( 0xdeadbeef ); process = (HANDLE)0xdeadbeef; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status ); ok( !process || broken(process == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", process ); cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() ); cid.UniqueThread = 0; process = (HANDLE)0xdeadbeef; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status ); ok( !process || broken(process == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", process ); cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); cid.UniqueThread = 0; status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( !status, "NtOpenProcess returned %x\n", status ); + ok( !status, "NtOpenProcess returned %lx\n", status ); pNtClose( process ); cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); cid.UniqueThread = ULongToHandle( GetCurrentThreadId() ); status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( !status, "NtOpenProcess returned %x\n", status ); + ok( !status, "NtOpenProcess returned %lx\n", status ); pNtClose( process ); status = pNtOpenProcess( (HANDLE *)0xdeadbee0, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %lx\n", status ); } static void test_token(void) @@ -2062,28 +2063,28 @@ static void test_token(void) HANDLE handle, handle2; status = pNtOpenProcessToken( GetCurrentProcess(), TOKEN_ALL_ACCESS, (HANDLE *)0xdeadbee0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status); status = pNtOpenThreadToken( GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, (HANDLE *)0xdeadbee0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status); handle = (HANDLE)0xdeadbeef; status = NtOpenProcessToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, &handle ); - ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %lx\n", status); ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle ); handle = (HANDLE)0xdeadbeef; status = pNtOpenThreadToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, TRUE, &handle ); - ok( status == STATUS_INVALID_HANDLE, "NtOpenThreadToken failed: %x\n", status); + ok( status == STATUS_INVALID_HANDLE, "NtOpenThreadToken failed: %lx\n", status); ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle ); status = pNtOpenProcessToken( GetCurrentProcess(), TOKEN_ALL_ACCESS, &handle ); - ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %lx\n", status); status = pNtDuplicateToken( handle, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, &handle2 ); - ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %lx\n", status); pNtClose( handle2 ); status = pNtDuplicateToken( handle, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, (HANDLE *)0xdeadbee0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status); handle2 = (HANDLE)0xdeadbeef; status = pNtDuplicateToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, &handle2 ); - ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %x\n", status); + ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %lx\n", status); ok( !handle2 || broken(handle2 == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle2 ); pNtClose( handle ); } @@ -2179,27 +2180,27 @@ static void test_duplicate_object(void) status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, 0, 0 ); - ok( !status, "NtDuplicateObject failed %x\n", status ); + ok( !status, "NtDuplicateObject failed %lx\n", status ); pNtClose( handle ); status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), NULL, PROCESS_ALL_ACCESS, 0, 0 ); - ok( !status, "NtDuplicateObject failed %x\n", status ); + ok( !status, "NtDuplicateObject failed %lx\n", status ); status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), (HANDLE *)0xdeadbee0, PROCESS_ALL_ACCESS, 0, 0 ); - ok( status == STATUS_ACCESS_VIOLATION, "NtDuplicateObject failed %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "NtDuplicateObject failed %lx\n", status ); handle = (HANDLE)0xdeadbeef; status = pNtDuplicateObject( GetCurrentProcess(), (HANDLE)0xdead, GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, 0, 0 ); - ok( status == STATUS_INVALID_HANDLE, "NtDuplicateObject failed %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "NtDuplicateObject failed %lx\n", status ); ok( !handle, "handle set %p\n", handle ); handle = (HANDLE)0xdeadbeef; status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, ~0u, 0, 0 ); todo_wine - ok( status == STATUS_ACCESS_DENIED, "NtDuplicateObject failed %x\n", status ); + ok( status == STATUS_ACCESS_DENIED, "NtDuplicateObject failed %lx\n", status ); todo_wine ok( !handle, "handle set %p\n", handle ); if (!status) pNtClose( handle ); @@ -2243,17 +2244,17 @@ static void test_object_types(void) memset( buffer, 0xcc, sizeof(buffer) ); status = pNtQueryObject( NULL, ObjectTypesInformation, info, sizeof(buffer), &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status ); ok( info->NumberOfTypes < 100 || info->NumberOfTypes == 0xcccccccc, /* wow64 */ - "wrong number of types %u\n", info->NumberOfTypes ); + "wrong number of types %lu\n", info->NumberOfTypes ); info = malloc( len + 16 ); /* Windows gets the length wrong on WoW64 and overflows the buffer */ memset( info, 0xcc, sizeof(*info) ); status = pNtQueryObject( NULL, ObjectTypesInformation, info, len, &retlen ); - ok( retlen <= len + 16, "wrong len %x/%x\n", len, retlen ); + ok( retlen <= len + 16, "wrong len %lx/%lx\n", len, retlen ); ok( len == retlen || broken( retlen >= len - 32 && retlen <= len + 32 ), /* wow64 */ - "wrong len %x/%x\n", len, retlen ); - ok( !status, "NtQueryObject failed %x\n", status ); + "wrong len %lx/%lx\n", len, retlen ); + ok( !status, "NtQueryObject failed %lx\n", status ); if (!status) { OBJECT_TYPE_INFORMATION *type = align_ptr( info + 1 ); @@ -2277,7 +2278,7 @@ static void test_object_types(void) !((map.GenericWrite ^ tests[i].mapping.GenericWrite) & ~tests[i].broken) && !((map.GenericExecute ^ tests[i].mapping.GenericExecute) & ~tests[i].broken) && !((map.GenericAll ^ tests[i].mapping.GenericAll) & ~tests[i].broken) ), - "%s: mismatched mappings %08x,%08x,%08x,%08x / %08x,%08x,%08x,%08x\n", + "%s: mismatched mappings %08lx,%08lx,%08lx,%08lx / %08lx,%08lx,%08lx,%08lx\n", debugstr_w( tests[i].name ), all_types[j].GenericMapping.GenericRead, all_types[j].GenericMapping.GenericWrite, all_types[j].GenericMapping.GenericExecute, all_types[j].GenericMapping.GenericAll, @@ -2285,7 +2286,7 @@ static void test_object_types(void) tests[i].mapping.GenericExecute, tests[i].mapping.GenericAll ); ok( all_types[j].ValidAccessMask == tests[i].mask || broken( !((all_types[j].ValidAccessMask ^ tests[i].mask) & ~tests[i].broken) ), - "%s: mismatched access mask %08x / %08x\n", debugstr_w( tests[i].name ), + "%s: mismatched access mask %08lx / %08lx\n", debugstr_w( tests[i].name ), all_types[j].ValidAccessMask, tests[i].mask ); tested[j] = TRUE; break; @@ -2327,7 +2328,7 @@ static void test_get_next_thread(void) thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id ); status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status); found = FALSE; prev = NULL; @@ -2341,7 +2342,7 @@ static void test_get_next_thread(void) } else { - ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04x, current %04x.\n", + ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04lx, current %04lx.\n", GetThreadId(handle), GetCurrentThreadId()); } prev = handle; @@ -2349,26 +2350,26 @@ static void test_get_next_thread(void) } pNtClose(prev); ok(!handle, "Got unexpected handle %p.\n", handle); - ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#x.\n", status); + ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#lx.\n", status); ok(found, "Thread not found.\n"); handle = (HANDLE)0xdeadbeef; status = pNtGetNextThread((void *)0xdeadbeef, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); - ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status); ok(!handle, "Got unexpected handle %p.\n", handle); handle = (HANDLE)0xdeadbeef; status = pNtGetNextThread(hprocess, (void *)0xdeadbeef, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); - ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status); ok(!handle, "Got unexpected handle %p.\n", handle); /* Reversed search is only supported on recent enough Win10. */ status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 1, &handle); - ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#x.\n", status); + ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#lx.\n", status); if (!status) pNtClose(handle); status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 2, &handle); - ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status); SetEvent(event); WaitForSingleObject(thread, INFINITE); @@ -2411,16 +2412,16 @@ static void test_globalroot(void) pRtlInitUnicodeString(&str, symlinks[i].name); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status); + ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08lx\n", status); str.Buffer = buffer; str.MaximumLength = sizeof(buffer); len = 0xdeadbeef; memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQuerySymbolicLinkObject( h, &str, &len); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status ); full_len = str.Length + sizeof(WCHAR); - ok( len == full_len, "bad length %u (expected %u)\n", len, full_len ); + ok( len == full_len, "bad length %lu (expected %lu)\n", len, full_len ); ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); if (symlinks[i].target) @@ -2440,7 +2441,7 @@ static void test_globalroot(void) status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); ok(status == STATUS_SUCCESS, - "expected STATUS_SUCCESS, got %08x\n", status); + "expected STATUS_SUCCESS, got %08lx\n", status); test_object_type(h, L"File"); @@ -2459,42 +2460,42 @@ static void test_object_identity(void) } status = pNtCompareObjects( GetCurrentProcess(), GetCurrentProcess() ); - ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08x\n", status ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08lx\n", status ); status = pNtCompareObjects( GetCurrentThread(), GetCurrentThread() ); - ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08x\n", status ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08lx\n", status ); status = pNtCompareObjects( GetCurrentProcess(), GetCurrentThread() ); - ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08x\n", status ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08lx\n", status ); h1 = NULL; status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &h1, 0, 0, DUPLICATE_SAME_ACCESS ); - ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08x\n", status); + ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08lx\n", status); status = pNtCompareObjects( GetCurrentProcess(), h1 ); - ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08x\n", h1, status ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08lx\n", h1, status ); pNtClose( h1 ); h1 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); h2 = NULL; status = pNtDuplicateObject( GetCurrentProcess(), h1, GetCurrentProcess(), &h2, 0, 0, DUPLICATE_SAME_ACCESS ); - ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08x\n", h1, status); + ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08lx\n", h1, status); status = pNtCompareObjects( h1, h2 ); - ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08x\n", h1, h2, status ); + ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08lx\n", h1, h2, status ); pNtClose( h2 ); h2 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() ); status = pNtCompareObjects( h1, h2 ); - ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08x\n", h1, h2, status ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08lx\n", h1, h2, status ); pNtClose( h2 ); pNtClose( h1 );

1 0

[PATCH] dlls/ntdll/tests/large_int.c: enable compilation with long types
by Eric Pouech 19 Mar '22

19 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/large_int.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 00316fe65e0..3ae18f7906a 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdlib.h> @@ -297,7 +298,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -340,7 +341,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } else { ok(result == largeint2str->result, - "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, result, largeint2str->result); if (result == STATUS_SUCCESS) { ok(unicode_string.Buffer[unicode_string.Length/sizeof(WCHAR)] == '\0', @@ -349,7 +350,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } /* if */ ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlInt64ToUnicodeString(0x%x%08x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, @@ -384,7 +385,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -398,7 +399,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l result = pRtlLargeIntegerToChar(&value, largeint2str->base, largeint2str->MaximumLength, dest_str); } /* if */ ok(result == largeint2str->result, - "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, largeint2str->MaximumLength, result, largeint2str->result); ok(memcmp(dest_str, largeint2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, @@ -421,24 +422,24 @@ static void test_RtlLargeIntegerToChar(void) value = largeint2str[0].value; result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); }

1 0

[PATCH] dlls/ntdll/tests/file.c: enable compilation with long types
by Eric Pouech 19 Mar '22

19 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/file.c | 1467 ++++++++++++++++++++++++----------------------- 1 file changed, 734 insertions(+), 733 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 760e2ff167e..4014b395b56 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -23,6 +23,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -117,9 +118,9 @@ static ULONG get_pending_msgs(HANDLE h) ULONG a, req; res = pNtQueryIoCompletion( h, IoCompletionBasicInformation, &a, sizeof(a), &req ); - ok( res == STATUS_SUCCESS, "NtQueryIoCompletion failed: %x\n", res ); + ok( res == STATUS_SUCCESS, "NtQueryIoCompletion failed: %lx\n", res ); if (res != STATUS_SUCCESS) return -1; - ok( req == sizeof(a), "Unexpected response size: %x\n", req ); + ok( req == sizeof(a), "Unexpected response size: %lx\n", req ); return a; } @@ -127,10 +128,10 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { int *count = arg; - trace( "apc called block %p iosb.status %x iosb.info %lu\n", + trace( "apc called block %p iosb.status %lx iosb.info %Iu\n", iosb, U(*iosb).Status, iosb->Information ); (*count)++; - ok( !reserved, "reserved is not 0: %x\n", reserved ); + ok( !reserved, "reserved is not 0: %lx\n", reserved ); } static void create_file_test(void) @@ -166,31 +167,31 @@ static void create_file_test(void) /* try various open modes and options on directories */ status = pNtCreateFile( &dir, GENERIC_READ|GENERIC_WRITE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); - ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08lx\n", status ); if (status == STATUS_PENDING) { ret = WaitForSingleObject( dir, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %lu\n", ret ); ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, - "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + "expected STATUS_INVALID_DEVICE_REQUEST, got %08lx\n", U(io).Status ); } U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtWriteFile( dir, NULL, NULL, NULL, &io, testdata, sizeof(testdata), &offset, NULL); todo_wine - ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08x\n", status ); + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08lx\n", status ); if (status == STATUS_PENDING) { ret = WaitForSingleObject( dir, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %lu\n", ret ); ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, - "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + "expected STATUS_INVALID_DEVICE_REQUEST, got %08lx\n", U(io).Status ); } CloseHandle( dir ); @@ -198,54 +199,54 @@ static void create_file_test(void) status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, FILE_DIRECTORY_FILE, NULL, 0 ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SUPERSEDE, FILE_DIRECTORY_FILE, NULL, 0 ); - ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE, FILE_DIRECTORY_FILE, NULL, 0 ); - ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, FILE_DIRECTORY_FILE, NULL, 0 ); - ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, 0, NULL, 0 ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SUPERSEDE, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); @@ -261,7 +262,7 @@ static void create_file_test(void) FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); todo_wine ok( status == STATUS_INVALID_PARAMETER, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); /* Invalid chars in file/dirnames */ pRtlDosPathNameToNtPathName_U(questionmarkInvalidNameW, &nameW, NULL, NULL); @@ -270,13 +271,13 @@ static void create_file_test(void) FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status); status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, 0, FILE_CREATE, FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status); pRtlFreeUnicodeString(&nameW); pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); @@ -285,13 +286,13 @@ static void create_file_test(void) FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status); status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, 0, FILE_CREATE, FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status); pRtlFreeUnicodeString(&nameW); pRtlInitUnicodeString( &nameW, pathInvalidNtW ); @@ -299,33 +300,33 @@ static void create_file_test(void) FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtQueryFullAttributesFile( &attr, &info ); todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, - "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlInitUnicodeString( &nameW, pathInvalidNt2W ); status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtQueryFullAttributesFile( &attr, &info ); ok( status == STATUS_OBJECT_NAME_INVALID, - "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlInitUnicodeString( &nameW, pathInvalidDosW ); status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_INVALID, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtQueryFullAttributesFile( &attr, &info ); ok( status == STATUS_OBJECT_NAME_INVALID, - "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); } static void open_file_test(void) @@ -353,14 +354,14 @@ static void open_file_test(void) attr.SecurityQualityOfService = NULL; status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); path[3] = 0; /* root of the drive */ pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); status = pNtOpenFile( &root, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); /* test opening system dir with RootDirectory set to windows dir */ @@ -371,14 +372,14 @@ static void open_file_test(void) attr.RootDirectory = dir; status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); /* try uppercase name */ for (i = len; path[i]; i++) if (path[i] >= 'a' && path[i] <= 'z') path[i] -= 'a' - 'A'; status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); /* try with leading backslash */ @@ -389,14 +390,14 @@ static void open_file_test(void) ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_SYNTAX_BAD, - "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle ); /* try with empty name */ nameW.Length = 0; status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); CloseHandle( dir ); @@ -405,11 +406,11 @@ static void open_file_test(void) pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); pRtlFreeUnicodeString( &nameW ); @@ -418,11 +419,11 @@ static void open_file_test(void) status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); GetTempPathW( MAX_PATH, path ); @@ -433,15 +434,15 @@ static void open_file_test(void) attr.RootDirectory = NULL; status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); GetTempFileNameW( path, fooW, 0, tmpfile ); file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError() ); numbytes = 0xdeadbeef; ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); - ok( ret, "WriteFile failed with error %u\n", GetLastError() ); + ok( ret, "WriteFile failed with error %lu\n", GetLastError() ); ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); CloseHandle( file ); @@ -465,7 +466,7 @@ static void open_file_test(void) FILE_SHARE_READ, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + ok( status == STATUS_SUCCESS, "open %s failed %lx\n", wine_dbgstr_w(info->FileName), status ); if (!status) { BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; @@ -493,7 +494,7 @@ static void open_file_test(void) FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED, - "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + "open %s failed %lx\n", wine_dbgstr_w(info->FileName), status ); if (!status) CloseHandle( handle ); } } @@ -510,13 +511,13 @@ static void open_file_test(void) attr.SecurityQualityOfService = NULL; status = pNtOpenFile( &file, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); numbytes = 0xdeadbeef; memset( data, 0, sizeof(data) ); ret = ReadFile( file, data, sizeof(data), &numbytes, NULL ); - ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( ret, "ReadFile failed with error %lu\n", GetLastError() ); ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); @@ -527,7 +528,7 @@ static void open_file_test(void) status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); ok( status == STATUS_OBJECT_PATH_NOT_FOUND, - "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08lx\n", status ); nameW.Length = 0; nameW.Buffer = NULL; @@ -535,24 +536,24 @@ static void open_file_test(void) attr.ObjectName = &nameW; status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(tmpfile), status ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); - ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == 0, "SetFilePointer returned %lu\n", numbytes ); numbytes = 0xdeadbeef; memset( data, 0, sizeof(data) ); ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); - ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( ret, "ReadFile failed with error %lu\n", GetLastError() ); ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); - ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes ); CloseHandle( file ); CloseHandle( root ); @@ -644,10 +645,10 @@ static void read_file_test(void) ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "wrong status %x.\n", status ); + "wrong status %lx.\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); - ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -661,10 +662,10 @@ static void read_file_test(void) status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "wrong status %x.\n", status); + "wrong status %lx.\n", status); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); - ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -677,12 +678,12 @@ static void read_file_test(void) offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */, - "expected STATUS_PENDING, got %#x\n", status); + "expected STATUS_PENDING, got %#lx\n", status); if (status == STATUS_PENDING) /* vista */ { WaitForSingleObject( event, 1000 ); - ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); + ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -700,10 +701,10 @@ static void read_file_test(void) ok( status == STATUS_END_OF_FILE || status == STATUS_SUCCESS || status == STATUS_PENDING, /* vista */ - "wrong status %x\n", status ); + "wrong status %lx\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); - ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -715,9 +716,9 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); - ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); + ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); + ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -730,9 +731,9 @@ static void read_file_test(void) offset.QuadPart = strlen(text) + 2; ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); + ok( status == STATUS_END_OF_FILE, "wrong status %lx\n", status ); + ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %lx\n", U(iosb).Status ); + ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information ); ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ @@ -753,9 +754,9 @@ static void read_file_test(void) aligned_buffer, sizeof(aligned_buffer), &offset, NULL); ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "Wrong status %x.\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); - ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + "Wrong status %lx.\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %lx.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %Iu.\n", iosb.Information); ok(is_signaled(event), "event is not signaled.\n"); ok(!apc_count, "apc was called.\n"); SleepEx(1, TRUE); /* alertable sleep */ @@ -769,10 +770,10 @@ static void read_file_test(void) ResetEvent(event); status = pNtReadFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + ok(status == STATUS_PENDING, "Wrong status %lx.\n", status); WaitForSingleObject(event, 1000); - ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); - ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %lx.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %Iu.\n", iosb.Information); ok(is_signaled(event), "event is not signaled.\n"); ok(!apc_count, "apc was called.\n"); SleepEx(1, TRUE); /* alertable sleep */ @@ -796,57 +797,57 @@ static void append_file_test(void) GetTempFileNameA( path, "foo", 0, buffer ); handle = CreateFileA(buffer, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError()); U(iosb).Status = -1; iosb.Information = -1; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 2, NULL, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information); CloseHandle(handle); /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); - ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError()); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 1; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); - ok(ret == 4, "expected 4, got %u\n", ret); + ok(ret == 4, "expected 4, got %lu\n", ret); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 3; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); - ok(ret == 6, "expected 6, got %u\n", ret); + ok(ret == 6, "expected 6, got %lu\n", ret); CloseHandle(handle); handle = CreateFileA(buffer, FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); - ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError()); memset(buf, 0, sizeof(buf)); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 0; status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 6, "expected 6, got %Iu\n", iosb.Information); buf[6] = 0; ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf); @@ -854,18 +855,18 @@ static void append_file_test(void) iosb.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 3, "expected 3, got %Iu\n", iosb.Information); memset(buf, 0, sizeof(buf)); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 0; status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status); - ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status); + ok(iosb.Information == 6, "expected 6, got %Iu\n", iosb.Information); buf[6] = 0; ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf); @@ -904,7 +905,7 @@ static void nt_mailslot_test(void) &TimeOut); ok( rc == STATUS_ACCESS_VIOLATION || rc == STATUS_INVALID_PARAMETER, /* win2k3 */ - "rc = %x not STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER\n", rc); + "rc = %lx not STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER\n", rc); /* * Test to see if the Timeout can be NULL @@ -915,7 +916,7 @@ static void nt_mailslot_test(void) NULL); ok( rc == STATUS_SUCCESS || rc == STATUS_INVALID_PARAMETER, /* win2k3 */ - "rc = %x not STATUS_SUCCESS or STATUS_INVALID_PARAMETER\n", rc); + "rc = %lx not STATUS_SUCCESS or STATUS_INVALID_PARAMETER\n", rc); ok( hslot != 0, "Handle is invalid\n"); if ( rc == STATUS_SUCCESS ) pNtClose(hslot); @@ -927,7 +928,7 @@ static void nt_mailslot_test(void) rc = pNtCreateMailslotFile(&hslot, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, &TimeOut); - ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %x\n", rc); + ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %lx\n", rc); ok( hslot != 0, "Handle is invalid\n"); rc = pNtClose(hslot); @@ -955,27 +956,27 @@ static void test_set_io_completion(void) if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32; res = pNtCreateIoCompletion( &h, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); - ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#lx\n", res ); ok( h && h != INVALID_HANDLE_VALUE, "got invalid handle %p\n", h ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletion failed: %#x\n", res ); + ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletion failed: %#lx\n", res ); res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %lx\n", res ); count = get_pending_msgs(h); - ok( count == 1, "Unexpected msg count: %d\n", count ); + ok( count == 1, "Unexpected msg count: %ld\n", count ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res ); - ok( key == CKEY_FIRST, "Invalid completion key: %#lx\n", key ); - ok( iosb.Information == size, "Invalid iosb.Information: %lu\n", iosb.Information ); - ok( U(iosb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid iosb.Status: %#x\n", U(iosb).Status ); - ok( value == CVALUE_FIRST, "Invalid completion value: %#lx\n", value ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res ); + ok( key == CKEY_FIRST, "Invalid completion key: %#Ix\n", key ); + ok( iosb.Information == size, "Invalid iosb.Information: %Iu\n", iosb.Information ); + ok( U(iosb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid iosb.Status: %#lx\n", U(iosb).Status ); + ok( value == CVALUE_FIRST, "Invalid completion value: %#Ix\n", value ); count = get_pending_msgs(h); - ok( !count, "Unexpected msg count: %d\n", count ); + ok( !count, "Unexpected msg count: %ld\n", count ); if (!pNtRemoveIoCompletionEx) { @@ -986,92 +987,92 @@ static void test_set_io_completion(void) count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE ); - ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); + ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); res = pNtSetIoCompletion( h, 123, 456, 789, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); - ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey ); - ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue ); - ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); + ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n", info[0].IoStatusBlock.Information ); - ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status); res = pNtSetIoCompletion( h, 123, 456, 789, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); res = pNtSetIoCompletion( h, 12, 34, 56, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 2, "wrong count %u\n", count ); - ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey ); - ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue ); - ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 2, "wrong count %lu\n", count ); + ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n", info[0].IoStatusBlock.Information ); - ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); - ok( info[1].CompletionKey == 12, "wrong key %#lx\n", info[1].CompletionKey ); - ok( info[1].CompletionValue == 34, "wrong value %#lx\n", info[1].CompletionValue ); - ok( info[1].IoStatusBlock.Information == size, "wrong information %#lx\n", + ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status); + ok( info[1].CompletionKey == 12, "wrong key %#Ix\n", info[1].CompletionKey ); + ok( info[1].CompletionValue == 34, "wrong value %#Ix\n", info[1].CompletionValue ); + ok( info[1].IoStatusBlock.Information == size, "wrong information %#Ix\n", info[1].IoStatusBlock.Information ); - ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[1].IoStatusBlock).Status); + ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#lx\n", U(info[1].IoStatusBlock).Status); res = pNtSetIoCompletion( h, 123, 456, 789, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); res = pNtSetIoCompletion( h, 12, 34, 56, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); - ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey ); - ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue ); - ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); + ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n", info[0].IoStatusBlock.Information ); - ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status); count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); - ok( info[0].CompletionKey == 12, "wrong key %#lx\n", info[0].CompletionKey ); - ok( info[0].CompletionValue == 34, "wrong value %#lx\n", info[0].CompletionValue ); - ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); + ok( info[0].CompletionKey == 12, "wrong key %#Ix\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 34, "wrong value %#Ix\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n", info[0].IoStatusBlock.Information ); - ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status); apc_count = 0; QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count ); count = 0xdeadbeef; res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE ); - ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); + ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); ok( !apc_count, "wrong apc count %d\n", apc_count ); res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, TRUE ); - ok( res == STATUS_USER_APC, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); + ok( res == STATUS_USER_APC, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); ok( apc_count == 1, "wrong apc count %u\n", apc_count ); apc_count = 0; QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count ); res = pNtSetIoCompletion( h, 123, 456, 789, size ); - ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res ); res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, TRUE ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); - ok( count == 1, "wrong count %u\n", count ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res ); + ok( count == 1, "wrong count %lu\n", count ); ok( !apc_count, "wrong apc count %u\n", apc_count ); SleepEx( 1, TRUE ); @@ -1097,7 +1098,7 @@ static void test_file_io_completion(void) HANDLE h; res = pNtCreateIoCompletion( &h, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); - ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#x\n", res ); + ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#lx\n", res ); ok( h && h != INVALID_HANDLE_VALUE, "got invalid handle %p\n", h ); fci.CompletionPort = h; fci.CompletionKey = CKEY_SECOND; @@ -1105,31 +1106,31 @@ static void test_file_io_completion(void) server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); - ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#x\n", res ); + ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#lx\n", res ); todo_wine - ok( U(iosb).Status == 0xdeadbeef, "wrong status %#x\n", U(iosb).Status ); + ok( U(iosb).Status == 0xdeadbeef, "wrong status %#lx\n", U(iosb).Status ); CloseHandle( client ); CloseHandle( server ); server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); - ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %#x\n", res ); - ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %#x\n", U(iosb).Status ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %#lx\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %#lx\n", U(iosb).Status ); memset( send_buf, 0, TEST_BUF_LEN ); memset( recv_buf, 0xde, TEST_BUF_LEN ); @@ -1141,11 +1142,11 @@ static void test_file_io_completion(void) WriteFile( client, send_buf, TEST_BUF_LEN, &read, NULL ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res ); - ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key ); - ok( iosb.Information == 3, "Invalid iosb.Information: %ld\n", iosb.Information ); - ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status ); - ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res ); + ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key ); + ok( iosb.Information == 3, "Invalid iosb.Information: %Id\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status ); + ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value ); ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ), "Receive buffer (%02x %02x %02x) did not match send buffer (%02x %02x %02x)\n", recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] ); @@ -1162,11 +1163,11 @@ static void test_file_io_completion(void) ok( count == 1, "Unexpected msg count: %ld\n", count ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res ); - ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key ); - ok( iosb.Information == 2, "Invalid iosb.Information: %ld\n", iosb.Information ); - ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status ); - ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res ); + ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key ); + ok( iosb.Information == 2, "Invalid iosb.Information: %Id\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status ); + ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value ); ok( !memcmp( send_buf, recv_buf, 2 ), "Receive buffer (%02x %02x) did not match send buffer (%02x %02x)\n", recv_buf[0], recv_buf[1], send_buf[0], send_buf[1] ); @@ -1177,11 +1178,11 @@ static void test_file_io_completion(void) ok( count == 1, "Unexpected msg count: %ld\n", count ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res ); - ok( key == CKEY_SECOND, "Invalid completion key: %lx\n", key ); - ok( iosb.Information == 0, "Invalid iosb.Information: %ld\n", iosb.Information ); - ok( U(iosb).Status == STATUS_PIPE_BROKEN, "Invalid iosb.Status: %x\n", U(iosb).Status ); - ok( value == (ULONG_PTR)&o, "Invalid completion value: %lx\n", value ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res ); + ok( key == CKEY_SECOND, "Invalid completion key: %Ix\n", key ); + ok( iosb.Information == 0, "Invalid iosb.Information: %Id\n", iosb.Information ); + ok( U(iosb).Status == STATUS_PIPE_BROKEN, "Invalid iosb.Status: %lx\n", U(iosb).Status ); + ok( value == (ULONG_PTR)&o, "Invalid completion value: %Ix\n", value ); CloseHandle( client ); @@ -1189,10 +1190,10 @@ static void test_file_io_completion(void) server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); memset( send_buf, 0, TEST_BUF_LEN ); memset( recv_buf, 0xde, TEST_BUF_LEN ); @@ -1202,19 +1203,19 @@ static void test_file_io_completion(void) U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); - ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); - ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %lx\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %lx\n", U(iosb).Status ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); WriteFile( client, send_buf, TEST_BUF_LEN, &read, NULL ); res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout ); - ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res ); - ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key ); - ok( iosb.Information == 3, "Invalid iosb.Information: %ld\n", iosb.Information ); - ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status ); - ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res ); + ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key ); + ok( iosb.Information == 3, "Invalid iosb.Information: %Id\n", iosb.Information ); + ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status ); + ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value ); ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ), "Receive buffer (%02x %02x %02x) did not match send buffer (%02x %02x %02x)\n", recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] ); @@ -1224,7 +1225,7 @@ static void test_file_io_completion(void) /* using APCs on handle with associated completion port is not allowed */ res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %lx\n", res); CloseHandle( server ); CloseHandle( client ); @@ -1233,10 +1234,10 @@ static void test_file_io_completion(void) server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() ); + ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); apc_count = 0; memset( send_buf, 0, TEST_BUF_LEN ); @@ -1245,12 +1246,12 @@ static void test_file_io_completion(void) ok( !count, "Unexpected msg count: %ld\n", count ); res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); + ok(res == STATUS_PENDING, "NtReadFile returned %lx\n", res); U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); - ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); - ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %lx\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %lx\n", U(iosb).Status ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); @@ -1267,7 +1268,7 @@ static void test_file_io_completion(void) /* using APCs on handle with associated completion port is not allowed */ res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %lx\n", res); CloseHandle( server ); CloseHandle( client ); @@ -1289,9 +1290,9 @@ static void test_file_full_size_information(void) /* Assume No Quota Settings configured on Wine Testbot */ res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); - todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); - ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); /* Test for FileFsSizeInformation */ ok(fsi.TotalAllocationUnits.QuadPart > 0, @@ -1302,8 +1303,8 @@ static void test_file_full_size_information(void) wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); /* Assume file system is NTFS */ - ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); - ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); + ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %ld\n",fsi.BytesPerSector); + ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %ld\n",fsi.SectorsPerAllocationUnit); todo_wine { @@ -1329,8 +1330,8 @@ static void test_file_full_size_information(void) /* Assume file system is NTFS */ todo_wine { - ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); - ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); + ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %ld\n",ffsi.BytesPerSector); + ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %ld\n",ffsi.SectorsPerAllocationUnit); } CloseHandle( h ); @@ -1351,24 +1352,24 @@ static void test_file_basic_information(void) res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); ok ( (fbi.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, - "attribute %x not expected\n", fbi.FileAttributes ); + "attribute %lx not expected\n", fbi.FileAttributes ); memset(&fbi2, 0, sizeof(fbi2)); fbi2.LastWriteTime.QuadPart = -1; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status ); memset(&fbi2, 0, sizeof(fbi2)); fbi2.LastAccessTime.QuadPart = 0x200deadcafebeef; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof(fbi2), FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status ); res = pNtQueryInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get system attribute, NtQueryInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %lx\n", U(io).Status ); ok ( fbi2.LastAccessTime.QuadPart == fbi.LastAccessTime.QuadPart, "large access time set/get does not match.\n" ); @@ -1381,7 +1382,7 @@ static void test_file_basic_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status ); memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); @@ -1395,12 +1396,12 @@ static void test_file_basic_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status ); memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); + todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); /* Then HIDDEN */ memset(&fbi, 0, sizeof(fbi)); @@ -1408,12 +1409,12 @@ static void test_file_basic_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status ); memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); + todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fbi, 0, sizeof(fbi)); @@ -1421,12 +1422,12 @@ static void test_file_basic_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set normal attribute, NtSetInformationFile returned %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set normal attribute, io.Status is %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set normal attribute, io.Status is %lx\n", U(io).Status ); memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %x not 0\n", fbi.FileAttributes ); + todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %lx not 0\n", fbi.FileAttributes ); CloseHandle( h ); } @@ -1452,7 +1453,7 @@ static void test_file_all_information(void) res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); ok ( (fai_buf.fai.BasicInformation.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, - "attribute %x not expected\n", fai_buf.fai.BasicInformation.FileAttributes ); + "attribute %lx not expected\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Then SYSTEM */ /* Clear fbi to avoid setting times */ @@ -1461,16 +1462,16 @@ static void test_file_all_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_INVALID_INFO_CLASS || broken(res == STATUS_NOT_IMPLEMENTED), "shouldn't be able to set FileAllInformation, res %x\n", res); - todo_wine ok ( U(io).Status == 0xdeadbeef, "shouldn't be able to set FileAllInformation, io.Status is %x\n", U(io).Status); + todo_wine ok ( U(io).Status == 0xdeadbeef, "shouldn't be able to set FileAllInformation, io.Status is %lx\n", U(io).Status); U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status ); memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); + todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Then HIDDEN */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); @@ -1478,12 +1479,12 @@ static void test_file_all_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status ); memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); + todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); @@ -1491,12 +1492,12 @@ static void test_file_all_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res ); - ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status ); memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %x not FILE_ATTRIBUTE_NORMAL\n", fai_buf.fai.BasicInformation.FileAttributes ); + todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %lx not FILE_ATTRIBUTE_NORMAL\n", fai_buf.fai.BasicInformation.FileAttributes ); CloseHandle( h ); } @@ -1505,11 +1506,11 @@ static void delete_object( WCHAR *path ) { BOOL ret = DeleteFileW( path ); ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, - "DeleteFileW failed with %u\n", GetLastError() ); + "DeleteFileW failed with %lu\n", GetLastError() ); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { ret = RemoveDirectoryW( path ); - ok( ret, "RemoveDirectoryW failed with %u\n", GetLastError() ); + ok( ret, "RemoveDirectoryW failed with %lu\n", GetLastError() ); } } @@ -1547,8 +1548,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1556,7 +1557,7 @@ static void test_file_rename_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -1585,8 +1586,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1615,8 +1616,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1648,8 +1649,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1682,8 +1683,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1717,8 +1718,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1726,7 +1727,7 @@ static void test_file_rename_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -1764,8 +1765,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; todo_wine ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1804,8 +1805,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1840,8 +1841,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1874,8 +1875,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1910,8 +1911,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1947,8 +1948,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -1983,8 +1984,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2022,8 +2023,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2056,8 +2057,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2089,8 +2090,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2123,8 +2124,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2132,7 +2133,7 @@ static void test_file_rename_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -2160,8 +2161,8 @@ static void test_file_rename_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); - ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %lx\n", res ); ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); CloseHandle( handle ); @@ -2204,8 +2205,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2213,7 +2214,7 @@ static void test_file_link_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -2242,8 +2243,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2272,8 +2273,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2303,8 +2304,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2312,7 +2313,7 @@ static void test_file_link_information(void) CloseHandle( handle ); handle = FindFirstFileW( newpath, &find_data ); - ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %ld\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), @@ -2345,8 +2346,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2379,8 +2380,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2414,8 +2415,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef , "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef , "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2423,7 +2424,7 @@ static void test_file_link_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -2461,8 +2462,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2495,9 +2496,9 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, - "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2532,9 +2533,9 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, - "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2567,8 +2568,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2603,8 +2604,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2640,9 +2641,9 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, - "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2677,8 +2678,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2716,8 +2717,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2750,8 +2751,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2783,8 +2784,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); - ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2817,8 +2818,8 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2826,7 +2827,7 @@ static void test_file_link_information(void) fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) ); res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); @@ -2854,14 +2855,14 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %lx\n", res ); fli->ReplaceIfExists = TRUE; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %lx\n", res ); ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); CloseHandle( handle ); @@ -2885,19 +2886,19 @@ static void test_file_link_information(void) U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); - ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#lx\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %lx\n", res ); fli->ReplaceIfExists = TRUE; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); - ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %lx\n", res ); ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); CloseHandle( handle ); handle = FindFirstFileW( oldpath, &find_data ); - ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %ld\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), @@ -2976,10 +2977,10 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); res = pNtSetInformationFile( handle, &io, &fdi, 0, FileDispositionInformation ); todo_wine - ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %x\n", res ); + ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %lx\n", res ); fdi2 = 0x100; res = pNtSetInformationFile( handle, &io, &fdi2, sizeof(fdi2), FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x\n", res ); + ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %lx\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -2990,10 +2991,10 @@ static void test_file_disposition_information(void) handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); + ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %lx)\n", res ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); + ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3005,7 +3006,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3018,10 +3019,10 @@ static void test_file_disposition_information(void) ok( handle2 != INVALID_HANDLE_VALUE, "failed to open temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); + ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); todo_wine @@ -3029,12 +3030,12 @@ static void test_file_disposition_information(void) if (handle3 != INVALID_HANDLE_VALUE) CloseHandle( handle3 ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3050,11 +3051,11 @@ static void test_file_disposition_information(void) handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 != INVALID_HANDLE_VALUE, "failed to open temp file\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); - ok( res == STATUS_SUCCESS, "got %#x\n", res ); + ok( res == STATUS_SUCCESS, "got %#lx\n", res ); /* can't open the marked for delete file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3069,7 +3070,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3083,7 +3084,7 @@ static void test_file_disposition_information(void) fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); todo_wine - ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; todo_wine @@ -3097,10 +3098,10 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3112,7 +3113,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3127,7 +3128,7 @@ static void test_file_disposition_information(void) ok( !fileDeleted, "File shouldn't have been deleted\n" ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3138,7 +3139,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fileDeleted = DeleteFileA( buffer ); ok( !fileDeleted, "File shouldn't have been deleted\n" ); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); @@ -3154,12 +3155,12 @@ static void test_file_disposition_information(void) ok( !fileDeleted, "File shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); + ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); /* can't open the deleted file */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); @@ -3172,7 +3173,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "Directory should have been deleted\n" ); @@ -3185,7 +3186,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); fileDeleted = RemoveDirectoryA( buffer ); ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); @@ -3203,13 +3204,13 @@ static void test_file_disposition_information(void) ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); + ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3225,10 +3226,10 @@ static void test_file_disposition_information(void) ok( handle2 != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine - ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); + ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine @@ -3236,12 +3237,12 @@ static void test_file_disposition_information(void) if (handle3 != INVALID_HANDLE_VALUE) CloseHandle( handle3 ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); @@ -3261,7 +3262,7 @@ static void test_file_disposition_information(void) /* can't open the marked for delete file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); @@ -3282,7 +3283,7 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); SetLastError(0xdeadbeef); CloseHandle( handle ); - ok(GetLastError() == 0xdeadbeef, "got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "got %lu\n", GetLastError()); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); buffer[dirpos] = '\\'; @@ -3304,7 +3305,7 @@ static void test_file_disposition_information(void) CloseHandle( handle2 ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); + ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %lx)\n", res ); fileDeleted = DeleteFileA( buffer ); ok( fileDeleted, "File should have been deleted\n" ); buffer[dirpos] = '\0'; @@ -3318,89 +3319,89 @@ static void test_file_disposition_information(void) GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); WriteFile(handle, "data", 4, &size, NULL); mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); - ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( !res, "got %#x\n", res ); + ok( !res, "got %#lx\n", res ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + ok( res == STATUS_CANNOT_DELETE, "got %#lx\n", res ); res = GetFileAttributesA( buffer ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); CloseHandle( mapping ); CloseHandle( handle ); res = DeleteFileA( buffer ); - ok( res, "got error %u\n", GetLastError() ); + ok( res, "got error %lu\n", GetLastError() ); GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); WriteFile(handle, "data", 4, &size, NULL); mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); - ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() ); CloseHandle( mapping ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( !res, "got %#x\n", res ); + ok( !res, "got %#lx\n", res ); CloseHandle( handle ); res = DeleteFileA( buffer ); ok( !res, "expected failure\n" ); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError() ); /* a file with an open view cannot be deleted */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); WriteFile(handle, "data", 4, &size, NULL); mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); - ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() ); view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); - ok( !!view, "failed to map view, error %u\n", GetLastError() ); + ok( !!view, "failed to map view, error %lu\n", GetLastError() ); CloseHandle( mapping ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( !res, "got %#x\n", res ); + ok( !res, "got %#lx\n", res ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + ok( res == STATUS_CANNOT_DELETE, "got %#lx\n", res ); res = GetFileAttributesA( buffer ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); UnmapViewOfFile( view ); CloseHandle( handle ); res = DeleteFileA( buffer ); - ok( res, "got error %u\n", GetLastError() ); + ok( res, "got error %lu\n", GetLastError() ); GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); WriteFile(handle, "data", 4, &size, NULL); mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); - ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() ); view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); - ok( !!view, "failed to map view, error %u\n", GetLastError() ); + ok( !!view, "failed to map view, error %lu\n", GetLastError() ); CloseHandle( mapping ); UnmapViewOfFile( view ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - ok( !res, "got %#x\n", res ); + ok( !res, "got %#lx\n", res ); CloseHandle( handle ); res = DeleteFileA( buffer ); ok( !res, "expected failure\n" ); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError() ); } static void test_file_name_information(void) @@ -3451,33 +3452,33 @@ static void test_file_name_information(void) ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); - ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#lx.\n", hr); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); - ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", + ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_BUFFER_OVERFLOW); - ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %lu\n", info->FileNameLength); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); + ok(io.Information == sizeof(*info), "io.Information is %Iu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS); + ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_SUCCESS); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %lu\n", info->FileNameLength); ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, - "io.Information is %lu, expected %u.\n", + "io.Information is %Iu, expected %lu.\n", io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); CloseHandle( h ); @@ -3520,7 +3521,7 @@ static void test_file_name_information(void) memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); @@ -3580,30 +3581,30 @@ static void test_file_all_name_information(void) ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileAllInformation ); - ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x, expected %#x.\n", + ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_INFO_LENGTH_MISMATCH); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileAllInformation ); - ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", + ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_BUFFER_OVERFLOW); - ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); + "info->NameInformation.FileNameLength is %lu\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[2] == 0xcccc, "info->NameInformation.FileName[2] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->NameInformation.FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); + ok(io.Information == sizeof(*info), "io.Information is %Iu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS); + ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_SUCCESS); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); + "info->NameInformation.FileNameLength is %lu\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->NameInformation.FileName[len] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); @@ -3613,7 +3614,7 @@ static void test_file_all_name_information(void) wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); ok(io.Information == FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength, - "io.Information is %lu\n", io.Information ); + "io.Information is %Iu\n", io.Information ); CloseHandle( h ); HeapFree( GetProcessHeap(), 0, info ); @@ -3655,7 +3656,7 @@ static void test_file_all_name_information(void) memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS); info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->NameInformation.FileName, expected ), "info->NameInformation.FileName is %s, expected %s.\n", wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); @@ -3677,12 +3678,12 @@ static void _test_completion_flags(unsigned line, HANDLE handle, DWORD expected_ info.Flags = 0xdeadbeef; status = pNtQueryInformationFile(handle, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - ok_(__FILE__,line)(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status); - ok_(__FILE__,line)(io.Information == sizeof(info), "Information = %lu\n", io.Information); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); + ok_(__FILE__,line)(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status); + ok_(__FILE__,line)(io.Information == sizeof(info), "Information = %Iu\n", io.Information); /* FILE_SKIP_SET_USER_EVENT_ON_FAST_IO is not supported on win2k3 */ ok_(__FILE__,line)((info.Flags & ~FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) == expected_flags, - "got %08x\n", info.Flags); + "got %08lx\n", info.Flags); } static void test_file_completion_information(void) @@ -3703,7 +3704,7 @@ static void test_file_completion_information(void) status = pNtSetInformationFile(h, &io, &info, sizeof(info) - 1, FileIoCompletionNotificationInformation); ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS /* XP */), - "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + "expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); if (status != STATUS_INFO_LENGTH_MISMATCH) { win_skip("FileIoCompletionNotificationInformation class not supported\n"); @@ -3713,34 +3714,34 @@ static void test_file_completion_information(void) info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08lx\n", status); CloseHandle(h); if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return; info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE); info.Flags = FILE_SKIP_SET_USER_EVENT_ON_FAST_IO; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE); info.Flags = 0; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE); info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); info.Flags = 0xdeadbeef; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); CloseHandle(h); @@ -3750,36 +3751,36 @@ static void test_file_completion_information(void) memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0); - ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError()); + ok(port != NULL, "CreateIoCompletionPort failed, error %lu\n", GetLastError()); for (i = 0; i < 10; i++) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, - "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError()); ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); + ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError()); ret = FALSE; } if (ret) { - ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes); key = 0; pov = NULL; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); - ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key); + ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError()); + ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %Ix\n", key); ok(pov == &ov, "expected %p, got %p\n", &ov, pov); } info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); for (i = 0; i < 10; i++) @@ -3787,15 +3788,15 @@ static void test_file_completion_information(void) SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, - "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError()); ret = FALSE; } if (ret) { - ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes); pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500); @@ -3805,7 +3806,7 @@ static void test_file_completion_information(void) info.Flags = 0; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); for (i = 0; i < 10; i++) @@ -3813,17 +3814,17 @@ static void test_file_completion_information(void) SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, - "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError()); ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); + ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError()); ret = FALSE; } if (ret) { - ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes); pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); @@ -3838,32 +3839,32 @@ static void test_file_completion_information(void) return; port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0); - ok(port != NULL, "CreateIoCompletionPort failed, error %u.\n", GetLastError()); + ok(port != NULL, "CreateIoCompletionPort failed, error %lu.\n", GetLastError()); info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %#x.\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %#lx.\n", status); test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); ret = WriteFile(h, aligned_buf, sizeof(aligned_buf), &num_bytes, &ov); if (!ret && GetLastError() == ERROR_IO_PENDING) { ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed, error %u.\n", GetLastError()); - ok(num_bytes == sizeof(aligned_buf), "expected sizeof(aligned_buf), got %u.\n", num_bytes); + ok(ret, "GetOverlappedResult failed, error %lu.\n", GetLastError()); + ok(num_bytes == sizeof(aligned_buf), "expected sizeof(aligned_buf), got %lu.\n", num_bytes); ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - ok(ret, "GetQueuedCompletionStatus failed, error %u.\n", GetLastError()); + ok(ret, "GetQueuedCompletionStatus failed, error %lu.\n", GetLastError()); } - ok(num_bytes == sizeof(aligned_buf), "expected sizeof(buf), got %u.\n", num_bytes); + ok(num_bytes == sizeof(aligned_buf), "expected sizeof(buf), got %lu.\n", num_bytes); SetLastError(0xdeadbeef); ret = ReadFile(h, aligned_buf, sizeof(aligned_buf), &num_bytes, &ov); - ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected result, ret %#x, error %u.\n", + ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected result, ret %#x, error %lu.\n", ret, GetLastError()); ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed, error %u.\n", GetLastError()); + ok(ret, "GetOverlappedResult failed, error %lu.\n", GetLastError()); ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - ok(ret, "GetQueuedCompletionStatus failed, error %u.\n", GetLastError()); + ok(ret, "GetQueuedCompletionStatus failed, error %lu.\n", GetLastError()); CloseHandle(ov.hEvent); CloseHandle(port); @@ -3896,15 +3897,15 @@ static void test_file_id_information(void) ok( ret, "GetFileInformationByHandle failed\n" ); dwords = (DWORD *)&fid.VolumeSerialNumber; - ok( dwords[0] == info.dwVolumeSerialNumber, "expected %08x, got %08x\n", + ok( dwords[0] == info.dwVolumeSerialNumber, "expected %08lx, got %08lx\n", info.dwVolumeSerialNumber, dwords[0] ); ok( dwords[1] != 0x11111111, "expected != 0x11111111\n" ); dwords = (DWORD *)&fid.FileId; - ok( dwords[0] == info.nFileIndexLow, "expected %08x, got %08x\n", info.nFileIndexLow, dwords[0] ); - ok( dwords[1] == info.nFileIndexHigh, "expected %08x, got %08x\n", info.nFileIndexHigh, dwords[1] ); - ok( dwords[2] == 0, "expected 0, got %08x\n", dwords[2] ); - ok( dwords[3] == 0, "expected 0, got %08x\n", dwords[3] ); + ok( dwords[0] == info.nFileIndexLow, "expected %08lx, got %08lx\n", info.nFileIndexLow, dwords[0] ); + ok( dwords[1] == info.nFileIndexHigh, "expected %08lx, got %08lx\n", info.nFileIndexHigh, dwords[1] ); + ok( dwords[2] == 0, "expected 0, got %08lx\n", dwords[2] ); + ok( dwords[3] == 0, "expected 0, got %08lx\n", dwords[3] ); CloseHandle( h ); } @@ -3919,15 +3920,15 @@ static void test_file_access_information(void) if (!(h = create_temp_file(0))) return; status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAccessInformation ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAccessInformation ); - ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status ); memset(&info, 0x11, sizeof(info)); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAccessInformation ); - ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status ); - ok( info.AccessFlags == 0x13019f, "got %08x\n", info.AccessFlags ); + ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status ); + ok( info.AccessFlags == 0x13019f, "got %08lx\n", info.AccessFlags ); CloseHandle( h ); } @@ -3943,37 +3944,37 @@ static void test_file_attribute_tag_information(void) if (!(h = create_temp_file(0))) return; status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAttributeTagInformation ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status ); status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAttributeTagInformation ); - ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); memset(&info, 0x11, sizeof(info)); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); info.FileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; - ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#x\n", info.FileAttributes ); - ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#lx\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag ); fbi.FileAttributes = FILE_ATTRIBUTE_SYSTEM; status = pNtSetInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); memset(&info, 0x11, sizeof(info)); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); - todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#x\n", info.FileAttributes ); - ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag ); fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN; status = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); memset(&info, 0x11, sizeof(info)); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); - ok( status == STATUS_SUCCESS, "got %#x\n", status ); - todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#x\n", info.FileAttributes ); - ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#lx\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag ); CloseHandle( h ); } @@ -4019,7 +4020,7 @@ static void test_file_mode(void) GetTempPathW(MAX_PATH, tmp_path); res = GetTempFileNameW(tmp_path, fooW, 0, dos_file_name); - ok(res, "GetTempFileNameW failed: %u\n", GetLastError()); + ok(res, "GetTempFileNameW failed: %lu\n", GetLastError()); pRtlDosPathNameToNtPathName_U( dos_file_name, &file_name, NULL, NULL ); pipe_dev_name.Buffer = pipe_devW; @@ -4048,18 +4049,18 @@ static void test_file_mode(void) if (option_tests[i].file_name == &file_name) { file = CreateFileW(dos_file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError()); CloseHandle(file); access |= GENERIC_WRITE | DELETE; } status = pNtOpenFile(&file, access, &attr, &io, 0, option_tests[i].options); - ok(status == STATUS_SUCCESS, "[%u] NtOpenFile failed: %x\n", i, status); + ok(status == STATUS_SUCCESS, "[%u] NtOpenFile failed: %lx\n", i, status); memset(&mode, 0xcc, sizeof(mode)); status = pNtQueryInformationFile(file, &io, &mode, sizeof(mode), FileModeInformation); - ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %x\n", i, status); - ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %x, expected %x\n", + ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %lx\n", i, status); + ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %lx, expected %lx\n", i, mode.Mode, option_tests[i].mode); pNtClose(file); @@ -4092,7 +4093,7 @@ static void test_query_volume_information_file(void) status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); ZeroMemory( buf, sizeof(buf) ); @@ -4103,19 +4104,19 @@ static void test_query_volume_information_file(void) ffvi = (FILE_FS_VOLUME_INFORMATION *)buf; - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); - ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", U(io).Status); ok(io.Information == (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), - "expected %d, got %lu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), + "expected %ld, got %Iu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), io.Information); todo_wine ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); - ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength); + ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %ld\n", ffvi->VolumeLabelLength); - trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel)); + trace("VolumeSerialNumber: %lx VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel)); CloseHandle( dir ); } @@ -4142,7 +4143,7 @@ static void test_query_attribute_information_file(void) status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); - ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); ZeroMemory( buf, sizeof(buf) ); @@ -4153,13 +4154,13 @@ static void test_query_attribute_information_file(void) ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf; - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); - ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", U(io).Status); ok(ffai->FileSystemAttributes != 0, "Missing FileSystemAttributes\n"); ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); - trace("FileSystemAttributes: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + trace("FileSystemAttributes: %lx MaximumComponentNameLength: %lx FileSystemName: %s\n", ffai->FileSystemAttributes, ffai->MaximumComponentNameLength, wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); @@ -4220,11 +4221,11 @@ static void test_NtCreateFile(void) td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, td[i].disposition, 0, NULL, 0); - ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + ok(status == td[i].status, "%ld: expected %#lx got %#lx\n", i, td[i].status, status); if (!status) { - ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information); + ok(io.Information == td[i].result,"%ld: expected %#lx got %#Ix\n", i, td[i].result, io.Information); ret = GetFileAttributesW(path); ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; @@ -4232,11 +4233,11 @@ static void test_NtCreateFile(void) if (ret != td[i].attrib_out) { todo_wine - ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + ok(ret == td[i].attrib_out, "%ld: expected %#lx got %#lx\n", i, td[i].attrib_out, ret); SetFileAttributesW(path, td[i].attrib_out); } else - ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + ok(ret == td[i].attrib_out, "%ld: expected %#lx got %#lx\n", i, td[i].attrib_out, ret); CloseHandle(handle); } @@ -4270,33 +4271,33 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, NULL, sizeof(buf), &offset, NULL); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); hfile = create_temp_file(0); if (!hfile) return; @@ -4304,50 +4305,50 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); - ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; SetEvent(event); status = pNtWriteFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); - ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); ok(!is_signaled(event), "event is not signaled\n"); U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; SetEvent(event); status = pNtReadFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); ok(is_signaled(event), "event is not signaled\n"); U(iob).Status = -1; iob.Information = -1; SetEvent(event); status = pNtReadFile(hfile, event, NULL, NULL, &iob, (void*)0xdeadbeef, sizeof(contents), NULL, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); ok(is_signaled(event), "event is not signaled\n"); U(iob).Status = -1; iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, 7, NULL, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 7, "expected 7, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 7, "expected 7, got %Iu\n", iob.Information); SetFilePointer(hfile, 0, NULL, FILE_BEGIN); @@ -4355,41 +4356,41 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents + 7, sizeof(contents) - 7, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); ok(!ret, "ReadFile should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); SetFilePointer(hfile, 0, NULL, FILE_BEGIN); bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); for (i = -20; i < -1; i++) @@ -4400,9 +4401,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); } SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN); @@ -4411,65 +4412,65 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); - ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); - ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status); + ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); SetFilePointer(hfile, 0, NULL, FILE_BEGIN); bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); SetFilePointer(hfile, 0, NULL, FILE_BEGIN); bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(ret, "WriteFile error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); /* test reading beyond EOF */ bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, NULL, 0, &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); S(U(ovl)).Offset = sizeof(contents); S(U(ovl)).OffsetHigh = 0; @@ -4480,10 +4481,10 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ok(!ret, "ReadFile should fail\n"); - ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); S(U(ovl)).Offset = sizeof(contents); S(U(ovl)).OffsetHigh = 0; @@ -4493,57 +4494,57 @@ static void test_read_write(void) bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, &ovl); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); - ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); - ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status); + ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); - ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status); + ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); - ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status); + ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); for (i = -20; i < 0; i++) { @@ -4553,9 +4554,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); } SetFilePointer(hfile, 0, NULL, FILE_BEGIN); @@ -4563,48 +4564,48 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information); ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents) - 4; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); S(U(ovl)).Offset = sizeof(contents) - 4; S(U(ovl)).OffsetHigh = 0; @@ -4612,11 +4613,11 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); - ok(ret, "WriteFile error %d\n", GetLastError()); - ok(bytes == 4, "bytes %u\n", bytes); + ok(ret, "WriteFile error %ld\n", GetLastError()); + ok(bytes == 4, "bytes %lu\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; @@ -4626,15 +4627,15 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); - ok(ret, "ReadFile error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(ret, "ReadFile error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off); + ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off); CloseHandle(hfile); @@ -4645,8 +4646,8 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); ok(!ret, "ReadFile should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; @@ -4657,23 +4658,23 @@ static void test_read_write(void) SetLastError(0xdeadbeef); /* ReadFile return value depends on Windows version and testing it is not practical */ ReadFile(hfile, buf, 0, &bytes, &ovl); - ok(bytes == 0, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(bytes == 0, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); ok(!ret, "WriteFile should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); U(iob).Status = -1; iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); for (i = -20; i < -1; i++) { @@ -4681,9 +4682,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); } U(iob).Status = -1; @@ -4691,31 +4692,31 @@ static void test_read_write(void) offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "expected STATUS_PENDING, got %#x.\n", status); + "expected STATUS_PENDING, got %#lx.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); } - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); ok(!ret, "ReadFile should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(bytes == 0, "bytes %u\n", bytes); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(bytes == 0, "bytes %lu\n", bytes); U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); for (i = -20; i < 0; i++) { @@ -4723,13 +4724,13 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information); } off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); /* test reading beyond EOF */ offset.QuadPart = sizeof(contents); @@ -4744,11 +4745,11 @@ static void test_read_write(void) ok(!ret, "ReadFile should fail\n"); ret = GetLastError(); ok(ret == ERROR_IO_PENDING || broken(ret == ERROR_HANDLE_EOF) /* before Vista */, - "expected ERROR_IO_PENDING, got %d\n", ret); - ok(bytes == 0, "bytes %u\n", bytes); + "expected ERROR_IO_PENDING, got %ld\n", ret); + ok(bytes == 0, "bytes %lu\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); if (ret == ERROR_IO_PENDING) { @@ -4756,14 +4757,14 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); ok(!ret, "GetOverlappedResult should report FALSE\n"); - ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); - ok(bytes == 0, "expected 0, read %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %ld\n", GetLastError()); + ok(bytes == 0, "expected 0, read %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); } off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); offset.QuadPart = sizeof(contents); S(U(ovl)).Offset = offset.u.LowPart; @@ -4775,22 +4776,22 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, &ovl); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, - "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError()); ret = GetLastError(); - ok(bytes == 0, "bytes %u\n", bytes); + ok(bytes == 0, "bytes %lu\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); if (ret == ERROR_IO_PENDING) { bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); - ok(bytes == 0, "expected 0, read %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(ret, "GetOverlappedResult returned FALSE with %lu (expected TRUE)\n", GetLastError()); + ok(bytes == 0, "expected 0, read %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); } offset.QuadPart = sizeof(contents); @@ -4803,22 +4804,22 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, - "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError()); ret = GetLastError(); - ok(bytes == 0, "bytes %u\n", bytes); + ok(bytes == 0, "bytes %lu\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); if (ret == ERROR_IO_PENDING) { bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); - ok(bytes == 0, "expected 0, read %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + ok(ret, "GetOverlappedResult returned FALSE with %lu (expected TRUE)\n", GetLastError()); + ok(bytes == 0, "expected 0, read %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh); } U(iob).Status = -1; @@ -4828,41 +4829,41 @@ static void test_read_write(void) if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); - ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); + ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); } else { - ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); - ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); - ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status); + ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information); } off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "expected STATUS_PENDING, got %#x.\n", status); + "expected STATUS_PENDING, got %#lx.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); } else { - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information); } off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; @@ -4873,27 +4874,27 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, - "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError()); if (!ret) - ok(bytes == 0, "bytes %u\n", bytes); + ok(bytes == 0, "bytes %lu\n", bytes); else - ok(bytes == 14, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(bytes == 14, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); bytes = 0xdeadbeef; ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(ret, "GetOverlappedResult error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh); ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN); SetEndOfFile(hfile); @@ -4904,40 +4905,40 @@ static void test_read_write(void) offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "expected STATUS_PENDING, got %#x.\n", status); + "expected STATUS_PENDING, got %#lx.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); } - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, - "expected STATUS_PENDING, got %#x.\n", status); + "expected STATUS_PENDING, got %#lx.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); } - ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); - ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); S(U(ovl)).Offset = sizeof(contents) - 4; S(U(ovl)).OffsetHigh = 0; @@ -4948,29 +4949,29 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, - "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result %#lx, GetLastError() %lu.\n", ret, GetLastError()); if (!ret) { - ok(bytes == 0, "bytes %u\n", bytes); + ok(bytes == 0, "bytes %lu\n", bytes); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); } - else ok(bytes == 4, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + else ok(bytes == 4, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %Iu\n", ovl.InternalHigh); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); bytes = 0xdeadbeef; ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == 4, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + ok(ret, "GetOverlappedResult error %ld\n", GetLastError()); + ok(bytes == 4, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %Iu\n", ovl.InternalHigh); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; @@ -4981,31 +4982,31 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, - "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); + "Unexpected result %#lx, GetLastError() %lu.\n", ret, GetLastError()); if (!ret) { - ok(bytes == 0, "bytes %u\n", bytes); + ok(bytes == 0, "bytes %lu\n", bytes); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret); } - else ok(bytes == 14, "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + else ok(bytes == 14, "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); bytes = 0xdeadbeef; ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); - ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(ret, "GetOverlappedResult error %ld\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %lu\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); + ok(off == 0, "expected 0, got %lu\n", off); CloseHandle(event); CloseHandle(hfile); @@ -5025,18 +5026,18 @@ static void test_ioctl(void) SetEvent(event); status = pNtFsControlFile(file, event, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0); todo_wine - ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile returned %x\n", status); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile returned %lx\n", status); ok(!is_signaled(event), "event is signaled\n"); status = pNtFsControlFile(file, (HANDLE)0xdeadbeef, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0); - ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); + ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %lx\n", status); memset(&iosb, 0x55, sizeof(iosb)); status = pNtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); todo_wine - ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status); - ok(iosb.Status == 0x55555555, "iosb.Status = %x\n", iosb.Status); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %lx\n", status); + ok(iosb.Status == 0x55555555, "iosb.Status = %lx\n", iosb.Status); CloseHandle(event); CloseHandle(file); @@ -5057,51 +5058,51 @@ static void test_flush_buffers_file(void) hfileread = CreateFileA(buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %ld.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status); status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); - ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status); io_status_block.Information = 0xdeadbeef; io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(hfile, &io_status_block); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); - ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#x.\n", + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status); + ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#lx.\n", io_status_block.Status); - ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#lx.\n", + ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#Ix.\n", io_status_block.Information); status = pNtFlushBuffersFile(hfileread, &io_status_block); - ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status); io_status_block.Information = 0xdeadbeef; io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(NULL, &io_status_block); - ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); - ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#lx.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#lx.\n", io_status_block.Status); - ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#Ix.\n", io_status_block.Information); CloseHandle(hfileread); CloseHandle(hfile); hfile = CreateFileA(buffer, FILE_APPEND_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %ld.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, &io_status_block); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status); io_status_block.Information = 0xdeadbeef; io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile((HANDLE)0xdeadbeef, &io_status_block); - ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); - ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#lx.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#lx.\n", io_status_block.Status); - ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#Ix.\n", io_status_block.Information); CloseHandle(hfile); @@ -5135,40 +5136,40 @@ static void test_file_readonly_access(void) status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_READONLY, default_sharing, FILE_CREATE, 0, NULL, 0); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status); CloseHandle(handle); /* NtCreateFile FILE_GENERIC_WRITE */ status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); - ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status); /* NtCreateFile DELETE without FILE_DELETE_ON_CLOSE */ status = pNtCreateFile(&handle, DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status); CloseHandle(handle); /* NtCreateFile DELETE with FILE_DELETE_ON_CLOSE */ status = pNtCreateFile(&handle, SYNCHRONIZE | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); - ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status); + ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#lx.\n", status); /* NtOpenFile GENERIC_WRITE */ status = pNtOpenFile(&handle, GENERIC_WRITE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE); - ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status); /* NtOpenFile DELETE without FILE_DELETE_ON_CLOSE */ status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE); - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status); CloseHandle(handle); /* NtOpenFile DELETE with FILE_DELETE_ON_CLOSE */ status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE); - ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status); + ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#lx.\n", status); ret = GetFileAttributesW(path); - ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#x.\n", ret); + ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#lx.\n", ret); /* Clean up */ pRtlFreeUnicodeString(&nameW); @@ -5185,43 +5186,43 @@ static void test_mailslot_name(void) NTSTATUS ret; server = CreateMailslotA( "\\\\.\\mailslot\\winetest", 100, 1000, NULL ); - ok(server != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + ok(server != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError()); ret = NtQueryInformationFile( server, &io, buffer, 0, FileNameInformation ); - ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret); + ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret); memset(buffer, 0xcc, sizeof(buffer)); ret = NtQueryInformationFile( server, &io, buffer, offsetof(FILE_NAME_INFORMATION, FileName[5]), FileNameInformation ); - todo_wine ok(ret == STATUS_BUFFER_OVERFLOW, "got %#x\n", ret); + todo_wine ok(ret == STATUS_BUFFER_OVERFLOW, "got %#lx\n", ret); if (ret == STATUS_BUFFER_OVERFLOW) { - ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength); + ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength); ok(!memcmp(name->FileName, L"\\wine", 10), "got %s\n", debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); } memset(buffer, 0xcc, sizeof(buffer)); ret = NtQueryInformationFile( server, &io, buffer, sizeof(buffer), FileNameInformation ); - todo_wine ok(!ret, "got %#x\n", ret); + todo_wine ok(!ret, "got %#lx\n", ret); if (!ret) { - ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength); + ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength); ok(!memcmp(name->FileName, L"\\winetest", 18), "got %s\n", debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); } client = CreateFileA( "\\\\.\\mailslot\\winetest", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); - ok(client != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + ok(client != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError()); ret = NtQueryInformationFile( client, &io, buffer, 0, FileNameInformation ); - ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret); + ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret); ret = NtQueryInformationFile( client, &io, buffer, sizeof(buffer), FileNameInformation ); - todo_wine ok(ret == STATUS_INVALID_PARAMETER || !ret /* win8+ */, "got %#x\n", ret); + todo_wine ok(ret == STATUS_INVALID_PARAMETER || !ret /* win8+ */, "got %#lx\n", ret); if (!ret) { - ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength); + ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength); ok(!memcmp(name->FileName, L"\\winetest", 18), "got %s\n", debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); } @@ -5230,13 +5231,13 @@ static void test_mailslot_name(void) CloseHandle( client ); device = CreateFileA("\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + ok(device != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError()); ret = NtQueryInformationFile( device, &io, buffer, 0, FileNameInformation ); - ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret); + ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret); ret = NtQueryInformationFile( device, &io, buffer, sizeof(buffer), FileNameInformation ); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); CloseHandle( device ); }

1 0